* [PATCH] ARM: mvebu: select dtbs from MACH_ARMADA_*
@ 2014-02-25 17:56 Jason Cooper
2014-02-25 18:11 ` [RESEND PATCH] " Jason Cooper
2014-02-25 20:19 ` [PATCH] " Jason Cooper
0 siblings, 2 replies; 4+ messages in thread
From: Jason Cooper @ 2014-02-25 17:56 UTC (permalink / raw)
To: linux-arm-kernel
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.
Reported-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
---
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(-)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 46c54a2dac71..1e6dbde1724e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
--
1.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [RESEND PATCH] ARM: mvebu: select dtbs from MACH_ARMADA_*
2014-02-25 17:56 [PATCH] ARM: mvebu: select dtbs from MACH_ARMADA_* Jason Cooper
@ 2014-02-25 18:11 ` Jason Cooper
2014-02-25 19:05 ` Kevin Hilman
2014-02-25 20:19 ` [PATCH] " Jason Cooper
1 sibling, 1 reply; 4+ messages in thread
From: Jason Cooper @ 2014-02-25 18:11 UTC (permalink / raw)
To: linux-arm-kernel
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.
Reported-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
---
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(-)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 46c54a2dac71..1e6dbde1724e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
--
1.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [RESEND PATCH] ARM: mvebu: select dtbs from MACH_ARMADA_*
2014-02-25 18:11 ` [RESEND PATCH] " Jason Cooper
@ 2014-02-25 19:05 ` Kevin Hilman
0 siblings, 0 replies; 4+ messages in thread
From: Kevin Hilman @ 2014-02-25 19:05 UTC (permalink / raw)
To: linux-arm-kernel
Jason Cooper <jason@lakedaemon.net> writes:
> 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.
>
> Reported-by: Kevin Hilman <khilman@linaro.org>
> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
> ---
> Sorry, forgot to include Kevin in the To:
>
> If there are no complaints, I'll be applying this to mvebu/dt
For both:
Acked-by: Kevin Hilman <khilman@linaro.org>
> arch/arm/boot/dts/Makefile | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 46c54a2dac71..1e6dbde1724e 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -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 \
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM: mvebu: select dtbs from MACH_ARMADA_*
2014-02-25 17:56 [PATCH] ARM: mvebu: select dtbs from MACH_ARMADA_* Jason Cooper
2014-02-25 18:11 ` [RESEND PATCH] " Jason Cooper
@ 2014-02-25 20:19 ` Jason Cooper
1 sibling, 0 replies; 4+ messages in thread
From: Jason Cooper @ 2014-02-25 20:19 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Feb 25, 2014 at 05:56:07PM +0000, Jason Cooper wrote:
> 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.
>
> Reported-by: Kevin Hilman <khilman@linaro.org>
> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
> ---
> 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(-)
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-02-25 20:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-25 17:56 [PATCH] ARM: mvebu: select dtbs from MACH_ARMADA_* Jason Cooper
2014-02-25 18:11 ` [RESEND PATCH] " Jason Cooper
2014-02-25 19:05 ` Kevin Hilman
2014-02-25 20:19 ` [PATCH] " Jason Cooper
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.