Message ID | 1316191377-31718-1-git-send-email-s-paulraj@ti.com |
---|---|
State | Accepted |
Commit | d6cac9c83d22316d4eb59c7ae4f031e4dcc35842 |
Headers | show |
On Fri, Sep 16, 2011 at 9:42 AM, <s-paulraj@ti.com> wrote: > From: Sandeep Paulraj <s-paulraj@ti.com> > > Found a build erros when i ran MAKEALL. > So fix it. > > > Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> > --- > arch/arm/include/asm/omap_common.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h > index 015cede..66d6b71 100644 > --- a/arch/arm/include/asm/omap_common.h > +++ b/arch/arm/include/asm/omap_common.h > @@ -45,7 +45,7 @@ void preloader_console_init(void); > #define BOOT_DEVICE_ONE_NAND 4 > #define BOOT_DEVICE_MMC1 5 > #define BOOT_DEVICE_MMC2 6 > -#elif CONFIG_OMAP34XX /* OMAP3 */ > +#elif defined(CONFIG_OMAP34XX) /* OMAP3 */ > #define BOOT_DEVICE_NONE 0 > #define BOOT_DEVICE_XIP 1 > #define BOOT_DEVICE_NAND 2 I believe this only exists with the SPL patches merged which I thought was only in your next branch atm...
Le 17/09/2011 00:59, Tom Rini a écrit : > On Fri, Sep 16, 2011 at 9:42 AM,<s-paulraj@ti.com> wrote: >> From: Sandeep Paulraj<s-paulraj@ti.com> >> >> Found a build erros when i ran MAKEALL. >> So fix it. >> >> >> Signed-off-by: Sandeep Paulraj<s-paulraj@ti.com> >> --- >> arch/arm/include/asm/omap_common.h | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h >> index 015cede..66d6b71 100644 >> --- a/arch/arm/include/asm/omap_common.h >> +++ b/arch/arm/include/asm/omap_common.h >> @@ -45,7 +45,7 @@ void preloader_console_init(void); >> #define BOOT_DEVICE_ONE_NAND 4 >> #define BOOT_DEVICE_MMC1 5 >> #define BOOT_DEVICE_MMC2 6 >> -#elif CONFIG_OMAP34XX /* OMAP3 */ >> +#elif defined(CONFIG_OMAP34XX) /* OMAP3 */ >> #define BOOT_DEVICE_NONE 0 >> #define BOOT_DEVICE_XIP 1 >> #define BOOT_DEVICE_NAND 2 > > I believe this only exists with the SPL patches merged which I thought > was only in your next branch atm... Confirm, from current u-boot-arm/master: uboot@lilith:~/src/u-boot-arm$ ./MAKEALL devkit8000 Configuring for devkit8000 board... text data bss dec hex filename 277200 7540 216140 500880 7a490 ./u-boot --------------------- SUMMARY ---------------------------- Boards compiled: 1 ---------------------------------------------------------- uboot@lilith:~/src/u-boot-arm$ Amicalement,
> > I believe this only exists with the SPL patches merged which I thought > > was only in your next branch atm... > > Confirm, from current u-boot-arm/master: > > uboot@lilith:~/src/u-boot-arm$ ./MAKEALL devkit8000 > Configuring for devkit8000 board... > text data bss dec hex filename > 277200 7540 216140 500880 7a490 ./u-boot > > --------------------- SUMMARY ---------------------------- > Boards compiled: 1 > ---------------------------------------------------------- > uboot@lilith:~/src/u-boot-arm$ > That is correct. I intend to send a pull request for ti/next on Monday. Without this patch, I would have generated a new build error, hence the patch. You will get this as part of my next pull request. Thanks, Sandeep
On Sunday, September 18, 2011, Paulraj, Sandeep <s-paulraj@ti.com> wrote: >> > I believe this only exists with the SPL patches merged which I thought >> > was only in your next branch atm... >> >> Confirm, from current u-boot-arm/master: >> >> uboot@lilith:~/src/u-boot-arm$ ./MAKEALL devkit8000 >> Configuring for devkit8000 board... >> text data bss dec hex filename >> 277200 7540 216140 500880 7a490 ./u-boot >> >> --------------------- SUMMARY ---------------------------- >> Boards compiled: 1 >> ---------------------------------------------------------- >> uboot@lilith:~/src/u-boot-arm$ >> > > That is correct. > > I intend to send a pull request for ti/next on Monday. > > Without this patch, I would have generated a new build error, hence the patch. You will get this as part of my next pull request. I'm working on a v11 once NAND boot is working on omap3evm and beagle once that's working and getting these boards going required a little rework of the omap3 bits so I would like to hold on merging these for a little if we can.
diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h index 015cede..66d6b71 100644 --- a/arch/arm/include/asm/omap_common.h +++ b/arch/arm/include/asm/omap_common.h @@ -45,7 +45,7 @@ void preloader_console_init(void); #define BOOT_DEVICE_ONE_NAND 4 #define BOOT_DEVICE_MMC1 5 #define BOOT_DEVICE_MMC2 6 -#elif CONFIG_OMAP34XX /* OMAP3 */ +#elif defined(CONFIG_OMAP34XX) /* OMAP3 */ #define BOOT_DEVICE_NONE 0 #define BOOT_DEVICE_XIP 1 #define BOOT_DEVICE_NAND 2