kbuild: use SoC-specific CONFIG to descend into SoC directory

Use "obj-$(CONFIG_FOO) += foo/" where it is possible. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

kbuild: use SoC-specific CONFIG to descend into SoC directory
Use "obj-$(CONFIG_FOO) += foo/" where it is possible. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Masahiro Yamada · Tom Rini
1 parent 37c9940a09
Showing 10 changed files with 60 additions and 14 deletions Side-by-side Diff
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
@@ -8,5 +8,6 @@
 extra-y	= start.o
 obj-y	= cpu.o
  
-obj-y += $(if $(SOC),$(SOC)/)
+obj-$(CONFIG_MX31) += mx31/
+obj-$(CONFIG_MX35) += mx35/
@@ -11,5 +11,6 @@
 extra-y	= start.o
 obj-y	= cpu.o
  
-obj-y += $(if $(SOC),$(SOC)/)
+obj-$(CONFIG_BCM2835) += bcm2835/
+obj-$(CONFIG_TNETV107X) += tnetv107x/
@@ -9,6 +9,8 @@
 obj-y	= interrupts.o cpu.o
  
 obj-$(CONFIG_TEGRA) += tegra-common/
-
-obj-y += $(if $(SOC),$(SOC)/)
+obj-$(CONFIG_TEGRA20) += tegra20/
+obj-$(CONFIG_TEGRA30) += tegra30/
+obj-$(CONFIG_TEGRA114) += tegra114/
+obj-$(CONFIG_TEGRA124) += tegra124/
@@ -10,5 +10,10 @@
 obj-y	+= cpu.o
 obj-$(CONFIG_USE_IRQ)	+= interrupts.o
  
-obj-y += $(if $(SOC),$(SOC)/)
+obj-$(if $(filter a320,$(SOC)),y) += a320/
+obj-$(CONFIG_AT91FAMILY) += at91/
+obj-$(CONFIG_EP93XX) += ep93xx/
+obj-$(CONFIG_IMX) += imx/
+obj-$(CONFIG_KS8695) += ks8695/
+obj-$(CONFIG_S3C24X0) += s3c24x0/
@@ -14,5 +14,18 @@
 endif
 endif
  
-obj-y += $(if $(SOC),$(SOC)/)
+obj-$(CONFIG_ARMADA100) += armada100/
+obj-$(CONFIG_AT91FAMILY) += at91/
+obj-$(CONFIG_ARCH_DAVINCI) += davinci/
+obj-$(CONFIG_KIRKWOOD) += kirkwood/
+obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/
+obj-$(CONFIG_MB86R0x) += mb86r0x/
+obj-$(CONFIG_MX25) += mx25/
+obj-$(CONFIG_MX27) += mx27/
+obj-$(if $(filter mxs,$(SOC)),y) += mxs/
+obj-$(CONFIG_ARCH_NOMADIK) += nomadik/
+obj-$(CONFIG_ORION5X) += orion5x/
+obj-$(CONFIG_PANTHEON) += pantheon/
+obj-$(if $(filter spear,$(SOC)),y) += spear/
+obj-$(CONFIG_ARCH_VERSATILE) += versatile/
@@ -38,5 +38,31 @@
 obj-y += s5p-common/
 endif
  
-obj-y += $(if $(SOC),$(SOC)/)
+obj-$(if $(filter am33xx,$(SOC)),y) += am33xx/
+obj-$(if $(filter armada-xp,$(SOC)),y) += armada-xp/
+obj-$(CONFIG_AT91FAMILY) += at91/
+obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/
+obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/
+obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/
+obj-$(CONFIG_ARCH_EXYNOS) += exynos/
+obj-$(CONFIG_ARCH_HIGHBANK) += highbank/
+obj-$(CONFIG_ARCH_KEYSTONE) += keystone/
+obj-$(if $(filter ls102xa,$(SOC)),y) += ls102xa/
+obj-$(if $(filter mx5,$(SOC)),y) += mx5/
+obj-$(CONFIG_MX6) += mx6/
+obj-$(CONFIG_OMAP34XX) += omap3/
+obj-$(CONFIG_OMAP44XX) += omap4/
+obj-$(CONFIG_OMAP54XX) += omap5/
+obj-$(CONFIG_RMOBILE) += rmobile/
+obj-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx/
+obj-$(CONFIG_SOCFPGA) += socfpga/
+obj-$(CONFIG_ARCH_SUNXI) += sunxi/
+obj-$(CONFIG_TEGRA20) += tegra20/
+obj-$(CONFIG_TEGRA30) += tegra30/
+obj-$(CONFIG_TEGRA114) += tegra114/
+obj-$(CONFIG_TEGRA124) += tegra124/
+obj-$(CONFIG_U8500) += u8500/
+obj-$(CONFIG_ARCH_UNIPHIER) += uniphier/
+obj-$(CONFIG_VF610) += vf610/
+obj-$(CONFIG_ZYNQ) += zynq/
@@ -15,5 +15,5 @@
 obj-y	+= tlb.o
 obj-y	+= transition.o
  
