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>

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>
Masahiro Yamada · Tom Rini
1 parent be25d875b9
Showing 14 changed files with 23 additions and 7 deletions Side-by-side Diff
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
@@ -610,9 +610,6 @@
 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/
@@ -7,4 +7,6 @@
  
 extra-y	= start.o
 obj-y	= cpu.o
+
+obj-y += $(if $(SOC),$(SOC)/)
@@ -10,4 +10,6 @@
  
 extra-y	= start.o
 obj-y	= cpu.o
+
+obj-y += $(if $(SOC),$(SOC)/)
@@ -9,4 +9,6 @@
 obj-y	= interrupts.o cpu.o
  
 obj-$(CONFIG_TEGRA) += tegra-common/
+
+obj-y += $(if $(SOC),$(SOC)/)
@@ -9,4 +9,6 @@
  
 obj-y	+= cpu.o
 obj-$(CONFIG_USE_IRQ)	+= interrupts.o
+
+obj-y += $(if $(SOC),$(SOC)/)
@@ -13,4 +13,6 @@
 extra-y	:=
 endif
 endif
+
+obj-y += $(if $(SOC),$(SOC)/)
@@ -37,4 +37,6 @@
 ifneq (,$(filter s5pc1xx exynos,$(SOC)))
 obj-y += s5p-common/
 endif
+
+obj-y += $(if $(SOC),$(SOC)/)
@@ -14,4 +14,6 @@
 obj-y	+= cache.o
 obj-y	+= tlb.o
 obj-y	+= transition.o
+
+obj-y += $(if $(SOC),$(SOC)/)
@@ -16,4 +16,6 @@
 obj-y			+= interrupts.o
 obj-$(CONFIG_PORTMUX_PIO) += portmux-pio.o
 obj-$(CONFIG_PORTMUX_GPIO) += portmux-gpio.o
+
+obj-y += $(if $(SOC),$(SOC)/)
@@ -8,4 +8,6 @@
 extra-y	= start.o
 obj-y	= cache.o
 obj-y	+= cpu.o interrupts.o time.o
+
+obj-y += $(if $(SOC),$(SOC)/)
@@ -13,4 +13,6 @@
 obj- := __dummy__.o
  
 extra-y	= start.o
+
+obj-y += $(if $(SOC),$(SOC)/)
@@ -11,4 +11,6 @@
 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)/)
@@ -20,7 +20,7 @@
 	{
 	  *(.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*)
@@ -60,9 +60,6 @@
  
 libs-y += $(CPUDIR)/
  
-ifdef SOC
-libs-y += $(CPUDIR)/$(SOC)/
-endif
 libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/)
 libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
...	...	@@ -610,9 +610,6 @@
610	610	libs-y += lib/
611	611	libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
612	612	libs-y += $(CPUDIR)/
613		-ifdef SOC
614		-libs-y += $(CPUDIR)/$(SOC)/
615		-endif
616	613	libs-$(CONFIG_OF_EMBED) += dts/
617	614	libs-y += arch/$(ARCH)/lib/
618	615	libs-y += fs/
...	...	@@ -7,4 +7,6 @@
7	7
8	8	extra-y = start.o
9	9	obj-y = cpu.o
	10	+
	11	+obj-y += $(if $(SOC),$(SOC)/)
...	...	@@ -10,4 +10,6 @@
10	10
11	11	extra-y = start.o
12	12	obj-y = cpu.o
	13	+
	14	+obj-y += $(if $(SOC),$(SOC)/)
...	...	@@ -9,4 +9,6 @@
9	9	obj-y = interrupts.o cpu.o
10	10
11	11	obj-$(CONFIG_TEGRA) += tegra-common/
	12	+
	13	+obj-y += $(if $(SOC),$(SOC)/)
...	...	@@ -9,4 +9,6 @@
9	9
10	10	obj-y += cpu.o
11	11	obj-$(CONFIG_USE_IRQ) += interrupts.o
	12	+
	13	+obj-y += $(if $(SOC),$(SOC)/)
...	...	@@ -13,4 +13,6 @@
13	13	extra-y :=
14	14	endif
15	15	endif
	16	+
	17	+obj-y += $(if $(SOC),$(SOC)/)
...	...	@@ -37,4 +37,6 @@
37	37	ifneq (,$(filter s5pc1xx exynos,$(SOC)))
38	38	obj-y += s5p-common/
39	39	endif
	40	+
	41	+obj-y += $(if $(SOC),$(SOC)/)
...	...	@@ -14,4 +14,6 @@
14	14	obj-y += cache.o
15	15	obj-y += tlb.o
16	16	obj-y += transition.o
	17	+
	18	+obj-y += $(if $(SOC),$(SOC)/)
...	...	@@ -16,4 +16,6 @@
16	16	obj-y += interrupts.o
17	17	obj-$(CONFIG_PORTMUX_PIO) += portmux-pio.o
18	18	obj-$(CONFIG_PORTMUX_GPIO) += portmux-gpio.o
	19	+
	20	+obj-y += $(if $(SOC),$(SOC)/)
...	...	@@ -8,4 +8,6 @@
8	8	extra-y = start.o
9	9	obj-y = cache.o
10	10	obj-y += cpu.o interrupts.o time.o
	11	+
	12	+obj-y += $(if $(SOC),$(SOC)/)