summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-09-08 00:03:22 +0200
committerWolfgang Denk <wd@denx.de>2010-09-08 00:03:22 +0200
commit09b4a9cf4003599f2cd609587dfa5f0b754640ed (patch)
tree768c7e70dc393814643ed7b7290ea8e33fa95ba3 /Makefile
parent27130f133eda205b07d97b475a2ef96ec3f46b0f (diff)
parenta87bc64cb4311323f592265541ced6ec9171d4d6 (diff)
downloadu-boot-imx-09b4a9cf4003599f2cd609587dfa5f0b754640ed.zip
u-boot-imx-09b4a9cf4003599f2cd609587dfa5f0b754640ed.tar.gz
u-boot-imx-09b4a9cf4003599f2cd609587dfa5f0b754640ed.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-samsung
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 4f1cb1b..332c79a 100644
--- a/Makefile
+++ b/Makefile
@@ -253,6 +253,13 @@ ifeq ($(SOC),omap4)
LIBS += $(CPUDIR)/omap-common/libomap-common.a
endif
+ifeq ($(SOC),s5pc1xx)
+LIBS += $(CPUDIR)/s5p-common/libs5p-common.a
+endif
+ifeq ($(SOC),s5pc2xx)
+LIBS += $(CPUDIR)/s5p-common/libs5p-common.a
+endif
+
LIBS := $(addprefix $(obj),$(LIBS))
.PHONY : $(LIBS) $(TIMESTAMP_FILE) $(VERSION_FILE)