| From fd3620d39c813e9846ace3511bc96a868b5be61a Mon Sep 17 00:00:00 2001 |
| From: Phil Elwell <phil@raspberrypi.com> |
| Date: Mon, 26 Oct 2020 15:01:21 +0000 |
| Subject: [PATCH] dts: Tidy the Raspberry Pi Makefile entries |
| |
| Signed-off-by: Phil Elwell <phil@raspberrypi.com> |
| --- |
| arch/arm/boot/dts/Makefile | 2 +- |
| arch/arm64/boot/dts/broadcom/Makefile | 7 ++----- |
| 2 files changed, 3 insertions(+), 6 deletions(-) |
| |
| --- 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 |
| |
| --- a/arch/arm64/boot/dts/broadcom/Makefile |
| +++ b/arch/arm64/boot/dts/broadcom/Makefile |
| @@ -3,15 +3,12 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rp |
| 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 |