configs: Remove unused or redundant CONFIG symbols

A number of CONFIG symbols have crept in that are never referenced in
code, so drop them here. Further, we have two symbols being enabled
in headers while already enabled correctly in Kconfig, so these lines
can also be removed.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index 2862257e1f2c5bd742a63a70d38f75982daa6543..9656c52e955f9f4c71faf36feebcb391f9abbe7e 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -29,6 +29,7 @@ config ARCH_LS1028A
        select ESBC_HDR_LS if CHAIN_OF_TRUST
        select FSL_LAYERSCAPE
        select FSL_LSCH3
+       select FSL_TZASC_400
        select GICV3
        select NXP_LSCH3_2
        select SYS_FSL_HAS_CCI400

diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h
index 12758c8dd1ca608f0494b6d20b40bbf88ad1362f..516c9eab0478ba51bd2cb5d960e81459c762988c 100644 (file)
--- a/arch/arm/include/asm/arch-fsl-layerscape/config.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h
@@ -160,7 +160,6 @@
 
 #elif defined(CONFIG_ARCH_LS1028A)
 #define CFG_SYS_FSL_CLUSTER_CLOCKS             { 1, 1 }
-#define CONFIG_FSL_TZASC_400
 
 /* TZ Protection Controller Definitions */
 #define TZPC_BASE                              0x02200000

diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h
index 96a08104ff46d6d854f4e62d43d299a1410389ec..610274754837fea678a389cadaddea4d41089969 100644 (file)
--- a/arch/arm/mach-mvebu/include/mach/config.h
+++ b/arch/arm/mach-mvebu/include/mach/config.h
@@ -27,7 +27,4 @@
 
 #define MV_UART_CONSOLE_BASE           MVEBU_UART0_BASE
 
-/* Needed for SPI NOR booting in SPL */
-#define CONFIG_DM_SEQ_ALIAS            1
-
 #endif /* __MVEBU_CONFIG_H */

diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index 91454df197207e7b763f4ed6e2778a05b9e0ba77..98d4d8cf4bd983bde0bd99da5cf97e7cde770edb 100644 (file)
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -12,7 +12,6 @@
 #include <asm/arch/imx-regs.h>
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_SERIAL_LPUART_BASE      0x5a060000
 #define CFG_MALLOC_F_ADDR              0x00120000
 
 #endif

diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index 495ca313db2872a8ee73296c443446d44cbabf08..d4ab6a6207d6058bdfd5260c74c4010f853dbbda 100644 (file)
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -28,12 +28,6 @@
                                                  * GD_FLG_FULL_MALLOC_INIT \
                                                  * set \
                                                  */
-
-
-#if defined(CONFIG_NAND_BOOT)
-#define CONFIG_SPL_NAND_MXS
-#endif
-
 #endif
 
 /* ENET Config */
@@ -158,9 +152,6 @@
 #define FSL_FSPI_FLASH_NUM             1
 #define FSPI0_BASE_ADDR                        0x30bb0000
 #define FSPI0_AMBA_BASE                        0x0
-#define CONFIG_FSPI_QUAD_SUPPORT
-
-#define CONFIG_SYS_FSL_FSPI_AHB
 #endif
 
 #ifdef CONFIG_NAND_MXS

diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index 828bd67237271159d3d9427d1a574b350e577737..7cf482d6de159e5ae65dbeb750e25bf449813911 100644 (file)
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -11,7 +11,6 @@
 #include <asm/arch/imx-regs.h>
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
 #define CFG_MALLOC_F_ADDR              0x182000

diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index d2de2900c063243e2dfa270c2a6168be453986b0..d2e1649400a7ad37f7ce678d552aff5c4ec2dde2 100644 (file)
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -12,7 +12,6 @@
 
 #ifdef CONFIG_SPL_BUILD
 /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
-#define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
 #define CFG_MALLOC_F_ADDR              0x182000

diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index bfde15e6240f6d61f2601103a2535c2af7cab32d..b66fc18fa5e84923b7c4e23cabe5d20bbb7b1c3c 100644 (file)
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -11,7 +11,6 @@
 
 #ifdef CONFIG_SPL_BUILD
 /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
-#define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
 #define CFG_MALLOC_F_ADDR              0x182000

diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index a25efbb16bdb162eb45501868912581ec4a7dc44..4d5abe2d073bde47052c9b617b8163aa3407ee5e 100644 (file)
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -11,7 +11,6 @@
 #include <asm/arch/imx-regs.h>
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_SERIAL_LPUART_BASE      0x5a060000
 #define CFG_MALLOC_F_ADDR              0x00120000
 
 #endif

diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 4f55ae49403dd8f93729296939036a3e48ba609b..93999509948a15d4393039dd01e980cba0964365 100644 (file)
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -11,7 +11,6 @@
 #include <asm/arch/imx-regs.h>
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_SERIAL_LPUART_BASE      0x5a060000
 #define CFG_MALLOC_F_ADDR              0x00120000
 
 #endif

diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h
index e3a021c987c69ef3a3ad137116ea94ad8a3c64a7..5cf6b5a6dd4699b9c68a1a0715091df83f768565 100644 (file)
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@@ -13,7 +13,6 @@
                 0x40, 0xd4, 0x5c, 0xca, 0x13, 0x99)
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_SPL_PTE_RAM_BASE     0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
 #define CFG_MALLOC_F_ADDR              0x182000

diff --git a/include/configs/librem5.h b/include/configs/librem5.h
index e17190ce9c5d1dd5260dbcecaad4ff1a80a234a9..ce0a340ba26e852eef954f20a84a8727c7d2df8e 100644 (file)
--- a/include/configs/librem5.h
+++ b/include/configs/librem5.h
@@ -15,12 +15,6 @@
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
-#ifdef CONFIG_SPL_BUILD
-
-#define CONFIG_SPL_ABORT_ON_RAW_IMAGE /* For RAW image gives a error info not panic */
-
-#endif /* CONFIG_SPL_BUILD*/
-
 #define CFG_SYS_FSL_USDHC_NUM  2
 
 #define CONSOLE_ON_UART1

diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index 4b602ea030222c3eb5fdbfe994edd7fafbfa80b5..be31f8a23cab23128042a14587b7657e57834a55 100644 (file)
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -11,7 +11,6 @@
 
 #ifdef CONFIG_SPL_BUILD
 /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
-#define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
 #define CFG_MALLOC_F_ADDR              0x182000