| Message ID | 20220721000720.29578-1-william.zhang@broadcom.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: bcmbca: Move BCM4908 SoC support under ARCH_BCMBCA | expand |
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
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
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%)