Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[u-boot] / Makefile

diff --git a/Makefile b/Makefile
index cd83ba76fb957bb6951552df09d694c2b2f3f3c4..9cea069980a42de677de5d6d8d18f0e71b3cca60 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -246,6 +246,13 @@ LIBS += lib/libfdt/libfdt.a
 LIBS += api/libapi.a
 LIBS += post/libpost.a
 
+ifeq ($(SOC),omap3)
+LIBS += $(CPUDIR)/omap-common/libomap-common.a
+endif
+ifeq ($(SOC),omap4)
+LIBS += $(CPUDIR)/omap-common/libomap-common.a
+endif
+
 LIBS := $(addprefix $(obj),$(LIBS))
 .PHONY : $(LIBS) $(TIMESTAMP_FILE) $(VERSION_FILE)
 
@@ -2172,6 +2179,15 @@ trizepsiv_config :       unconfig
        fi;
        @$(MKCONFIG) -n $@ -a trizepsiv arm pxa trizepsiv
 
+vpac270_nor_config \
+vpac270_onenand_config : unconfig
+       @mkdir -p $(obj)include
+       @if [ "$(findstring onenand,$@)" ] ; then \
+               echo "#define CONFIG_ONENAND_U_BOOT" \
+                       >>$(obj)include/config.h ; \
+       fi;
+       @$(MKCONFIG) -n $@ -a vpac270 arm pxa vpac270
+
 #########################################################################
 ## ARM1136 Systems
 #########################################################################