summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Warren <twarren@nvidia.com>2011-12-19 15:58:06 -0700
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-12-24 10:23:32 +0100
commit5b37bd3afdae436b8c1490e19a436a11e652e1cf (patch)
treef7959b2b2e2a1a4c8f2d9b5ea0f9ffd7c5fbfb60
parenta783bdb870047a837ec4928d4c3d222b1b1b506c (diff)
downloadblackbird-obmc-uboot-5b37bd3afdae436b8c1490e19a436a11e652e1cf.tar.gz
blackbird-obmc-uboot-5b37bd3afdae436b8c1490e19a436a11e652e1cf.zip
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>
-rw-r--r--board/nvidia/harmony/Makefile1
-rw-r--r--board/nvidia/ventana/Makefile3
-rw-r--r--include/configs/ventana.h3
3 files changed, 4 insertions, 3 deletions
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 */
OpenPOWER on IntegriCloud