ARM: dtb: move all dtb targets to common Makefile
Subsystems (6)
PATCH 1/1 ARM: dtb: move all dtb targets to common Makefile
Since the dtb targets have moved to arch/arm/boot/dts/Makefile, sweep the platforms that have had new targets added recently and move them over.
While I was at it, I also made the dtb generation more generic, i.e. if the platform is enabled then all dtbs for that platform will be created.
---
Already applied to next/multiplatform.
arch/arm/boot/dts/Makefile | 16 ++++++++++++++++ arch/arm/mach-msm/Makefile.boot | 3 --- arch/arm/mach-omap2/Makefile.boot | 6 ------ arch/arm/mach-prima2/Makefile.boot | 2 -- arch/arm/mach-shmobile/Makefile.boot | 4 ---- 5 files changed, 16 insertions(+), 15 deletions(-)
arch/arm/boot/dts/Makefile +16 -0
@@ -16,6 +16,7 @@ dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb \ usb_a9260.dtb \ usb_a9263.dtb \ usb_a9g20.dtb +dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ exynos4210-smdkv310.dtb \ exynos5250-smdk5250.dtb
@@ -31,6 +32,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ kirkwood-lsxhl.dtb \ kirkwood-ts219-6281.dtb \ kirkwood-ts219-6282.dtb +dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \ + msm8960-cdp.dtb dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ armada-xp-db.dtb dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
@@ -49,7 +52,20 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ imx28-evk.dtb \ imx28-m28evk.dtb \ imx28-tx28.dtb +dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ + omap3-beagle-xm.dtb \ + omap3-evm.dtb \ + omap3-tobi.dtb \ + omap4-panda.dtb \ + omap4-pandaES.dtb \ + omap4-var_som.dtb \ + omap4-sdp.dtb \ + omap5-evm.dtb +dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb dtb-$(CONFIG_ARCH_U8500) += snowball.dtb +dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ + r8a7740-armadillo800eva.dtb \ + sh73a0-kzm9g.dtb dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \ spear1340-evb.dtb dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \
arch/arm/mach-msm/Makefile.boot +0 -3
@@ -1,6 +1,3 @@ zreladdr-y += 0x10008000 params_phys-y := 0x10000100 initrd_phys-y := 0x10800000 - -dtb-$(CONFIG_ARCH_MSM8X60) += msm8660-surf.dtb -dtb-$(CONFIG_ARCH_MSM8960) += msm8960-cdp.dtb
arch/arm/mach-omap2/Makefile.boot +0 -6
@@ -1,9 +1,3 @@ zreladdr-y += 0x80008000 params_phys-y := 0x80000100 initrd_phys-y := 0x80800000 - -dtb-$(CONFIG_SOC_OMAP2420) += omap2420-h4.dtb -dtb-$(CONFIG_ARCH_OMAP3) += omap3-beagle-xm.dtb omap3-evm.dtb omap3-tobi.dtb -dtb-$(CONFIG_ARCH_OMAP4) += omap4-panda.dtb omap4-pandaES.dtb -dtb-$(CONFIG_ARCH_OMAP4) += omap4-var_som.dtb omap4-sdp.dtb -dtb-$(CONFIG_SOC_OMAP5) += omap5-evm.dtb
arch/arm/mach-prima2/Makefile.boot +0 -2
@@ -1,5 +1,3 @@ zreladdr-y += 0x00008000 params_phys-y := 0x00000100 initrd_phys-y := 0x00800000 - -dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
arch/arm/mach-shmobile/Makefile.boot +0 -4
@@ -7,7 +7,3 @@ __ZRELADDR := $(shell /bin/bash -c 'printf "0x%08x" \ # #params_phys-y (Instead: Pass atags pointer in r2) #initrd_phys-y (Instead: Use compiled-in initramfs) - -dtb-$(CONFIG_MACH_KZM9G) += sh73a0-kzm9g.dtb -dtb-$(CONFIG_MACH_KZM9D) += emev2-kzm9d.dtb -dtb-$(CONFIG_MACH_ARMADILLO800EVA) += r8a7740-armadillo800eva.dtb
Signature · 1 line
1.7.10.1.488.g05fbf7a
PATCH 1/1 ARM: dtb: move all dtb targets to common Makefile
Quoted 6 lines · Olof Johansson
Since the dtb targets have moved to
arch/arm/boot/dts/Makefile, sweep the platforms that have had new targets added recently and move them over.While I was at it, I also made the dtb generation more generic, i.e. if the platform is enabled then all dtbs for that platform will be created.
Quoted 7 lines
Signed-off-by Olof Johansson <[email protected]>Cc Tony Lindgren <[email protected]>Cc David Brown <[email protected]>Cc Barry Song <[email protected]>Cc Simon Horman <[email protected]>Cc Rob Herring <[email protected]>Cc Stephen Warren <[email protected]>
shmobile portions:
PATCH 1/1 ARM: dtb: move all dtb targets to common Makefile
In reply to Olof Johanssonarch/arm/boot/dts/Makefile
Quoted 9 lines · Olof Johansson
Since the dtb targets have moved to
arch/arm/boot/dts/Makefile, sweep the platforms that have had new targets added recently and move them over.While I was at it, I also made the dtb generation more generic, i.e. if the platform is enabled then all dtbs for that platform will be created.
arch/arm/boot/dts/Makefile +1
-0+dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
That's still in arch/arm/mach-bcm2835/Makefile.boot.
And I don't see any diffs for Tegra, which added some new files in the dt and dt2 branches IIRC (e.g. commit a3ee1293b1bec15e179b5a4c99fe07157de35202). Strangely, git log on arm-soc for-next commit bc51b817c64e6c3b9865b87a7c3d6b9d6ea9afb2 doesn't show any edits to arch/arm/mach-tegra/Makefile.boot even though that other commit I mentioned did touch the file and is in the history??? I guess I need sleep.
PATCH 1/1 ARM: dtb: move all dtb targets to common Makefile
Quoted 13 lines · Stephen Warren
arch/arm/boot/dts/Makefile
Quoted 9 lines · Olof Johansson
Since the dtb targets have moved to
arch/arm/boot/dts/Makefile, sweep the platforms that have had new targets added recently and move them over.While I was at it, I also made the dtb generation more generic, i.e. if the platform is enabled then all dtbs for that platform will be created.
arch/arm/boot/dts/Makefile +1
-0+dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtbThat's still in
arch/arm/mach-bcm2835/Makefile.boot.
Quoted 7 lines
And I don't see any diffs for Tegra, which added some new files in the dt and dt2 branches IIRC (e.g. commit
a3ee1293b1bec15e179b5a4c99fe07157de35202). Strangely, git log on arm-soc for-next commitbc51b817c64e6c3b9865b87a7c3d6b9d6ea9afb2doesn't show any edits toarch/arm/mach-tegra/Makefile.booteven though that other commit I mentioned did touch the file and is in the history??? I guess I need sleep.
Odd, something seems to have happened when I did a re-merge of the branch. You're right, they didn't get moved over properly (I do know for a fact that I did it by hand earlier tonight though).
I'll fix it up right away and push fresh branches. This means next/multiplatform and for-next will be rebased shortly. I'll send a reply when done.
-Olof
PATCH 1/1 ARM: dtb: move all dtb targets to common Makefile
Quoted 3 lines · Olof Johansson
I'll fix it up right away and push fresh branches. This means next/multiplatform and for-next will be rebased shortly. I'll send a reply when done.
Ok, done, should mirror out shortly.
Apologies for the churn; looks like I discovered one of the limitations of git rerere.
-Olof
PATCH 1/1 ARM: dtb: move all dtb targets to common Makefile
In reply to Olof JohanssonQuoted 13 lines · Olof Johansson
Since the dtb targets have moved to
arch/arm/boot/dts/Makefile, sweep the platforms that have had new targets added recently and move them over.While I was at it, I also made the dtb generation more generic, i.e. if the platform is enabled then all dtbs for that platform will be created.
Signed-off-by Olof Johansson <[email protected]>Cc Tony Lindgren <[email protected]>Cc David Brown <[email protected]>Cc Barry Song <[email protected]>Cc Simon Horman <[email protected]>Cc Rob Herring <[email protected]>Cc Stephen Warren <[email protected]>
Quoted 5 lines
---
Already applied to next/multiplatform.
arch/arm/mach-msm/Makefile.boot | 3 ---
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation