kbuild: Descend into SOC directory from CPU directory

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>

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/

arch/arm/cpu/arm1136/Makefile

@@ -7,3 +7,5 @@
 
 extra-y	= start.o
 obj-y	= cpu.o
+
+obj-y += $(if $(SOC),$(SOC)/)

arch/arm/cpu/arm1176/Makefile

@@ -10,3 +10,5 @@
 
 extra-y	= start.o
 obj-y	= cpu.o
+
+obj-y += $(if $(SOC),$(SOC)/)

arch/arm/cpu/arm720t/Makefile

@@ -9,3 +9,5 @@ extra-y	= start.o
 obj-y	= interrupts.o cpu.o
 
 obj-$(CONFIG_TEGRA) += tegra-common/
+
+obj-y += $(if $(SOC),$(SOC)/)

arch/arm/cpu/arm920t/Makefile

@@ -9,3 +9,5 @@ extra-y	= start.o
 
 obj-y	+= cpu.o
 obj-$(CONFIG_USE_IRQ)	+= interrupts.o
+
+obj-y += $(if $(SOC),$(SOC)/)

arch/arm/cpu/arm926ejs/Makefile

@@ -13,3 +13,5 @@ ifdef	CONFIG_SPL_NO_CPU_SUPPORT_CODE
 extra-y	:=
 endif
 endif
+
+obj-y += $(if $(SOC),$(SOC)/)

arch/arm/cpu/armv7/Makefile

@@ -37,3 +37,5 @@ obj-$(CONFIG_TEGRA) += tegra-common/
 ifneq (,$(filter s5pc1xx exynos,$(SOC)))
 obj-y += s5p-common/
 endif
+
+obj-y += $(if $(SOC),$(SOC)/)

arch/arm/cpu/armv8/Makefile

@@ -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)/)

arch/avr32/cpu/Makefile

@@ -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)/)

arch/mips/cpu/mips32/Makefile

@@ -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)/)

arch/nds32/cpu/n1213/Makefile

@@ -13,3 +13,5 @@
 obj- := __dummy__.o
 
 extra-y	= start.o
+
+obj-y += $(if $(SOC),$(SOC)/)

arch/x86/cpu/Makefile

@@ -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)/)

board/davinci/da8xxevm/u-boot-spl-hawk.lds

@@ -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*)

scripts/Makefile.spl

@@ -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/