Re: [PATCH v3 2/5] arm: bcmbca: remove bcm63158 support under CONFIG_ARCH_BCM63158

[Philippe REYNES <philippe.reynes@softathome.com>]

Hi William,


Le 22/08/2022 à 20:19, William Zhang a écrit :
> Now that BCM63158 is supported under CONFIG_ARCH_BCMBCA and
> CONFIG_BCM63158, remove the original ARCH_BCM63158 support and migrate
> configuration settings.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>


Reviewed-by: Philippe Reynes <philippe.reynes@softathome.com>


>
> ---
>
> (no changes since v2)
>
> Changes in v2:
> - Remove bcm963158_ram_defconfig per discussion with Philippe as a
> basic config version of bcm963158_defconfig is now added.
>
>   arch/arm/Kconfig                     |  8 +---
>   arch/arm/dts/Makefile                |  3 --
>   board/broadcom/bcm963158/Kconfig     | 17 -------
>   board/broadcom/bcm963158/MAINTAINERS |  6 ---
>   board/broadcom/bcm963158/Makefile    |  3 --
>   board/broadcom/bcm963158/bcm963158.c | 62 -------------------------
>   configs/bcm963158_ram_defconfig      | 67 ----------------------------
>   include/configs/bcm963158.h          |  4 ++
>   include/configs/broadcom_bcm963158.h | 32 -------------
>   9 files changed, 5 insertions(+), 197 deletions(-)
>   delete mode 100644 board/broadcom/bcm963158/Kconfig
>   delete mode 100644 board/broadcom/bcm963158/MAINTAINERS
>   delete mode 100644 board/broadcom/bcm963158/Makefile
>   delete mode 100644 board/broadcom/bcm963158/bcm963158.c
>   delete mode 100644 configs/bcm963158_ram_defconfig
>   delete mode 100644 include/configs/broadcom_bcm963158.h
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 0d4903a2eb5b..da4defa08466 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -665,12 +665,6 @@ config ARCH_BCM283X
>   	imply CMD_DM
>   	imply FAT_WRITE
>   
> -config ARCH_BCM63158
> -	bool "Broadcom BCM63158 family"
> -	select DM
> -	select OF_CONTROL
> -	imply CMD_DM
> -
>   config ARCH_BCM6753
>   	bool "Broadcom BCM6753 family"
>   	select CPU_V7A
> @@ -706,6 +700,7 @@ config ARCH_BCMBCA
>   	bool "Broadcom broadband chip family"
>   	select DM
>   	select OF_CONTROL
> +	imply CMD_DM
>   
>   config TARGET_VEXPRESS_CA9X4
>   	bool "Support vexpress_ca9x4"
> @@ -2284,7 +2279,6 @@ source "board/Marvell/octeontx2/Kconfig"
>   source "board/armltd/vexpress/Kconfig"
>   source "board/armltd/vexpress64/Kconfig"
>   source "board/cortina/presidio-asic/Kconfig"
> -source "board/broadcom/bcm963158/Kconfig"
>   source "board/broadcom/bcm96753ref/Kconfig"
>   source "board/broadcom/bcm968360bg/Kconfig"
>   source "board/broadcom/bcm968580xref/Kconfig"
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index a7fc3d7d7021..c55bc3569662 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_BCM63158) += \
> -	bcm963158.dtb
> -
>   dtb-$(CONFIG_ARCH_BCM68360) += \
>   	bcm968360bg.dtb
>   
> diff --git a/board/broadcom/bcm963158/Kconfig b/board/broadcom/bcm963158/Kconfig
> deleted file mode 100644
> index 08a8bc1c14d3..000000000000
> --- a/board/broadcom/bcm963158/Kconfig
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -if TARGET_BCM963158
> -
> -config SYS_VENDOR
> -	default "broadcom"
> -
> -config SYS_BOARD
> -	default "bcm963158"
> -
> -config SYS_CONFIG_NAME
> -	default "broadcom_bcm963158"
> -
> -endif
> -
> -config TARGET_BCM963158
> -	bool "Support Broadcom bcm963158"
> -	depends on ARCH_BCM63158
> -	select ARM64
> diff --git a/board/broadcom/bcm963158/MAINTAINERS b/board/broadcom/bcm963158/MAINTAINERS
> deleted file mode 100644
> index d28d971f9d36..000000000000
> --- a/board/broadcom/bcm963158/MAINTAINERS
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -BROADCOM BCM963158
> -M:	Philippe Reynes <philippe.reynes@softathome.com>
> -S:	Maintained
> -F:	board/broadcom/bcm963158/
> -F:	include/configs/broadcom_bcm963158.h
> -F:	configs/bcm963158_ram_defconfig
> diff --git a/board/broadcom/bcm963158/Makefile b/board/broadcom/bcm963158/Makefile
> deleted file mode 100644
> index 0a902c9cf618..000000000000
> --- a/board/broadcom/bcm963158/Makefile
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -# SPDX-License-Identifier: GPL-2.0+
> -
> -obj-y	+= bcm963158.o
> diff --git a/board/broadcom/bcm963158/bcm963158.c b/board/broadcom/bcm963158/bcm963158.c
> deleted file mode 100644
> index 9feaee3c0fc4..000000000000
> --- a/board/broadcom/bcm963158/bcm963158.c
> +++ /dev/null
> @@ -1,62 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0+
> -/*
> - * Copyright (C) 2019 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_bcm963158_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_bcm963158_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/bcm963158_ram_defconfig b/configs/bcm963158_ram_defconfig
> deleted file mode 100644
> index 424eca7946b8..000000000000
> --- a/configs/bcm963158_ram_defconfig
> +++ /dev/null
> @@ -1,67 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_SKIP_LOWLEVEL_INIT=y
> -# CONFIG_ARM64_SUPPORT_AARCH32 is not set
> -CONFIG_ARCH_BCM63158=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="bcm963158"
> -CONFIG_SYS_LOAD_ADDR=0x10000000
> -CONFIG_TARGET_BCM963158=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_RSASSA_PSS=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=0x1000000
> -# CONFIG_CMD_LZMADEC is not set
> -# CONFIG_CMD_UNZIP is not set
> -# CONFIG_CMD_FLASH is not set
> -CONFIG_CMD_GPIO=y
> -CONFIG_CMD_MTD=y
> -CONFIG_CMD_NAND=y
> -CONFIG_CMD_CACHE=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_63158=y
> -CONFIG_SYS_NAND_ONFI_DETECTION=y
> -CONFIG_DM_SPI_FLASH=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_PL01X_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/bcm963158.h b/include/configs/bcm963158.h
> index b15c4111c967..f47396335868 100644
> --- a/include/configs/bcm963158.h
> +++ b/include/configs/bcm963158.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_bcm963158.h b/include/configs/broadcom_bcm963158.h
> deleted file mode 100644
> index 0c8d352be97c..000000000000
> --- a/include/configs/broadcom_bcm963158.h
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> -/*
> - * Copyright (C) 2019 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 */
> -
> -/*
> - * 63158
> - */
> -
> -/* 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 */
> -
> -/*
> - * bcm963158
> - */