diff mbox

[U-Boot] arm: Tegra: Fix Harmony and Ventana builds

Message ID 1324336129-4488-1-git-send-email-twarren@nvidia.com
State Accepted
Commit 5b37bd3afdae436b8c1490e19a436a11e652e1cf
Headers show

Commit Message

Tom Warren Dec. 19, 2011, 11:08 p.m. UTC
Signed-off-by: Tom Warren <twarren@nvidia.com>

BUG=none
TEST=built all 3 (Harmony, Seaboard and Ventana) and tested Seaboard
---
 board/nvidia/harmony/Makefile |    1 -
 board/nvidia/ventana/Makefile |    3 +--
 include/configs/ventana.h     |    3 +++
 3 files changed, 4 insertions(+), 3 deletions(-)

Comments

Stephen Warren Dec. 20, 2011, 12:06 a.m. UTC | #1
Tom Warren wrote at Monday, December 19, 2011 4:09 PM:
> Signed-off-by: Tom Warren <twarren@nvidia.com>
> 
> BUG=none
> TEST=built all 3 (Harmony, Seaboard and Ventana) and tested Seaboard

Tom,

I'm a little confused by this. The patch removes ../common/board.o from
COBJS for Harmony and Ventana, but not from Seaboard, and at least in
u-boot-tegra/ next, Seaboard still references that file.

Also, applying this patch causes Harmony and Ventana to fail to build
(link) due to undefined symbols typically provided by common/board.o.

What branch is the patch targeted at, and what build problems is it
solving?
Albert ARIBAUD Dec. 20, 2011, 6:55 a.m. UTC | #2
Hi all,

Le 20/12/2011 01:06, Stephen Warren a écrit :
> Tom Warren wrote at Monday, December 19, 2011 4:09 PM:
>> Signed-off-by: Tom Warren<twarren@nvidia.com>
>>
>> BUG=none
>> TEST=built all 3 (Harmony, Seaboard and Ventana) and tested Seaboard
>
> Tom,
>
> I'm a little confused by this. The patch removes ../common/board.o from
> COBJS for Harmony and Ventana, but not from Seaboard, and at least in
> u-boot-tegra/ next, Seaboard still references that file.
>
> Also, applying this patch causes Harmony and Ventana to fail to build
> (link) due to undefined symbols typically provided by common/board.o.
>
> What branch is the patch targeted at, and what build problems is it
> solving?

Plus, I would suggest making the commit message less cryptic; I can make 
no heads or tails of these "BUG=" and "TEST=" lines.

Amicalement,
diff mbox

Patch

diff --git a/board/nvidia/harmony/Makefile b/board/nvidia/harmony/Makefile
index f6599de..b6efa1c 100644
--- a/board/nvidia/harmony/Makefile
+++ b/board/nvidia/harmony/Makefile
@@ -31,7 +31,6 @@  endif
 LIB	= $(obj)lib$(BOARD).o
 
 COBJS	:= $(BOARD).o
-COBJS	+= ../common/board.o
 
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
diff --git a/board/nvidia/ventana/Makefile b/board/nvidia/ventana/Makefile
index 9e5a87f..b4ab79a 100644
--- a/board/nvidia/ventana/Makefile
+++ b/board/nvidia/ventana/Makefile
@@ -30,8 +30,7 @@  endif
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS	+= ../seaboard/seaboard.o
-COBJS	+= ../common/board.o
+COBJS	= ../seaboard/seaboard.o
 
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index afd6ff6..acc9b43 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -52,4 +52,7 @@ 
 #define CONFIG_EFI_PARTITION
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
+
+/* Environment not stored */
+#define CONFIG_ENV_IS_NOWHERE
 #endif /* __CONFIG_H */