Merge branch 'master' of ../master

[people/ms/u-boot.git] / Makefile

diff --git a/Makefile b/Makefile
index 9c4e3a44806337ebe9d24e4f4e06c6ad87458083..bba41cb125d507da22f8a92a85f593bbc3bbe518 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -245,6 +245,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)