]> git.sur5r.net Git - u-boot/commitdiff
arm: Tegra: Fix Harmony and Ventana builds in u-boot-tegra/master
authorTom Warren <twarren@nvidia.com>
Mon, 19 Dec 2011 22:58:06 +0000 (15:58 -0700)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 24 Dec 2011 09:23:32 +0000 (10:23 +0100)
Seaboard changes have removed the need for common/board.o in the
Makefile. Propagate this change to the other Tegra2 builds.

Signed-off-by: Tom Warren <twarren@nvidia.com>
board/nvidia/harmony/Makefile
board/nvidia/ventana/Makefile
include/configs/ventana.h

index f6599ded803ef24283424564438811a0d2cb4e58..b6efa1c29a0931431f64505e1c183828fdab0880 100644 (file)
@@ -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))
index d5140c81354ed97b734debc714ad6da8f4373774..eced3239f4507bb8967c4637e7a3768aadb58def 100644 (file)
@@ -31,8 +31,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))
index afd6ff610cbfb7d38df4b4ad0824a9a79aaacf55..acc9b434bbc36f834bb35534678ee1427db2e6a5 100644 (file)
@@ -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 */