ARM: mvebu: select dtbs from MACH_ARMADA_*
PATCH 1/1 ARM: mvebu: select dtbs from MACH_ARMADA_*
With kirkwood migrating into mach-mvebu, mvebu_v5_defconfig needs to select ARCH_MVEBU. Unfortunately, this means that when building a v5 kernel, we unnecessarily build dtbs for the armada v7 boards.
To fix this, we instead select based on MACH_ARMADA_* on a per SoC basis.
---
If there are no complaints, I'll be applying this to mvebu/dt
arch/arm/boot/dts/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
arch/arm/boot/dts/Makefile +8 -4
@@ -142,13 +142,17 @@ dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \ qcom-msm8960-cdp.dtb \ qcom-apq8074-dragonboard.dtb -dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ +dtb-$(CONFIG_MACH_ARMADA_370) += \ + armada-370-db.dtb \ armada-370-mirabox.dtb \ armada-370-netgear-rn102.dtb \ armada-370-netgear-rn104.dtb \ - armada-370-rd.dtb \ - armada-375-db.dtb \ - armada-385-db.dtb \ + armada-370-rd.dtb +dtb-$(CONFIG_MACH_ARMADA_375) += \ + armada-375-db.dtb +dtb-$(CONFIG_MACH_ARMADA_38X) += \ + armada-385-db.dtb +dtb-$(CONFIG_MACH_ARMADA_XP) += \ armada-xp-axpwifiap.dtb \ armada-xp-db.dtb \ armada-xp-gp.dtb \
Signature · 1 line
1.9.0
PATCH RESEND 1/1 ARM: mvebu: select dtbs from MACH_ARMADA_*
With kirkwood migrating into mach-mvebu, mvebu_v5_defconfig needs to select ARCH_MVEBU. Unfortunately, this means that when building a v5 kernel, we unnecessarily build dtbs for the armada v7 boards.
To fix this, we instead select based on MACH_ARMADA_* on a per SoC basis.
---
Sorry, forgot to include Kevin in the To:
If there are no complaints, I'll be applying this to mvebu/dt
arch/arm/boot/dts/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
arch/arm/boot/dts/Makefile +8 -4
@@ -142,13 +142,17 @@ dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \ qcom-msm8960-cdp.dtb \ qcom-apq8074-dragonboard.dtb -dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ +dtb-$(CONFIG_MACH_ARMADA_370) += \ + armada-370-db.dtb \ armada-370-mirabox.dtb \ armada-370-netgear-rn102.dtb \ armada-370-netgear-rn104.dtb \ - armada-370-rd.dtb \ - armada-375-db.dtb \ - armada-385-db.dtb \ + armada-370-rd.dtb +dtb-$(CONFIG_MACH_ARMADA_375) += \ + armada-375-db.dtb +dtb-$(CONFIG_MACH_ARMADA_38X) += \ + armada-385-db.dtb +dtb-$(CONFIG_MACH_ARMADA_XP) += \ armada-xp-axpwifiap.dtb \ armada-xp-db.dtb \ armada-xp-gp.dtb \
Signature · 1 line
1.9.0
PATCH RESEND 1/1 ARM: mvebu: select dtbs from MACH_ARMADA_*
Quoted 4 lines · Jason Cooper
With kirkwood migrating into mach-mvebu,
mvebu_v5_defconfigneeds to selectARCH_MVEBU. Unfortunately, this means that when building a v5 kernel, we unnecessarily build dtbs for the armada v7 boards.
Quoted 8 lines
To fix this, we instead select based on MACH_ARMADA_* on a per SoC basis.
Reported-by Kevin Hilman <[email protected]>Signed-off-by Jason Cooper <[email protected]>---
Sorry, forgot to include Kevin in the To:If there are no complaints, I'll be applying this to mvebu/dt
For both:
Quoted 29 lines
arch/arm/boot/dts/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)arch/arm/boot/dts/Makefile +8
-4@@ -142,13 +142,17 @@ dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \ qcom-msm8960-cdp.dtb \ qcom-apq8074-dragonboard.dtb -dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ +dtb-$(CONFIG_MACH_ARMADA_370) += \ + armada-370-db.dtb \ armada-370-mirabox.dtb \ armada-370-netgear-rn102.dtb \ armada-370-netgear-rn104.dtb \ - armada-370-rd.dtb \ - armada-375-db.dtb \ - armada-385-db.dtb \ + armada-370-rd.dtb +dtb-$(CONFIG_MACH_ARMADA_375) += \ + armada-375-db.dtb +dtb-$(CONFIG_MACH_ARMADA_38X) += \ + armada-385-db.dtb +dtb-$(CONFIG_MACH_ARMADA_XP) += \ armada-xp-axpwifiap.dtb \ armada-xp-db.dtb \ armada-xp-gp.dtb \
Jason Cooper
AppliedPATCH 1/1 ARM: mvebu: select dtbs from MACH_ARMADA_*
In reply to Jason CooperQuoted 6 lines · Jason Cooper
With kirkwood migrating into mach-mvebu,
mvebu_v5_defconfigneeds to selectARCH_MVEBU. Unfortunately, this means that when building a v5 kernel, we unnecessarily build dtbs for the armada v7 boards.To fix this, we instead select based on MACH_ARMADA_* on a per SoC basis.
Quoted 7 lines
Reported-by Kevin Hilman <[email protected]>Signed-off-by Jason Cooper <[email protected]>---
If there are no complaints, I'll be applying this to mvebu/dtarch/arm/boot/dts/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
Applied to mvebu/dt with Kevin's Ack.
Also, merged mvebu/dt-3xx into mvebu/dt since it has been building fine and I see no reason to drop it later.
thx,
Jason.