From: Tom Warren <twarren@nvidia.com>
Date: Mon, 19 Dec 2011 22:58:06 +0000 (-0700)
Subject: arm: Tegra: Fix Harmony and Ventana builds in u-boot-tegra/master
X-Git-Tag: v2012.04-rc1~329^2~7
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5b37bd3afdae436b8c1490e19a436a11e652e1cf;p=u-boot

arm: Tegra: Fix Harmony and Ventana builds in u-boot-tegra/master

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

diff --git a/board/nvidia/harmony/Makefile b/board/nvidia/harmony/Makefile
index f6599ded80..b6efa1c29a 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 d5140c8135..eced3239f4 100644
--- a/board/nvidia/ventana/Makefile
+++ b/board/nvidia/ventana/Makefile
@@ -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))
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index afd6ff610c..acc9b434bb 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 */