* [RESEND PATCH 4/9] arm64: dts: Move BCM4908 dts to bcmbca folder
@ 2022-07-21 0:07 William Zhang
2022-07-21 6:25 ` Rafał Miłecki
0 siblings, 1 reply; 2+ messages in thread
From: William Zhang @ 2022-07-21 0:07 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, dan.beygelman, William Zhang, Rob Herring,
Krzysztof Kozlowski, Anand Gore, Kursad Oney, Florian Fainelli,
Rafał Miłecki, Broadcom internal kernel review list,
Stefan Wahren, Nicolas Saenz Julienne,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list
[-- Attachment #1: Type: text/plain, Size: 4795 bytes --]
Move the BCM4908 dts files to bcmbca folder. Use CONFIG_ARCH_BCMBCA to
build all the BCM4908 board dts. Remove bcm4908 folder and its makefile.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
arch/arm64/boot/dts/broadcom/Makefile | 1 -
arch/arm64/boot/dts/broadcom/bcm4908/Makefile | 5 -----
arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 4 ++++
.../broadcom/{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts | 0
.../{bcm4908 => bcmbca}/bcm4906-tplink-archer-c2300-v1.dts | 0
.../arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi | 0
.../broadcom/{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts | 0
.../broadcom/{bcm4908 => bcmbca}/bcm4908-netgear-raxe500.dts | 0
.../arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi | 0
9 files changed, 4 insertions(+), 6 deletions(-)
delete mode 100644 arch/arm64/boot/dts/broadcom/bcm4908/Makefile
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts (100%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-tplink-archer-c2300-v1.dts (100%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi (100%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts (100%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-netgear-raxe500.dts (100%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi (100%)
diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
index e8584d3b698f..05d8c5ecf3b0 100644
--- a/arch/arm64/boot/dts/broadcom/Makefile
+++ b/arch/arm64/boot/dts/broadcom/Makefile
@@ -8,7 +8,6 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb \
bcm2837-rpi-cm3-io3.dtb \
bcm2837-rpi-zero-2-w.dtb
-subdir-y += bcm4908
subdir-y += bcmbca
subdir-y += northstar2
subdir-y += stingray
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/Makefile b/arch/arm64/boot/dts/broadcom/bcm4908/Makefile
deleted file mode 100644
index 6e364e304d4f..000000000000
--- a/arch/arm64/boot/dts/broadcom/bcm4908/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-netgear-r8000p.dtb
-dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-tplink-archer-c2300-v1.dtb
-dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-asus-gt-ac5300.dtb
-dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-netgear-raxe500.dtb
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/Makefile b/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
index 38f14307184b..d30fa75f0611 100644
--- a/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
@@ -1,5 +1,9 @@
# SPDX-License-Identifier: GPL-2.0
dtb-$(CONFIG_ARCH_BCMBCA) += \
+ bcm4906-netgear-r8000p.dtb \
+ bcm4906-tplink-archer-c2300-v1.dtb \
+ bcm4908-asus-gt-ac5300.dtb \
+ bcm4908-netgear-raxe500.dtb \
bcm4912-asus-gt-ax6000.dtb \
bcm94912.dtb \
bcm963158.dtb \
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-tplink-archer-c2300-v1.dts
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-tplink-archer-c2300-v1.dts
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4906.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4906.dtsi
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-netgear-raxe500.dts
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-netgear-raxe500.dts
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
--
2.34.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [RESEND PATCH 4/9] arm64: dts: Move BCM4908 dts to bcmbca folder
2022-07-21 0:07 [RESEND PATCH 4/9] arm64: dts: Move BCM4908 dts to bcmbca folder William Zhang
@ 2022-07-21 6:25 ` Rafał Miłecki
0 siblings, 0 replies; 2+ messages in thread
From: Rafał Miłecki @ 2022-07-21 6:25 UTC (permalink / raw)
To: William Zhang
Cc: Linux ARM List, joel.peshkin, dan.beygelman, Rob Herring,
Krzysztof Kozlowski, Anand Gore, Kursad Oney, Florian Fainelli,
Broadcom internal kernel review list, Stefan Wahren,
Nicolas Saenz Julienne, devicetree, linux-kernel
On 2022-07-21 02:07, William Zhang wrote:
> Move the BCM4908 dts files to bcmbca folder. Use CONFIG_ARCH_BCMBCA to
> build all the BCM4908 board dts. Remove bcm4908 folder and its
> makefile.
This will be a but painful for projects like OpenWrt or Buildroot. They
have scripts that look for dtb files in specific directories. Now they
will have to be made kernel-version-aware which may not be an option.
Still I think it's a nice & needed cleanup!
Just in case someone knows some intermediate solution let me know
please.
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> ---
>
> arch/arm64/boot/dts/broadcom/Makefile | 1 -
> arch/arm64/boot/dts/broadcom/bcm4908/Makefile | 5 -----
> arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 4 ++++
> .../broadcom/{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts | 0
> .../{bcm4908 => bcmbca}/bcm4906-tplink-archer-c2300-v1.dts | 0
> .../arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi | 0
> .../broadcom/{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts | 0
> .../broadcom/{bcm4908 => bcmbca}/bcm4908-netgear-raxe500.dts | 0
> .../arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi | 0
> 9 files changed, 4 insertions(+), 6 deletions(-)
> delete mode 100644 arch/arm64/boot/dts/broadcom/bcm4908/Makefile
> rename arch/arm64/boot/dts/broadcom/{bcm4908 =>
> bcmbca}/bcm4906-netgear-r8000p.dts (100%)
> rename arch/arm64/boot/dts/broadcom/{bcm4908 =>
> bcmbca}/bcm4906-tplink-archer-c2300-v1.dts (100%)
> rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi
> (100%)
> rename arch/arm64/boot/dts/broadcom/{bcm4908 =>
> bcmbca}/bcm4908-asus-gt-ac5300.dts (100%)
> rename arch/arm64/boot/dts/broadcom/{bcm4908 =>
> bcmbca}/bcm4908-netgear-raxe500.dts (100%)
> rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi
> (100%)
>
> diff --git a/arch/arm64/boot/dts/broadcom/Makefile
> b/arch/arm64/boot/dts/broadcom/Makefile
> index e8584d3b698f..05d8c5ecf3b0 100644
> --- a/arch/arm64/boot/dts/broadcom/Makefile
> +++ b/arch/arm64/boot/dts/broadcom/Makefile
> @@ -8,7 +8,6 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb \
> bcm2837-rpi-cm3-io3.dtb \
> bcm2837-rpi-zero-2-w.dtb
>
> -subdir-y += bcm4908
> subdir-y += bcmbca
> subdir-y += northstar2
> subdir-y += stingray
> diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/Makefile
> b/arch/arm64/boot/dts/broadcom/bcm4908/Makefile
> deleted file mode 100644
> index 6e364e304d4f..000000000000
> --- a/arch/arm64/boot/dts/broadcom/bcm4908/Makefile
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# SPDX-License-Identifier: GPL-2.0
> -dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-netgear-r8000p.dtb
> -dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-tplink-archer-c2300-v1.dtb
> -dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-asus-gt-ac5300.dtb
> -dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-netgear-raxe500.dtb
> diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
> b/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
> index 38f14307184b..d30fa75f0611 100644
> --- a/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
> +++ b/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
> @@ -1,5 +1,9 @@
> # SPDX-License-Identifier: GPL-2.0
> dtb-$(CONFIG_ARCH_BCMBCA) += \
> + bcm4906-netgear-r8000p.dtb \
> + bcm4906-tplink-archer-c2300-v1.dtb \
> + bcm4908-asus-gt-ac5300.dtb \
> + bcm4908-netgear-raxe500.dtb \
> bcm4912-asus-gt-ax6000.dtb \
> bcm94912.dtb \
> bcm963158.dtb \
> diff --git
> a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
> b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts
> similarity index 100%
> rename from
> arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
> rename to
> arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts
> diff --git
> a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
> b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-tplink-archer-c2300-v1.dts
> similarity index 100%
> rename from
> arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
> rename to
> arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-tplink-archer-c2300-v1.dts
> diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi
> b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4906.dtsi
> similarity index 100%
> rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi
> rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4906.dtsi
> diff --git
> a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
> b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts
> similarity index 100%
> rename from
> arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
> rename to
> arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts
> diff --git
> a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts
> b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-netgear-raxe500.dts
> similarity index 100%
> rename from
> arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts
> rename to
> arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-netgear-raxe500.dts
> diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
> b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
> similarity index 100%
> rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
> rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-21 6:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-21 0:07 [RESEND PATCH 4/9] arm64: dts: Move BCM4908 dts to bcmbca folder William Zhang
2022-07-21 6:25 ` Rafał Miłecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).