* [PATCH V2] ARM: dts: Only build dtb if associated Arch and/or SoC is enabled
@ 2014-12-30 6:20 Peter Robinson
2015-01-12 22:42 ` Olof Johansson
0 siblings, 1 reply; 16+ messages in thread
From: Peter Robinson @ 2014-12-30 6:20 UTC (permalink / raw)
To: linux-arm-kernel
A number of arches (EXYNOS/IMX/TEGRA) are separated out into finer grained
definitions whether it be sub ARCH or SOC definitions. The device tree blobs
should only be built if the specific option is enabled that supports that
device or it might be that there's an expectation that the device is supported
when in actual fact it's not. This ensures only the relevant bits are built.
Also standardised the line break between the arch/soc definitions and the
dtbs to be on separate lines for better consistency as per feedback.
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Thierry Reding <treding@nvidia.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Shawn Guo <shawn.guo@freescale.com>
---
arch/arm/boot/dts/Makefile | 213 ++++++++++++++++++++++++++++++---------------
1 file changed, 141 insertions(+), 72 deletions(-)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 91bd5bd..5873b3e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -51,33 +51,43 @@ dtb-$(CONFIG_ARCH_AT91) += sama5d36ek.dtb
# sama5d4
dtb-$(CONFIG_ARCH_AT91) += at91-sama5d4ek.dtb
-dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
-dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb
-dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
-dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb
+dtb-$(CONFIG_ARCH_ATLAS6) += \
+ atlas6-evb.dtb
+dtb-$(CONFIG_ARCH_AXXIA) += \
+ axm5516-amarillo.dtb
+dtb-$(CONFIG_ARCH_BCM2835) += \
+ bcm2835-rpi-b.dtb \
+ bcm2835-rpi-b-plus.dtb
dtb-$(CONFIG_ARCH_BCM_5301X) += \
bcm4708-buffalo-wzr-1750dhp.dtb \
bcm4708-netgear-r6250.dtb \
bcm4708-netgear-r6300-v2.dtb \
bcm47081-asus-rt-n18u.dtb \
bcm47081-buffalo-wzr-600dhp2.dtb
-dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
-dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \
+dtb-$(CONFIG_ARCH_BCM_63XX) += \
+ bcm963138dvt.dtb
+dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \
+ bcm911360_entphn.dtb \
bcm911360k.dtb \
bcm958300k.dtb
-dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
+dtb-$(CONFIG_ARCH_BCM_MOBILE) += \
+ bcm28155-ap.dtb \
bcm21664-garnet.dtb
dtb-$(CONFIG_ARCH_BERLIN) += \
- berlin2-sony-nsz-gs7.dtb \
- berlin2cd-google-chromecast.dtb \
+ berlin2-sony-nsz-gs7.dtb \
+ berlin2cd-google-chromecast.dtb \
berlin2q-marvell-dmp.dtb
dtb-$(CONFIG_ARCH_BRCMSTB) += \
bcm7445-bcm97445svmb.dtb
-dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
+dtb-$(CONFIG_ARCH_DAVINCI) += \
+ da850-enbw-cmc.dtb \
da850-evm.dtb
-dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb
-dtb-$(CONFIG_ARCH_EXYNOS) += exynos3250-monk.dtb \
- exynos3250-rinato.dtb \
+dtb-$(CONFIG_ARCH_EFM32) += \
+ efm32gg-dk3750.dtb
+dtb-$(CONFIG_ARCH_EXYNOS3) += \
+ exynos3250-monk.dtb \
+ exynos3250-rinato.dtb
+dtb-$(CONFIG_ARCH_EXYNOS4) += \
exynos4210-origen.dtb \
exynos4210-smdkv310.dtb \
exynos4210-trats.dtb \
@@ -88,7 +98,8 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos3250-monk.dtb \
exynos4412-origen.dtb \
exynos4412-smdk4412.dtb \
exynos4412-tiny4412.dtb \
- exynos4412-trats2.dtb \
+ exynos4412-trats2.dtb
+dtb-$(CONFIG_ARCH_EXYNOS5) += \
exynos5250-arndale.dtb \
exynos5250-smdk5250.dtb \
exynos5250-snow.dtb \
@@ -101,17 +112,24 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos3250-monk.dtb \
exynos5440-sd5v1.dtb \
exynos5440-ssdk5440.dtb \
exynos5800-peach-pi.dtb
-dtb-$(CONFIG_ARCH_HI3xxx) += hi3620-hi4511.dtb
-dtb-$(CONFIG_ARCH_HIX5HD2) += hisi-x5hd2-dkb.dtb
-dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
+dtb-$(CONFIG_ARCH_HI3xxx) += \
+ hi3620-hi4511.dtb
+dtb-$(CONFIG_ARCH_HIX5HD2) += \
+ hisi-x5hd2-dkb.dtb
+dtb-$(CONFIG_ARCH_HIGHBANK) += \
+ highbank.dtb \
ecx-2000.dtb
-dtb-$(CONFIG_ARCH_HIP04) += hip04-d01.dtb
-dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
+dtb-$(CONFIG_ARCH_HIP04) += \
+ hip04-d01.dtb
+dtb-$(CONFIG_ARCH_INTEGRATOR) += \
+ integratorap.dtb \
integratorcp.dtb
-dtb-$(CONFIG_ARCH_KEYSTONE) += k2hk-evm.dtb \
+dtb-$(CONFIG_ARCH_KEYSTONE) += \
+ k2hk-evm.dtb \
k2l-evm.dtb \
k2e-evm.dtb
-dtb-$(CONFIG_MACH_KIRKWOOD) += kirkwood-b3.dtb \
+dtb-$(CONFIG_MACH_KIRKWOOD) += \
+ kirkwood-b3.dtb \
kirkwood-cloudbox.dtb \
kirkwood-d2net.dtb \
kirkwood-db-88f6281.dtb \
@@ -174,37 +192,49 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += kirkwood-b3.dtb \
kirkwood-ts219-6282.dtb \
kirkwood-ts419-6281.dtb \
kirkwood-ts419-6282.dtb
-dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
-dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
-dtb-$(CONFIG_MACH_MESON6) += meson6-atv1200.dtb
-dtb-$(CONFIG_ARCH_MMP) += pxa168-aspenite.dtb \
+dtb-$(CONFIG_ARCH_LPC32XX) += \
+ ea3250.dtb phy3250.dtb
+dtb-$(CONFIG_ARCH_MARCO) += \
+ marco-evb.dtb
+dtb-$(CONFIG_MACH_MESON6) += \
+ meson6-atv1200.dtb
+dtb-$(CONFIG_ARCH_MMP) += \
+ pxa168-aspenite.dtb \
pxa910-dkb.dtb \
mmp2-brownstone.dtb
-dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
-dtb-$(CONFIG_ARCH_MXC) += \
+dtb-$(CONFIG_ARCH_MOXART) += \
+ moxart-uc7112lx.dtb
+dtb-$(CONFIG_SOC_IMX1) += \
imx1-ads.dtb \
- imx1-apf9328.dtb \
+ imx1-apf9328.dtb
+dtb-$(CONFIG_SOC_IMX25) += \
imx25-eukrea-mbimxsd25-baseboard.dtb \
imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dtb \
imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dtb \
imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dtb \
imx25-karo-tx25.dtb \
- imx25-pdk.dtb \
+ imx25-pdk.dtb
+dtb-$(CONFIG_SOC_IMX31) += \
imx27-apf27.dtb \
imx27-apf27dev.dtb \
imx27-eukrea-mbimxsd27-baseboard.dtb \
imx27-pdk.dtb \
imx27-phytec-phycore-rdk.dtb \
- imx27-phytec-phycard-s-rdk.dtb \
- imx31-bug.dtb \
+ imx27-phytec-phycard-s-rdk.dtb
+dtb-$(CONFIG_SOC_IMX31) += \
+ imx31-bug.dtb
+dtb-$(CONFIG_SOC_IMX35) += \
imx35-eukrea-mbimxsd35-baseboard.dtb \
- imx35-pdk.dtb \
- imx50-evk.dtb \
+ imx35-pdk.dtb
+dtb-$(CONFIG_SOC_IMX50) += \
+ imx50-evk.dtb
+dtb-$(CONFIG_SOC_IMX51) += \
imx51-apf51.dtb \
imx51-apf51dev.dtb \
imx51-babbage.dtb \
imx51-digi-connectcore-jsk.dtb \
- imx51-eukrea-mbimxsd51-baseboard.dtb \
+ imx51-eukrea-mbimxsd51-baseboard.dtb
+dtb-$(CONFIG_SOC_IMX53) += \
imx53-ard.dtb \
imx53-m53evk.dtb \
imx53-mba53.dtb \
@@ -213,7 +243,8 @@ dtb-$(CONFIG_ARCH_MXC) += \
imx53-smd.dtb \
imx53-tx53-x03x.dtb \
imx53-tx53-x13x.dtb \
- imx53-voipac-bsb.dtb \
+ imx53-voipac-bsb.dtb
+dtb-$(CONFIG_SOC_IMX6Q) += \
imx6dl-aristainetos_4.dtb \
imx6dl-aristainetos_7.dtb \
imx6dl-cubox-i.dtb \
@@ -264,16 +295,21 @@ dtb-$(CONFIG_ARCH_MXC) += \
imx6q-tx6q-1010-comtft.dtb \
imx6q-tx6q-1020.dtb \
imx6q-tx6q-1020-comtft.dtb \
- imx6q-tx6q-1110.dtb \
- imx6sl-evk.dtb \
+ imx6q-tx6q-1110.dtb
+dtb-$(CONFIG_SOC_IMX6SL) += \
+ imx6sl-evk.dtb
+dtb-$(CONFIG_SOC_IMX6SX) += \
imx6sx-sdb.dtb \
+dtb-$(CONFIG_SOC_LS1021A) += \
ls1021a-qds.dtb \
- ls1021a-twr.dtb \
+ ls1021a-twr.dtb
+dtb-$(CONFIG_SOC_VF610) += \
vf500-colibri-eval-v3.dtb \
vf610-colibri-eval-v3.dtb \
vf610-cosmic.dtb \
vf610-twr.dtb
-dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
+dtb-$(CONFIG_ARCH_MXS) += \
+ imx23-evk.dtb \
imx23-olinuxino.dtb \
imx23-stmp378x_devb.dtb \
imx28-apf28.dtb \
@@ -294,17 +330,21 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
imx28-m28evk.dtb \
imx28-sps1.dtb \
imx28-tx28.dtb
-dtb-$(CONFIG_ARCH_NOMADIK) += ste-nomadik-s8815.dtb \
+dtb-$(CONFIG_ARCH_NOMADIK) += \
+ ste-nomadik-s8815.dtb \
ste-nomadik-nhk15.dtb
-dtb-$(CONFIG_ARCH_NSPIRE) += nspire-cx.dtb \
+dtb-$(CONFIG_ARCH_NSPIRE) += \
+ nspire-cx.dtb \
nspire-tp.dtb \
nspire-clp.dtb
-dtb-$(CONFIG_ARCH_OMAP2) += omap2420-h4.dtb \
+dtb-$(CONFIG_ARCH_OMAP2) += \
+ omap2420-h4.dtb \
omap2420-n800.dtb \
omap2420-n810.dtb \
omap2420-n810-wimax.dtb \
omap2430-sdp.dtb
-dtb-$(CONFIG_ARCH_OMAP3) += am3517-craneboard.dtb \
+dtb-$(CONFIG_ARCH_OMAP3) += \
+ am3517-craneboard.dtb \
am3517-evm.dtb \
am3517_mt_ventoux.dtb \
omap3430-sdp.dtb \
@@ -348,7 +388,8 @@ dtb-$(CONFIG_ARCH_OMAP3) += am3517-craneboard.dtb \
omap3-sbc-t3730.dtb \
omap3-thunder.dtb \
omap3-zoom3.dtb
-dtb-$(CONFIG_SOC_AM33XX) += am335x-base0033.dtb \
+dtb-$(CONFIG_SOC_AM33XX) += \
+ am335x-base0033.dtb \
am335x-bone.dtb \
am335x-boneblack.dtb \
am335x-evm.dtb \
@@ -356,7 +397,8 @@ dtb-$(CONFIG_SOC_AM33XX) += am335x-base0033.dtb \
am335x-nano.dtb \
am335x-pepper.dtb \
am335x-lxm.dtb
-dtb-$(CONFIG_ARCH_OMAP4) += omap4-duovero-parlor.dtb \
+dtb-$(CONFIG_ARCH_OMAP4) += \
+ omap4-duovero-parlor.dtb \
omap4-panda.dtb \
omap4-panda-a4.dtb \
omap4-panda-es.dtb \
@@ -364,20 +406,25 @@ dtb-$(CONFIG_ARCH_OMAP4) += omap4-duovero-parlor.dtb \
omap4-sdp-es23plus.dtb \
omap4-var-dvk-om44.dtb \
omap4-var-stk-om44.dtb
-dtb-$(CONFIG_SOC_AM43XX) += am43x-epos-evm.dtb \
+dtb-$(CONFIG_SOC_AM43XX) += \
+ am43x-epos-evm.dtb \
am437x-sk-evm.dtb \
am437x-gp-evm.dtb
-dtb-$(CONFIG_SOC_OMAP5) += omap5-cm-t54.dtb \
+dtb-$(CONFIG_SOC_OMAP5) += \
+ omap5-cm-t54.dtb \
omap5-sbc-t54.dtb \
omap5-uevm.dtb
-dtb-$(CONFIG_SOC_DRA7XX) += dra7-evm.dtb \
+dtb-$(CONFIG_SOC_DRA7XX) += \
+ dra7-evm.dtb \
am57xx-beagle-x15.dtb \
dra72-evm.dtb
-dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.dtb \
+dtb-$(CONFIG_ARCH_ORION5X) += \
+ orion5x-lacie-d2-network.dtb \
orion5x-lacie-ethernet-disk-mini-v2.dtb \
orion5x-maxtor-shared-storage-2.dtb \
orion5x-rd88f5182-nas.dtb
-dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
+dtb-$(CONFIG_ARCH_PRIMA2) += \
+ prima2-evb.dtb
dtb-$(CONFIG_ARCH_QCOM) += \
qcom-apq8064-cm-qs600.dtb \
qcom-apq8064-ifc6410.dtb \
@@ -388,17 +435,21 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-msm8660-surf.dtb \
qcom-msm8960-cdp.dtb \
qcom-msm8974-sony-xperia-honami.dtb
-dtb-$(CONFIG_ARCH_REALVIEW) += arm-realview-pb1176.dtb
+dtb-$(CONFIG_ARCH_REALVIEW) += \
+ arm-realview-pb1176.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += \
rk3066a-bqcurie2.dtb \
rk3066a-marsboard.dtb \
rk3188-radxarock.dtb \
rk3288-evb-act8846.dtb \
rk3288-evb-rk808.dtb
-dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
-dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
+dtb-$(CONFIG_ARCH_S3C24XX) += \
+ s3c2416-smdk2416.dtb
+dtb-$(CONFIG_ARCH_S3C64XX) += \
+ s3c6410-mini6410.dtb \
s3c6410-smdk6410.dtb
-dtb-$(CONFIG_ARCH_S5PV210) += s5pv210-aquila.dtb \
+dtb-$(CONFIG_ARCH_S5PV210) += \
+ s5pv210-aquila.dtb \
s5pv210-goni.dtb \
s5pv210-smdkc110.dtb \
s5pv210-smdkv210.dtb \
@@ -414,7 +465,8 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \
sh7372-mackerel.dtb \
sh73a0-kzm9g.dtb \
sh73a0-kzm9g-reference.dtb
-dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
+dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
+ emev2-kzm9d.dtb \
r7s72100-genmai.dtb \
r8a7740-armadillo800eva.dtb \
r8a7779-marzen.dtb \
@@ -422,20 +474,25 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
r8a7791-henninger.dtb \
r8a7791-koelsch.dtb \
r8a7794-alt.dtb
-dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
+dtb-$(CONFIG_ARCH_SOCFPGA) += \
+ socfpga_arria5_socdk.dtb \
socfpga_arria10_socdk.dtb \
socfpga_cyclone5_socdk.dtb \
socfpga_cyclone5_sockit.dtb \
socfpga_cyclone5_socrates.dtb \
socfpga_vt.dtb
-dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
+dtb-$(CONFIG_ARCH_SPEAR13XX) += \
+ spear1310-evb.dtb \
spear1340-evb.dtb
-dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \
+dtb-$(CONFIG_ARCH_SPEAR3XX) += \
+ spear300-evb.dtb \
spear310-evb.dtb \
spear320-evb.dtb \
spear320-hmi.dtb
-dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
-dtb-$(CONFIG_ARCH_STI)+= stih407-b2120.dtb \
+dtb-$(CONFIG_ARCH_SPEAR6XX) += \
+ spear600-evb.dtb
+dtb-$(CONFIG_ARCH_STI) += \
+ stih407-b2120.dtb \
stih410-b2120.dtb \
stih415-b2000.dtb \
stih415-b2020.dtb \
@@ -477,7 +534,8 @@ dtb-$(CONFIG_MACH_SUN8I) += \
sun8i-a23-ippo-q8h-v5.dtb
dtb-$(CONFIG_MACH_SUN9I) += \
sun9i-a80-optimus.dtb
-dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
+dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \
+ tegra20-harmony.dtb \
tegra20-iris-512.dtb \
tegra20-medcom-wide.dtb \
tegra20-paz00.dtb \
@@ -486,34 +544,43 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
tegra20-tec.dtb \
tegra20-trimslice.dtb \
tegra20-ventana.dtb \
- tegra20-whistler.dtb \
+ tegra20-whistler.dtb
+dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += \
tegra30-apalis-eval.dtb \
tegra30-beaver.dtb \
tegra30-cardhu-a02.dtb \
tegra30-cardhu-a04.dtb \
- tegra30-colibri-eval-v3.dtb \
+ tegra30-colibri-eval-v3.dtb
+dtb-$(CONFIG_ARCH_TEGRA_114_SOC) += \
tegra114-dalmore.dtb \
tegra114-roth.dtb \
- tegra114-tn7.dtb \
+ tegra114-tn7.dtb
+dtb-$(CONFIG_ARCH_TEGRA_124_SOC) += \
tegra124-jetson-tk1.dtb \
tegra124-nyan-big.dtb \
tegra124-venice2.dtb
-dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb
-dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
+dtb-$(CONFIG_ARCH_U300) += \
+ ste-u300.dtb
+dtb-$(CONFIG_ARCH_U8500) += \
+ ste-snowball.dtb \
ste-hrefprev60-stuib.dtb \
ste-hrefprev60-tvk.dtb \
ste-hrefv60plus-stuib.dtb \
ste-hrefv60plus-tvk.dtb \
ste-ccu8540.dtb \
ste-ccu9540.dtb
-dtb-$(CONFIG_ARCH_VERSATILE) += versatile-ab.dtb \
+dtb-$(CONFIG_ARCH_VERSATILE) += \
+ versatile-ab.dtb \
versatile-pb.dtb
-dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
+dtb-$(CONFIG_ARCH_VEXPRESS) += \
+ vexpress-v2p-ca5s.dtb \
vexpress-v2p-ca9.dtb \
vexpress-v2p-ca15-tc1.dtb \
vexpress-v2p-ca15_a7.dtb
-dtb-$(CONFIG_ARCH_VIRT) += xenvm-4.2.dtb
-dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
+dtb-$(CONFIG_ARCH_VIRT) += \
+ xenvm-4.2.dtb
+dtb-$(CONFIG_ARCH_VT8500) += \
+ vt8500-bv07.dtb \
wm8505-ref.dtb \
wm8650-mid.dtb \
wm8750-apc8750.dtb \
@@ -545,13 +612,15 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \
armada-xp-netgear-rn2120.dtb \
armada-xp-openblocks-ax3-4.dtb \
armada-xp-synology-ds414.dtb
-dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \
+dtb-$(CONFIG_MACH_DOVE) += \
+ dove-cm-a510.dtb \
dove-cubox.dtb \
dove-cubox-es.dtb \
dove-d2plug.dtb \
dove-d3plug.dtb \
dove-dove-db.dtb
-dtb-$(CONFIG_ARCH_MEDIATEK) += mt6589-aquaris5.dtb \
+dtb-$(CONFIG_ARCH_MEDIATEK) += \
+ mt6589-aquaris5.dtb \
mt6592-evb.dtb \
mt8127-moose.dtb \
mt8135-evbp1.dtb
--
2.1.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH V2] ARM: dts: Only build dtb if associated Arch and/or SoC is enabled
2014-12-30 6:20 [PATCH V2] ARM: dts: Only build dtb if associated Arch and/or SoC is enabled Peter Robinson
@ 2015-01-12 22:42 ` Olof Johansson
2015-01-13 12:23 ` Arnd Bergmann
2015-01-13 14:43 ` Nicolas Ferre
0 siblings, 2 replies; 16+ messages in thread
From: Olof Johansson @ 2015-01-12 22:42 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Dec 30, 2014 at 06:20:27AM +0000, Peter Robinson wrote:
> A number of arches (EXYNOS/IMX/TEGRA) are separated out into finer grained
> definitions whether it be sub ARCH or SOC definitions. The device tree blobs
> should only be built if the specific option is enabled that supports that
> device or it might be that there's an expectation that the device is supported
> when in actual fact it's not. This ensures only the relevant bits are built.
>
> Also standardised the line break between the arch/soc definitions and the
> dtbs to be on separate lines for better consistency as per feedback.
>
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
> Acked-by: Thierry Reding <treding@nvidia.com>
> Acked-by: Stephen Warren <swarren@nvidia.com>
> Acked-by: Shawn Guo <shawn.guo@freescale.com>
> ---
> arch/arm/boot/dts/Makefile | 213 ++++++++++++++++++++++++++++++---------------
> 1 file changed, 141 insertions(+), 72 deletions(-)
(adding Nicolas on cc)
Nice cleanup, but I really wish we had split up into subdirectories on ARM
much earlier. Doing that now is too much churn.
AT91 now sticks out a bit with its special case in formatting. Could be
worth changing at some point.
I've applied this on next/dt now, hopefully it won't become too much of
a headache of conflicts during this release cycle. At least doing it on that
branch should keep us from exposing it up outside our tree.
-Olof
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH V2] ARM: dts: Only build dtb if associated Arch and/or SoC is enabled
2015-01-12 22:42 ` Olof Johansson
@ 2015-01-13 12:23 ` Arnd Bergmann
2015-01-13 18:07 ` Olof Johansson
2015-01-13 14:43 ` Nicolas Ferre
1 sibling, 1 reply; 16+ messages in thread
From: Arnd Bergmann @ 2015-01-13 12:23 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 12 January 2015 14:42:03 Olof Johansson wrote:
>
> I've applied this on next/dt now, hopefully it won't become too much of
> a headache of conflicts during this release cycle. At least doing it on that
> branch should keep us from exposing it up outside our tree.
>
I had to add this snippet to get my local tree to build again:
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 7be7a6f62d81..3308d110bdc7 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -303,7 +303,7 @@ dtb-$(CONFIG_SOC_IMX6SL) += \
imx6sl-evk.dtb
dtb-$(CONFIG_SOC_IMX6SX) += \
imx6sx-sabreauto.dtb \
- imx6sx-sdb.dtb \
+ imx6sx-sdb.dtb
dtb-$(CONFIG_SOC_LS1021A) += \
ls1021a-qds.dtb \
ls1021a-twr.dtb
Arnd
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH] ARM: dts: re-fromat AT91 part to match other entries
2015-01-12 22:42 ` Olof Johansson
@ 2015-01-13 14:43 ` Nicolas Ferre
2015-01-13 14:43 ` Nicolas Ferre
1 sibling, 0 replies; 16+ messages in thread
From: Nicolas Ferre @ 2015-01-13 14:43 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, ARM Maintainers
Cc: Alexandre Belloni, Boris BREZILLON,
Jean-Christophe PLAGNIOL-VILLARD, linux-arm-kernel, linux-kernel,
Nicolas Ferre
The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
options may be removed in the near future.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
Hi Olof,
This is an attempt to match other ARM SoC families format.
If you feel that the patch can be good, do not hesitate to take it yourself. I
don't plan to integrate it in any of my pull-request so it can appear quickly in
arm-soc and can be used by everyone.
arch/arm/boot/dts/Makefile | 90 +++++++++++++++++++++-------------------------
1 file changed, 40 insertions(+), 50 deletions(-)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 7be7a6f62d81..66ea13037dbc 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1,56 +1,46 @@
ifeq ($(CONFIG_OF),y)
# Keep at91 dtb files sorted alphabetically for each SoC
-# rm9200
-dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb
-# sam9260
-dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91-qil_a9260.dtb
-dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb
-dtb-$(CONFIG_ARCH_AT91) += ethernut5.dtb
-dtb-$(CONFIG_ARCH_AT91) += evk-pro3.dtb
-dtb-$(CONFIG_ARCH_AT91) += tny_a9260.dtb
-dtb-$(CONFIG_ARCH_AT91) += usb_a9260.dtb
-# sam9261
-dtb-$(CONFIG_ARCH_AT91) += at91sam9261ek.dtb
-# sam9263
-dtb-$(CONFIG_ARCH_AT91) += at91sam9263ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += tny_a9263.dtb
-dtb-$(CONFIG_ARCH_AT91) += usb_a9263.dtb
-# sam9g20
-dtb-$(CONFIG_ARCH_AT91) += at91-foxg20.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek_2mmc.dtb
-dtb-$(CONFIG_ARCH_AT91) += kizbox.dtb
-dtb-$(CONFIG_ARCH_AT91) += tny_a9g20.dtb
-dtb-$(CONFIG_ARCH_AT91) += usb_a9g20.dtb
-dtb-$(CONFIG_ARCH_AT91) += usb_a9g20_lpw.dtb
-# sam9g45
-dtb-$(CONFIG_ARCH_AT91) += at91sam9m10g45ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += pm9g45.dtb
-# sam9n12
-dtb-$(CONFIG_ARCH_AT91) += at91sam9n12ek.dtb
-# sam9rl
-dtb-$(CONFIG_ARCH_AT91) += at91sam9rlek.dtb
-# sam9x5
-dtb-$(CONFIG_ARCH_AT91) += at91-ariag25.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91-cosino_mega2560.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9g15ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9g25ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9x25ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9x35ek.dtb
-# sama5d3
-dtb-$(CONFIG_ARCH_AT91) += at91-sama5d3_xplained.dtb
-dtb-$(CONFIG_ARCH_AT91) += sama5d31ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += sama5d33ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += sama5d34ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += sama5d35ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += sama5d36ek.dtb
-# sama5d4
-dtb-$(CONFIG_ARCH_AT91) += at91-sama5d4ek.dtb
-
+dtb-$(CONFIG_SOC_SAM_V4_V5) += \
+ at91rm9200ek.dtb \
+ mpa1600.dtb \
+ animeo_ip.dtb \
+ at91-qil_a9260.dtb \
+ aks-cdu.dtb \
+ ethernut5.dtb \
+ evk-pro3.dtb \
+ tny_a9260.dtb \
+ usb_a9260.dtb \
+ at91sam9261ek.dtb \
+ at91sam9263ek.dtb \
+ tny_a9263.dtb \
+ usb_a9263.dtb \
+ at91-foxg20.dtb \
+ at91sam9g20ek.dtb \
+ at91sam9g20ek_2mmc.dtb \
+ kizbox.dtb \
+ tny_a9g20.dtb \
+ usb_a9g20.dtb \
+ usb_a9g20_lpw.dtb \
+ at91sam9m10g45ek.dtb \
+ pm9g45.dtb \
+ at91sam9n12ek.dtb \
+ at91sam9rlek.dtb \
+ at91-ariag25.dtb \
+ at91-cosino_mega2560.dtb \
+ at91sam9g15ek.dtb \
+ at91sam9g25ek.dtb \
+ at91sam9g35ek.dtb \
+ at91sam9x25ek.dtb \
+ at91sam9x35ek.dtb
+dtb-$(CONFIG_SOC_SAM_V7) += \
+ at91-sama5d3_xplained.dtb \
+ sama5d31ek.dtb \
+ sama5d33ek.dtb \
+ sama5d34ek.dtb \
+ sama5d35ek.dtb \
+ sama5d36ek.dtb \
+ at91-sama5d4ek.dtb
dtb-$(CONFIG_ARCH_ATLAS6) += \
atlas6-evb.dtb
dtb-$(CONFIG_ARCH_AXXIA) += \
--
2.1.3
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH] ARM: dts: re-fromat AT91 part to match other entries
@ 2015-01-13 14:43 ` Nicolas Ferre
0 siblings, 0 replies; 16+ messages in thread
From: Nicolas Ferre @ 2015-01-13 14:43 UTC (permalink / raw)
To: linux-arm-kernel
The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
options may be removed in the near future.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
Hi Olof,
This is an attempt to match other ARM SoC families format.
If you feel that the patch can be good, do not hesitate to take it yourself. I
don't plan to integrate it in any of my pull-request so it can appear quickly in
arm-soc and can be used by everyone.
arch/arm/boot/dts/Makefile | 90 +++++++++++++++++++++-------------------------
1 file changed, 40 insertions(+), 50 deletions(-)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 7be7a6f62d81..66ea13037dbc 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1,56 +1,46 @@
ifeq ($(CONFIG_OF),y)
# Keep at91 dtb files sorted alphabetically for each SoC
-# rm9200
-dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb
-# sam9260
-dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91-qil_a9260.dtb
-dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb
-dtb-$(CONFIG_ARCH_AT91) += ethernut5.dtb
-dtb-$(CONFIG_ARCH_AT91) += evk-pro3.dtb
-dtb-$(CONFIG_ARCH_AT91) += tny_a9260.dtb
-dtb-$(CONFIG_ARCH_AT91) += usb_a9260.dtb
-# sam9261
-dtb-$(CONFIG_ARCH_AT91) += at91sam9261ek.dtb
-# sam9263
-dtb-$(CONFIG_ARCH_AT91) += at91sam9263ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += tny_a9263.dtb
-dtb-$(CONFIG_ARCH_AT91) += usb_a9263.dtb
-# sam9g20
-dtb-$(CONFIG_ARCH_AT91) += at91-foxg20.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek_2mmc.dtb
-dtb-$(CONFIG_ARCH_AT91) += kizbox.dtb
-dtb-$(CONFIG_ARCH_AT91) += tny_a9g20.dtb
-dtb-$(CONFIG_ARCH_AT91) += usb_a9g20.dtb
-dtb-$(CONFIG_ARCH_AT91) += usb_a9g20_lpw.dtb
-# sam9g45
-dtb-$(CONFIG_ARCH_AT91) += at91sam9m10g45ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += pm9g45.dtb
-# sam9n12
-dtb-$(CONFIG_ARCH_AT91) += at91sam9n12ek.dtb
-# sam9rl
-dtb-$(CONFIG_ARCH_AT91) += at91sam9rlek.dtb
-# sam9x5
-dtb-$(CONFIG_ARCH_AT91) += at91-ariag25.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91-cosino_mega2560.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9g15ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9g25ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9x25ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9x35ek.dtb
-# sama5d3
-dtb-$(CONFIG_ARCH_AT91) += at91-sama5d3_xplained.dtb
-dtb-$(CONFIG_ARCH_AT91) += sama5d31ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += sama5d33ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += sama5d34ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += sama5d35ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += sama5d36ek.dtb
-# sama5d4
-dtb-$(CONFIG_ARCH_AT91) += at91-sama5d4ek.dtb
-
+dtb-$(CONFIG_SOC_SAM_V4_V5) += \
+ at91rm9200ek.dtb \
+ mpa1600.dtb \
+ animeo_ip.dtb \
+ at91-qil_a9260.dtb \
+ aks-cdu.dtb \
+ ethernut5.dtb \
+ evk-pro3.dtb \
+ tny_a9260.dtb \
+ usb_a9260.dtb \
+ at91sam9261ek.dtb \
+ at91sam9263ek.dtb \
+ tny_a9263.dtb \
+ usb_a9263.dtb \
+ at91-foxg20.dtb \
+ at91sam9g20ek.dtb \
+ at91sam9g20ek_2mmc.dtb \
+ kizbox.dtb \
+ tny_a9g20.dtb \
+ usb_a9g20.dtb \
+ usb_a9g20_lpw.dtb \
+ at91sam9m10g45ek.dtb \
+ pm9g45.dtb \
+ at91sam9n12ek.dtb \
+ at91sam9rlek.dtb \
+ at91-ariag25.dtb \
+ at91-cosino_mega2560.dtb \
+ at91sam9g15ek.dtb \
+ at91sam9g25ek.dtb \
+ at91sam9g35ek.dtb \
+ at91sam9x25ek.dtb \
+ at91sam9x35ek.dtb
+dtb-$(CONFIG_SOC_SAM_V7) += \
+ at91-sama5d3_xplained.dtb \
+ sama5d31ek.dtb \
+ sama5d33ek.dtb \
+ sama5d34ek.dtb \
+ sama5d35ek.dtb \
+ sama5d36ek.dtb \
+ at91-sama5d4ek.dtb
dtb-$(CONFIG_ARCH_ATLAS6) += \
atlas6-evb.dtb
dtb-$(CONFIG_ARCH_AXXIA) += \
--
2.1.3
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH V2] ARM: dts: Only build dtb if associated Arch and/or SoC is enabled
2015-01-13 12:23 ` Arnd Bergmann
@ 2015-01-13 18:07 ` Olof Johansson
0 siblings, 0 replies; 16+ messages in thread
From: Olof Johansson @ 2015-01-13 18:07 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 13, 2015 at 4:23 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Monday 12 January 2015 14:42:03 Olof Johansson wrote:
>>
>> I've applied this on next/dt now, hopefully it won't become too much of
>> a headache of conflicts during this release cycle. At least doing it on that
>> branch should keep us from exposing it up outside our tree.
>>
>
> I had to add this snippet to get my local tree to build again:
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 7be7a6f62d81..3308d110bdc7 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -303,7 +303,7 @@ dtb-$(CONFIG_SOC_IMX6SL) += \
> imx6sl-evk.dtb
> dtb-$(CONFIG_SOC_IMX6SX) += \
> imx6sx-sabreauto.dtb \
> - imx6sx-sdb.dtb \
> + imx6sx-sdb.dtb
> dtb-$(CONFIG_SOC_LS1021A) += \
> ls1021a-qds.dtb \
> ls1021a-twr.dtb
I found that after merging, and fixed up the commit in arm-soc, but it
seems that Stephen fetched for linux-next before I did the fixup.
-Olof
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] ARM: dts: re-fromat AT91 part to match other entries
2015-01-13 14:43 ` Nicolas Ferre
@ 2015-01-13 23:09 ` Olof Johansson
-1 siblings, 0 replies; 16+ messages in thread
From: Olof Johansson @ 2015-01-13 23:09 UTC (permalink / raw)
To: Nicolas Ferre
Cc: Arnd Bergmann, ARM Maintainers, Alexandre Belloni,
Boris BREZILLON, Jean-Christophe PLAGNIOL-VILLARD,
linux-arm-kernel, linux-kernel
On Tue, Jan 13, 2015 at 03:43:00PM +0100, Nicolas Ferre wrote:
> The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
> options may be removed in the near future.
>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> Hi Olof,
>
> This is an attempt to match other ARM SoC families format.
> If you feel that the patch can be good, do not hesitate to take it yourself. I
> don't plan to integrate it in any of my pull-request so it can appear quickly in
> arm-soc and can be used by everyone.
Hi,
If you see what Peter did, he split up the rules per-SoC based on how
things were selectable in Kconfig. Since you seem to have the Kconfig
entries already, how about doing the same? That way the same information
w.r.t. SoC family that you have as comments isn't lost either.
-Olof
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH] ARM: dts: re-fromat AT91 part to match other entries
@ 2015-01-13 23:09 ` Olof Johansson
0 siblings, 0 replies; 16+ messages in thread
From: Olof Johansson @ 2015-01-13 23:09 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 13, 2015 at 03:43:00PM +0100, Nicolas Ferre wrote:
> The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
> options may be removed in the near future.
>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> Hi Olof,
>
> This is an attempt to match other ARM SoC families format.
> If you feel that the patch can be good, do not hesitate to take it yourself. I
> don't plan to integrate it in any of my pull-request so it can appear quickly in
> arm-soc and can be used by everyone.
Hi,
If you see what Peter did, he split up the rules per-SoC based on how
things were selectable in Kconfig. Since you seem to have the Kconfig
entries already, how about doing the same? That way the same information
w.r.t. SoC family that you have as comments isn't lost either.
-Olof
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] ARM: dts: re-fromat AT91 part to match other entries
2015-01-13 23:09 ` Olof Johansson
@ 2015-01-13 23:47 ` Alexandre Belloni
-1 siblings, 0 replies; 16+ messages in thread
From: Alexandre Belloni @ 2015-01-13 23:47 UTC (permalink / raw)
To: Olof Johansson
Cc: Nicolas Ferre, Arnd Bergmann, ARM Maintainers, Boris BREZILLON,
Jean-Christophe PLAGNIOL-VILLARD, linux-arm-kernel, linux-kernel
Hi Olof,
On 13/01/2015 at 15:09:56 -0800, Olof Johansson wrote :
> On Tue, Jan 13, 2015 at 03:43:00PM +0100, Nicolas Ferre wrote:
> > The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
> > options may be removed in the near future.
> >
> > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> > ---
> > Hi Olof,
> >
> > This is an attempt to match other ARM SoC families format.
> > If you feel that the patch can be good, do not hesitate to take it yourself. I
> > don't plan to integrate it in any of my pull-request so it can appear quickly in
> > arm-soc and can be used by everyone.
>
> Hi,
>
> If you see what Peter did, he split up the rules per-SoC based on how
> things were selectable in Kconfig. Since you seem to have the Kconfig
> entries already, how about doing the same? That way the same information
> w.r.t. SoC family that you have as comments isn't lost either.
>
You didn't see the patch set yet because it depends on a lot of other
series still being discussed but after the switch to multiplatform, the
only config option left will be SOC_AT91RM9200, SOC_AT91SAM9 (both
under SOC_SAM_V4_V5) and SOC_SAMA5, under SOC_SAM_V7.
That's our plan, unless you feel that we should keep one config option
per SoC.
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH] ARM: dts: re-fromat AT91 part to match other entries
@ 2015-01-13 23:47 ` Alexandre Belloni
0 siblings, 0 replies; 16+ messages in thread
From: Alexandre Belloni @ 2015-01-13 23:47 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof,
On 13/01/2015 at 15:09:56 -0800, Olof Johansson wrote :
> On Tue, Jan 13, 2015 at 03:43:00PM +0100, Nicolas Ferre wrote:
> > The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
> > options may be removed in the near future.
> >
> > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> > ---
> > Hi Olof,
> >
> > This is an attempt to match other ARM SoC families format.
> > If you feel that the patch can be good, do not hesitate to take it yourself. I
> > don't plan to integrate it in any of my pull-request so it can appear quickly in
> > arm-soc and can be used by everyone.
>
> Hi,
>
> If you see what Peter did, he split up the rules per-SoC based on how
> things were selectable in Kconfig. Since you seem to have the Kconfig
> entries already, how about doing the same? That way the same information
> w.r.t. SoC family that you have as comments isn't lost either.
>
You didn't see the patch set yet because it depends on a lot of other
series still being discussed but after the switch to multiplatform, the
only config option left will be SOC_AT91RM9200, SOC_AT91SAM9 (both
under SOC_SAM_V4_V5) and SOC_SAMA5, under SOC_SAM_V7.
That's our plan, unless you feel that we should keep one config option
per SoC.
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] ARM: dts: re-fromat AT91 part to match other entries
2015-01-13 23:47 ` Alexandre Belloni
@ 2015-01-14 9:05 ` Arnd Bergmann
-1 siblings, 0 replies; 16+ messages in thread
From: Arnd Bergmann @ 2015-01-14 9:05 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Olof Johansson, Nicolas Ferre, ARM Maintainers, Boris BREZILLON,
Jean-Christophe PLAGNIOL-VILLARD, linux-arm-kernel, linux-kernel
On Wednesday 14 January 2015 00:47:59 Alexandre Belloni wrote:
>
> On 13/01/2015 at 15:09:56 -0800, Olof Johansson wrote :
> > On Tue, Jan 13, 2015 at 03:43:00PM +0100, Nicolas Ferre wrote:
> > > The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
> > > options may be removed in the near future.
> > >
> > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> > > ---
> > > Hi Olof,
> > >
> > > This is an attempt to match other ARM SoC families format.
> > > If you feel that the patch can be good, do not hesitate to take it yourself. I
> > > don't plan to integrate it in any of my pull-request so it can appear quickly in
> > > arm-soc and can be used by everyone.
> >
> > Hi,
> >
> > If you see what Peter did, he split up the rules per-SoC based on how
> > things were selectable in Kconfig. Since you seem to have the Kconfig
> > entries already, how about doing the same? That way the same information
> > w.r.t. SoC family that you have as comments isn't lost either.
> >
>
> You didn't see the patch set yet because it depends on a lot of other
> series still being discussed but after the switch to multiplatform, the
> only config option left will be SOC_AT91RM9200, SOC_AT91SAM9 (both
> under SOC_SAM_V4_V5) and SOC_SAMA5, under SOC_SAM_V7.
>
> That's our plan, unless you feel that we should keep one config option
> per SoC.
With the patches that I prepared last year, all of AT91SAM9 becomes
one small file, so there really isn't any need to have separate Kconfig
options.
Arnd
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH] ARM: dts: re-fromat AT91 part to match other entries
@ 2015-01-14 9:05 ` Arnd Bergmann
0 siblings, 0 replies; 16+ messages in thread
From: Arnd Bergmann @ 2015-01-14 9:05 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday 14 January 2015 00:47:59 Alexandre Belloni wrote:
>
> On 13/01/2015 at 15:09:56 -0800, Olof Johansson wrote :
> > On Tue, Jan 13, 2015 at 03:43:00PM +0100, Nicolas Ferre wrote:
> > > The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
> > > options may be removed in the near future.
> > >
> > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> > > ---
> > > Hi Olof,
> > >
> > > This is an attempt to match other ARM SoC families format.
> > > If you feel that the patch can be good, do not hesitate to take it yourself. I
> > > don't plan to integrate it in any of my pull-request so it can appear quickly in
> > > arm-soc and can be used by everyone.
> >
> > Hi,
> >
> > If you see what Peter did, he split up the rules per-SoC based on how
> > things were selectable in Kconfig. Since you seem to have the Kconfig
> > entries already, how about doing the same? That way the same information
> > w.r.t. SoC family that you have as comments isn't lost either.
> >
>
> You didn't see the patch set yet because it depends on a lot of other
> series still being discussed but after the switch to multiplatform, the
> only config option left will be SOC_AT91RM9200, SOC_AT91SAM9 (both
> under SOC_SAM_V4_V5) and SOC_SAMA5, under SOC_SAM_V7.
>
> That's our plan, unless you feel that we should keep one config option
> per SoC.
With the patches that I prepared last year, all of AT91SAM9 becomes
one small file, so there really isn't any need to have separate Kconfig
options.
Arnd
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] ARM: dts: re-fromat AT91 part to match other entries
2015-01-14 9:05 ` Arnd Bergmann
@ 2015-01-26 15:45 ` Nicolas Ferre
-1 siblings, 0 replies; 16+ messages in thread
From: Nicolas Ferre @ 2015-01-26 15:45 UTC (permalink / raw)
To: Olof Johansson
Cc: Arnd Bergmann, Alexandre Belloni, ARM Maintainers,
Boris BREZILLON, Jean-Christophe PLAGNIOL-VILLARD,
linux-arm-kernel, linux-kernel
Le 14/01/2015 10:05, Arnd Bergmann a écrit :
> On Wednesday 14 January 2015 00:47:59 Alexandre Belloni wrote:
>>
>> On 13/01/2015 at 15:09:56 -0800, Olof Johansson wrote :
>>> On Tue, Jan 13, 2015 at 03:43:00PM +0100, Nicolas Ferre wrote:
>>>> The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
>>>> options may be removed in the near future.
>>>>
>>>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>>>> ---
>>>> Hi Olof,
>>>>
>>>> This is an attempt to match other ARM SoC families format.
>>>> If you feel that the patch can be good, do not hesitate to take it yourself. I
>>>> don't plan to integrate it in any of my pull-request so it can appear quickly in
>>>> arm-soc and can be used by everyone.
>>>
>>> Hi,
>>>
>>> If you see what Peter did, he split up the rules per-SoC based on how
>>> things were selectable in Kconfig. Since you seem to have the Kconfig
>>> entries already, how about doing the same? That way the same information
>>> w.r.t. SoC family that you have as comments isn't lost either.
>>>
>>
>> You didn't see the patch set yet because it depends on a lot of other
>> series still being discussed but after the switch to multiplatform, the
>> only config option left will be SOC_AT91RM9200, SOC_AT91SAM9 (both
>> under SOC_SAM_V4_V5) and SOC_SAMA5, under SOC_SAM_V7.
>>
>> That's our plan, unless you feel that we should keep one config option
>> per SoC.
>
> With the patches that I prepared last year, all of AT91SAM9 becomes
> one small file, so there really isn't any need to have separate Kconfig
> options.
Hi Olof,
After what noted Alexandre and Arnd, don't you think my initial attempt
was okay? Aka: ping ;-)
Bye,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH] ARM: dts: re-fromat AT91 part to match other entries
@ 2015-01-26 15:45 ` Nicolas Ferre
0 siblings, 0 replies; 16+ messages in thread
From: Nicolas Ferre @ 2015-01-26 15:45 UTC (permalink / raw)
To: linux-arm-kernel
Le 14/01/2015 10:05, Arnd Bergmann a ?crit :
> On Wednesday 14 January 2015 00:47:59 Alexandre Belloni wrote:
>>
>> On 13/01/2015 at 15:09:56 -0800, Olof Johansson wrote :
>>> On Tue, Jan 13, 2015 at 03:43:00PM +0100, Nicolas Ferre wrote:
>>>> The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
>>>> options may be removed in the near future.
>>>>
>>>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>>>> ---
>>>> Hi Olof,
>>>>
>>>> This is an attempt to match other ARM SoC families format.
>>>> If you feel that the patch can be good, do not hesitate to take it yourself. I
>>>> don't plan to integrate it in any of my pull-request so it can appear quickly in
>>>> arm-soc and can be used by everyone.
>>>
>>> Hi,
>>>
>>> If you see what Peter did, he split up the rules per-SoC based on how
>>> things were selectable in Kconfig. Since you seem to have the Kconfig
>>> entries already, how about doing the same? That way the same information
>>> w.r.t. SoC family that you have as comments isn't lost either.
>>>
>>
>> You didn't see the patch set yet because it depends on a lot of other
>> series still being discussed but after the switch to multiplatform, the
>> only config option left will be SOC_AT91RM9200, SOC_AT91SAM9 (both
>> under SOC_SAM_V4_V5) and SOC_SAMA5, under SOC_SAM_V7.
>>
>> That's our plan, unless you feel that we should keep one config option
>> per SoC.
>
> With the patches that I prepared last year, all of AT91SAM9 becomes
> one small file, so there really isn't any need to have separate Kconfig
> options.
Hi Olof,
After what noted Alexandre and Arnd, don't you think my initial attempt
was okay? Aka: ping ;-)
Bye,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] ARM: dts: re-fromat AT91 part to match other entries
2015-01-26 15:45 ` Nicolas Ferre
@ 2015-01-27 2:13 ` Olof Johansson
-1 siblings, 0 replies; 16+ messages in thread
From: Olof Johansson @ 2015-01-27 2:13 UTC (permalink / raw)
To: Nicolas Ferre
Cc: Arnd Bergmann, Alexandre Belloni, ARM Maintainers,
Boris BREZILLON, Jean-Christophe PLAGNIOL-VILLARD,
linux-arm-kernel, linux-kernel
On Mon, Jan 26, 2015 at 04:45:02PM +0100, Nicolas Ferre wrote:
> Le 14/01/2015 10:05, Arnd Bergmann a écrit :
> > On Wednesday 14 January 2015 00:47:59 Alexandre Belloni wrote:
> >>
> >> On 13/01/2015 at 15:09:56 -0800, Olof Johansson wrote :
> >>> On Tue, Jan 13, 2015 at 03:43:00PM +0100, Nicolas Ferre wrote:
> >>>> The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
> >>>> options may be removed in the near future.
> >>>>
> >>>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> >>>> ---
> >>>> Hi Olof,
> >>>>
> >>>> This is an attempt to match other ARM SoC families format.
> >>>> If you feel that the patch can be good, do not hesitate to take it yourself. I
> >>>> don't plan to integrate it in any of my pull-request so it can appear quickly in
> >>>> arm-soc and can be used by everyone.
> >>>
> >>> Hi,
> >>>
> >>> If you see what Peter did, he split up the rules per-SoC based on how
> >>> things were selectable in Kconfig. Since you seem to have the Kconfig
> >>> entries already, how about doing the same? That way the same information
> >>> w.r.t. SoC family that you have as comments isn't lost either.
> >>>
> >>
> >> You didn't see the patch set yet because it depends on a lot of other
> >> series still being discussed but after the switch to multiplatform, the
> >> only config option left will be SOC_AT91RM9200, SOC_AT91SAM9 (both
> >> under SOC_SAM_V4_V5) and SOC_SAMA5, under SOC_SAM_V7.
> >>
> >> That's our plan, unless you feel that we should keep one config option
> >> per SoC.
> >
> > With the patches that I prepared last year, all of AT91SAM9 becomes
> > one small file, so there really isn't any need to have separate Kconfig
> > options.
>
> Hi Olof,
>
> After what noted Alexandre and Arnd, don't you think my initial attempt
> was okay? Aka: ping ;-)
Ah, yes. Applied now.
-Olof
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH] ARM: dts: re-fromat AT91 part to match other entries
@ 2015-01-27 2:13 ` Olof Johansson
0 siblings, 0 replies; 16+ messages in thread
From: Olof Johansson @ 2015-01-27 2:13 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jan 26, 2015 at 04:45:02PM +0100, Nicolas Ferre wrote:
> Le 14/01/2015 10:05, Arnd Bergmann a ?crit :
> > On Wednesday 14 January 2015 00:47:59 Alexandre Belloni wrote:
> >>
> >> On 13/01/2015 at 15:09:56 -0800, Olof Johansson wrote :
> >>> On Tue, Jan 13, 2015 at 03:43:00PM +0100, Nicolas Ferre wrote:
> >>>> The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
> >>>> options may be removed in the near future.
> >>>>
> >>>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> >>>> ---
> >>>> Hi Olof,
> >>>>
> >>>> This is an attempt to match other ARM SoC families format.
> >>>> If you feel that the patch can be good, do not hesitate to take it yourself. I
> >>>> don't plan to integrate it in any of my pull-request so it can appear quickly in
> >>>> arm-soc and can be used by everyone.
> >>>
> >>> Hi,
> >>>
> >>> If you see what Peter did, he split up the rules per-SoC based on how
> >>> things were selectable in Kconfig. Since you seem to have the Kconfig
> >>> entries already, how about doing the same? That way the same information
> >>> w.r.t. SoC family that you have as comments isn't lost either.
> >>>
> >>
> >> You didn't see the patch set yet because it depends on a lot of other
> >> series still being discussed but after the switch to multiplatform, the
> >> only config option left will be SOC_AT91RM9200, SOC_AT91SAM9 (both
> >> under SOC_SAM_V4_V5) and SOC_SAMA5, under SOC_SAM_V7.
> >>
> >> That's our plan, unless you feel that we should keep one config option
> >> per SoC.
> >
> > With the patches that I prepared last year, all of AT91SAM9 becomes
> > one small file, so there really isn't any need to have separate Kconfig
> > options.
>
> Hi Olof,
>
> After what noted Alexandre and Arnd, don't you think my initial attempt
> was okay? Aka: ping ;-)
Ah, yes. Applied now.
-Olof
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2015-01-27 2:13 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-30 6:20 [PATCH V2] ARM: dts: Only build dtb if associated Arch and/or SoC is enabled Peter Robinson
2015-01-12 22:42 ` Olof Johansson
2015-01-13 12:23 ` Arnd Bergmann
2015-01-13 18:07 ` Olof Johansson
2015-01-13 14:43 ` [PATCH] ARM: dts: re-fromat AT91 part to match other entries Nicolas Ferre
2015-01-13 14:43 ` Nicolas Ferre
2015-01-13 23:09 ` Olof Johansson
2015-01-13 23:09 ` Olof Johansson
2015-01-13 23:47 ` Alexandre Belloni
2015-01-13 23:47 ` Alexandre Belloni
2015-01-14 9:05 ` Arnd Bergmann
2015-01-14 9:05 ` Arnd Bergmann
2015-01-26 15:45 ` Nicolas Ferre
2015-01-26 15:45 ` Nicolas Ferre
2015-01-27 2:13 ` Olof Johansson
2015-01-27 2:13 ` Olof Johansson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.