From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Vasut Date: Fri, 20 Jul 2012 22:26:03 +0200 Subject: [U-Boot] [PULL] u-boot-usb/master In-Reply-To: References: <201207191452.53818.marex@denx.de> Message-ID: <201207202226.03514.marex@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Dear Ilya Yanok, > Hi, > > On Fri, Jul 20, 2012 at 10:59 PM, McClintock Matthew-B29882 < > > B29882 at freescale.com> wrote: > > On Fri, Jul 20, 2012 at 1:56 PM, Marek Vasut wrote: > > > Dear McClintock Matthew-B29882, > > > > > > [...] > > > > > >> I think this merge is causing issues. Resetting to the previous merge > > >> (ad8439d Merge branch 'sf' of git://git.denx.de/u-boot-blackfin) and > > >> the issues go away. > > >> > > >> -M > > >> > > >> Generating include/generated/asm-offsets.h > > >> bootm.c:329:16: error: expected ')' before '__attribute__' > > including breaks __attribute__((noinline)) (has to be > changed to noinline). I believe it's enough to fix this file and remove > #define noinline from lib/vsprintf.c It isn't, but there's a patch that changes __aligned to __attribute__((aligned(...))); and removes compiler.h > Regards, Ilya. Best regards, Marek Vasut