* [PATCH] arm: mvebu: dts: Build only arch-compatible dts files
@ 2022-08-05 11:37 Pali Rohár
2022-08-05 11:39 ` Stefan Roese
2022-08-09 11:38 ` Stefan Roese
0 siblings, 2 replies; 3+ messages in thread
From: Pali Rohár @ 2022-08-05 11:37 UTC (permalink / raw)
To: Stefan Roese; +Cc: u-boot
64-bit Armada DTS files are not build correctly during compilation of
32-bit Armada boards and vice versa. So fix makefile build system to
compile only those dts files which are compatible for the current build
(64-bit Armada DTS files only for 64-bit builds and 32-bit Armada DTS files
only for 32-bit builds).
Signed-off-by: Pali Rohár <pali@kernel.org>
---
arch/arm/dts/Makefile | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index ceaa39e4b4d6..7330121dbaba 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -232,12 +232,8 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
tegra210-p2571.dtb \
tegra210-p3450-0000.dtb
+ifdef CONFIG_ARMADA_32BIT
dtb-$(CONFIG_ARCH_MVEBU) += \
- armada-3720-db.dtb \
- armada-3720-espressobin.dtb \
- armada-3720-turris-mox.dtb \
- armada-3720-eDPU.dtb \
- armada-3720-uDPU.dtb \
armada-375-db.dtb \
armada-385-atl-x530.dtb \
armada-385-atl-x530DP.dtb \
@@ -247,12 +243,6 @@ dtb-$(CONFIG_ARCH_MVEBU) += \
armada-388-gp.dtb \
armada-388-helios4.dtb \
armada-38x-controlcenterdc.dtb \
- armada-7040-db-nand.dtb \
- armada-7040-db.dtb \
- armada-8040-clearfog-gt-8k.dtb \
- armada-8040-db.dtb \
- armada-8040-mcbin.dtb \
- armada-8040-puzzle-m801.dtb \
armada-xp-crs305-1g-4s.dtb \
armada-xp-crs305-1g-4s-bit.dtb \
armada-xp-crs326-24g-2s.dtb \
@@ -263,7 +253,20 @@ dtb-$(CONFIG_ARCH_MVEBU) += \
armada-xp-gp.dtb \
armada-xp-maxbcm.dtb \
armada-xp-synology-ds414.dtb \
- armada-xp-theadorable.dtb \
+ armada-xp-theadorable.dtb
+else
+dtb-$(CONFIG_ARCH_MVEBU) += \
+ armada-3720-db.dtb \
+ armada-3720-espressobin.dtb \
+ armada-3720-turris-mox.dtb \
+ armada-3720-eDPU.dtb \
+ armada-3720-uDPU.dtb \
+ armada-7040-db-nand.dtb \
+ armada-7040-db.dtb \
+ armada-8040-clearfog-gt-8k.dtb \
+ armada-8040-db.dtb \
+ armada-8040-mcbin.dtb \
+ armada-8040-puzzle-m801.dtb \
cn9130-db-A.dtb \
cn9130-db-B.dtb \
cn9131-db-A.dtb \
@@ -272,6 +275,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += \
cn9132-db-B.dtb \
cn9130-crb-A.dtb \
cn9130-crb-B.dtb
+endif
dtb-$(CONFIG_ARCH_SYNQUACER) += synquacer-sc2a11-developerbox.dtb
dtb-$(CONFIG_ARCH_UNIPHIER_LD11) += \
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] arm: mvebu: dts: Build only arch-compatible dts files
2022-08-05 11:37 [PATCH] arm: mvebu: dts: Build only arch-compatible dts files Pali Rohár
@ 2022-08-05 11:39 ` Stefan Roese
2022-08-09 11:38 ` Stefan Roese
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Roese @ 2022-08-05 11:39 UTC (permalink / raw)
To: Pali Rohár; +Cc: u-boot
On 05.08.22 13:37, Pali Rohár wrote:
> 64-bit Armada DTS files are not build correctly during compilation of
> 32-bit Armada boards and vice versa. So fix makefile build system to
> compile only those dts files which are compatible for the current build
> (64-bit Armada DTS files only for 64-bit builds and 32-bit Armada DTS files
> only for 32-bit builds).
>
> Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> arch/arm/dts/Makefile | 28 ++++++++++++++++------------
> 1 file changed, 16 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index ceaa39e4b4d6..7330121dbaba 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -232,12 +232,8 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
> tegra210-p2571.dtb \
> tegra210-p3450-0000.dtb
>
> +ifdef CONFIG_ARMADA_32BIT
> dtb-$(CONFIG_ARCH_MVEBU) += \
> - armada-3720-db.dtb \
> - armada-3720-espressobin.dtb \
> - armada-3720-turris-mox.dtb \
> - armada-3720-eDPU.dtb \
> - armada-3720-uDPU.dtb \
> armada-375-db.dtb \
> armada-385-atl-x530.dtb \
> armada-385-atl-x530DP.dtb \
> @@ -247,12 +243,6 @@ dtb-$(CONFIG_ARCH_MVEBU) += \
> armada-388-gp.dtb \
> armada-388-helios4.dtb \
> armada-38x-controlcenterdc.dtb \
> - armada-7040-db-nand.dtb \
> - armada-7040-db.dtb \
> - armada-8040-clearfog-gt-8k.dtb \
> - armada-8040-db.dtb \
> - armada-8040-mcbin.dtb \
> - armada-8040-puzzle-m801.dtb \
> armada-xp-crs305-1g-4s.dtb \
> armada-xp-crs305-1g-4s-bit.dtb \
> armada-xp-crs326-24g-2s.dtb \
> @@ -263,7 +253,20 @@ dtb-$(CONFIG_ARCH_MVEBU) += \
> armada-xp-gp.dtb \
> armada-xp-maxbcm.dtb \
> armada-xp-synology-ds414.dtb \
> - armada-xp-theadorable.dtb \
> + armada-xp-theadorable.dtb
> +else
> +dtb-$(CONFIG_ARCH_MVEBU) += \
> + armada-3720-db.dtb \
> + armada-3720-espressobin.dtb \
> + armada-3720-turris-mox.dtb \
> + armada-3720-eDPU.dtb \
> + armada-3720-uDPU.dtb \
> + armada-7040-db-nand.dtb \
> + armada-7040-db.dtb \
> + armada-8040-clearfog-gt-8k.dtb \
> + armada-8040-db.dtb \
> + armada-8040-mcbin.dtb \
> + armada-8040-puzzle-m801.dtb \
> cn9130-db-A.dtb \
> cn9130-db-B.dtb \
> cn9131-db-A.dtb \
> @@ -272,6 +275,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += \
> cn9132-db-B.dtb \
> cn9130-crb-A.dtb \
> cn9130-crb-B.dtb
> +endif
>
> dtb-$(CONFIG_ARCH_SYNQUACER) += synquacer-sc2a11-developerbox.dtb
> dtb-$(CONFIG_ARCH_UNIPHIER_LD11) += \
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] arm: mvebu: dts: Build only arch-compatible dts files
2022-08-05 11:37 [PATCH] arm: mvebu: dts: Build only arch-compatible dts files Pali Rohár
2022-08-05 11:39 ` Stefan Roese
@ 2022-08-09 11:38 ` Stefan Roese
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Roese @ 2022-08-09 11:38 UTC (permalink / raw)
To: Pali Rohár; +Cc: u-boot
On 05.08.22 13:37, Pali Rohár wrote:
> 64-bit Armada DTS files are not build correctly during compilation of
> 32-bit Armada boards and vice versa. So fix makefile build system to
> compile only those dts files which are compatible for the current build
> (64-bit Armada DTS files only for 64-bit builds and 32-bit Armada DTS files
> only for 32-bit builds).
>
> Signed-off-by: Pali Rohár <pali@kernel.org>
Applied to u-boot-marvell/master
Thanks,
Stefan
> ---
> arch/arm/dts/Makefile | 28 ++++++++++++++++------------
> 1 file changed, 16 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index ceaa39e4b4d6..7330121dbaba 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -232,12 +232,8 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
> tegra210-p2571.dtb \
> tegra210-p3450-0000.dtb
>
> +ifdef CONFIG_ARMADA_32BIT
> dtb-$(CONFIG_ARCH_MVEBU) += \
> - armada-3720-db.dtb \
> - armada-3720-espressobin.dtb \
> - armada-3720-turris-mox.dtb \
> - armada-3720-eDPU.dtb \
> - armada-3720-uDPU.dtb \
> armada-375-db.dtb \
> armada-385-atl-x530.dtb \
> armada-385-atl-x530DP.dtb \
> @@ -247,12 +243,6 @@ dtb-$(CONFIG_ARCH_MVEBU) += \
> armada-388-gp.dtb \
> armada-388-helios4.dtb \
> armada-38x-controlcenterdc.dtb \
> - armada-7040-db-nand.dtb \
> - armada-7040-db.dtb \
> - armada-8040-clearfog-gt-8k.dtb \
> - armada-8040-db.dtb \
> - armada-8040-mcbin.dtb \
> - armada-8040-puzzle-m801.dtb \
> armada-xp-crs305-1g-4s.dtb \
> armada-xp-crs305-1g-4s-bit.dtb \
> armada-xp-crs326-24g-2s.dtb \
> @@ -263,7 +253,20 @@ dtb-$(CONFIG_ARCH_MVEBU) += \
> armada-xp-gp.dtb \
> armada-xp-maxbcm.dtb \
> armada-xp-synology-ds414.dtb \
> - armada-xp-theadorable.dtb \
> + armada-xp-theadorable.dtb
> +else
> +dtb-$(CONFIG_ARCH_MVEBU) += \
> + armada-3720-db.dtb \
> + armada-3720-espressobin.dtb \
> + armada-3720-turris-mox.dtb \
> + armada-3720-eDPU.dtb \
> + armada-3720-uDPU.dtb \
> + armada-7040-db-nand.dtb \
> + armada-7040-db.dtb \
> + armada-8040-clearfog-gt-8k.dtb \
> + armada-8040-db.dtb \
> + armada-8040-mcbin.dtb \
> + armada-8040-puzzle-m801.dtb \
> cn9130-db-A.dtb \
> cn9130-db-B.dtb \
> cn9131-db-A.dtb \
> @@ -272,6 +275,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += \
> cn9132-db-B.dtb \
> cn9130-crb-A.dtb \
> cn9130-crb-B.dtb
> +endif
>
> dtb-$(CONFIG_ARCH_SYNQUACER) += synquacer-sc2a11-developerbox.dtb
> dtb-$(CONFIG_ARCH_UNIPHIER_LD11) += \
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-09 11:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-05 11:37 [PATCH] arm: mvebu: dts: Build only arch-compatible dts files Pali Rohár
2022-08-05 11:39 ` Stefan Roese
2022-08-09 11:38 ` Stefan Roese
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.