From 07f97bde54bcfea0cdba7d44a55fad457d7cb38e Mon Sep 17 00:00:00 2001 From: William Zhang Date: Mon, 22 Aug 2022 11:19:45 -0700 Subject: arm: bcmbca: remove bcm63158 support under CONFIG_ARCH_BCM63158 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 Reviewed-by: Philippe Reynes --- include/configs/bcm963158.h | 4 ++++ include/configs/broadcom_bcm963158.h | 32 -------------------------------- 2 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 include/configs/broadcom_bcm963158.h (limited to 'include') diff --git a/include/configs/bcm963158.h b/include/configs/bcm963158.h index b15c4111c96..f4739633586 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 0c8d352be97..00000000000 --- a/include/configs/broadcom_bcm963158.h +++ /dev/null @@ -1,32 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2019 Philippe Reynes - */ - -#include - -/* - * 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 - */ -- cgit v1.2.3