summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-10-17 20:38:56 +0900
committerTom Rini <trini@ti.com>2013-10-31 13:26:44 -0400
commit09ab61c660726e94550d0a5d2fbef11bed2cf924 (patch)
treea0c9518f5e4d437682d62f93845554a54bfe1639
parent3c5edd8ca594c73162ef01c45dbf4ea6f7148003 (diff)
downloadu-boot-imx-09ab61c660726e94550d0a5d2fbef11bed2cf924.zip
u-boot-imx-09ab61c660726e94550d0a5d2fbef11bed2cf924.tar.gz
u-boot-imx-09ab61c660726e94550d0a5d2fbef11bed2cf924.tar.bz2
ARM: s5pc, exynos: move Samsung ARM SoC specific code under arch/arm/
This patch moves S5PC, EXYNOS specific directory entries from the toplevel Makefile to arch/arm/cpu/armv7/Makefile using Kbuild descending feature. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Minkyu Kang <mk7.kang@samsung.com>
-rw-r--r--Makefile6
-rw-r--r--arch/arm/cpu/armv7/Makefile4
-rw-r--r--spl/Makefile4
3 files changed, 4 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index c6a9c0d..03389dd 100644
--- a/Makefile
+++ b/Makefile
@@ -304,12 +304,6 @@ ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35 mxs vf610))
LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
endif
-ifeq ($(SOC),s5pc1xx)
-LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o
-endif
-ifeq ($(SOC),exynos)
-LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o
-endif
LIBS-$(CONFIG_ARM) += arch/arm/cpu/libcpu.o
LIBS := $(addprefix $(obj),$(sort $(LIBS-y)))
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile
index a5d5bf3..d3347b3 100644
--- a/arch/arm/cpu/armv7/Makefile
+++ b/arch/arm/cpu/armv7/Makefile
@@ -25,3 +25,7 @@ endif
obj-$(CONFIG_OMAP_COMMON) += omap-common/
obj-$(CONFIG_TEGRA) += tegra-common/
+
+ifneq (,$(filter s5pc1xx exynos,$(SOC)))
+obj-y += s5p-common/
+endif
diff --git a/spl/Makefile b/spl/Makefile
index 8e7daa2..bf7271d 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -111,10 +111,6 @@ ifneq ($(CONFIG_MX23)$(CONFIG_MX35),)
LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
endif
-ifeq ($(SOC),exynos)
-LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o
-endif
-
# Add GCC lib
ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
PLATFORM_LIBGCC = $(SPLTREE)/arch/$(ARCH)/lib/libgcc.o