Hi William,
Le 22/08/2022 à 20:31, William Zhang a écrit :
BCM68360 is a variant within the BCM6856 chip family. Now that BCM6856 is supported under CONFIG_ARCH_BCMBCA and CONFIG_BCM6856, remove the original ARCH_BCM68360 support and migrate its configuration and dts settings. This includes:
- Remove the bcm968360bg board folder. It is replaced by the generic bcmbca board folder.
- Merge the 68360.dtsi setting to the new 6856.dtsi file. Update board dts with the new compatible string.
- Merge broadcom_bcm968360bg.h setting to the new bcm96856.h file.
- Remove bcm968360bg_ram_defconfig as a basic config version of bcm96856_defconfig is now added.
Signed-off-by: William Zhang william.zhang@broadcom.com
Reviewed-by: Philippe Reynes philippe.reynes@softathome.com
(no changes since v3)
Changes in v3:
- Remove bcm968360bg_ram_defconfig per discussion with Philippe as a
basic config version of bcm96856_defconfig is now added.
- Update commit message
Changes in v2:
Bring Philippe Reynes copyright tag from 68360 dts to 6856 dts
arch/arm/Kconfig | 7 - arch/arm/dts/Makefile | 6 +- arch/arm/dts/bcm68360.dtsi | 217 ----------------------- arch/arm/dts/bcm6856.dtsi | 150 ++++++++++++++++ arch/arm/dts/bcm968360bg.dts | 6 +- board/broadcom/bcm968360bg/Kconfig | 17 -- board/broadcom/bcm968360bg/MAINTAINERS | 6 - board/broadcom/bcm968360bg/Makefile | 3 - board/broadcom/bcm968360bg/bcm968360bg.c | 62 ------- configs/bcm968360bg_ram_defconfig | 63 ------- include/configs/bcm96856.h | 4 + include/configs/broadcom_bcm968360bg.h | 32 ---- 12 files changed, 159 insertions(+), 414 deletions(-) delete mode 100644 arch/arm/dts/bcm68360.dtsi delete mode 100644 board/broadcom/bcm968360bg/Kconfig delete mode 100644 board/broadcom/bcm968360bg/MAINTAINERS delete mode 100644 board/broadcom/bcm968360bg/Makefile delete mode 100644 board/broadcom/bcm968360bg/bcm968360bg.c delete mode 100644 configs/bcm968360bg_ram_defconfig delete mode 100644 include/configs/broadcom_bcm968360bg.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index da4defa08466..3f124ab0ce85 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -672,12 +672,6 @@ config ARCH_BCM6753 select OF_CONTROL imply CMD_DM
-config ARCH_BCM68360
- bool "Broadcom BCM68360 family"
- select DM
- select OF_CONTROL
- imply CMD_DM
- config ARCH_BCM6858 bool "Broadcom BCM6858 family" select DM
@@ -2280,7 +2274,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/bcm968360bg/Kconfig" source "board/broadcom/bcm968580xref/Kconfig" source "board/broadcom/bcmns3/Kconfig" source "board/cavium/thunderx/Kconfig" diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index a32bdf8c9f17..a0ea9fa6029d 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -1147,9 +1147,6 @@ dtb-$(CONFIG_ARCH_BCM283X) += \ bcm2837-rpi-cm3-io3.dtb \ bcm2711-rpi-4-b.dtb
-dtb-$(CONFIG_ARCH_BCM68360) += \
- bcm968360bg.dtb
- dtb-$(CONFIG_ARCH_BCM6753) += \ bcm96753ref.dtb
@@ -1183,7 +1180,8 @@ dtb-$(CONFIG_BCM6813) += \ dtb-$(CONFIG_BCM6846) += \ bcm96846.dtb dtb-$(CONFIG_BCM6856) += \
- bcm96856.dtb
- bcm96856.dtb \
- bcm968360bg.dtb dtb-$(CONFIG_BCM6878) += \ bcm96878.dtb
diff --git a/arch/arm/dts/bcm68360.dtsi b/arch/arm/dts/bcm68360.dtsi deleted file mode 100644 index 7bbe207794eb..000000000000 --- a/arch/arm/dts/bcm68360.dtsi +++ /dev/null @@ -1,217 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/*
- Copyright (C) 2020 Philippe Reynes philippe.reynes@softathome.com
- */
-#include "skeleton64.dtsi"
-/ {
- compatible = "brcm,bcm68360";
- #address-cells = <2>;
- #size-cells = <2>;
- aliases {
spi0 = &hsspi;- };
- cpus {
#address-cells = <2>;#size-cells = <0>;u-boot,dm-pre-reloc;cpu0: cpu@0 {compatible = "arm,cortex-a53", "arm,armv8";device_type = "cpu";reg = <0x0 0x0>;next-level-cache = <&l2>;u-boot,dm-pre-reloc;};cpu1: cpu@1 {compatible = "arm,cortex-a53", "arm,armv8";device_type = "cpu";reg = <0x0 0x1>;next-level-cache = <&l2>;u-boot,dm-pre-reloc;};l2: l2-cache0 {compatible = "cache";u-boot,dm-pre-reloc;};- };
- clocks {
compatible = "simple-bus";#address-cells = <2>;#size-cells = <2>;ranges;u-boot,dm-pre-reloc;periph_osc: periph-osc {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>;clock-mult = <2>;clock-div = <1>;};refclk50mhz: refclk50mhz {compatible = "fixed-clock";#clock-cells = <0>;clock-frequency = <50000000>;};- };
- ubus {
compatible = "simple-bus";#address-cells = <2>;#size-cells = <2>;u-boot,dm-pre-reloc;wdt1: watchdog@ff800480 {compatible = "brcm,bcm6345-wdt";reg = <0x0 0xff800480 0x0 0x14>;clocks = <&refclk50mhz>;};wdt2: watchdog@ff8004c0 {compatible = "brcm,bcm6345-wdt";reg = <0x0 0xff8004c0 0x0 0x14>;clocks = <&refclk50mhz>;};wdt-reboot {compatible = "wdt-reboot";wdt = <&wdt1>;};uart0: serial@ff800640 {compatible = "brcm,bcm6345-uart";reg = <0x0 0xff800640 0x0 0x18>;clocks = <&periph_osc>;status = "disabled";};leds: led-controller@ff800800 {compatible = "brcm,bcm6858-leds";reg = <0x0 0xff800800 0x0 0xe4>;status = "disabled";};gpio0: gpio-controller@0xff800500 {compatible = "brcm,bcm6345-gpio";reg = <0x0 0xff800500 0x0 0x4>,<0x0 0xff800520 0x0 0x4>;gpio-controller;#gpio-cells = <2>;status = "disabled";};gpio1: gpio-controller@0xff800504 {compatible = "brcm,bcm6345-gpio";reg = <0x0 0xff800504 0x0 0x4>,<0x0 0xff800524 0x0 0x4>;gpio-controller;#gpio-cells = <2>;status = "disabled";};gpio2: gpio-controller@0xff800508 {compatible = "brcm,bcm6345-gpio";reg = <0x0 0xff800508 0x0 0x4>,<0x0 0xff800528 0x0 0x4>;gpio-controller;#gpio-cells = <2>;status = "disabled";};gpio3: gpio-controller@0xff80050c {compatible = "brcm,bcm6345-gpio";reg = <0x0 0xff80050c 0x0 0x4>,<0x0 0xff80052c 0x0 0x4>;gpio-controller;#gpio-cells = <2>;status = "disabled";};gpio4: gpio-controller@0xff800510 {compatible = "brcm,bcm6345-gpio";reg = <0x0 0xff800510 0x0 0x4>,<0x0 0xff800530 0x0 0x4>;gpio-controller;#gpio-cells = <2>;status = "disabled";};gpio5: gpio-controller@0xff800514 {compatible = "brcm,bcm6345-gpio";reg = <0x0 0xff800514 0x0 0x4>,<0x0 0xff800534 0x0 0x4>;gpio-controller;#gpio-cells = <2>;status = "disabled";};gpio6: gpio-controller@0xff800518 {compatible = "brcm,bcm6345-gpio";reg = <0x0 0xff800518 0x0 0x4>,<0x0 0xff800538 0x0 0x4>;gpio-controller;#gpio-cells = <2>;status = "disabled";};gpio7: gpio-controller@0xff80051c {compatible = "brcm,bcm6345-gpio";reg = <0x0 0xff80051c 0x0 0x4>,<0x0 0xff80053c 0x0 0x4>;gpio-controller;#gpio-cells = <2>;status = "disabled";};hsspi: spi-controller@ff801000 {compatible = "brcm,bcm6328-hsspi";#address-cells = <1>;#size-cells = <0>;reg = <0x0 0xff801000 0x0 0x600>;clocks = <&hsspi_pll>, <&hsspi_pll>;clock-names = "hsspi", "pll";spi-max-frequency = <100000000>;num-cs = <8>;status = "disabled";};nand: nand-controller@ff801800 {compatible = "brcm,nand-bcm68360","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>;parameter-page-big-endian = <0>;status = "disabled";};- };
-}; diff --git a/arch/arm/dts/bcm6856.dtsi b/arch/arm/dts/bcm6856.dtsi index 0bce6497219f..99185ab0bcaf 100644 --- a/arch/arm/dts/bcm6856.dtsi +++ b/arch/arm/dts/bcm6856.dtsi @@ -1,5 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /*
*/
- Copyright (C) 2020 Philippe Reynes philippe.reynes@softathome.com
- Copyright 2022 Broadcom Ltd.
@@ -54,11 +55,29 @@ };
clocks: clocks {
u-boot,dm-pre-reloc;periph_clk:periph-clk { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <200000000>; };
hsspi_pll: hsspi-pll {compatible = "fixed-factor-clock";#clock-cells = <0>;clocks = <&periph_clk>;clock-mult = <2>;clock-div = <1>;};wdt_clk: wdt-clk {compatible = "fixed-factor-clock";#clock-cells = <0>;clocks = <&periph_clk>;clock-div = <4>;clock-mult = <1>;};};
psci {
@@ -90,6 +109,7 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x0 0xff800000 0x800000>;
u-boot,dm-pre-reloc;uart0: serial@640 { compatible = "brcm,bcm6345-uart";
@@ -99,5 +119,135 @@ clock-names = "refclk"; status = "disabled"; };
wdt1: watchdog@480 {compatible = "brcm,bcm6345-wdt";reg = <0x480 0x14>;clocks = <&wdt_clk>;};wdt2: watchdog@4c0 {compatible = "brcm,bcm6345-wdt";reg = <0x4c0 0x14>;clocks = <&wdt_clk>;};wdt-reboot {compatible = "wdt-reboot";wdt = <&wdt1>;};leds: led-controller@800 {compatible = "brcm,bcm6858-leds";reg = <0x800 0xe4>;status = "disabled";};gpio0: gpio-controller@500 {compatible = "brcm,bcm6345-gpio";reg = <0x500 0x4>,<0x520 0x4>;gpio-controller;#gpio-cells = <2>;status = "disabled";};gpio1: gpio-controller@504 {compatible = "brcm,bcm6345-gpio";reg = <0x504 0x4>,<0x524 0x4>;gpio-controller;#gpio-cells = <2>;status = "disabled";};gpio2: gpio-controller@508 {compatible = "brcm,bcm6345-gpio";reg = <0x508 0x4>,<0x528 0x4>;gpio-controller;#gpio-cells = <2>;status = "disabled";};gpio3: gpio-controller@50c {compatible = "brcm,bcm6345-gpio";reg = <0x50c 0x4>,<0x52c 0x4>;gpio-controller;#gpio-cells = <2>;status = "disabled";};gpio4: gpio-controller@510 {compatible = "brcm,bcm6345-gpio";reg = <0x510 0x4>,<0x530 0x4>;gpio-controller;#gpio-cells = <2>;status = "disabled";};gpio5: gpio-controller@514 {compatible = "brcm,bcm6345-gpio";reg = <0x514 0x4>,<0x534 0x4>;gpio-controller;#gpio-cells = <2>;status = "disabled";};gpio6: gpio-controller@518 {compatible = "brcm,bcm6345-gpio";reg = <0x518 0x4>,<0x538 0x4>;gpio-controller;#gpio-cells = <2>;status = "disabled";};gpio7: gpio-controller@51c {compatible = "brcm,bcm6345-gpio";reg = <0x51c 0x4>,<0x53c 0x4>;gpio-controller;#gpio-cells = <2>;status = "disabled";};hsspi: spi-controller@1000 {compatible = "brcm,bcm6328-hsspi";#address-cells = <1>;#size-cells = <0>;reg = <0x1000 0x600>;clocks = <&hsspi_pll>, <&hsspi_pll>;clock-names = "hsspi", "pll";spi-max-frequency = <100000000>;num-cs = <8>;status = "disabled";};nand: nand-controller@1800 {compatible = "brcm,nand-bcm68360","brcm,brcmnand-v5.0","brcm,brcmnand";reg-names = "nand", "nand-int-base", "nand-cache";reg = <0x1800 0x180>,<0x2000 0x10>,<0x1c00 0x200>;parameter-page-big-endian = <0>;status = "disabled";};diff --git a/arch/arm/dts/bcm968360bg.dts b/arch/arm/dts/bcm968360bg.dts index c060294cc925..6f1090aa8eee 100644 --- a/arch/arm/dts/bcm968360bg.dts +++ b/arch/arm/dts/bcm968360bg.dts @@ -5,11 +5,11 @@
/dts-v1/;
-#include "bcm68360.dtsi" +#include "bcm6856.dtsi"
/ {
- model = "Broadcom bcm68360bg";
- compatible = "broadcom,bcm68360bg", "brcm,bcm68360";
model = "Broadcom BCM968360BG Reference Board";
compatible = "brcm,bcm968360bg", "brcm,bcm6856", "brcm,bcmbca";
aliases { serial0 = &uart0;
diff --git a/board/broadcom/bcm968360bg/Kconfig b/board/broadcom/bcm968360bg/Kconfig deleted file mode 100644 index dd372f126aef..000000000000 --- a/board/broadcom/bcm968360bg/Kconfig +++ /dev/null @@ -1,17 +0,0 @@ -if ARCH_BCM68360
-config SYS_VENDOR
- default "broadcom"
-config SYS_BOARD
- default "bcm968360bg"
-config SYS_CONFIG_NAME
- default "broadcom_bcm968360bg"
-endif
-config TARGET_BCM968360BG
- bool "Support Broadcom bcm968360bg"
- depends on ARCH_BCM68360
- select ARM64
diff --git a/board/broadcom/bcm968360bg/MAINTAINERS b/board/broadcom/bcm968360bg/MAINTAINERS deleted file mode 100644 index cfcbbc51f8e6..000000000000 --- a/board/broadcom/bcm968360bg/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -BCM968360BG BOARD -M: Philippe Reynes philippe.reynes@softathome.com -S: Maintained -F: board/broadcom/bcm968360bg -F: include/configs/broadcom_bcm968360bg.h -F: configs/bcm968360bg_ram_defconfig diff --git a/board/broadcom/bcm968360bg/Makefile b/board/broadcom/bcm968360bg/Makefile deleted file mode 100644 index d099c1cf3569..000000000000 --- a/board/broadcom/bcm968360bg/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+
-obj-y += bcm968360bg.o diff --git a/board/broadcom/bcm968360bg/bcm968360bg.c b/board/broadcom/bcm968360bg/bcm968360bg.c deleted file mode 100644 index 90af6b88bd47..000000000000 --- a/board/broadcom/bcm968360bg/bcm968360bg.c +++ /dev/null @@ -1,62 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/*
- Copyright (C) 2020 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_bcm968360bg_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_bcm968360bg_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/bcm968360bg_ram_defconfig b/configs/bcm968360bg_ram_defconfig deleted file mode 100644 index 7f9093c6f6d3..000000000000 --- a/configs/bcm968360bg_ram_defconfig +++ /dev/null @@ -1,63 +0,0 @@ -CONFIG_ARM=y -CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_ARCH_BCM68360=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="bcm968360bg" -CONFIG_SYS_LOAD_ADDR=0x10000000 -CONFIG_TARGET_BCM968360BG=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_68360=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 diff --git a/include/configs/bcm96856.h b/include/configs/bcm96856.h index a7ae71eeaafe..3050cf337229 100644 --- a/include/configs/bcm96856.h +++ b/include/configs/bcm96856.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_bcm968360bg.h b/include/configs/broadcom_bcm968360bg.h deleted file mode 100644 index 8a8023571236..000000000000 --- a/include/configs/broadcom_bcm968360bg.h +++ /dev/null @@ -1,32 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/*
- Copyright (C) 2020 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 */
-/*
- 968360bg
- */