kbuild: Descend into SOC directory from CPU directory
authorMasahiro Yamada <yamada.m@jp.panasonic.com>
Thu, 13 Nov 2014 03:28:40 +0000 (12:28 +0900)
committerTom Rini <trini@ti.com>
Sun, 23 Nov 2014 11:49:02 +0000 (06:49 -0500)
Some CPUs of some architectures have SOC directories.
At present, the build system directly descends into SOC directories
from the top Makefile, but it should generally descend into each
directory from its parent directory.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
14 files changed:
Makefile
arch/arm/cpu/arm1136/Makefile
arch/arm/cpu/arm1176/Makefile
arch/arm/cpu/arm720t/Makefile
arch/arm/cpu/arm920t/Makefile
arch/arm/cpu/arm926ejs/Makefile
arch/arm/cpu/armv7/Makefile
arch/arm/cpu/armv8/Makefile
arch/avr32/cpu/Makefile
arch/mips/cpu/mips32/Makefile
arch/nds32/cpu/n1213/Makefile
arch/x86/cpu/Makefile
board/davinci/da8xxevm/u-boot-spl-hawk.lds
scripts/Makefile.spl

index ddea534..590fec8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -610,9 +610,6 @@ HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(srctree)/board/$(VENDOR)/common/Makef
 libs-y += lib/
 libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
 libs-y += $(CPUDIR)/
-ifdef SOC
-libs-y += $(CPUDIR)/$(SOC)/
-endif
 libs-$(CONFIG_OF_EMBED) += dts/
 libs-y += arch/$(ARCH)/lib/
 libs-y += fs/
index 3279f12..90dc7aa 100644 (file)
@@ -7,3 +7,5 @@
 
 extra-y        = start.o
 obj-y  = cpu.o
+
+obj-y += $(if $(SOC),$(SOC)/)
index deec427..b64edf9 100644 (file)
@@ -10,3 +10,5 @@
 
 extra-y        = start.o
 obj-y  = cpu.o
+
+obj-y += $(if $(SOC),$(SOC)/)
index 6badb3b..9893b08 100644 (file)
@@ -9,3 +9,5 @@ extra-y = start.o
 obj-y  = interrupts.o cpu.o
 
 obj-$(CONFIG_TEGRA) += tegra-common/
+
+obj-y += $(if $(SOC),$(SOC)/)
index aac8043..9f885ff 100644 (file)
@@ -9,3 +9,5 @@ extra-y = start.o
 
 obj-y  += cpu.o
 obj-$(CONFIG_USE_IRQ)  += interrupts.o
+
+obj-y += $(if $(SOC),$(SOC)/)
index 1252995..bd1ef8b 100644 (file)
@@ -13,3 +13,5 @@ ifdef CONFIG_SPL_NO_CPU_SUPPORT_CODE
 extra-y        :=
 endif
 endif
+
+obj-y += $(if $(SOC),$(SOC)/)
index afeed4d..7d8ca08 100644 (file)
@@ -37,3 +37,5 @@ obj-$(CONFIG_TEGRA) += tegra-common/
 ifneq (,$(filter s5pc1xx exynos,$(SOC)))
 obj-y += s5p-common/
 endif
+
+obj-y += $(if $(SOC),$(SOC)/)
index 7d93f59..d2488e7 100644 (file)
@@ -14,3 +14,5 @@ obj-y += exceptions.o
 obj-y  += cache.o
 obj-y  += tlb.o
 obj-y  += transition.o
+
+obj-y += $(if $(SOC),$(SOC)/)
index 5e11721..2f7adf8 100644 (file)
@@ -16,3 +16,5 @@ obj-y                 += cache.o
 obj-y                  += interrupts.o
 obj-$(CONFIG_PORTMUX_PIO) += portmux-pio.o
 obj-$(CONFIG_PORTMUX_GPIO) += portmux-gpio.o
+
+obj-y += $(if $(SOC),$(SOC)/)
index e0e6309..1221b9e 100644 (file)
@@ -8,3 +8,5 @@
 extra-y        = start.o
 obj-y  = cache.o
 obj-y  += cpu.o interrupts.o time.o
+
+obj-y += $(if $(SOC),$(SOC)/)
index 206d304..be98c4a 100644 (file)
@@ -13,3 +13,5 @@
 obj- := __dummy__.o
 
 extra-y        = start.o
+
+obj-y += $(if $(SOC),$(SOC)/)
index 9d38ef7..b5ad1ba 100644 (file)
@@ -11,3 +11,5 @@
 extra-y        = start.o
 obj-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o
 obj-y  += interrupts.o cpu.o call64.o
+
+obj-y += $(if $(SOC),$(SOC)/)
index 682f268..5c629db 100644 (file)
@@ -20,7 +20,7 @@ SECTIONS
        {
          *(.vectors)
          arch/arm/cpu/arm926ejs/start.o                (.text*)
-         arch/arm/cpu/arm926ejs/davinci/built-in.o     (.text*)
+         arch/arm/cpu/arm926ejs/built-in.o             (.text*)
          drivers/mtd/nand/built-in.o                   (.text*)
 
          *(.text*)
index 07db0bf..69f7c9f 100644 (file)
@@ -60,9 +60,6 @@ libs-y += arch/$(ARCH)/lib/
 
 libs-y += $(CPUDIR)/
 
-ifdef SOC
-libs-y += $(CPUDIR)/$(SOC)/
-endif
 libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/)
 libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/