Skip to contentSkip to conversation

devkit8000: Fix build break

PATCH New s-paulraj at ti.com 4 participants 5 messages Sep 16, 2011 – Sep 19, 2011 Arm (32-bit)

lore
Share & tools
lore

s-paulraj at ti.com

author
#0 lore raw

PATCH 1/1 devkit8000: Fix build break

From: Sandeep Paulraj <[email protected]>

Found a build erros when i ran MAKEALL.
So fix it.

Signed-off-by Sandeep Paulraj <[email protected]>
---
 arch/arm/include/asm/omap_common.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/include/asm/omap_common.h +1 -1
index 015cede..66d6b71 100644
@@ -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
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 devkit8000: Fix build break

Quoted 21 lines · On Fri, Sep 16, 2011 at 9:42 AM, <[email protected]> wrote:

From: Sandeep Paulraj <[email protected]>

Found a build erros when i ran MAKEALL.
So fix it.

Signed-off-by Sandeep Paulraj <[email protected]>

---
?arch/arm/include/asm/omap_common.h | ? ?2 +-
?1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/include/asm/omap_common.h +0 -0
index 015cede..66d6b71 100644
@@ -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

arch/arm/include/asm/omap_common.h +1 -1
-#elif CONFIG_OMAP34XX /* OMAP3 */
+#elif defined(CONFIG_OMAP34XX) /* OMAP3 */
Quoted 3 lines

?#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...

Signature · 1 line
Tom
#2 lore raw

PATCH 1/1 devkit8000: Fix build break

Le 17/09/2011 00:59, Tom Rini a ?crit :

Quoted 12 lines · On Fri, Sep 16, 2011 at 9:42 AM,<[email protected]> wrote:
Quoted 11 lines

From: Sandeep Paulraj<[email protected]>

Found a build erros when i ran MAKEALL.
So fix it.

Signed-off-by Sandeep Paulraj<[email protected]>
---
  arch/arm/include/asm/omap_common.h |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
Quoted 16 lines

arch/arm/include/asm/omap_common.h void preloader_console_init(void); · line 51

Quoted 13 lines
arch/arm/include/asm/omap_common.h +1 -1
index 015cede..66d6b71 100644
@@ -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,

Signature · 1 line
Albert.
#3 lore raw

PATCH 1/1 devkit8000: Fix build break

Quoted 10 lines
Quoted 2 lines

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

Quoted 5 lines

--------------------- 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

#4 lore raw

PATCH 1/1 devkit8000: Fix build break

Quoted 16 lines · Sandeep
Quoted 10 lines
Quoted 2 lines

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

Quoted 5 lines

--------------------- SUMMARY ---------------------------- Boards compiled: 1
----------------------------------------------------------
uboot at lilith:~/src/u-boot-arm$

Quoted 5 lines

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.

Signature · 4 lines
Tom

-- 
Tom