1 From 8364d0445bde9900c7ef8e6f6d4ba2642dca0807 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.com>
3 Date: Mon, 26 Oct 2020 15:01:21 +0000
4 Subject: [PATCH] dts: Tidy the Raspberry Pi Makefile entries
6 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
8 arch/arm/boot/dts/Makefile | 2 +-
9 arch/arm64/boot/dts/broadcom/Makefile | 7 ++-----
10 2 files changed, 3 insertions(+), 6 deletions(-)
12 --- a/arch/arm/boot/dts/Makefile
13 +++ b/arch/arm/boot/dts/Makefile
14 @@ -10,8 +10,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
18 - bcm2711-rpi-4-b.dtb \
19 bcm2710-rpi-3-b-plus.dtb \
20 + bcm2711-rpi-4-b.dtb \
24 --- a/arch/arm64/boot/dts/broadcom/Makefile
25 +++ b/arch/arm64/boot/dts/broadcom/Makefile
26 @@ -3,15 +3,12 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rp
28 bcm2837-rpi-3-b-plus.dtb \
29 bcm2837-rpi-cm3-io3.dtb
30 -dtb-$(CONFIG_ARCH_BCM2709) += bcm2710-rpi-2-b.dtb
31 -dtb-$(CONFIG_ARCH_BCM2709) += bcm2710-rpi-3-b.dtb
32 dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-2-b.dtb
33 dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b.dtb
34 -dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-4-b.dtb \
36 dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b-plus.dtb
37 -dtb-$(CONFIG_ARCH_BCM2709) += bcm2710-rpi-cm3.dtb
38 +dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-4-b.dtb
39 dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-cm3.dtb
40 +dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4.dtb
42 subdir-y += northstar2