target/linux/bcm27xx/patches-5.4/950-0995-dts-Tidy-the-Raspberry-Pi-Makefile-entries.patch

   1 From fd3620d39c813e9846ace3511bc96a868b5be61a 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
   5
   6 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
   7 ---
   8  arch/arm/boot/dts/Makefile            | 2 +-
   9  arch/arm64/boot/dts/broadcom/Makefile | 7 ++-----
  10  2 files changed, 3 insertions(+), 6 deletions(-)
  11
  12 --- a/arch/arm/boot/dts/Makefile
  13 +++ b/arch/arm/boot/dts/Makefile
  14 @@ -10,8 +10,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
  15         bcm2709-rpi-2-b.dtb \
  16         bcm2710-rpi-2-b.dtb \
  17         bcm2710-rpi-3-b.dtb \
  18 -       bcm2711-rpi-4-b.dtb \
  19         bcm2710-rpi-3-b-plus.dtb \
  20 +       bcm2711-rpi-4-b.dtb \
  21         bcm2710-rpi-cm3.dtb \
  22         bcm2711-rpi-cm4.dtb
  23
  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
  27                               bcm2837-rpi-3-b.dtb \
  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 \
  35 -                             bcm2711-rpi-cm4.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
  41
  42  subdir-y       += northstar2
  43  subdir-y       += stingray