* [PATCH v2 0/3] arm: bcmbca: move bcm6858 support under CONFIG_ARCH_BCMBCA
@ 2022-08-22 18:39 William Zhang
2022-08-22 18:39 ` [PATCH v2 1/3] arm: bcmbca: add bcm6858 SoC " William Zhang
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: William Zhang @ 2022-08-22 18:39 UTC (permalink / raw)
To: U-Boot Mailing List
Cc: dan.beygelman, joel.peshkin, rafal, f.fainelli, kursad.oney,
philippe.reynes, anand.gore, William Zhang, Andre Przywara,
Christian Hewitt, Fabio Estevam, Marek Vasut, Rick Chen,
Samuel Holland, Sean Anderson, Simon Glass, Tom Rini,
Tomer Yacoby, Wolfgang Denk, Ying-Chun Liu (PaulLiu)
[-- Attachment #1: Type: text/plain, Size: 3143 bytes --]
Sorry for another version of patch series with some minor updates.
Please see the change log and specific patch for details.
BCM6858 is part of the Broadcom BCA (Broadband Carrier Access origin)
chipset family. BCM6858 was originally added by Philippe before Broadcom
started to upstream the support for BCMBCA SoCs. The ARM based Broadband
SoC family is now supported under the unified ARCH_BCMBCA config. This
patch series migrate the BCM6858 support under the config of ARCH_BCMBCA
and BCM6858.
This patch series need to apply on top of my previous patch series [1].
[1]: https://lists.denx.de/pipermail/u-boot/2022-August/492470.html
Changes in v2:
-Add help in BCM6858 Kconfig option to include the list of the supported
chips.
-Update subject line to be more clear for patch 3
William Zhang (3):
arm: bcmbca: add bcm6858 SoC support under CONFIG_ARCH_BCMBCA
arm: bcmbca: remove bcm6858 support under CONFIG_ARCH_BCM6858
arm: bcmbca: replace ARCH_BCM6858 symbols in Kconfig with BCM6858
MAINTAINERS | 1 +
arch/arm/Kconfig | 7 -
arch/arm/dts/Makefile | 6 +-
arch/arm/dts/bcm6858.dtsi | 197 +++++++++++--------
arch/arm/dts/bcm96858.dts | 30 +++
arch/arm/dts/bcm968580xref.dts | 4 +-
arch/arm/mach-bcmbca/Kconfig | 11 ++
arch/arm/mach-bcmbca/Makefile | 1 +
arch/arm/mach-bcmbca/bcm6858/Kconfig | 17 ++
arch/arm/mach-bcmbca/bcm6858/Makefile | 5 +
arch/arm/mach-bcmbca/bcm6858/mmu_table.c | 32 +++
board/broadcom/bcm968580xref/Kconfig | 17 --
board/broadcom/bcm968580xref/MAINTAINERS | 6 -
board/broadcom/bcm968580xref/Makefile | 3 -
board/broadcom/bcm968580xref/bcm968580xref.c | 62 ------
board/broadcom/bcmbca/Kconfig | 7 +
configs/bcm968580xref_ram_defconfig | 64 ------
configs/bcm96858_defconfig | 23 +++
drivers/gpio/Kconfig | 3 +-
drivers/led/Kconfig | 2 +-
drivers/mtd/nand/raw/Kconfig | 2 +-
drivers/spi/Kconfig | 3 +-
drivers/watchdog/Kconfig | 3 +-
include/configs/bcm96858.h | 15 ++
include/configs/broadcom_bcm968580xref.h | 32 ---
25 files changed, 270 insertions(+), 283 deletions(-)
create mode 100644 arch/arm/dts/bcm96858.dts
create mode 100644 arch/arm/mach-bcmbca/bcm6858/Kconfig
create mode 100644 arch/arm/mach-bcmbca/bcm6858/Makefile
create mode 100644 arch/arm/mach-bcmbca/bcm6858/mmu_table.c
delete mode 100644 board/broadcom/bcm968580xref/Kconfig
delete mode 100644 board/broadcom/bcm968580xref/MAINTAINERS
delete mode 100644 board/broadcom/bcm968580xref/Makefile
delete mode 100644 board/broadcom/bcm968580xref/bcm968580xref.c
delete mode 100644 configs/bcm968580xref_ram_defconfig
create mode 100644 configs/bcm96858_defconfig
create mode 100644 include/configs/bcm96858.h
delete mode 100644 include/configs/broadcom_bcm968580xref.h
--
2.37.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 1/3] arm: bcmbca: add bcm6858 SoC support under CONFIG_ARCH_BCMBCA
2022-08-22 18:39 [PATCH v2 0/3] arm: bcmbca: move bcm6858 support under CONFIG_ARCH_BCMBCA William Zhang
@ 2022-08-22 18:39 ` William Zhang
2022-08-24 12:38 ` Philippe REYNES
2022-10-31 14:45 ` Tom Rini
2022-08-22 18:39 ` [PATCH v2 2/3] arm: bcmbca: remove bcm6858 support under CONFIG_ARCH_BCM6858 William Zhang
2022-08-22 18:39 ` [PATCH v2 3/3] arm: bcmbca: replace ARCH_BCM6858 symbols in Kconfig with BCM6858 William Zhang
2 siblings, 2 replies; 8+ messages in thread
From: William Zhang @ 2022-08-22 18:39 UTC (permalink / raw)
To: U-Boot Mailing List
Cc: dan.beygelman, joel.peshkin, rafal, f.fainelli, kursad.oney,
philippe.reynes, anand.gore, William Zhang, Andre Przywara,
Christian Hewitt, Marek Vasut, Samuel Holland, Simon Glass,
Tom Rini, Tomer Yacoby, Ying-Chun Liu (PaulLiu)
[-- Attachment #1: Type: text/plain, Size: 16198 bytes --]
BCM6858 is a Broadcom B53 based PON Gateway SoC. It is part of the BCA
(Broadband Carrier Access origin) chipset family. Like other broadband
SoC, this patch adds it under CONFIG_BCM6858 chip config and
CONFIG_ARCH_BCMBCA platform config.
This initial support includes a bare-bone implementation and the
original dts is updated with the one from linux next git repository.
The u-boot image can be loaded from flash or network to the entry point
address in the memory and boot from there to the console.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
Changes in v2:
-Add help in BCM6858 Kconfig option to include the list of the supported
chips.
MAINTAINERS | 1 +
arch/arm/dts/Makefile | 2 +
arch/arm/dts/bcm6858.dtsi | 197 ++++++++++++++---------
arch/arm/dts/bcm96858.dts | 30 ++++
arch/arm/mach-bcmbca/Kconfig | 11 ++
arch/arm/mach-bcmbca/Makefile | 1 +
arch/arm/mach-bcmbca/bcm6858/Kconfig | 17 ++
arch/arm/mach-bcmbca/bcm6858/Makefile | 5 +
arch/arm/mach-bcmbca/bcm6858/mmu_table.c | 32 ++++
board/broadcom/bcmbca/Kconfig | 7 +
configs/bcm96858_defconfig | 23 +++
include/configs/bcm96858.h | 11 ++
12 files changed, 258 insertions(+), 79 deletions(-)
create mode 100644 arch/arm/dts/bcm96858.dts
create mode 100644 arch/arm/mach-bcmbca/bcm6858/Kconfig
create mode 100644 arch/arm/mach-bcmbca/bcm6858/Makefile
create mode 100644 arch/arm/mach-bcmbca/bcm6858/mmu_table.c
create mode 100644 configs/bcm96858_defconfig
create mode 100644 include/configs/bcm96858.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 1f50dad583ce..819fa5b87824 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -231,6 +231,7 @@ N: bcm[9]?6756
N: bcm[9]?6813
N: bcm[9]?6846
N: bcm[9]?6856
+N: bcm[9]?6858
N: bcm[9]?6878
ARM BROADCOM BCMSTB
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index a0ea9fa6029d..ee3475b97a40 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1182,6 +1182,8 @@ dtb-$(CONFIG_BCM6846) += \
dtb-$(CONFIG_BCM6856) += \
bcm96856.dtb \
bcm968360bg.dtb
+dtb-$(CONFIG_BCM6858) += \
+ bcm96858.dtb
dtb-$(CONFIG_BCM6878) += \
bcm96878.dtb
diff --git a/arch/arm/dts/bcm6858.dtsi b/arch/arm/dts/bcm6858.dtsi
index 02225621710b..19c4dd6fa7e4 100644
--- a/arch/arm/dts/bcm6858.dtsi
+++ b/arch/arm/dts/bcm6858.dtsi
@@ -1,122 +1,161 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2018 Philippe Reynes <philippe.reynes@softathome.com>
+ * Copyright 2022 Broadcom Ltd.
*/
-#include "skeleton64.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
/ {
- compatible = "brcm,bcm6858";
+ compatible = "brcm,bcm6858", "brcm,bcmbca";
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- spi0 = &hsspi;
- };
+ interrupt-parent = <&gic>;
cpus {
#address-cells = <2>;
#size-cells = <0>;
- u-boot,dm-pre-reloc;
- cpu0: cpu@0 {
- compatible = "arm,cortex-a53", "arm,armv8";
+ B53_0: cpu@0 {
+ compatible = "brcm,brahma-b53";
device_type = "cpu";
reg = <0x0 0x0>;
- next-level-cache = <&l2>;
- u-boot,dm-pre-reloc;
+ next-level-cache = <&L2_0>;
+ enable-method = "psci";
};
- cpu1: cpu@1 {
- compatible = "arm,cortex-a53", "arm,armv8";
+ B53_1: cpu@1 {
+ compatible = "brcm,brahma-b53";
device_type = "cpu";
reg = <0x0 0x1>;
- next-level-cache = <&l2>;
- u-boot,dm-pre-reloc;
+ next-level-cache = <&L2_0>;
+ enable-method = "psci";
};
- cpu2: cpu@2 {
- compatible = "arm,cortex-a53", "arm,armv8";
+ B53_2: cpu@2 {
+ compatible = "brcm,brahma-b53";
device_type = "cpu";
reg = <0x0 0x2>;
- next-level-cache = <&l2>;
- u-boot,dm-pre-reloc;
+ next-level-cache = <&L2_0>;
+ enable-method = "psci";
};
- cpu3: cpu@3 {
- compatible = "arm,cortex-a53", "arm,armv8";
+ B53_3: cpu@3 {
+ compatible = "brcm,brahma-b53";
device_type = "cpu";
reg = <0x0 0x3>;
- next-level-cache = <&l2>;
- u-boot,dm-pre-reloc;
+ next-level-cache = <&L2_0>;
+ enable-method = "psci";
};
- l2: l2-cache0 {
+ L2_0: l2-cache0 {
compatible = "cache";
- u-boot,dm-pre-reloc;
};
};
+ timer {
+ compatible = "arm,armv8-timer";
+ interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
+ };
+
+ pmu: pmu {
+ compatible = "arm,armv8-pmuv3";
+ interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-affinity = <&B53_0>, <&B53_1>,
+ <&B53_2>, <&B53_3>;
+ };
+
clocks {
- compatible = "simple-bus";
- #address-cells = <2>;
- #size-cells = <2>;
- ranges;
u-boot,dm-pre-reloc;
- periph_osc: periph-osc {
+ periph_clk: periph_clk {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <200000000>;
- u-boot,dm-pre-reloc;
};
hsspi_pll: hsspi-pll {
compatible = "fixed-factor-clock";
#clock-cells = <0>;
- clocks = <&periph_osc>;
+ clocks = <&periph_clk>;
clock-mult = <2>;
clock-div = <1>;
};
- refclk50mhz: refclk50mhz {
- compatible = "fixed-clock";
+ wdt_clk: wdt-clk {
+ compatible = "fixed-factor-clock";
#clock-cells = <0>;
- clock-frequency = <50000000>;
+ clocks = <&periph_clk>;
+ clock-div = <4>;
+ clock-mult = <1>;
};
};
- ubus {
+ psci {
+ compatible = "arm,psci-0.2";
+ method = "smc";
+ };
+
+ axi@81000000 {
compatible = "simple-bus";
- #address-cells = <2>;
- #size-cells = <2>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0x0 0x0 0x81000000 0x8000>;
+
+ gic: interrupt-controller@1000 {
+ compatible = "arm,gic-400";
+ #interrupt-cells = <3>;
+ interrupt-controller;
+ reg = <0x1000 0x1000>, /* GICD */
+ <0x2000 0x2000>, /* GICC */
+ <0x4000 0x2000>, /* GICH */
+ <0x6000 0x2000>; /* GICV */
+ interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) |
+ IRQ_TYPE_LEVEL_HIGH)>;
+ };
+ };
+
+ bus@ff800000 {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0x0 0x0 0xff800000 0x800000>;
u-boot,dm-pre-reloc;
- uart0: serial@ff800640 {
+ uart0: serial@640 {
compatible = "brcm,bcm6345-uart";
- reg = <0x0 0xff800640 0x0 0x18>;
- clocks = <&periph_osc>;
-
+ reg = <0x640 0x18>;
+ interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&periph_clk>;
+ clock-names = "refclk";
status = "disabled";
};
- leds: led-controller@ff800800 {
+ leds: led-controller@800 {
compatible = "brcm,bcm6858-leds";
- reg = <0x0 0xff800800 0x0 0xe4>;
+ reg = <0x800 0xe4>;
status = "disabled";
};
- wdt1: watchdog@ff802780 {
+ wdt1: watchdog@2780 {
compatible = "brcm,bcm6345-wdt";
- reg = <0x0 0xff802780 0x0 0x14>;
- clocks = <&refclk50mhz>;
+ reg = <0x2780 0x14>;
+ clocks = <&wdt_clk>;
};
- wdt2: watchdog@ff8027c0 {
+ wdt2: watchdog@27c0 {
compatible = "brcm,bcm6345-wdt";
- reg = <0x0 0xff8027c0 0x0 0x14>;
- clocks = <&refclk50mhz>;
+ reg = <0x27c0 0x14>;
+ clocks = <&wdt_clk>;
};
wdt-reboot {
@@ -124,91 +163,91 @@
wdt = <&wdt1>;
};
- gpio0: gpio-controller@0xff800500 {
+ gpio0: gpio-controller@500 {
compatible = "brcm,bcm6345-gpio";
- reg = <0x0 0xff800500 0x0 0x4>,
- <0x0 0xff800520 0x0 0x4>;
+ reg = <0x500 0x4>,
+ <0x520 0x4>;
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
- gpio1: gpio-controller@0xff800504 {
+ gpio1: gpio-controller@504 {
compatible = "brcm,bcm6345-gpio";
- reg = <0x0 0xff800504 0x0 0x4>,
- <0x0 0xff800524 0x0 0x4>;
+ reg = <0x504 0x4>,
+ <0x524 0x4>;
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
- gpio2: gpio-controller@0xff800508 {
+ gpio2: gpio-controller@508 {
compatible = "brcm,bcm6345-gpio";
- reg = <0x0 0xff800508 0x0 0x4>,
- <0x0 0xff800528 0x0 0x4>;
+ reg = <0x508 0x4>,
+ <0x528 0x4>;
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
- gpio3: gpio-controller@0xff80050c {
+ gpio3: gpio-controller@50c {
compatible = "brcm,bcm6345-gpio";
- reg = <0x0 0xff80050c 0x0 0x4>,
- <0x0 0xff80052c 0x0 0x4>;
+ reg = <0x50c 0x4>,
+ <0x52c 0x4>;
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
- gpio4: gpio-controller@0xff800510 {
+ gpio4: gpio-controller@510 {
compatible = "brcm,bcm6345-gpio";
- reg = <0x0 0xff800510 0x0 0x4>,
- <0x0 0xff800530 0x0 0x4>;
+ reg = <0x510 0x4>,
+ <0x530 0x4>;
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
- gpio5: gpio-controller@0xff800514 {
+ gpio5: gpio-controller@514 {
compatible = "brcm,bcm6345-gpio";
- reg = <0x0 0xff800514 0x0 0x4>,
- <0x0 0xff800534 0x0 0x4>;
+ reg = <0x514 0x4>,
+ <0x534 0x4>;
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
- gpio6: gpio-controller@0xff800518 {
+ gpio6: gpio-controller@518 {
compatible = "brcm,bcm6345-gpio";
- reg = <0x0 0xff800518 0x0 0x4>,
- <0x0 0xff800538 0x0 0x4>;
+ reg = <0x518 0x4>,
+ <0x538 0x4>;
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
- gpio7: gpio-controller@0xff80051c {
+ gpio7: gpio-controller@51c {
compatible = "brcm,bcm6345-gpio";
- reg = <0x0 0xff80051c 0x0 0x4>,
- <0x0 0xff80053c 0x0 0x4>;
+ reg = <0x51c 0x4>,
+ <0x53c 0x4>;
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
- hsspi: spi-controller@ff801000 {
+ hsspi: spi-controller@1000 {
compatible = "brcm,bcm6328-hsspi";
#address-cells = <1>;
#size-cells = <0>;
- reg = <0x0 0xff801000 0x0 0x600>;
+ reg = <0x1000 0x600>;
clocks = <&hsspi_pll>, <&hsspi_pll>;
clock-names = "hsspi", "pll";
spi-max-frequency = <100000000>;
@@ -217,14 +256,14 @@
status = "disabled";
};
- nand: nand-controller@ff801800 {
+ nand: nand-controller@1800 {
compatible = "brcm,nand-bcm6858",
"brcm,brcmnand-v5.0",
"brcm,brcmnand";
reg-names = "nand", "nand-int-base", "nand-cache";
- reg = <0x0 0xff801800 0x0 0x180>,
- <0x0 0xff802000 0x0 0x10>,
- <0x0 0xff801c00 0x0 0x200>;
+ reg = <0x1800 0x180>,
+ <0x2000 0x10>,
+ <0x1c00 0x200>;
parameter-page-big-endian = <0>;
status = "disabled";
diff --git a/arch/arm/dts/bcm96858.dts b/arch/arm/dts/bcm96858.dts
new file mode 100644
index 000000000000..0cbf582f5d54
--- /dev/null
+++ b/arch/arm/dts/bcm96858.dts
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright 2022 Broadcom Ltd.
+ */
+
+/dts-v1/;
+
+#include "bcm6858.dtsi"
+
+/ {
+ model = "Broadcom BCM96858 Reference Board";
+ compatible = "brcm,bcm96858", "brcm,bcm6858", "brcm,bcmbca";
+
+ aliases {
+ serial0 = &uart0;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ memory@0 {
+ device_type = "memory";
+ reg = <0x0 0x0 0x0 0x08000000>;
+ };
+};
+
+&uart0 {
+ status = "okay";
+};
diff --git a/arch/arm/mach-bcmbca/Kconfig b/arch/arm/mach-bcmbca/Kconfig
index f35f02c59772..5b977734df41 100644
--- a/arch/arm/mach-bcmbca/Kconfig
+++ b/arch/arm/mach-bcmbca/Kconfig
@@ -93,6 +93,16 @@ config BCM6856
Broadcom BCM6856 is a dual core Brahma-B53 ARMv8 based xPON Gateway
SoC. This SoC family includes BCM6856, BCM6836 and BCM4910.
+config BCM6858
+ bool "Support for Broadcom 6858 Family"
+ select ARM64
+ select SYS_ARCH_TIMER
+ select DM_SERIAL
+ select BCM6345_SERIAL
+ help
+ Broadcom BCM6858 is a quad core Brahma-B53 ARMv8 based xPON Gateway
+ SoC. This SoC family includes BCM6858, BCM49508, BCM5504X and BCM6545.
+
config BCM6878
bool "Support for Broadcom 6878 Family"
select SYS_ARCH_TIMER
@@ -112,6 +122,7 @@ source "arch/arm/mach-bcmbca/bcm6756/Kconfig"
source "arch/arm/mach-bcmbca/bcm6813/Kconfig"
source "arch/arm/mach-bcmbca/bcm6846/Kconfig"
source "arch/arm/mach-bcmbca/bcm6856/Kconfig"
+source "arch/arm/mach-bcmbca/bcm6858/Kconfig"
source "arch/arm/mach-bcmbca/bcm6878/Kconfig"
endif
diff --git a/arch/arm/mach-bcmbca/Makefile b/arch/arm/mach-bcmbca/Makefile
index 20f827512005..c06809417499 100644
--- a/arch/arm/mach-bcmbca/Makefile
+++ b/arch/arm/mach-bcmbca/Makefile
@@ -15,4 +15,5 @@ obj-$(CONFIG_BCM6756) += bcm6756/
obj-$(CONFIG_BCM6813) += bcm6813/
obj-$(CONFIG_BCM6846) += bcm6846/
obj-$(CONFIG_BCM6856) += bcm6856/
+obj-$(CONFIG_BCM6858) += bcm6858/
obj-$(CONFIG_BCM6878) += bcm6878/
diff --git a/arch/arm/mach-bcmbca/bcm6858/Kconfig b/arch/arm/mach-bcmbca/bcm6858/Kconfig
new file mode 100644
index 000000000000..a6504bae1f18
--- /dev/null
+++ b/arch/arm/mach-bcmbca/bcm6858/Kconfig
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# (C) Copyright 2022 Broadcom Ltd
+#
+
+if BCM6858
+
+config TARGET_BCM96858
+ bool "Broadcom 6858 Reference Board"
+ depends on ARCH_BCMBCA
+
+config SYS_SOC
+ default "bcm6858"
+
+source "board/broadcom/bcmbca/Kconfig"
+
+endif
diff --git a/arch/arm/mach-bcmbca/bcm6858/Makefile b/arch/arm/mach-bcmbca/bcm6858/Makefile
new file mode 100644
index 000000000000..62624977034b
--- /dev/null
+++ b/arch/arm/mach-bcmbca/bcm6858/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# (C) Copyright 2022 Broadcom Ltd
+#
+obj-y += mmu_table.o
diff --git a/arch/arm/mach-bcmbca/bcm6858/mmu_table.c b/arch/arm/mach-bcmbca/bcm6858/mmu_table.c
new file mode 100644
index 000000000000..898291075f5e
--- /dev/null
+++ b/arch/arm/mach-bcmbca/bcm6858/mmu_table.c
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2022 Broadcom Ltd.
+ */
+#include <common.h>
+#include <asm/armv8/mmu.h>
+#include <linux/sizes.h>
+
+static struct mm_region bcm96858_mem_map[] = {
+ {
+ .virt = 0x00000000UL,
+ .phys = 0x00000000UL,
+ .size = 1UL * SZ_1G,
+ .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
+ PTE_BLOCK_INNER_SHARE
+ },
+ {
+ /* SoC peripheral */
+ .virt = 0xff800000UL,
+ .phys = 0xff800000UL,
+ .size = 0x100000,
+ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
+ PTE_BLOCK_NON_SHARE |
+ PTE_BLOCK_PXN | PTE_BLOCK_UXN
+ },
+ {
+ /* List terminator */
+ 0,
+ }
+};
+
+struct mm_region *mem_map = bcm96858_mem_map;
diff --git a/board/broadcom/bcmbca/Kconfig b/board/broadcom/bcmbca/Kconfig
index efe504919a0f..7da9e954d4b2 100644
--- a/board/broadcom/bcmbca/Kconfig
+++ b/board/broadcom/bcmbca/Kconfig
@@ -93,6 +93,13 @@ config SYS_CONFIG_NAME
endif
+if TARGET_BCM96858
+
+config SYS_CONFIG_NAME
+ default "bcm96858"
+
+endif
+
if TARGET_BCM96878
config SYS_CONFIG_NAME
diff --git a/configs/bcm96858_defconfig b/configs/bcm96858_defconfig
new file mode 100644
index 000000000000..5f7be1107e8a
--- /dev/null
+++ b/configs/bcm96858_defconfig
@@ -0,0 +1,23 @@
+CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=50000000
+CONFIG_ARCH_BCMBCA=y
+CONFIG_SYS_TEXT_BASE=0x01000000
+CONFIG_SYS_MALLOC_LEN=0x2000000
+CONFIG_SYS_MALLOC_F_LEN=0x8000
+CONFIG_BCM6858=y
+CONFIG_TARGET_BCM96858=y
+CONFIG_NR_DRAM_BANKS=2
+CONFIG_DEFAULT_DEVICE_TREE="bcm96858"
+CONFIG_IDENT_STRING=" Broadcom BCM6858"
+CONFIG_SYS_LOAD_ADDR=0x01000000
+CONFIG_ENV_VARS_UBOOT_CONFIG=y
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000000
+CONFIG_OF_STDOUT_VIA_ALIAS=y
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_HUSH_PARSER=y
+CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x4000000
+CONFIG_CMD_CACHE=y
+CONFIG_OF_EMBED=y
+CONFIG_CLK=y
diff --git a/include/configs/bcm96858.h b/include/configs/bcm96858.h
new file mode 100644
index 000000000000..4e584b41fb37
--- /dev/null
+++ b/include/configs/bcm96858.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2022 Broadcom Ltd.
+ */
+
+#ifndef __BCM96858_H
+#define __BCM96858_H
+
+#define CONFIG_SYS_SDRAM_BASE 0x00000000
+
+#endif
--
2.37.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 2/3] arm: bcmbca: remove bcm6858 support under CONFIG_ARCH_BCM6858
2022-08-22 18:39 [PATCH v2 0/3] arm: bcmbca: move bcm6858 support under CONFIG_ARCH_BCMBCA William Zhang
2022-08-22 18:39 ` [PATCH v2 1/3] arm: bcmbca: add bcm6858 SoC " William Zhang
@ 2022-08-22 18:39 ` William Zhang
2022-08-24 12:38 ` Philippe REYNES
2022-08-22 18:39 ` [PATCH v2 3/3] arm: bcmbca: replace ARCH_BCM6858 symbols in Kconfig with BCM6858 William Zhang
2 siblings, 1 reply; 8+ messages in thread
From: William Zhang @ 2022-08-22 18:39 UTC (permalink / raw)
To: U-Boot Mailing List
Cc: dan.beygelman, joel.peshkin, rafal, f.fainelli, kursad.oney,
philippe.reynes, anand.gore, William Zhang, Andre Przywara,
Christian Hewitt, Fabio Estevam, Rayagonda Kokatanur, Rick Chen,
Samuel Holland, Sean Anderson, Simon Glass, Tom Rini,
Tomer Yacoby, Wolfgang Denk, Ying-Chun Liu (PaulLiu)
[-- Attachment #1: Type: text/plain, Size: 8992 bytes --]
Now that BCM6858 is supported under CONFIG_ARCH_BCMBCA and
CONFIG_BCM6858, remove the original ARCH_BCM6858 support and migrate its
configuration and dts settings. This includes:
- Remove the bcm968580xref board folder. It is replaced by the generic
bcmbca board folder.
- Update bcm968580xref board dts with the new compatible string.
- Delete broadcom_bcm968580xref.h and merge its setting to the new
bcm96858.h file.
- Remove bcm968580xref_ram_defconfig as a basic config version of
bcm96858_defconfig is now added.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
(no changes since v1)
arch/arm/Kconfig | 7 ---
arch/arm/dts/Makefile | 6 +-
arch/arm/dts/bcm968580xref.dts | 4 +-
board/broadcom/bcm968580xref/Kconfig | 17 ------
board/broadcom/bcm968580xref/MAINTAINERS | 6 --
board/broadcom/bcm968580xref/Makefile | 3 -
board/broadcom/bcm968580xref/bcm968580xref.c | 62 -------------------
configs/bcm968580xref_ram_defconfig | 64 --------------------
include/configs/bcm96858.h | 4 ++
include/configs/broadcom_bcm968580xref.h | 32 ----------
10 files changed, 8 insertions(+), 197 deletions(-)
delete mode 100644 board/broadcom/bcm968580xref/Kconfig
delete mode 100644 board/broadcom/bcm968580xref/MAINTAINERS
delete mode 100644 board/broadcom/bcm968580xref/Makefile
delete mode 100644 board/broadcom/bcm968580xref/bcm968580xref.c
delete mode 100644 configs/bcm968580xref_ram_defconfig
delete mode 100644 include/configs/broadcom_bcm968580xref.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3f124ab0ce85..063616ff8d0b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -672,12 +672,6 @@ config ARCH_BCM6753
select OF_CONTROL
imply CMD_DM
-config ARCH_BCM6858
- bool "Broadcom BCM6858 family"
- select DM
- select OF_CONTROL
- imply CMD_DM
-
config ARCH_BCMSTB
bool "Broadcom BCM7XXX family"
select CPU_V7A
@@ -2274,7 +2268,6 @@ source "board/armltd/vexpress/Kconfig"
source "board/armltd/vexpress64/Kconfig"
source "board/cortina/presidio-asic/Kconfig"
source "board/broadcom/bcm96753ref/Kconfig"
-source "board/broadcom/bcm968580xref/Kconfig"
source "board/broadcom/bcmns3/Kconfig"
source "board/cavium/thunderx/Kconfig"
source "board/eets/pdu001/Kconfig"
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index ee3475b97a40..07e6130042f5 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1150,9 +1150,6 @@ dtb-$(CONFIG_ARCH_BCM283X) += \
dtb-$(CONFIG_ARCH_BCM6753) += \
bcm96753ref.dtb
-dtb-$(CONFIG_ARCH_BCM6858) += \
- bcm968580xref.dtb
-
dtb-$(CONFIG_TARGET_BCMNS3) += ns3-board.dtb
dtb-$(CONFIG_ARCH_BCMSTB) += bcm7xxx.dtb
@@ -1183,7 +1180,8 @@ dtb-$(CONFIG_BCM6856) += \
bcm96856.dtb \
bcm968360bg.dtb
dtb-$(CONFIG_BCM6858) += \
- bcm96858.dtb
+ bcm96858.dtb \
+ bcm968580xref.dtb
dtb-$(CONFIG_BCM6878) += \
bcm96878.dtb
diff --git a/arch/arm/dts/bcm968580xref.dts b/arch/arm/dts/bcm968580xref.dts
index a034e38318bd..6d787bd011b8 100644
--- a/arch/arm/dts/bcm968580xref.dts
+++ b/arch/arm/dts/bcm968580xref.dts
@@ -8,8 +8,8 @@
#include "bcm6858.dtsi"
/ {
- model = "Broadcom bcm68580xref";
- compatible = "broadcom,bcm68580xref", "brcm,bcm6858";
+ model = "Broadcom BCM968580xref Reference Board";
+ compatible = "brcm,bcm968580xref", "brcm,bcm6858", "brcm,bcmbca";
aliases {
serial0 = &uart0;
diff --git a/board/broadcom/bcm968580xref/Kconfig b/board/broadcom/bcm968580xref/Kconfig
deleted file mode 100644
index b5730367a2d2..000000000000
--- a/board/broadcom/bcm968580xref/Kconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-if ARCH_BCM6858
-
-config SYS_VENDOR
- default "broadcom"
-
-config SYS_BOARD
- default "bcm968580xref"
-
-config SYS_CONFIG_NAME
- default "broadcom_bcm968580xref"
-
-endif
-
-config TARGET_BCM968580XREF
- bool "Support Broadcom bcm968580xref"
- depends on ARCH_BCM6858
- select ARM64
diff --git a/board/broadcom/bcm968580xref/MAINTAINERS b/board/broadcom/bcm968580xref/MAINTAINERS
deleted file mode 100644
index 5ee0c4dd4e42..000000000000
--- a/board/broadcom/bcm968580xref/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-BCM968580XREF BOARD
-M: Philippe Reynes <philippe.reynes@softathome.com>
-S: Maintained
-F: board/broadcom/bcm968580xref/
-F: include/configs/broadcom_bcm968580xref.h
-F: configs/bcm968580xref_ram_defconfig
diff --git a/board/broadcom/bcm968580xref/Makefile b/board/broadcom/bcm968580xref/Makefile
deleted file mode 100644
index 5cd393b19629..000000000000
--- a/board/broadcom/bcm968580xref/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-
-obj-y += bcm968580xref.o
diff --git a/board/broadcom/bcm968580xref/bcm968580xref.c b/board/broadcom/bcm968580xref/bcm968580xref.c
deleted file mode 100644
index 1bd723d49edd..000000000000
--- a/board/broadcom/bcm968580xref/bcm968580xref.c
+++ /dev/null
@@ -1,62 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Philippe Reynes <philippe.reynes@softathome.com>
- */
-
-#include <common.h>
-#include <fdtdec.h>
-#include <init.h>
-#include <linux/io.h>
-
-#ifdef CONFIG_ARM64
-#include <asm/armv8/mmu.h>
-
-static struct mm_region broadcom_bcm968580xref_mem_map[] = {
- {
- /* RAM */
- .virt = 0x00000000UL,
- .phys = 0x00000000UL,
- .size = 8UL * SZ_1G,
- .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
- PTE_BLOCK_INNER_SHARE
- }, {
- /* SoC */
- .virt = 0x80000000UL,
- .phys = 0x80000000UL,
- .size = 0xff80000000UL,
- .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
- PTE_BLOCK_NON_SHARE |
- PTE_BLOCK_PXN | PTE_BLOCK_UXN
- }, {
- /* List terminator */
- 0,
- }
-};
-
-struct mm_region *mem_map = broadcom_bcm968580xref_mem_map;
-#endif
-
-int board_init(void)
-{
- return 0;
-}
-
-int dram_init(void)
-{
- if (fdtdec_setup_mem_size_base() != 0)
- printf("fdtdec_setup_mem_size_base() has failed\n");
-
- return 0;
-}
-
-int dram_init_banksize(void)
-{
- fdtdec_setup_memory_banksize();
-
- return 0;
-}
-
-int print_cpuinfo(void)
-{
- return 0;
-}
diff --git a/configs/bcm968580xref_ram_defconfig b/configs/bcm968580xref_ram_defconfig
deleted file mode 100644
index a8c7ffa74875..000000000000
--- a/configs/bcm968580xref_ram_defconfig
+++ /dev/null
@@ -1,64 +0,0 @@
-CONFIG_ARM=y
-CONFIG_SKIP_LOWLEVEL_INIT=y
-CONFIG_ARCH_BCM6858=y
-CONFIG_SYS_TEXT_BASE=0x10000000
-CONFIG_SYS_MALLOC_LEN=0x100000
-CONFIG_SYS_MALLOC_F_LEN=0x8000
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x2000
-CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="bcm968580xref"
-CONFIG_SYS_LOAD_ADDR=0x10000000
-CONFIG_TARGET_BCM968580XREF=y
-CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
-CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x11000000
-CONFIG_FIT=y
-CONFIG_FIT_SIGNATURE=y
-CONFIG_FIT_VERBOSE=y
-CONFIG_LEGACY_IMAGE_FORMAT=y
-CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_DISPLAY_BOARDINFO_LATE=y
-CONFIG_HUSH_PARSER=y
-CONFIG_SYS_MAXARGS=24
-CONFIG_SYS_CBSIZE=256
-CONFIG_SYS_PBSIZE=276
-CONFIG_SYS_BOOTM_LEN=0x800000
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_MTD=y
-CONFIG_CMD_NAND=y
-CONFIG_CMD_PART=y
-CONFIG_CMD_SPI=y
-CONFIG_DOS_PARTITION=y
-CONFIG_ISO_PARTITION=y
-CONFIG_EFI_PARTITION=y
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_NET is not set
-CONFIG_BLK=y
-CONFIG_CLK=y
-CONFIG_BCM6345_GPIO=y
-CONFIG_LED=y
-CONFIG_LED_BCM6858=y
-CONFIG_LED_BLINK=y
-# CONFIG_MMC is not set
-CONFIG_MTD=y
-CONFIG_DM_MTD=y
-CONFIG_MTD_RAW_NAND=y
-CONFIG_NAND_BRCMNAND=y
-CONFIG_NAND_BRCMNAND_6858=y
-CONFIG_SYS_NAND_ONFI_DETECTION=y
-CONFIG_DM_SPI_FLASH=y
-CONFIG_SPI_FLASH_SFDP_SUPPORT=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPECIFY_CONSOLE_INDEX=y
-CONFIG_CONS_INDEX=0
-CONFIG_DM_SERIAL=y
-CONFIG_SERIAL_SEARCH_ALL=y
-CONFIG_BCM6345_SERIAL=y
-CONFIG_SPI=y
-CONFIG_DM_SPI=y
-CONFIG_BCM63XX_HSSPI=y
-CONFIG_SYSRESET=y
-CONFIG_SYSRESET_WATCHDOG=y
-CONFIG_WDT_BCM6345=y
-# CONFIG_GENERATE_SMBIOS_TABLE is not set
diff --git a/include/configs/bcm96858.h b/include/configs/bcm96858.h
index 4e584b41fb37..8bd1169207f0 100644
--- a/include/configs/bcm96858.h
+++ b/include/configs/bcm96858.h
@@ -8,4 +8,8 @@
#define CONFIG_SYS_SDRAM_BASE 0x00000000
+#ifdef CONFIG_MTD_RAW_NAND
+#define CONFIG_SYS_MAX_NAND_DEVICE 1
+#endif /* CONFIG_MTD_RAW_NAND */
+
#endif
diff --git a/include/configs/broadcom_bcm968580xref.h b/include/configs/broadcom_bcm968580xref.h
deleted file mode 100644
index abc2da3d1fe3..000000000000
--- a/include/configs/broadcom_bcm968580xref.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2018 Philippe Reynes <philippe.reynes@softathome.com>
- */
-
-#include <linux/sizes.h>
-
-/*
- * common
- */
-
-/* UART */
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, \
- 230400, 500000, 1500000 }
-/* Memory usage */
-
-/*
- * 6858
- */
-
-/* RAM */
-#define CONFIG_SYS_SDRAM_BASE 0x00000000
-
-/* U-Boot */
-
-#ifdef CONFIG_MTD_RAW_NAND
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
-#endif /* CONFIG_MTD_RAW_NAND */
-
-/*
- * 968580xref
- */
--
2.37.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 3/3] arm: bcmbca: replace ARCH_BCM6858 symbols in Kconfig with BCM6858
2022-08-22 18:39 [PATCH v2 0/3] arm: bcmbca: move bcm6858 support under CONFIG_ARCH_BCMBCA William Zhang
2022-08-22 18:39 ` [PATCH v2 1/3] arm: bcmbca: add bcm6858 SoC " William Zhang
2022-08-22 18:39 ` [PATCH v2 2/3] arm: bcmbca: remove bcm6858 support under CONFIG_ARCH_BCM6858 William Zhang
@ 2022-08-22 18:39 ` William Zhang
2022-08-24 12:39 ` Philippe REYNES
2 siblings, 1 reply; 8+ messages in thread
From: William Zhang @ 2022-08-22 18:39 UTC (permalink / raw)
To: U-Boot Mailing List
Cc: dan.beygelman, joel.peshkin, rafal, f.fainelli, kursad.oney,
philippe.reynes, anand.gore, William Zhang, Andre Przywara,
Dario Binacchi, Eddie James, Hannes Schmelzer, Ivan Vozvakhov,
Jagan Teki, Michael Trimarchi, Michal Simek, Oleksandr Suvorov,
Simon Glass, Stefan Roese, T Karthik Reddy, Tom Rini
[-- Attachment #1: Type: text/plain, Size: 2985 bytes --]
As CONFIG_ARCH_BCM6858 is replaced with CONFIG_BCM6858, update the
driver Kconfig to use the new config symbol.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
Changes in v2:
-Update subject line to be more clear for patch 3
drivers/gpio/Kconfig | 3 +--
drivers/led/Kconfig | 2 +-
drivers/mtd/nand/raw/Kconfig | 2 +-
drivers/spi/Kconfig | 3 +--
drivers/watchdog/Kconfig | 3 +--
5 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 9e00b48234ab..929f3fb9eacb 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -111,8 +111,7 @@ config BCM2835_GPIO
config BCM6345_GPIO
bool "BCM6345 GPIO driver"
depends on DM_GPIO && (ARCH_BMIPS || BCM6856 || \
- ARCH_BCM6858 || BCM63158 || \
- ARCH_BCM6753)
+ BCM6858 || BCM63158 || ARCH_BCM6753)
help
This driver supports the GPIO banks on BCM6345 SoCs.
diff --git a/drivers/led/Kconfig b/drivers/led/Kconfig
index bd8f23fd9631..98f015a07f97 100644
--- a/drivers/led/Kconfig
+++ b/drivers/led/Kconfig
@@ -37,7 +37,7 @@ config LED_BCM6753
config LED_BCM6858
bool "LED Support for BCM6858"
- depends on LED && (BCM6856 || ARCH_BCM6858 || BCM63158)
+ depends on LED && (BCM6856 || BCM6858 || BCM63158)
help
This option enables support for LEDs connected to the BCM6858
HW has blinking capabilities and up to 32 LEDs can be controlled.
diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
index 5d006ca1ea07..f8445e09633c 100644
--- a/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
@@ -115,7 +115,7 @@ config NAND_BRCMNAND_6838
config NAND_BRCMNAND_6858
bool "Support Broadcom NAND controller on bcm6858"
- depends on NAND_BRCMNAND && ARCH_BCM6858
+ depends on NAND_BRCMNAND && BCM6858
help
Enable support for broadcom nand driver on bcm6858.
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 978e5c86a420..e815a715f9b2 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -91,8 +91,7 @@ config ATMEL_SPI
config BCM63XX_HSSPI
bool "BCM63XX HSSPI driver"
- depends on (ARCH_BMIPS || BCM6856 || \
- ARCH_BCM6858 || BCM63158)
+ depends on (ARCH_BMIPS || BCM6856 || BCM6858 || BCM63158)
help
Enable the BCM6328 HSSPI driver. This driver can be used to
access the SPI NOR flash on platforms embedding this Broadcom
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 6d559515b78b..84a4034fe87c 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -129,8 +129,7 @@ config WDT_AT91
config WDT_BCM6345
bool "BCM6345 watchdog timer support"
depends on WDT && (ARCH_BMIPS || BCM6856 || \
- ARCH_BCM6858 || BCM63158 || \
- ARCH_BCM6753)
+ BCM6858 || BCM63158 || ARCH_BCM6753)
help
Select this to enable watchdog timer for BCM6345 SoCs.
The watchdog timer is stopped when initialized.
--
2.37.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/3] arm: bcmbca: add bcm6858 SoC support under CONFIG_ARCH_BCMBCA
2022-08-22 18:39 ` [PATCH v2 1/3] arm: bcmbca: add bcm6858 SoC " William Zhang
@ 2022-08-24 12:38 ` Philippe REYNES
2022-10-31 14:45 ` Tom Rini
1 sibling, 0 replies; 8+ messages in thread
From: Philippe REYNES @ 2022-08-24 12:38 UTC (permalink / raw)
To: William Zhang, U-Boot Mailing List
Cc: dan.beygelman, joel.peshkin, rafal, f.fainelli, kursad.oney,
anand.gore, Andre Przywara, Christian Hewitt, Marek Vasut,
Samuel Holland, Simon Glass, Tom Rini, Tomer Yacoby,
Ying-Chun Liu (PaulLiu)
Hi William,
Le 22/08/2022 à 20:39, William Zhang a écrit :
> BCM6858 is a Broadcom B53 based PON Gateway SoC. It is part of the BCA
> (Broadband Carrier Access origin) chipset family. Like other broadband
> SoC, this patch adds it under CONFIG_BCM6858 chip config and
> CONFIG_ARCH_BCMBCA platform config.
>
> This initial support includes a bare-bone implementation and the
> original dts is updated with the one from linux next git repository.
>
> The u-boot image can be loaded from flash or network to the entry point
> address in the memory and boot from there to the console.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
Reviewed-by: Philippe Reynes <philippe.reynes@softathome.com>
>
> ---
>
> Changes in v2:
> -Add help in BCM6858 Kconfig option to include the list of the supported
> chips.
>
> MAINTAINERS | 1 +
> arch/arm/dts/Makefile | 2 +
> arch/arm/dts/bcm6858.dtsi | 197 ++++++++++++++---------
> arch/arm/dts/bcm96858.dts | 30 ++++
> arch/arm/mach-bcmbca/Kconfig | 11 ++
> arch/arm/mach-bcmbca/Makefile | 1 +
> arch/arm/mach-bcmbca/bcm6858/Kconfig | 17 ++
> arch/arm/mach-bcmbca/bcm6858/Makefile | 5 +
> arch/arm/mach-bcmbca/bcm6858/mmu_table.c | 32 ++++
> board/broadcom/bcmbca/Kconfig | 7 +
> configs/bcm96858_defconfig | 23 +++
> include/configs/bcm96858.h | 11 ++
> 12 files changed, 258 insertions(+), 79 deletions(-)
> create mode 100644 arch/arm/dts/bcm96858.dts
> create mode 100644 arch/arm/mach-bcmbca/bcm6858/Kconfig
> create mode 100644 arch/arm/mach-bcmbca/bcm6858/Makefile
> create mode 100644 arch/arm/mach-bcmbca/bcm6858/mmu_table.c
> create mode 100644 configs/bcm96858_defconfig
> create mode 100644 include/configs/bcm96858.h
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 1f50dad583ce..819fa5b87824 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -231,6 +231,7 @@ N: bcm[9]?6756
> N: bcm[9]?6813
> N: bcm[9]?6846
> N: bcm[9]?6856
> +N: bcm[9]?6858
> N: bcm[9]?6878
>
> ARM BROADCOM BCMSTB
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index a0ea9fa6029d..ee3475b97a40 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -1182,6 +1182,8 @@ dtb-$(CONFIG_BCM6846) += \
> dtb-$(CONFIG_BCM6856) += \
> bcm96856.dtb \
> bcm968360bg.dtb
> +dtb-$(CONFIG_BCM6858) += \
> + bcm96858.dtb
> dtb-$(CONFIG_BCM6878) += \
> bcm96878.dtb
>
> diff --git a/arch/arm/dts/bcm6858.dtsi b/arch/arm/dts/bcm6858.dtsi
> index 02225621710b..19c4dd6fa7e4 100644
> --- a/arch/arm/dts/bcm6858.dtsi
> +++ b/arch/arm/dts/bcm6858.dtsi
> @@ -1,122 +1,161 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> * Copyright (C) 2018 Philippe Reynes <philippe.reynes@softathome.com>
> + * Copyright 2022 Broadcom Ltd.
> */
>
> -#include "skeleton64.dtsi"
> +#include <dt-bindings/interrupt-controller/irq.h>
> +#include <dt-bindings/interrupt-controller/arm-gic.h>
>
> / {
> - compatible = "brcm,bcm6858";
> + compatible = "brcm,bcm6858", "brcm,bcmbca";
> #address-cells = <2>;
> #size-cells = <2>;
>
> - aliases {
> - spi0 = &hsspi;
> - };
> + interrupt-parent = <&gic>;
>
> cpus {
> #address-cells = <2>;
> #size-cells = <0>;
> - u-boot,dm-pre-reloc;
>
> - cpu0: cpu@0 {
> - compatible = "arm,cortex-a53", "arm,armv8";
> + B53_0: cpu@0 {
> + compatible = "brcm,brahma-b53";
> device_type = "cpu";
> reg = <0x0 0x0>;
> - next-level-cache = <&l2>;
> - u-boot,dm-pre-reloc;
> + next-level-cache = <&L2_0>;
> + enable-method = "psci";
> };
>
> - cpu1: cpu@1 {
> - compatible = "arm,cortex-a53", "arm,armv8";
> + B53_1: cpu@1 {
> + compatible = "brcm,brahma-b53";
> device_type = "cpu";
> reg = <0x0 0x1>;
> - next-level-cache = <&l2>;
> - u-boot,dm-pre-reloc;
> + next-level-cache = <&L2_0>;
> + enable-method = "psci";
> };
>
> - cpu2: cpu@2 {
> - compatible = "arm,cortex-a53", "arm,armv8";
> + B53_2: cpu@2 {
> + compatible = "brcm,brahma-b53";
> device_type = "cpu";
> reg = <0x0 0x2>;
> - next-level-cache = <&l2>;
> - u-boot,dm-pre-reloc;
> + next-level-cache = <&L2_0>;
> + enable-method = "psci";
> };
>
> - cpu3: cpu@3 {
> - compatible = "arm,cortex-a53", "arm,armv8";
> + B53_3: cpu@3 {
> + compatible = "brcm,brahma-b53";
> device_type = "cpu";
> reg = <0x0 0x3>;
> - next-level-cache = <&l2>;
> - u-boot,dm-pre-reloc;
> + next-level-cache = <&L2_0>;
> + enable-method = "psci";
> };
>
> - l2: l2-cache0 {
> + L2_0: l2-cache0 {
> compatible = "cache";
> - u-boot,dm-pre-reloc;
> };
> };
>
> + timer {
> + compatible = "arm,armv8-timer";
> + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
> + <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
> + <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
> + <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
> + };
> +
> + pmu: pmu {
> + compatible = "arm,armv8-pmuv3";
> + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
> + interrupt-affinity = <&B53_0>, <&B53_1>,
> + <&B53_2>, <&B53_3>;
> + };
> +
> clocks {
> - compatible = "simple-bus";
> - #address-cells = <2>;
> - #size-cells = <2>;
> - ranges;
> u-boot,dm-pre-reloc;
>
> - periph_osc: periph-osc {
> + periph_clk: periph_clk {
> compatible = "fixed-clock";
> #clock-cells = <0>;
> clock-frequency = <200000000>;
> - u-boot,dm-pre-reloc;
> };
>
> hsspi_pll: hsspi-pll {
> compatible = "fixed-factor-clock";
> #clock-cells = <0>;
> - clocks = <&periph_osc>;
> + clocks = <&periph_clk>;
> clock-mult = <2>;
> clock-div = <1>;
> };
>
> - refclk50mhz: refclk50mhz {
> - compatible = "fixed-clock";
> + wdt_clk: wdt-clk {
> + compatible = "fixed-factor-clock";
> #clock-cells = <0>;
> - clock-frequency = <50000000>;
> + clocks = <&periph_clk>;
> + clock-div = <4>;
> + clock-mult = <1>;
> };
> };
>
> - ubus {
> + psci {
> + compatible = "arm,psci-0.2";
> + method = "smc";
> + };
> +
> + axi@81000000 {
> compatible = "simple-bus";
> - #address-cells = <2>;
> - #size-cells = <2>;
> + #address-cells = <1>;
> + #size-cells = <1>;
> + ranges = <0x0 0x0 0x81000000 0x8000>;
> +
> + gic: interrupt-controller@1000 {
> + compatible = "arm,gic-400";
> + #interrupt-cells = <3>;
> + interrupt-controller;
> + reg = <0x1000 0x1000>, /* GICD */
> + <0x2000 0x2000>, /* GICC */
> + <0x4000 0x2000>, /* GICH */
> + <0x6000 0x2000>; /* GICV */
> + interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) |
> + IRQ_TYPE_LEVEL_HIGH)>;
> + };
> + };
> +
> + bus@ff800000 {
> + compatible = "simple-bus";
> + #address-cells = <1>;
> + #size-cells = <1>;
> + ranges = <0x0 0x0 0xff800000 0x800000>;
> u-boot,dm-pre-reloc;
>
> - uart0: serial@ff800640 {
> + uart0: serial@640 {
> compatible = "brcm,bcm6345-uart";
> - reg = <0x0 0xff800640 0x0 0x18>;
> - clocks = <&periph_osc>;
> -
> + reg = <0x640 0x18>;
> + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&periph_clk>;
> + clock-names = "refclk";
> status = "disabled";
> };
>
> - leds: led-controller@ff800800 {
> + leds: led-controller@800 {
> compatible = "brcm,bcm6858-leds";
> - reg = <0x0 0xff800800 0x0 0xe4>;
> + reg = <0x800 0xe4>;
>
> status = "disabled";
> };
>
> - wdt1: watchdog@ff802780 {
> + wdt1: watchdog@2780 {
> compatible = "brcm,bcm6345-wdt";
> - reg = <0x0 0xff802780 0x0 0x14>;
> - clocks = <&refclk50mhz>;
> + reg = <0x2780 0x14>;
> + clocks = <&wdt_clk>;
> };
>
> - wdt2: watchdog@ff8027c0 {
> + wdt2: watchdog@27c0 {
> compatible = "brcm,bcm6345-wdt";
> - reg = <0x0 0xff8027c0 0x0 0x14>;
> - clocks = <&refclk50mhz>;
> + reg = <0x27c0 0x14>;
> + clocks = <&wdt_clk>;
> };
>
> wdt-reboot {
> @@ -124,91 +163,91 @@
> wdt = <&wdt1>;
> };
>
> - gpio0: gpio-controller@0xff800500 {
> + gpio0: gpio-controller@500 {
> compatible = "brcm,bcm6345-gpio";
> - reg = <0x0 0xff800500 0x0 0x4>,
> - <0x0 0xff800520 0x0 0x4>;
> + reg = <0x500 0x4>,
> + <0x520 0x4>;
> gpio-controller;
> #gpio-cells = <2>;
>
> status = "disabled";
> };
>
> - gpio1: gpio-controller@0xff800504 {
> + gpio1: gpio-controller@504 {
> compatible = "brcm,bcm6345-gpio";
> - reg = <0x0 0xff800504 0x0 0x4>,
> - <0x0 0xff800524 0x0 0x4>;
> + reg = <0x504 0x4>,
> + <0x524 0x4>;
> gpio-controller;
> #gpio-cells = <2>;
>
> status = "disabled";
> };
>
> - gpio2: gpio-controller@0xff800508 {
> + gpio2: gpio-controller@508 {
> compatible = "brcm,bcm6345-gpio";
> - reg = <0x0 0xff800508 0x0 0x4>,
> - <0x0 0xff800528 0x0 0x4>;
> + reg = <0x508 0x4>,
> + <0x528 0x4>;
> gpio-controller;
> #gpio-cells = <2>;
>
> status = "disabled";
> };
>
> - gpio3: gpio-controller@0xff80050c {
> + gpio3: gpio-controller@50c {
> compatible = "brcm,bcm6345-gpio";
> - reg = <0x0 0xff80050c 0x0 0x4>,
> - <0x0 0xff80052c 0x0 0x4>;
> + reg = <0x50c 0x4>,
> + <0x52c 0x4>;
> gpio-controller;
> #gpio-cells = <2>;
>
> status = "disabled";
> };
>
> - gpio4: gpio-controller@0xff800510 {
> + gpio4: gpio-controller@510 {
> compatible = "brcm,bcm6345-gpio";
> - reg = <0x0 0xff800510 0x0 0x4>,
> - <0x0 0xff800530 0x0 0x4>;
> + reg = <0x510 0x4>,
> + <0x530 0x4>;
> gpio-controller;
> #gpio-cells = <2>;
>
> status = "disabled";
> };
>
> - gpio5: gpio-controller@0xff800514 {
> + gpio5: gpio-controller@514 {
> compatible = "brcm,bcm6345-gpio";
> - reg = <0x0 0xff800514 0x0 0x4>,
> - <0x0 0xff800534 0x0 0x4>;
> + reg = <0x514 0x4>,
> + <0x534 0x4>;
> gpio-controller;
> #gpio-cells = <2>;
>
> status = "disabled";
> };
>
> - gpio6: gpio-controller@0xff800518 {
> + gpio6: gpio-controller@518 {
> compatible = "brcm,bcm6345-gpio";
> - reg = <0x0 0xff800518 0x0 0x4>,
> - <0x0 0xff800538 0x0 0x4>;
> + reg = <0x518 0x4>,
> + <0x538 0x4>;
> gpio-controller;
> #gpio-cells = <2>;
>
> status = "disabled";
> };
>
> - gpio7: gpio-controller@0xff80051c {
> + gpio7: gpio-controller@51c {
> compatible = "brcm,bcm6345-gpio";
> - reg = <0x0 0xff80051c 0x0 0x4>,
> - <0x0 0xff80053c 0x0 0x4>;
> + reg = <0x51c 0x4>,
> + <0x53c 0x4>;
> gpio-controller;
> #gpio-cells = <2>;
>
> status = "disabled";
> };
>
> - hsspi: spi-controller@ff801000 {
> + hsspi: spi-controller@1000 {
> compatible = "brcm,bcm6328-hsspi";
> #address-cells = <1>;
> #size-cells = <0>;
> - reg = <0x0 0xff801000 0x0 0x600>;
> + reg = <0x1000 0x600>;
> clocks = <&hsspi_pll>, <&hsspi_pll>;
> clock-names = "hsspi", "pll";
> spi-max-frequency = <100000000>;
> @@ -217,14 +256,14 @@
> status = "disabled";
> };
>
> - nand: nand-controller@ff801800 {
> + nand: nand-controller@1800 {
> compatible = "brcm,nand-bcm6858",
> "brcm,brcmnand-v5.0",
> "brcm,brcmnand";
> reg-names = "nand", "nand-int-base", "nand-cache";
> - reg = <0x0 0xff801800 0x0 0x180>,
> - <0x0 0xff802000 0x0 0x10>,
> - <0x0 0xff801c00 0x0 0x200>;
> + reg = <0x1800 0x180>,
> + <0x2000 0x10>,
> + <0x1c00 0x200>;
> parameter-page-big-endian = <0>;
>
> status = "disabled";
> diff --git a/arch/arm/dts/bcm96858.dts b/arch/arm/dts/bcm96858.dts
> new file mode 100644
> index 000000000000..0cbf582f5d54
> --- /dev/null
> +++ b/arch/arm/dts/bcm96858.dts
> @@ -0,0 +1,30 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Copyright 2022 Broadcom Ltd.
> + */
> +
> +/dts-v1/;
> +
> +#include "bcm6858.dtsi"
> +
> +/ {
> + model = "Broadcom BCM96858 Reference Board";
> + compatible = "brcm,bcm96858", "brcm,bcm6858", "brcm,bcmbca";
> +
> + aliases {
> + serial0 = &uart0;
> + };
> +
> + chosen {
> + stdout-path = "serial0:115200n8";
> + };
> +
> + memory@0 {
> + device_type = "memory";
> + reg = <0x0 0x0 0x0 0x08000000>;
> + };
> +};
> +
> +&uart0 {
> + status = "okay";
> +};
> diff --git a/arch/arm/mach-bcmbca/Kconfig b/arch/arm/mach-bcmbca/Kconfig
> index f35f02c59772..5b977734df41 100644
> --- a/arch/arm/mach-bcmbca/Kconfig
> +++ b/arch/arm/mach-bcmbca/Kconfig
> @@ -93,6 +93,16 @@ config BCM6856
> Broadcom BCM6856 is a dual core Brahma-B53 ARMv8 based xPON Gateway
> SoC. This SoC family includes BCM6856, BCM6836 and BCM4910.
>
> +config BCM6858
> + bool "Support for Broadcom 6858 Family"
> + select ARM64
> + select SYS_ARCH_TIMER
> + select DM_SERIAL
> + select BCM6345_SERIAL
> + help
> + Broadcom BCM6858 is a quad core Brahma-B53 ARMv8 based xPON Gateway
> + SoC. This SoC family includes BCM6858, BCM49508, BCM5504X and BCM6545.
> +
> config BCM6878
> bool "Support for Broadcom 6878 Family"
> select SYS_ARCH_TIMER
> @@ -112,6 +122,7 @@ source "arch/arm/mach-bcmbca/bcm6756/Kconfig"
> source "arch/arm/mach-bcmbca/bcm6813/Kconfig"
> source "arch/arm/mach-bcmbca/bcm6846/Kconfig"
> source "arch/arm/mach-bcmbca/bcm6856/Kconfig"
> +source "arch/arm/mach-bcmbca/bcm6858/Kconfig"
> source "arch/arm/mach-bcmbca/bcm6878/Kconfig"
>
> endif
> diff --git a/arch/arm/mach-bcmbca/Makefile b/arch/arm/mach-bcmbca/Makefile
> index 20f827512005..c06809417499 100644
> --- a/arch/arm/mach-bcmbca/Makefile
> +++ b/arch/arm/mach-bcmbca/Makefile
> @@ -15,4 +15,5 @@ obj-$(CONFIG_BCM6756) += bcm6756/
> obj-$(CONFIG_BCM6813) += bcm6813/
> obj-$(CONFIG_BCM6846) += bcm6846/
> obj-$(CONFIG_BCM6856) += bcm6856/
> +obj-$(CONFIG_BCM6858) += bcm6858/
> obj-$(CONFIG_BCM6878) += bcm6878/
> diff --git a/arch/arm/mach-bcmbca/bcm6858/Kconfig b/arch/arm/mach-bcmbca/bcm6858/Kconfig
> new file mode 100644
> index 000000000000..a6504bae1f18
> --- /dev/null
> +++ b/arch/arm/mach-bcmbca/bcm6858/Kconfig
> @@ -0,0 +1,17 @@
> +# SPDX-License-Identifier: GPL-2.0+
> +#
> +# (C) Copyright 2022 Broadcom Ltd
> +#
> +
> +if BCM6858
> +
> +config TARGET_BCM96858
> + bool "Broadcom 6858 Reference Board"
> + depends on ARCH_BCMBCA
> +
> +config SYS_SOC
> + default "bcm6858"
> +
> +source "board/broadcom/bcmbca/Kconfig"
> +
> +endif
> diff --git a/arch/arm/mach-bcmbca/bcm6858/Makefile b/arch/arm/mach-bcmbca/bcm6858/Makefile
> new file mode 100644
> index 000000000000..62624977034b
> --- /dev/null
> +++ b/arch/arm/mach-bcmbca/bcm6858/Makefile
> @@ -0,0 +1,5 @@
> +# SPDX-License-Identifier: GPL-2.0+
> +#
> +# (C) Copyright 2022 Broadcom Ltd
> +#
> +obj-y += mmu_table.o
> diff --git a/arch/arm/mach-bcmbca/bcm6858/mmu_table.c b/arch/arm/mach-bcmbca/bcm6858/mmu_table.c
> new file mode 100644
> index 000000000000..898291075f5e
> --- /dev/null
> +++ b/arch/arm/mach-bcmbca/bcm6858/mmu_table.c
> @@ -0,0 +1,32 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright 2022 Broadcom Ltd.
> + */
> +#include <common.h>
> +#include <asm/armv8/mmu.h>
> +#include <linux/sizes.h>
> +
> +static struct mm_region bcm96858_mem_map[] = {
> + {
> + .virt = 0x00000000UL,
> + .phys = 0x00000000UL,
> + .size = 1UL * SZ_1G,
> + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
> + PTE_BLOCK_INNER_SHARE
> + },
> + {
> + /* SoC peripheral */
> + .virt = 0xff800000UL,
> + .phys = 0xff800000UL,
> + .size = 0x100000,
> + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
> + PTE_BLOCK_NON_SHARE |
> + PTE_BLOCK_PXN | PTE_BLOCK_UXN
> + },
> + {
> + /* List terminator */
> + 0,
> + }
> +};
> +
> +struct mm_region *mem_map = bcm96858_mem_map;
> diff --git a/board/broadcom/bcmbca/Kconfig b/board/broadcom/bcmbca/Kconfig
> index efe504919a0f..7da9e954d4b2 100644
> --- a/board/broadcom/bcmbca/Kconfig
> +++ b/board/broadcom/bcmbca/Kconfig
> @@ -93,6 +93,13 @@ config SYS_CONFIG_NAME
>
> endif
>
> +if TARGET_BCM96858
> +
> +config SYS_CONFIG_NAME
> + default "bcm96858"
> +
> +endif
> +
> if TARGET_BCM96878
>
> config SYS_CONFIG_NAME
> diff --git a/configs/bcm96858_defconfig b/configs/bcm96858_defconfig
> new file mode 100644
> index 000000000000..5f7be1107e8a
> --- /dev/null
> +++ b/configs/bcm96858_defconfig
> @@ -0,0 +1,23 @@
> +CONFIG_ARM=y
> +CONFIG_COUNTER_FREQUENCY=50000000
> +CONFIG_ARCH_BCMBCA=y
> +CONFIG_SYS_TEXT_BASE=0x01000000
> +CONFIG_SYS_MALLOC_LEN=0x2000000
> +CONFIG_SYS_MALLOC_F_LEN=0x8000
> +CONFIG_BCM6858=y
> +CONFIG_TARGET_BCM96858=y
> +CONFIG_NR_DRAM_BANKS=2
> +CONFIG_DEFAULT_DEVICE_TREE="bcm96858"
> +CONFIG_IDENT_STRING=" Broadcom BCM6858"
> +CONFIG_SYS_LOAD_ADDR=0x01000000
> +CONFIG_ENV_VARS_UBOOT_CONFIG=y
> +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
> +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000000
> +CONFIG_OF_STDOUT_VIA_ALIAS=y
> +CONFIG_DISPLAY_BOARDINFO_LATE=y
> +CONFIG_HUSH_PARSER=y
> +CONFIG_SYS_MAXARGS=64
> +CONFIG_SYS_BOOTM_LEN=0x4000000
> +CONFIG_CMD_CACHE=y
> +CONFIG_OF_EMBED=y
> +CONFIG_CLK=y
> diff --git a/include/configs/bcm96858.h b/include/configs/bcm96858.h
> new file mode 100644
> index 000000000000..4e584b41fb37
> --- /dev/null
> +++ b/include/configs/bcm96858.h
> @@ -0,0 +1,11 @@
> +/* SPDX-License-Identifier: GPL-2.0+ */
> +/*
> + * (C) Copyright 2022 Broadcom Ltd.
> + */
> +
> +#ifndef __BCM96858_H
> +#define __BCM96858_H
> +
> +#define CONFIG_SYS_SDRAM_BASE 0x00000000
> +
> +#endif
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/3] arm: bcmbca: remove bcm6858 support under CONFIG_ARCH_BCM6858
2022-08-22 18:39 ` [PATCH v2 2/3] arm: bcmbca: remove bcm6858 support under CONFIG_ARCH_BCM6858 William Zhang
@ 2022-08-24 12:38 ` Philippe REYNES
0 siblings, 0 replies; 8+ messages in thread
From: Philippe REYNES @ 2022-08-24 12:38 UTC (permalink / raw)
To: William Zhang, U-Boot Mailing List
Cc: dan.beygelman, joel.peshkin, rafal, f.fainelli, kursad.oney,
anand.gore, Andre Przywara, Christian Hewitt, Fabio Estevam,
Rayagonda Kokatanur, Rick Chen, Samuel Holland, Sean Anderson,
Simon Glass, Tom Rini, Tomer Yacoby, Wolfgang Denk,
Ying-Chun Liu (PaulLiu)
Hi William,
Le 22/08/2022 à 20:39, William Zhang a écrit :
> Now that BCM6858 is supported under CONFIG_ARCH_BCMBCA and
> CONFIG_BCM6858, remove the original ARCH_BCM6858 support and migrate its
> configuration and dts settings. This includes:
> - Remove the bcm968580xref board folder. It is replaced by the generic
> bcmbca board folder.
> - Update bcm968580xref board dts with the new compatible string.
> - Delete broadcom_bcm968580xref.h and merge its setting to the new
> bcm96858.h file.
> - Remove bcm968580xref_ram_defconfig as a basic config version of
> bcm96858_defconfig is now added.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
Reviewed-by: Philippe Reynes <philippe.reynes@softathome.com>
> ---
>
> (no changes since v1)
>
> arch/arm/Kconfig | 7 ---
> arch/arm/dts/Makefile | 6 +-
> arch/arm/dts/bcm968580xref.dts | 4 +-
> board/broadcom/bcm968580xref/Kconfig | 17 ------
> board/broadcom/bcm968580xref/MAINTAINERS | 6 --
> board/broadcom/bcm968580xref/Makefile | 3 -
> board/broadcom/bcm968580xref/bcm968580xref.c | 62 -------------------
> configs/bcm968580xref_ram_defconfig | 64 --------------------
> include/configs/bcm96858.h | 4 ++
> include/configs/broadcom_bcm968580xref.h | 32 ----------
> 10 files changed, 8 insertions(+), 197 deletions(-)
> delete mode 100644 board/broadcom/bcm968580xref/Kconfig
> delete mode 100644 board/broadcom/bcm968580xref/MAINTAINERS
> delete mode 100644 board/broadcom/bcm968580xref/Makefile
> delete mode 100644 board/broadcom/bcm968580xref/bcm968580xref.c
> delete mode 100644 configs/bcm968580xref_ram_defconfig
> delete mode 100644 include/configs/broadcom_bcm968580xref.h
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 3f124ab0ce85..063616ff8d0b 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -672,12 +672,6 @@ config ARCH_BCM6753
> select OF_CONTROL
> imply CMD_DM
>
> -config ARCH_BCM6858
> - bool "Broadcom BCM6858 family"
> - select DM
> - select OF_CONTROL
> - imply CMD_DM
> -
> config ARCH_BCMSTB
> bool "Broadcom BCM7XXX family"
> select CPU_V7A
> @@ -2274,7 +2268,6 @@ source "board/armltd/vexpress/Kconfig"
> source "board/armltd/vexpress64/Kconfig"
> source "board/cortina/presidio-asic/Kconfig"
> source "board/broadcom/bcm96753ref/Kconfig"
> -source "board/broadcom/bcm968580xref/Kconfig"
> source "board/broadcom/bcmns3/Kconfig"
> source "board/cavium/thunderx/Kconfig"
> source "board/eets/pdu001/Kconfig"
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index ee3475b97a40..07e6130042f5 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -1150,9 +1150,6 @@ dtb-$(CONFIG_ARCH_BCM283X) += \
> dtb-$(CONFIG_ARCH_BCM6753) += \
> bcm96753ref.dtb
>
> -dtb-$(CONFIG_ARCH_BCM6858) += \
> - bcm968580xref.dtb
> -
> dtb-$(CONFIG_TARGET_BCMNS3) += ns3-board.dtb
>
> dtb-$(CONFIG_ARCH_BCMSTB) += bcm7xxx.dtb
> @@ -1183,7 +1180,8 @@ dtb-$(CONFIG_BCM6856) += \
> bcm96856.dtb \
> bcm968360bg.dtb
> dtb-$(CONFIG_BCM6858) += \
> - bcm96858.dtb
> + bcm96858.dtb \
> + bcm968580xref.dtb
> dtb-$(CONFIG_BCM6878) += \
> bcm96878.dtb
>
> diff --git a/arch/arm/dts/bcm968580xref.dts b/arch/arm/dts/bcm968580xref.dts
> index a034e38318bd..6d787bd011b8 100644
> --- a/arch/arm/dts/bcm968580xref.dts
> +++ b/arch/arm/dts/bcm968580xref.dts
> @@ -8,8 +8,8 @@
> #include "bcm6858.dtsi"
>
> / {
> - model = "Broadcom bcm68580xref";
> - compatible = "broadcom,bcm68580xref", "brcm,bcm6858";
> + model = "Broadcom BCM968580xref Reference Board";
> + compatible = "brcm,bcm968580xref", "brcm,bcm6858", "brcm,bcmbca";
>
> aliases {
> serial0 = &uart0;
> diff --git a/board/broadcom/bcm968580xref/Kconfig b/board/broadcom/bcm968580xref/Kconfig
> deleted file mode 100644
> index b5730367a2d2..000000000000
> --- a/board/broadcom/bcm968580xref/Kconfig
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -if ARCH_BCM6858
> -
> -config SYS_VENDOR
> - default "broadcom"
> -
> -config SYS_BOARD
> - default "bcm968580xref"
> -
> -config SYS_CONFIG_NAME
> - default "broadcom_bcm968580xref"
> -
> -endif
> -
> -config TARGET_BCM968580XREF
> - bool "Support Broadcom bcm968580xref"
> - depends on ARCH_BCM6858
> - select ARM64
> diff --git a/board/broadcom/bcm968580xref/MAINTAINERS b/board/broadcom/bcm968580xref/MAINTAINERS
> deleted file mode 100644
> index 5ee0c4dd4e42..000000000000
> --- a/board/broadcom/bcm968580xref/MAINTAINERS
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -BCM968580XREF BOARD
> -M: Philippe Reynes <philippe.reynes@softathome.com>
> -S: Maintained
> -F: board/broadcom/bcm968580xref/
> -F: include/configs/broadcom_bcm968580xref.h
> -F: configs/bcm968580xref_ram_defconfig
> diff --git a/board/broadcom/bcm968580xref/Makefile b/board/broadcom/bcm968580xref/Makefile
> deleted file mode 100644
> index 5cd393b19629..000000000000
> --- a/board/broadcom/bcm968580xref/Makefile
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -# SPDX-License-Identifier: GPL-2.0+
> -
> -obj-y += bcm968580xref.o
> diff --git a/board/broadcom/bcm968580xref/bcm968580xref.c b/board/broadcom/bcm968580xref/bcm968580xref.c
> deleted file mode 100644
> index 1bd723d49edd..000000000000
> --- a/board/broadcom/bcm968580xref/bcm968580xref.c
> +++ /dev/null
> @@ -1,62 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0+
> -/*
> - * Copyright (C) 2018 Philippe Reynes <philippe.reynes@softathome.com>
> - */
> -
> -#include <common.h>
> -#include <fdtdec.h>
> -#include <init.h>
> -#include <linux/io.h>
> -
> -#ifdef CONFIG_ARM64
> -#include <asm/armv8/mmu.h>
> -
> -static struct mm_region broadcom_bcm968580xref_mem_map[] = {
> - {
> - /* RAM */
> - .virt = 0x00000000UL,
> - .phys = 0x00000000UL,
> - .size = 8UL * SZ_1G,
> - .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
> - PTE_BLOCK_INNER_SHARE
> - }, {
> - /* SoC */
> - .virt = 0x80000000UL,
> - .phys = 0x80000000UL,
> - .size = 0xff80000000UL,
> - .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
> - PTE_BLOCK_NON_SHARE |
> - PTE_BLOCK_PXN | PTE_BLOCK_UXN
> - }, {
> - /* List terminator */
> - 0,
> - }
> -};
> -
> -struct mm_region *mem_map = broadcom_bcm968580xref_mem_map;
> -#endif
> -
> -int board_init(void)
> -{
> - return 0;
> -}
> -
> -int dram_init(void)
> -{
> - if (fdtdec_setup_mem_size_base() != 0)
> - printf("fdtdec_setup_mem_size_base() has failed\n");
> -
> - return 0;
> -}
> -
> -int dram_init_banksize(void)
> -{
> - fdtdec_setup_memory_banksize();
> -
> - return 0;
> -}
> -
> -int print_cpuinfo(void)
> -{
> - return 0;
> -}
> diff --git a/configs/bcm968580xref_ram_defconfig b/configs/bcm968580xref_ram_defconfig
> deleted file mode 100644
> index a8c7ffa74875..000000000000
> --- a/configs/bcm968580xref_ram_defconfig
> +++ /dev/null
> @@ -1,64 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_SKIP_LOWLEVEL_INIT=y
> -CONFIG_ARCH_BCM6858=y
> -CONFIG_SYS_TEXT_BASE=0x10000000
> -CONFIG_SYS_MALLOC_LEN=0x100000
> -CONFIG_SYS_MALLOC_F_LEN=0x8000
> -CONFIG_NR_DRAM_BANKS=1
> -CONFIG_ENV_SIZE=0x2000
> -CONFIG_DM_GPIO=y
> -CONFIG_DEFAULT_DEVICE_TREE="bcm968580xref"
> -CONFIG_SYS_LOAD_ADDR=0x10000000
> -CONFIG_TARGET_BCM968580XREF=y
> -CONFIG_ENV_VARS_UBOOT_CONFIG=y
> -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
> -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x11000000
> -CONFIG_FIT=y
> -CONFIG_FIT_SIGNATURE=y
> -CONFIG_FIT_VERBOSE=y
> -CONFIG_LEGACY_IMAGE_FORMAT=y
> -CONFIG_SUPPORT_RAW_INITRD=y
> -CONFIG_DISPLAY_BOARDINFO_LATE=y
> -CONFIG_HUSH_PARSER=y
> -CONFIG_SYS_MAXARGS=24
> -CONFIG_SYS_CBSIZE=256
> -CONFIG_SYS_PBSIZE=276
> -CONFIG_SYS_BOOTM_LEN=0x800000
> -CONFIG_CMD_GPIO=y
> -CONFIG_CMD_MTD=y
> -CONFIG_CMD_NAND=y
> -CONFIG_CMD_PART=y
> -CONFIG_CMD_SPI=y
> -CONFIG_DOS_PARTITION=y
> -CONFIG_ISO_PARTITION=y
> -CONFIG_EFI_PARTITION=y
> -CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> -# CONFIG_NET is not set
> -CONFIG_BLK=y
> -CONFIG_CLK=y
> -CONFIG_BCM6345_GPIO=y
> -CONFIG_LED=y
> -CONFIG_LED_BCM6858=y
> -CONFIG_LED_BLINK=y
> -# CONFIG_MMC is not set
> -CONFIG_MTD=y
> -CONFIG_DM_MTD=y
> -CONFIG_MTD_RAW_NAND=y
> -CONFIG_NAND_BRCMNAND=y
> -CONFIG_NAND_BRCMNAND_6858=y
> -CONFIG_SYS_NAND_ONFI_DETECTION=y
> -CONFIG_DM_SPI_FLASH=y
> -CONFIG_SPI_FLASH_SFDP_SUPPORT=y
> -CONFIG_SPI_FLASH_MACRONIX=y
> -CONFIG_SPECIFY_CONSOLE_INDEX=y
> -CONFIG_CONS_INDEX=0
> -CONFIG_DM_SERIAL=y
> -CONFIG_SERIAL_SEARCH_ALL=y
> -CONFIG_BCM6345_SERIAL=y
> -CONFIG_SPI=y
> -CONFIG_DM_SPI=y
> -CONFIG_BCM63XX_HSSPI=y
> -CONFIG_SYSRESET=y
> -CONFIG_SYSRESET_WATCHDOG=y
> -CONFIG_WDT_BCM6345=y
> -# CONFIG_GENERATE_SMBIOS_TABLE is not set
> diff --git a/include/configs/bcm96858.h b/include/configs/bcm96858.h
> index 4e584b41fb37..8bd1169207f0 100644
> --- a/include/configs/bcm96858.h
> +++ b/include/configs/bcm96858.h
> @@ -8,4 +8,8 @@
>
> #define CONFIG_SYS_SDRAM_BASE 0x00000000
>
> +#ifdef CONFIG_MTD_RAW_NAND
> +#define CONFIG_SYS_MAX_NAND_DEVICE 1
> +#endif /* CONFIG_MTD_RAW_NAND */
> +
> #endif
> diff --git a/include/configs/broadcom_bcm968580xref.h b/include/configs/broadcom_bcm968580xref.h
> deleted file mode 100644
> index abc2da3d1fe3..000000000000
> --- a/include/configs/broadcom_bcm968580xref.h
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> -/*
> - * Copyright (C) 2018 Philippe Reynes <philippe.reynes@softathome.com>
> - */
> -
> -#include <linux/sizes.h>
> -
> -/*
> - * common
> - */
> -
> -/* UART */
> -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, \
> - 230400, 500000, 1500000 }
> -/* Memory usage */
> -
> -/*
> - * 6858
> - */
> -
> -/* RAM */
> -#define CONFIG_SYS_SDRAM_BASE 0x00000000
> -
> -/* U-Boot */
> -
> -#ifdef CONFIG_MTD_RAW_NAND
> -#define CONFIG_SYS_MAX_NAND_DEVICE 1
> -#endif /* CONFIG_MTD_RAW_NAND */
> -
> -/*
> - * 968580xref
> - */
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 3/3] arm: bcmbca: replace ARCH_BCM6858 symbols in Kconfig with BCM6858
2022-08-22 18:39 ` [PATCH v2 3/3] arm: bcmbca: replace ARCH_BCM6858 symbols in Kconfig with BCM6858 William Zhang
@ 2022-08-24 12:39 ` Philippe REYNES
0 siblings, 0 replies; 8+ messages in thread
From: Philippe REYNES @ 2022-08-24 12:39 UTC (permalink / raw)
To: William Zhang, U-Boot Mailing List
Cc: dan.beygelman, joel.peshkin, rafal, f.fainelli, kursad.oney,
anand.gore, Andre Przywara, Dario Binacchi, Eddie James,
Hannes Schmelzer, Ivan Vozvakhov, Jagan Teki, Michael Trimarchi,
Michal Simek, Oleksandr Suvorov, Simon Glass, Stefan Roese,
T Karthik Reddy, Tom Rini
Hi William,
Le 22/08/2022 à 20:39, William Zhang a écrit :
> As CONFIG_ARCH_BCM6858 is replaced with CONFIG_BCM6858, update the
> driver Kconfig to use the new config symbol.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
Reviewed-by: Philippe Reynes <philippe.reynes@softathome.com>
>
> ---
>
> Changes in v2:
> -Update subject line to be more clear for patch 3
>
> drivers/gpio/Kconfig | 3 +--
> drivers/led/Kconfig | 2 +-
> drivers/mtd/nand/raw/Kconfig | 2 +-
> drivers/spi/Kconfig | 3 +--
> drivers/watchdog/Kconfig | 3 +--
> 5 files changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index 9e00b48234ab..929f3fb9eacb 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -111,8 +111,7 @@ config BCM2835_GPIO
> config BCM6345_GPIO
> bool "BCM6345 GPIO driver"
> depends on DM_GPIO && (ARCH_BMIPS || BCM6856 || \
> - ARCH_BCM6858 || BCM63158 || \
> - ARCH_BCM6753)
> + BCM6858 || BCM63158 || ARCH_BCM6753)
> help
> This driver supports the GPIO banks on BCM6345 SoCs.
>
> diff --git a/drivers/led/Kconfig b/drivers/led/Kconfig
> index bd8f23fd9631..98f015a07f97 100644
> --- a/drivers/led/Kconfig
> +++ b/drivers/led/Kconfig
> @@ -37,7 +37,7 @@ config LED_BCM6753
>
> config LED_BCM6858
> bool "LED Support for BCM6858"
> - depends on LED && (BCM6856 || ARCH_BCM6858 || BCM63158)
> + depends on LED && (BCM6856 || BCM6858 || BCM63158)
> help
> This option enables support for LEDs connected to the BCM6858
> HW has blinking capabilities and up to 32 LEDs can be controlled.
> diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
> index 5d006ca1ea07..f8445e09633c 100644
> --- a/drivers/mtd/nand/raw/Kconfig
> +++ b/drivers/mtd/nand/raw/Kconfig
> @@ -115,7 +115,7 @@ config NAND_BRCMNAND_6838
>
> config NAND_BRCMNAND_6858
> bool "Support Broadcom NAND controller on bcm6858"
> - depends on NAND_BRCMNAND && ARCH_BCM6858
> + depends on NAND_BRCMNAND && BCM6858
> help
> Enable support for broadcom nand driver on bcm6858.
>
> diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
> index 978e5c86a420..e815a715f9b2 100644
> --- a/drivers/spi/Kconfig
> +++ b/drivers/spi/Kconfig
> @@ -91,8 +91,7 @@ config ATMEL_SPI
>
> config BCM63XX_HSSPI
> bool "BCM63XX HSSPI driver"
> - depends on (ARCH_BMIPS || BCM6856 || \
> - ARCH_BCM6858 || BCM63158)
> + depends on (ARCH_BMIPS || BCM6856 || BCM6858 || BCM63158)
> help
> Enable the BCM6328 HSSPI driver. This driver can be used to
> access the SPI NOR flash on platforms embedding this Broadcom
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 6d559515b78b..84a4034fe87c 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -129,8 +129,7 @@ config WDT_AT91
> config WDT_BCM6345
> bool "BCM6345 watchdog timer support"
> depends on WDT && (ARCH_BMIPS || BCM6856 || \
> - ARCH_BCM6858 || BCM63158 || \
> - ARCH_BCM6753)
> + BCM6858 || BCM63158 || ARCH_BCM6753)
> help
> Select this to enable watchdog timer for BCM6345 SoCs.
> The watchdog timer is stopped when initialized.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/3] arm: bcmbca: add bcm6858 SoC support under CONFIG_ARCH_BCMBCA
2022-08-22 18:39 ` [PATCH v2 1/3] arm: bcmbca: add bcm6858 SoC " William Zhang
2022-08-24 12:38 ` Philippe REYNES
@ 2022-10-31 14:45 ` Tom Rini
1 sibling, 0 replies; 8+ messages in thread
From: Tom Rini @ 2022-10-31 14:45 UTC (permalink / raw)
To: William Zhang
Cc: U-Boot Mailing List, dan.beygelman, joel.peshkin, rafal,
f.fainelli, kursad.oney, philippe.reynes, anand.gore,
Andre Przywara, Christian Hewitt, Marek Vasut, Samuel Holland,
Simon Glass, Tomer Yacoby, Ying-Chun Liu (PaulLiu)
[-- Attachment #1: Type: text/plain, Size: 796 bytes --]
On Mon, Aug 22, 2022 at 11:39:43AM -0700, William Zhang wrote:
> BCM6858 is a Broadcom B53 based PON Gateway SoC. It is part of the BCA
> (Broadband Carrier Access origin) chipset family. Like other broadband
> SoC, this patch adds it under CONFIG_BCM6858 chip config and
> CONFIG_ARCH_BCMBCA platform config.
>
> This initial support includes a bare-bone implementation and the
> original dts is updated with the one from linux next git repository.
>
> The u-boot image can be loaded from flash or network to the entry point
> address in the memory and boot from there to the console.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> Reviewed-by: Philippe Reynes <philippe.reynes@softathome.com>
For the series, applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-10-31 14:46 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-22 18:39 [PATCH v2 0/3] arm: bcmbca: move bcm6858 support under CONFIG_ARCH_BCMBCA William Zhang
2022-08-22 18:39 ` [PATCH v2 1/3] arm: bcmbca: add bcm6858 SoC " William Zhang
2022-08-24 12:38 ` Philippe REYNES
2022-10-31 14:45 ` Tom Rini
2022-08-22 18:39 ` [PATCH v2 2/3] arm: bcmbca: remove bcm6858 support under CONFIG_ARCH_BCM6858 William Zhang
2022-08-24 12:38 ` Philippe REYNES
2022-08-22 18:39 ` [PATCH v2 3/3] arm: bcmbca: replace ARCH_BCM6858 symbols in Kconfig with BCM6858 William Zhang
2022-08-24 12:39 ` Philippe REYNES
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).