-obj-y += $(if $(SOC),$(SOC)/)
+obj-$(CONFIG_FSL_LSCH3) += fsl-lsch3/
@@ -17,5 +17,5 @@
 obj-$(CONFIG_PORTMUX_PIO) += portmux-pio.o
 obj-$(CONFIG_PORTMUX_GPIO) += portmux-gpio.o
  
-obj-y += $(if $(SOC),$(SOC)/)
+obj-$(if $(filter at32ap700x,$(SOC)),y) += at32ap700x/
@@ -9,5 +9,5 @@
 obj-y	= cache.o
 obj-y	+= cpu.o interrupts.o time.o
  
-obj-y += $(if $(SOC),$(SOC)/)
+obj-$(CONFIG_SOC_AU1X00) += au1x00/
@@ -9,10 +9,8 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-# necessary to create built-in.o
-obj- := __dummy__.o
-
 extra-y	= start.o
  
-obj-y += $(if $(SOC),$(SOC)/)
+obj-$(if $(filter ag101,$(SOC)),y) += ag101/
+obj-$(if $(filter ag102,$(SOC)),y) += ag102/
...	...	@@ -8,5 +8,6 @@
8	8	extra-y = start.o
9	9	obj-y = cpu.o
10	10
11		-obj-y += $(if $(SOC),$(SOC)/)
	11	+obj-$(CONFIG_MX31) += mx31/
	12	+obj-$(CONFIG_MX35) += mx35/
...	...	@@ -11,5 +11,6 @@
11	11	extra-y = start.o
12	12	obj-y = cpu.o
13	13
14		-obj-y += $(if $(SOC),$(SOC)/)
	14	+obj-$(CONFIG_BCM2835) += bcm2835/
	15	+obj-$(CONFIG_TNETV107X) += tnetv107x/
...	...	@@ -9,6 +9,8 @@
9	9	obj-y = interrupts.o cpu.o
10	10
11	11	obj-$(CONFIG_TEGRA) += tegra-common/
12		-
13		-obj-y += $(if $(SOC),$(SOC)/)
	12	+obj-$(CONFIG_TEGRA20) += tegra20/
	13	+obj-$(CONFIG_TEGRA30) += tegra30/
	14	+obj-$(CONFIG_TEGRA114) += tegra114/
	15	+obj-$(CONFIG_TEGRA124) += tegra124/
...	...	@@ -10,5 +10,10 @@
10	10	obj-y += cpu.o
11	11	obj-$(CONFIG_USE_IRQ) += interrupts.o
12	12
13		-obj-y += $(if $(SOC),$(SOC)/)
	13	+obj-$(if $(filter a320,$(SOC)),y) += a320/
	14	+obj-$(CONFIG_AT91FAMILY) += at91/
	15	+obj-$(CONFIG_EP93XX) += ep93xx/
	16	+obj-$(CONFIG_IMX) += imx/
	17	+obj-$(CONFIG_KS8695) += ks8695/
	18	+obj-$(CONFIG_S3C24X0) += s3c24x0/
