From patchwork Thu Mar 18 14:28:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1455300 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F1TtS6tdgz9sWF; Fri, 19 Mar 2021 01:29:19 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lMteG-00085h-Ii; Thu, 18 Mar 2021 14:29:16 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lMteC-00084o-OC for kernel-team@lists.ubuntu.com; Thu, 18 Mar 2021 14:29:12 +0000 Received: from mail-wr1-f70.google.com ([209.85.221.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lMteC-0006yr-Gz for kernel-team@lists.ubuntu.com; Thu, 18 Mar 2021 14:29:12 +0000 Received: by mail-wr1-f70.google.com with SMTP id s10so20204758wre.0 for ; Thu, 18 Mar 2021 07:29:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZaOR8cHZRanp4+TJM1k8Vxd4sekBg7FwtYPqj8jDAmM=; b=Bq6Br4gdrBqbTgKUNCLFja4rQlNgbgMpjA0gOnX63ndeHdQKAdp+ASMruWV87VIa+6 HFrRwlqeO4vj0pgOeeEK7+fABWLTbFHbbhkty0AFroWpP8a5Yh8KkCHObUMnk0aDnNdZ kAucPgzfxtOt3Da5hzJ4T2XiJj+k6ZssC8D67Hx31qQ0j3b1kMAWL9vjJXMRrXh4SaaU bfqVQSo1rltQuc2Ot07G6W19x0fpFm5VKmdF/pk9kEmdlT3JXVwCFkT2koH36YiPfRS0 HZptpfS0Y9ACI0G49jTy6DGwti1RZSnfc/ptTBkqfZcdXRLzmVFvjeMck3JtR5T488Az YFMQ== X-Gm-Message-State: AOAM533cCUUCfpJrcGY7ZJRe6Kp0uX8WTPdhxwobaKgwcKePxrSo82el amd3KHrWMLu4s0cK3T9+ynSSxwo/MeRigX6NIazLK0Kl6veHTD0uG4GjflONBXJesC/N3R6uYZx s9p9Xbz5LO2GgAH8gKYyDQWp2d86RFdAbUN34q7EFdQ== X-Received: by 2002:a1c:61c5:: with SMTP id v188mr3855152wmb.20.1616077752203; Thu, 18 Mar 2021 07:29:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsP6A8+8FEKNPm/PdLn/JSThAcynxt8wnj4TAIswW/dw6oO6vmYUSZhOxSK7gzQs+kDK8BvQ== X-Received: by 2002:a1c:61c5:: with SMTP id v188mr3855133wmb.20.1616077751986; Thu, 18 Mar 2021 07:29:11 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id o11sm3162403wrq.74.2021.03.18.07.29.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 07:29:11 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][G/raspi][PATCH 2/2] dts: Tidy the Raspberry Pi Makefile entries Date: Thu, 18 Mar 2021 15:28:38 +0100 Message-Id: <20210318142838.35254-3-juergh@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210318142838.35254-1-juergh@canonical.com> References: <20210318142838.35254-1-juergh@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Phil Elwell BugLink: https://bugs.launchpad.net/bugs/1919349 Signed-off-by: Phil Elwell (cherry picked from commit 42ac71e98a3a66236ec43bd06089ab3f8f3a9bec rpi-5.4.y) Signed-off-by: Juerg Haefliger --- arch/arm/boot/dts/Makefile | 2 +- arch/arm64/boot/dts/broadcom/Makefile | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) 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