diff mbox series

[SRU,G/raspi,2/2] dts: Tidy the Raspberry Pi Makefile entries

Message ID 20210318142838.35254-3-juergh@canonical.com
State New
Headers show
Series Invalid compatible on CM4 arm64 (LP: #1919349) | expand

Commit Message

Juerg Haefliger March 18, 2021, 2:28 p.m. UTC 
From: Phil Elwell <phil@raspberrypi.com>

BugLink: https://bugs.launchpad.net/bugs/1919349

Signed-off-by: Phil Elwell <phil@raspberrypi.com>

(cherry picked from commit 42ac71e98a3a66236ec43bd06089ab3f8f3a9bec rpi-5.4.y)
Signed-off-by: Juerg Haefliger <juergh@canonical.com>
---
 arch/arm/boot/dts/Makefile            | 2 +-
 arch/arm64/boot/dts/broadcom/Makefile | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 18c7cca21fea..3a290be75656 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -10,8 +10,8 @@  dtb-$(CONFIG_ARCH_BCM2835) += \
 	bcm2709-rpi-2-b.dtb \
 	bcm2710-rpi-2-b.dtb \
 	bcm2710-rpi-3-b.dtb \
-	bcm2711-rpi-4-b.dtb \
 	bcm2710-rpi-3-b-plus.dtb \
+	bcm2711-rpi-4-b.dtb \
 	bcm2710-rpi-cm3.dtb \
 	bcm2711-rpi-cm4.dtb
 
diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
index 1e861e2bf2e0..996e670a6018 100644
--- a/arch/arm64/boot/dts/broadcom/Makefile
+++ b/arch/arm64/boot/dts/broadcom/Makefile
@@ -3,15 +3,12 @@  dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-a-plus.dtb \
 			      bcm2837-rpi-3-b.dtb \
 			      bcm2837-rpi-3-b-plus.dtb \
 			      bcm2837-rpi-cm3-io3.dtb
-dtb-$(CONFIG_ARCH_BCM2709) += bcm2710-rpi-2-b.dtb
-dtb-$(CONFIG_ARCH_BCM2709) += bcm2710-rpi-3-b.dtb
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-2-b.dtb
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b.dtb
-dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-4-b.dtb \
-			      bcm2711-rpi-cm4.dtb
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b-plus.dtb
-dtb-$(CONFIG_ARCH_BCM2709) += bcm2710-rpi-cm3.dtb
+dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-4-b.dtb
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-cm3.dtb
+dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4.dtb
 
 subdir-y	+= northstar2
 subdir-y	+= stingray