...	...	@@ -14,5 +14,18 @@
14	14	endif
15	15	endif
16	16
17		-obj-y += $(if $(SOC),$(SOC)/)
	17	+obj-$(CONFIG_ARMADA100) += armada100/
	18	+obj-$(CONFIG_AT91FAMILY) += at91/
	19	+obj-$(CONFIG_ARCH_DAVINCI) += davinci/
	20	+obj-$(CONFIG_KIRKWOOD) += kirkwood/
	21	+obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/
	22	+obj-$(CONFIG_MB86R0x) += mb86r0x/
	23	+obj-$(CONFIG_MX25) += mx25/
	24	+obj-$(CONFIG_MX27) += mx27/
	25	+obj-$(if $(filter mxs,$(SOC)),y) += mxs/
	26	+obj-$(CONFIG_ARCH_NOMADIK) += nomadik/
	27	+obj-$(CONFIG_ORION5X) += orion5x/
	28	+obj-$(CONFIG_PANTHEON) += pantheon/
	29	+obj-$(if $(filter spear,$(SOC)),y) += spear/
	30	+obj-$(CONFIG_ARCH_VERSATILE) += versatile/
...	...	@@ -38,5 +38,31 @@
38	38	obj-y += s5p-common/
39	39	endif
40	40
41		-obj-y += $(if $(SOC),$(SOC)/)
	41	+obj-$(if $(filter am33xx,$(SOC)),y) += am33xx/
	42	+obj-$(if $(filter armada-xp,$(SOC)),y) += armada-xp/
	43	+obj-$(CONFIG_AT91FAMILY) += at91/
	44	+obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/
	45	+obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/
	46	+obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/
	47	+obj-$(CONFIG_ARCH_EXYNOS) += exynos/
	48	+obj-$(CONFIG_ARCH_HIGHBANK) += highbank/
	49	+obj-$(CONFIG_ARCH_KEYSTONE) += keystone/
	50	+obj-$(if $(filter ls102xa,$(SOC)),y) += ls102xa/
	51	+obj-$(if $(filter mx5,$(SOC)),y) += mx5/
	52	+obj-$(CONFIG_MX6) += mx6/
	53	+obj-$(CONFIG_OMAP34XX) += omap3/
	54	+obj-$(CONFIG_OMAP44XX) += omap4/
	55	+obj-$(CONFIG_OMAP54XX) += omap5/
	56	+obj-$(CONFIG_RMOBILE) += rmobile/
	57	+obj-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx/
	58	+obj-$(CONFIG_SOCFPGA) += socfpga/
	59	+obj-$(CONFIG_ARCH_SUNXI) += sunxi/
	60	+obj-$(CONFIG_TEGRA20) += tegra20/
	61	+obj-$(CONFIG_TEGRA30) += tegra30/
	62	+obj-$(CONFIG_TEGRA114) += tegra114/
	63	+obj-$(CONFIG_TEGRA124) += tegra124/
	64	+obj-$(CONFIG_U8500) += u8500/
	65	+obj-$(CONFIG_ARCH_UNIPHIER) += uniphier/
	66	+obj-$(CONFIG_VF610) += vf610/
	67	+obj-$(CONFIG_ZYNQ) += zynq/
...	...	@@ -15,5 +15,5 @@
15	15	obj-y += tlb.o
16	16	obj-y += transition.o
17	17
18		-obj-y += $(if $(SOC),$(SOC)/)
	18	+obj-$(CONFIG_FSL_LSCH3) += fsl-lsch3/
...	...	@@ -17,5 +17,5 @@
17	17	obj-$(CONFIG_PORTMUX_PIO) += portmux-pio.o
18	18	obj-$(CONFIG_PORTMUX_GPIO) += portmux-gpio.o
19	19
20		-obj-y += $(if $(SOC),$(SOC)/)
	20	+obj-$(if $(filter at32ap700x,$(SOC)),y) += at32ap700x/
...	...	@@ -9,5 +9,5 @@
9	9	obj-y = cache.o
10	10	obj-y += cpu.o interrupts.o time.o
11	11
12		-obj-y += $(if $(SOC),$(SOC)/)
	12	+obj-$(CONFIG_SOC_AU1X00) += au1x00/
...	...	@@ -9,10 +9,8 @@
9	9	# SPDX-License-Identifier: GPL-2.0+
10	10	#
11	11
12		-# necessary to create built-in.o
13		-obj- := __dummy__.o
14		-
15	12	extra-y = start.o
16	13
17		-obj-y += $(if $(SOC),$(SOC)/)
	14	+obj-$(if $(filter ag101,$(SOC)),y) += ag101/
	15	+obj-$(if $(filter ag102,$(SOC)),y) += ag102/