Commit 360a0cab authored by Rob Herring's avatar Rob Herring
Browse files

ARM: move all dtb targets out of Makefile.boot 



In preparation to support multi-platform kernels, move all the dtb targets
out of the mach Makefile.boot and into the arch/arm/boot/dts/Makefile
which is closer to the sources.

DTBs are only built when CONFIG_OF is enabled and now use top level
CONFIG_ARCH_xxx instead of chip or board specific config options.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Cc: Viresh Kumar <viresh.linux@gmail.com>
Cc: Shiraz Hashim <shiraz.hashim@st.com>
Cc: Rajeev Kumar <rajeev-dlh.kumar@st.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
parent 59bba2a9

arch/arm/boot/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ ifneq ($(MACHINE),) 
include $(srctree)/$(MACHINE)/Makefile.boot

endif



include $(srctree)/arch/arm/boot/dts/Makefile



# Note: the following conditions must always be true:

#   ZRELADDR == virt_to_phys(PAGE_OFFSET + TEXT_OFFSET)

#   PARAMS_PHYS must be within 4MB of ZRELADDR

arch/arm/boot/dts/Makefile

0 → 100644
+71 −0
Original line number Diff line number Diff line 
ifeq ($(CONFIG_OF),y)



dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb \

	at91sam9263ek.dtb \

	at91sam9g20ek_2mmc.dtb \

	at91sam9g20ek.dtb \

	at91sam9g25ek.dtb \

	at91sam9m10g45ek.dtb \

	at91sam9n12ek.dtb \

	ethernut5.dtb \

	evk-pro3.dtb \

	kizbox.dtb \

	tny_a9260.dtb \

	tny_a9263.dtb \

	tny_a9g20.dtb \

	usb_a9260.dtb \

	usb_a9263.dtb \

	usb_a9g20.dtb

dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \

	exynos4210-smdkv310.dtb \

	exynos5250-smdk5250.dtb

dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb

dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb

dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \

	kirkwood-dns325.dtb \

	kirkwood-dreamplug.dtb \

	kirkwood-goflexnet.dtb \

	kirkwood-ib62x0.dtb \

	kirkwood-iconnect.dtb \

	kirkwood-lschlv2.dtb \

	kirkwood-lsxhl.dtb \

	kirkwood-ts219-6281.dtb \

	kirkwood-ts219-6282.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \

	armada-xp-db.dtb

dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \

	imx53-ard.dtb \

	imx53-evk.dtb \

	imx53-qsb.dtb \

	imx53-smd.dtb \

	imx6q-arm2.dtb \

	imx6q-sabrelite.dtb \

	imx6q-sabresd.dtb

dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \

	imx23-olinuxino.dtb \

	imx23-stmp378x_devb.dtb \

	imx28-apx4devkit.dtb \

	imx28-cfa10036.dtb \

	imx28-evk.dtb \

	imx28-m28evk.dtb \

	imx28-tx28.dtb

dtb-$(CONFIG_ARCH_U8500) += snowball.dtb

dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \

	spear1340-evb.dtb

dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \

	spear310-evb.dtb \

	spear320-evb.dtb

dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb

dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \

	tegra20-paz00.dtb \

	tegra20-seaboard.dtb \

	tegra20-trimslice.dtb \

	tegra20-ventana.dtb \

	tegra20-whistler.dtb \

	tegra30-cardhu.dtb

dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \

	vexpress-v2p-ca9.dtb \

	vexpress-v2p-ca15-tc1.dtb \

	vexpress-v2p-ca15_a7.dtb



endif

arch/arm/mach-at91/Makefile.boot

+0 −24
Original line number Diff line number Diff line
@@ -12,27 +12,3 @@ else 
params_phys-y	:= 0x20000100

initrd_phys-y	:= 0x20410000

endif
 


# Keep dtb files sorted alphabetically for each SoC

# sam9260

dtb-$(CONFIG_MACH_AT91SAM_DT) += aks-cdu.dtb

dtb-$(CONFIG_MACH_AT91SAM_DT) += ethernut5.dtb

dtb-$(CONFIG_MACH_AT91SAM_DT) += evk-pro3.dtb

dtb-$(CONFIG_MACH_AT91SAM_DT) += tny_a9260.dtb

dtb-$(CONFIG_MACH_AT91SAM_DT) += usb_a9260.dtb

# sam9263

dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9263ek.dtb

dtb-$(CONFIG_MACH_AT91SAM_DT) += tny_a9263.dtb

dtb-$(CONFIG_MACH_AT91SAM_DT) += usb_a9263.dtb

# sam9g20

dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9g20ek.dtb

dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9g20ek_2mmc.dtb

dtb-$(CONFIG_MACH_AT91SAM_DT) += kizbox.dtb

dtb-$(CONFIG_MACH_AT91SAM_DT) += tny_a9g20.dtb

dtb-$(CONFIG_MACH_AT91SAM_DT) += usb_a9g20.dtb

# sam9g45

dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9m10g45ek.dtb

# sam9n12

dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9n12ek.dtb

# sam9x5

dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9g25ek.dtb

arch/arm/mach-exynos/Makefile.boot

+0 −3
Original line number Diff line number Diff line 
   zreladdr-y	+= 0x40008000

params_phys-y	:= 0x40000100
 


dtb-$(CONFIG_MACH_EXYNOS4_DT) += exynos4210-origen.dtb exynos4210-smdkv310.dtb

dtb-$(CONFIG_MACH_EXYNOS5_DT) += exynos5250-smdk5250.dtb

arch/arm/mach-imx/Makefile.boot

+0 −7
Original line number Diff line number Diff line
@@ -37,10 +37,3 @@ initrd_phys-$(CONFIG_SOC_IMX53) := 0x70800000 
zreladdr-$(CONFIG_SOC_IMX6Q)	+= 0x10008000

params_phys-$(CONFIG_SOC_IMX6Q)	:= 0x10000100

initrd_phys-$(CONFIG_SOC_IMX6Q)	:= 0x10800000
 


dtb-$(CONFIG_MACH_IMX51_DT) += imx51-babbage.dtb

dtb-$(CONFIG_MACH_IMX53_DT) += imx53-ard.dtb imx53-evk.dtb \

			       imx53-qsb.dtb imx53-smd.dtb

dtb-$(CONFIG_SOC_IMX6Q)	+= imx6q-arm2.dtb \

			   imx6q-sabrelite.dtb \

			   imx6q-sabresd.dtb \

CRA Git | Maintained and supported by SUSTech CRA and CCSE