summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWilliam Zhang <william.zhang@broadcom.com>2022-08-22 21:19:45 +0300
committerTom Rini <trini@konsulko.com>2022-10-31 15:55:40 +0300
commit07f97bde54bcfea0cdba7d44a55fad457d7cb38e (patch)
tree52638a889fab668ed44591e6fde72aa9e94cf51c /include
parent61546e7cda036a57e8af9524203d42746ab87cef (diff)
downloadu-boot-07f97bde54bcfea0cdba7d44a55fad457d7cb38e.tar.xz
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 <william.zhang@broadcom.com> Reviewed-by: Philippe Reynes <philippe.reynes@softathome.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/bcm963158.h4
-rw-r--r--include/configs/broadcom_bcm963158.h32
2 files changed, 4 insertions, 32 deletions
diff --git a/include/configs/bcm963158.h b/include/configs/bcm963158.h
index b15c4111c9..f473963358 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 0c8d352be9..0000000000
--- 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
- */