* [U-Boot] [PATCH] devkit8000: Fix build break
@ 2011-09-16 16:42 s-paulraj at ti.com
2011-09-16 22:59 ` Tom Rini
0 siblings, 1 reply; 5+ messages in thread
From: s-paulraj at ti.com @ 2011-09-16 16:42 UTC (permalink / raw)
To: u-boot
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
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] devkit8000: Fix build break
2011-09-16 16:42 [U-Boot] [PATCH] devkit8000: Fix build break s-paulraj at ti.com
@ 2011-09-16 22:59 ` Tom Rini
2011-09-17 6:56 ` Albert ARIBAUD
0 siblings, 1 reply; 5+ messages in thread
From: Tom Rini @ 2011-09-16 22:59 UTC (permalink / raw)
To: u-boot
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...
--
Tom
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] devkit8000: Fix build break
2011-09-16 22:59 ` Tom Rini
@ 2011-09-17 6:56 ` Albert ARIBAUD
2011-09-18 23:27 ` Paulraj, Sandeep
0 siblings, 1 reply; 5+ messages in thread
From: Albert ARIBAUD @ 2011-09-17 6:56 UTC (permalink / raw)
To: u-boot
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 at 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 at lilith:~/src/u-boot-arm$
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 5+ messages in thread* [U-Boot] [PATCH] devkit8000: Fix build break
2011-09-17 6:56 ` Albert ARIBAUD
@ 2011-09-18 23:27 ` Paulraj, Sandeep
2011-09-19 2:19 ` Tom Rini
0 siblings, 1 reply; 5+ messages in thread
From: Paulraj, Sandeep @ 2011-09-18 23:27 UTC (permalink / raw)
To: u-boot
> > 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 at 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 at 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] devkit8000: Fix build break
2011-09-18 23:27 ` Paulraj, Sandeep
@ 2011-09-19 2:19 ` Tom Rini
0 siblings, 0 replies; 5+ messages in thread
From: Tom Rini @ 2011-09-19 2:19 UTC (permalink / raw)
To: u-boot
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 at 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 at 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.
--
Tom
--
Tom
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-09-19 2:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-16 16:42 [U-Boot] [PATCH] devkit8000: Fix build break s-paulraj at ti.com
2011-09-16 22:59 ` Tom Rini
2011-09-17 6:56 ` Albert ARIBAUD
2011-09-18 23:27 ` Paulraj, Sandeep
2011-09-19 2:19 ` Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox