aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/configs/MPC837XERDB.h1
-rw-r--r--include/configs/P1010RDB.h2
-rw-r--r--include/configs/P2041RDB.h1
-rw-r--r--include/configs/SBx81LIFKW.h2
-rw-r--r--include/configs/SBx81LIFXCAT.h2
-rw-r--r--include/configs/T102xRDB.h1
-rw-r--r--include/configs/T104xRDB.h3
-rw-r--r--include/configs/T208xQDS.h1
-rw-r--r--include/configs/T208xRDB.h1
-rw-r--r--include/configs/T4240RDB.h1
-rw-r--r--include/configs/apalis_imx6.h1
-rw-r--r--include/configs/apple.h2
-rw-r--r--include/configs/bcmstb.h4
-rw-r--r--include/configs/capricorn-common.h6
-rw-r--r--include/configs/cgtqmx8.h3
-rw-r--r--include/configs/ci20.h3
-rw-r--r--include/configs/cm_fx6.h1
-rw-r--r--include/configs/colibri_imx6.h1
-rw-r--r--include/configs/corenet_ds.h1
-rw-r--r--include/configs/deneb.h3
-rw-r--r--include/configs/devkit3250.h1
-rw-r--r--include/configs/ebisu.h1
-rw-r--r--include/configs/etamin.h3
-rw-r--r--include/configs/ethernut5.h1
-rw-r--r--include/configs/evb_ast2500.h3
-rw-r--r--include/configs/evb_ast2600.h3
-rw-r--r--include/configs/exynos78x0-common.h17
-rw-r--r--include/configs/giedi.h3
-rw-r--r--include/configs/ib62x0.h7
-rw-r--r--include/configs/imx8mm-cl-iot-gate.h2
-rw-r--r--include/configs/imx8mm_beacon.h2
-rw-r--r--include/configs/imx8mm_evk.h2
-rw-r--r--include/configs/imx8mm_icore_mx8mm.h2
-rw-r--r--include/configs/imx8mm_venice.h2
-rw-r--r--include/configs/imx8mn_beacon.h3
-rw-r--r--include/configs/imx8mn_evk.h2
-rw-r--r--include/configs/imx8mp_evk.h2
-rw-r--r--include/configs/imx8mq_cm.h2
-rw-r--r--include/configs/imx8mq_evk.h6
-rw-r--r--include/configs/imx8mq_phanbell.h6
-rw-r--r--include/configs/imx8qm_mek.h5
-rw-r--r--include/configs/imx8qxp_mek.h5
-rw-r--r--include/configs/imx8ulp_evk.h3
-rw-r--r--include/configs/imxrt1020-evk.h1
-rw-r--r--include/configs/imxrt1050-evk.h1
-rw-r--r--include/configs/kmcent2.h1
-rw-r--r--include/configs/ls1012a2g5rdb.h2
-rw-r--r--include/configs/ls1012a_common.h5
-rw-r--r--include/configs/ls1012afrwy.h3
-rw-r--r--include/configs/ls1012aqds.h3
-rw-r--r--include/configs/ls1021aiot.h8
-rw-r--r--include/configs/ls1021aqds.h5
-rw-r--r--include/configs/ls1021atsn.h1
-rw-r--r--include/configs/ls1021atwr.h5
-rw-r--r--include/configs/ls1028a_common.h6
-rw-r--r--include/configs/ls1043a_common.h12
-rw-r--r--include/configs/ls1046a_common.h5
-rw-r--r--include/configs/ls1088a_common.h5
-rw-r--r--include/configs/ls1088aqds.h3
-rw-r--r--include/configs/ls2080a_common.h5
-rw-r--r--include/configs/ls2080aqds.h10
-rw-r--r--include/configs/ls2080ardb.h3
-rw-r--r--include/configs/lx2160a_common.h6
-rw-r--r--include/configs/mx6ullevk.h2
-rw-r--r--include/configs/nokia_rx51.h1
-rw-r--r--include/configs/nsa310s.h5
-rw-r--r--include/configs/octeontx2_common.h2
-rw-r--r--include/configs/octeontx_common.h6
-rw-r--r--include/configs/odroid.h1
-rw-r--r--include/configs/odroid_xu3.h2
-rw-r--r--include/configs/p1_p2_rdb_pc.h1
-rw-r--r--include/configs/p3450-0000.h2
-rw-r--r--include/configs/phycore_imx8mm.h2
-rw-r--r--include/configs/phycore_imx8mp.h2
-rw-r--r--include/configs/pico-imx8mq.h6
-rw-r--r--include/configs/presidio_asic.h2
-rw-r--r--include/configs/rk3036_common.h1
-rw-r--r--include/configs/rk3128_common.h1
-rw-r--r--include/configs/rk3188_common.h1
-rw-r--r--include/configs/rk322x_common.h1
-rw-r--r--include/configs/rk3288_common.h1
-rw-r--r--include/configs/rk3308_common.h1
-rw-r--r--include/configs/s5p4418_nanopi2.h10
-rw-r--r--include/configs/s5pc210_universal.h6
-rw-r--r--include/configs/salvator-x.h1
-rw-r--r--include/configs/sama5d2_icp.h5
-rw-r--r--include/configs/siemens-ccp-common.h19
-rw-r--r--include/configs/sifive-unleashed.h4
-rw-r--r--include/configs/sifive-unmatched.h4
-rw-r--r--include/configs/snapper9g45.h3
-rw-r--r--include/configs/socfpga_common.h4
-rw-r--r--include/configs/socfpga_soc64_common.h1
-rw-r--r--include/configs/tegra-common.h1
-rw-r--r--include/configs/trats.h1
-rw-r--r--include/configs/trats2.h1
-rw-r--r--include/configs/ulcb.h1
-rw-r--r--include/configs/verdin-imx8mm.h2
-rw-r--r--include/configs/vexpress_common.h2
-rw-r--r--include/configs/vinco.h2
-rw-r--r--include/configs/vocore2.h1
-rw-r--r--include/configs/work_92105.h2
-rw-r--r--include/configs/xea.h4
-rw-r--r--include/configs/xenguest_arm64.h11
-rw-r--r--include/configs/zynq-common.h1
104 files changed, 0 insertions, 339 deletions
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 1cf36705331..9aeab7097ae 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -326,7 +326,6 @@
*/
#define CONFIG_HAS_FSL_DR_USB
-#define CONFIG_USB_EHCI_FSL
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_NETDEV "eth1"
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index d36a8e2dc84..e09b9a4187f 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -110,7 +110,6 @@
#endif
/* High Level Configuration Options */
-#define CONFIG_SYS_HAS_SERDES /* common SERDES init code */
#if defined(CONFIG_PCI)
#define CONFIG_PCIE1 /* PCIE controller 1 (slot 1) */
@@ -573,7 +572,6 @@ extern unsigned long get_sdram_size(void);
#if defined(CONFIG_HAS_FSL_DR_USB)
#ifdef CONFIG_USB_EHCI_HCD
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-#define CONFIG_USB_EHCI_FSL
#endif
#endif
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index ef4bb0b7b0c..d217a9545a8 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -395,7 +395,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_HAS_FSL_MPH_USB
#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
-#define CONFIG_USB_EHCI_FSL
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#endif
diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index bf9f26ea999..782b16f30fa 100644
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -24,7 +24,6 @@
/*
* NS16550 Configuration
*/
-#define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE (-4)
#define CONFIG_SYS_NS16550_CLK CONFIG_SYS_TCLK
@@ -61,7 +60,6 @@
* Ethernet Driver configuration
*/
#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE /* Enable kirkwood Gbe Controller Driver */
#define CONFIG_MVGBE_PORTS {1, 0} /* enable a single port */
#define CONFIG_PHY_BASE_ADR 0x01
#endif /* CONFIG_CMD_NET */
diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h
index 71394aea22c..e4666e1e7e3 100644
--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -24,7 +24,6 @@
/*
* NS16550 Configuration
*/
-#define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE (-4)
#define CONFIG_SYS_NS16550_CLK CONFIG_SYS_TCLK
@@ -66,7 +65,6 @@
* Ethernet Driver configuration
*/
#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE /* Enable kirkwood Gbe Controller Driver */
#define CONFIG_MVGBE_PORTS {1, 0} /* enable a single port */
#define CONFIG_PHY_BASE_ADR 0x01
#endif /* CONFIG_CMD_NET */
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index faeba06cd24..b543b8647a8 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -452,7 +452,6 @@ unsigned long get_board_sys_clk(void);
#define CONFIG_HAS_FSL_DR_USB
#ifdef CONFIG_HAS_FSL_DR_USB
-#define CONFIG_USB_EHCI_FSL
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#endif
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index e70209231d1..a0db427f87e 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -460,7 +460,6 @@
#ifdef CONFIG_HAS_FSL_DR_USB
#ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_USB_EHCI_FSL
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#endif
#endif
@@ -499,8 +498,6 @@
#define CONFIG_SYS_DPAA_FMAN
#define CONFIG_SYS_DPAA_PME
-#define CONFIG_U_QE
-
#define CONFIG_SYS_FDT_PAD (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
#endif /* CONFIG_NOBQFMAN */
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 7344f9392b9..bfd06a51cf3 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -517,7 +517,6 @@ unsigned long get_board_sys_clk(void);
* USB
*/
#ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_USB_EHCI_FSL
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_HAS_FSL_DR_USB
#endif
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 979a997c73c..afd9367b578 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -472,7 +472,6 @@ unsigned long get_board_sys_clk(void);
* USB
*/
#ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_USB_EHCI_FSL
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_HAS_FSL_DR_USB
#endif
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 12a11e260b5..9c412ec64c9 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -498,7 +498,6 @@ unsigned long get_board_sys_clk(void);
/*
* USB
*/
-#define CONFIG_USB_EHCI_FSL
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_HAS_FSL_DR_USB
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index dfed1615b9b..13c8d8a54e5 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -45,7 +45,6 @@
#define CONFIG_USBD_HS
/* Framebuffer and LCD */
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IMX_HDMI
diff --git a/include/configs/apple.h b/include/configs/apple.h
index b1f60431746..9cf20fc833f 100644
--- a/include/configs/apple.h
+++ b/include/configs/apple.h
@@ -5,8 +5,6 @@
#define CONFIG_SYS_SDRAM_BASE 0x880000000
-#define CONFIG_LNX_KRNL_IMG_TEXT_OFFSET_BASE CONFIG_SYS_TEXT_BASE
-
/* Environment */
#define ENV_DEVICE_SETTINGS \
"stdin=serial,usbkbd\0" \
diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h
index e7f380b5155..98c815961c0 100644
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -90,7 +90,6 @@ extern phys_addr_t prior_stage_fdt_address;
/*
* CONFIG_SYS_LOAD_ADDR - 1 MiB.
*/
-#define CONFIG_SYS_FDT_SAVE_ADDRESS 0x1f00000
#define CONFIG_SYS_CBSIZE 512
#define CONFIG_SYS_MAXARGS 32
@@ -104,7 +103,6 @@ extern phys_addr_t prior_stage_fdt_address;
*/
#define V_NS16550_CLK 81000000
-#define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE (-4)
#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
@@ -126,8 +124,6 @@ extern phys_addr_t prior_stage_fdt_address;
/*
* Flash configuration.
*/
-#define CONFIG_SPI_FLASH_STMICRO
-#define CONFIG_SPI_FLASH_MACRONIX
/*
* Filesystem configuration.
diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index e42f2b544c9..729c6a2ea34 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -11,15 +11,12 @@
#include <asm/arch/imx-regs.h>
#include "siemens-env-common.h"
-#include "siemens-ccp-common.h"
/* SPL config */
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SPL_MAX_SIZE (124 * 1024)
#define CONFIG_SYS_MONITOR_LEN (1024 * 1024)
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x800
#define CONFIG_SPL_STACK 0x013E000
#define CONFIG_SPL_BSS_START_ADDR 0x00128000
@@ -35,9 +32,6 @@
#define CONFIG_FACTORYSET
-#undef CONFIG_IDENT_STRING
-#define CONFIG_IDENT_STRING GENERATE_CCP_VERSION("01", "07")
-
#define CONFIG_REMAKE_ELF
/* ENET Config */
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index 220eb819100..36ca4715204 100644
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -14,8 +14,6 @@
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SPL_MAX_SIZE (124 * 1024)
#define CONFIG_SYS_MONITOR_LEN (1024 * 1024)
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x800
#define CONFIG_SPL_STACK 0x013E000
#define CONFIG_SPL_BSS_START_ADDR 0x00128000
@@ -33,7 +31,6 @@
#define CONFIG_REMAKE_ELF
/* Flat Device Tree Definitions */
-#define CONFIG_OF_BOARD_SETUP
#define CONFIG_SYS_BOOTMAPSZ (256 << 20)
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
diff --git a/include/configs/ci20.h b/include/configs/ci20.h
index 0a7043a80c5..17954fe3aab 100644
--- a/include/configs/ci20.h
+++ b/include/configs/ci20.h
@@ -35,7 +35,6 @@
#define CONFIG_SYS_MAXARGS 32 /* Max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot argument buffer size */
-#define CONFIG_VERSION_VARIABLE /* U-BOOT version */
/* Miscellaneous configuration options */
#define CONFIG_SYS_BOOTM_LEN (64 << 20)
@@ -50,6 +49,4 @@
#define CONFIG_SPL_START_S_PATH "arch/mips/mach-jz47xx"
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x1c /* 14 KiB offset */
-
#endif /* __CONFIG_CI20_H__ */
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index d61d759092c..e1723c927fa 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -13,7 +13,6 @@
#include "mx6_common.h"
/* Machine config */
-#define CONFIG_SYS_LITTLE_ENDIAN
/* MMC */
#define CONFIG_SYS_FSL_USDHC_NUM 3
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index b103186bf46..9a6f17f5bd2 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -35,7 +35,6 @@
#define CONFIG_USBD_HS
/* Framebuffer and LCD */
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IMX_HDMI
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index a04e7f98b9d..95383420d5b 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -392,7 +392,6 @@
#define CONFIG_HAS_FSL_MPH_USB
#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
-#define CONFIG_USB_EHCI_FSL
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#endif
diff --git a/include/configs/deneb.h b/include/configs/deneb.h
index a33165c1caa..f155bb8bf50 100644
--- a/include/configs/deneb.h
+++ b/include/configs/deneb.h
@@ -9,9 +9,6 @@
#include "capricorn-common.h"
-#undef CONFIG_IDENT_STRING
-#define CONFIG_IDENT_STRING GENERATE_CCP_VERSION("01", "06")
-
/* DDR3 board total DDR is 2 GB */
#undef PHYS_SDRAM_1_SIZE
#define PHYS_SDRAM_1_SIZE 0x80000000 /* 2 GB */
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 7fbe9dff96d..1e24d05bfb8 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -28,7 +28,6 @@
/*
* GPIO
*/
-#define CONFIG_LPC32XX_GPIO
/*
* Ethernet
diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h
index 48d4c8a9480..081d5e9aaa6 100644
--- a/include/configs/ebisu.h
+++ b/include/configs/ebisu.h
@@ -25,7 +25,6 @@
#define CONFIG_FLASH_SHOW_PROGRESS 45
#define CONFIG_SYS_FLASH_QUIET_TEST
#define CONFIG_SYS_FLASH_BANKS_LIST { 0x08000000 }
-#define CONFIG_SYS_FLASH_CFI
#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1
#define CONFIG_SYS_MAX_FLASH_SECT 256
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 55700861711..dc83ab71908 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -84,9 +84,6 @@
*/
/* nedded by compliance test in read mode */
-#if defined(CONFIG_SPL_CMT)
-#define CONFIG_SYS_DCACHE_OFF
-#endif
/* Define own nand partitions */
#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index f9a739ede0c..75409a4ecca 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -66,7 +66,6 @@
/* MMC */
#ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_ATMEL_MCI
#define CONFIG_SYS_MMC_CD_PIN AT91_PIO_PORTC, 8
#endif
diff --git a/include/configs/evb_ast2500.h b/include/configs/evb_ast2500.h
index 558d6f9452c..b109a151838 100644
--- a/include/configs/evb_ast2500.h
+++ b/include/configs/evb_ast2500.h
@@ -13,9 +13,6 @@
#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE
-/* Memory Info */
-#define CONFIG_SYS_LOAD_ADDR 0x83000000
-
/* Misc */
#define CONFIG_EXTRA_ENV_SETTINGS \
""
diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h
index 9049a9fc105..3c2155da46d 100644
--- a/include/configs/evb_ast2600.h
+++ b/include/configs/evb_ast2600.h
@@ -10,9 +10,6 @@
#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE
-/* Memory Info */
-#define CONFIG_SYS_LOAD_ADDR 0x83000000
-
/* Misc */
#define STR_HELPER(s) #s
#define STR(s) STR_HELPER(s)
diff --git a/include/configs/exynos78x0-common.h b/include/configs/exynos78x0-common.h
index 478a0c42b1d..8d3449f028c 100644
--- a/include/configs/exynos78x0-common.h
+++ b/include/configs/exynos78x0-common.h
@@ -67,23 +67,6 @@
#define PHYS_SDRAM_12 (CONFIG_SYS_SDRAM_BASE + (11 * SDRAM_BANK_SIZE))
#define PHYS_SDRAM_12_SIZE SDRAM_BANK_SIZE
-#define CONFIG_DEBUG_UART_CLOCK 132710400
-
-#define CONFIG_PREBOOT \
-"echo Read pressed buttons status;" \
-"KEY_VOLUMEUP=gpa20;" \
-"KEY_HOME=gpa17;" \
-"KEY_VOLUMEDOWN=gpa21;" \
-"KEY_POWER=gpa00;" \
-"PRESSED=0;" \
-"RELEASED=1;" \
-"if gpio input $KEY_VOLUMEUP; then setenv VOLUME_UP $PRESSED; " \
-"else setenv VOLUME_UP $RELEASED; fi;" \
-"if gpio input $KEY_VOLUMEDOWN; then setenv VOLUME_DOWN $PRESSED; " \
-"else setenv VOLUME_DOWN $RELEASED; fi;" \
-"if gpio input $KEY_HOME; then setenv HOME $PRESSED; else setenv HOME $RELEASED; fi;" \
-"if gpio input $KEY_POWER; then setenv POWER $PRESSED; else setenv POWER $RELEASED; fi;"
-
#ifndef MEM_LAYOUT_ENV_SETTINGS
#define MEM_LAYOUT_ENV_SETTINGS \
"bootm_size=0x10000000\0" \
diff --git a/include/configs/giedi.h b/include/configs/giedi.h
index dabb1fb1713..19a795bcf86 100644
--- a/include/configs/giedi.h
+++ b/include/configs/giedi.h
@@ -9,9 +9,6 @@
#include "capricorn-common.h"
-#undef CONFIG_IDENT_STRING
-#define CONFIG_IDENT_STRING GENERATE_CCP_VERSION("01", "07")
-
/* DDR3 board total DDR is 1 GB */
#undef PHYS_SDRAM_1_SIZE
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1 GB */
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index b03b45f837a..75bb073d4d8 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -50,11 +50,4 @@
#define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET
#endif /* CONFIG_IDE */
-/*
- * RTC driver configuration
- */
-#ifdef CONFIG_CMD_DATE
-#define CONFIG_RTC_MV
-#endif /* CONFIG_CMD_DATE */
-
#endif /* _CONFIG_IB62x0_H */
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 988058780f9..36e0a423fe7 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -14,8 +14,6 @@
#define CONFIG_SYS_BOOTM_LEN (32 * SZ_1M)
#define CONFIG_SPL_MAX_SIZE (148 * 1024)
#define CONFIG_SYS_MONITOR_LEN SZ_512K
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
index 5d91de3d1e5..519353bd47c 100644
--- a/include/configs/imx8mm_beacon.h
+++ b/include/configs/imx8mm_beacon.h
@@ -11,8 +11,6 @@
#define CONFIG_SPL_MAX_SIZE (148 * 1024)
#define CONFIG_SYS_MONITOR_LEN SZ_512K
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 167ca19f210..dcb627c4b95 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -13,8 +13,6 @@
#define CONFIG_SYS_BOOTM_LEN (64 * SZ_1M)
#define CONFIG_SPL_MAX_SIZE (148 * 1024)
#define CONFIG_SYS_MONITOR_LEN SZ_512K
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h
index 4b22ba10a02..4c9550a1f5a 100644
--- a/include/configs/imx8mm_icore_mx8mm.h
+++ b/include/configs/imx8mm_icore_mx8mm.h
@@ -12,8 +12,6 @@
#define CONFIG_SPL_MAX_SIZE (148 * 1024)
#define CONFIG_SYS_MONITOR_LEN SZ_512K
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index f8d41425c6f..28d2b719335 100644
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -11,8 +11,6 @@
#define CONFIG_SPL_MAX_SIZE (148 * 1024)
#define CONFIG_SYS_MONITOR_LEN SZ_512K
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h
index 438a3820c74..63e8f5e23a8 100644
--- a/include/configs/imx8mn_beacon.h
+++ b/include/configs/imx8mn_beacon.h
@@ -11,9 +11,6 @@
#define CONFIG_SPL_MAX_SIZE (148 * SZ_1K)
#define CONFIG_SYS_MONITOR_LEN SZ_512K
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index ab893214921..da66ab4dbf8 100644
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -14,8 +14,6 @@
#define CONFIG_SPL_MAX_SIZE (148 * 1024)
#define CONFIG_SYS_MONITOR_LEN SZ_512K
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index 30cce1a49e2..267a40bf81d 100644
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -14,8 +14,6 @@
#define CONFIG_SPL_MAX_SIZE (152 * 1024)
#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300
#define CONFIG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
#ifdef CONFIG_SPL_BUILD
diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index 7206c08a8c9..938b13c845b 100644
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -14,8 +14,6 @@
#define CONFIG_SPL_MAX_SIZE (124 * 1024)
#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SPL_STACK 0x187FF0
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 49a9526d96e..8242fdb37a6 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -14,8 +14,6 @@
#define CONFIG_SPL_MAX_SIZE (124 * 1024)
#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300
#ifdef CONFIG_SPL_BUILD
/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
@@ -104,8 +102,4 @@
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
-#define CONFIG_MXC_GPIO
-
-#define CONFIG_OF_SYSTEM_SETUP
-
#endif
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 9f55b039f20..54922b8b1c2 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -11,8 +11,6 @@
#define CONFIG_SPL_MAX_SIZE (172 * 1024)
#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300
#ifdef CONFIG_SPL_BUILD
/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
@@ -136,8 +134,4 @@
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
-#define CONFIG_MXC_GPIO
-
-#define CONFIG_OF_SYSTEM_SETUP
-
#endif
diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index 6b8d9405f46..7f21e074ee8 100644
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -15,8 +15,6 @@
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SPL_MAX_SIZE (124 * 1024)
#define CONFIG_SYS_MONITOR_LEN (1024 * 1024)
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x800
#define CONFIG_SPL_STACK 0x013E000
#define CONFIG_SPL_BSS_START_ADDR 0x00128000
@@ -33,9 +31,6 @@
#define CONFIG_REMAKE_ELF
-/* Flat Device Tree Definitions */
-#define CONFIG_OF_BOARD_SETUP
-
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define USDHC1_BASE_ADDR 0x5B010000
#define USDHC2_BASE_ADDR 0x5B020000
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 76ef1241340..f93dbdfcead 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -13,8 +13,6 @@
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SPL_MAX_SIZE (124 * 1024)
#define CONFIG_SYS_MONITOR_LEN (1024 * 1024)
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x800
#define CONFIG_SPL_STACK 0x013E000
#define CONFIG_SPL_BSS_START_ADDR 0x00128000
@@ -31,9 +29,6 @@
#define CONFIG_REMAKE_ELF
-/* Flat Device Tree Definitions */
-#define CONFIG_OF_BOARD_SETUP
-
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define USDHC1_BASE_ADDR 0x5B010000
#define USDHC2_BASE_ADDR 0x5B020000
diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index 501f465b9e7..2a02815620d 100644
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -12,9 +12,6 @@
#define CONFIG_SYS_BOOTM_LEN (SZ_64M)
#define CONFIG_SPL_MAX_SIZE (148 * 1024)
#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
#define CONFIG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
#ifdef CONFIG_SPL_BUILD
diff --git a/include/configs/imxrt1020-evk.h b/include/configs/imxrt1020-evk.h
index 64c0f5eaf0b..79feab389e3 100644
--- a/include/configs/imxrt1020-evk.h
+++ b/include/configs/imxrt1020-evk.h
@@ -11,7 +11,6 @@
#define CONFIG_SYS_INIT_SP_ADDR 0x20240000
-#define CONFIG_SYS_FSL_ERRATUM_ESDHC135 1
#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE 1
#define PHYS_SDRAM 0x80000000
diff --git a/include/configs/imxrt1050-evk.h b/include/configs/imxrt1050-evk.h
index 99d25c1e6ef..241e87234fd 100644
--- a/include/configs/imxrt1050-evk.h
+++ b/include/configs/imxrt1050-evk.h
@@ -11,7 +11,6 @@
#define CONFIG_SYS_INIT_SP_ADDR 0x20280000
-#define CONFIG_SYS_FSL_ERRATUM_ESDHC135 1
#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE 1
#define PHYS_SDRAM 0x80000000
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 4dbd53c3877..24dc4c91228 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -362,7 +362,6 @@
* Retain non-DM serial port for debug purposes.
*/
#if !defined(CONFIG_DM_SERIAL)
-#define CONFIG_CONS_INDEX 1
#define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE 1
#define CONFIG_SYS_NS16550_CLK (get_bus_freq(0) / 2)
diff --git a/include/configs/ls1012a2g5rdb.h b/include/configs/ls1012a2g5rdb.h
index ffc23debb85..bda4283ef5a 100644
--- a/include/configs/ls1012a2g5rdb.h
+++ b/include/configs/ls1012a2g5rdb.h
@@ -14,8 +14,6 @@
#define CONFIG_SYS_SDRAM_SIZE 0x40000000
/* SATA */
-#define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
#define CONFIG_SCSI_AHCI_PLAT
#define CONFIG_SYS_SATA AHCI_BASE_ADDR
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 88986f973f7..7cbea269245 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -45,11 +45,6 @@
/* I2C */
/* GPIO */
-#ifdef CONFIG_DM_GPIO
-#ifndef CONFIG_MPC8XXX_GPIO
-#define CONFIG_MPC8XXX_GPIO
-#endif
-#endif
#define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE 1
diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h
index 391f0f3be72..c61865ccd4e 100644
--- a/include/configs/ls1012afrwy.h
+++ b/include/configs/ls1012afrwy.h
@@ -8,9 +8,6 @@
#include "ls1012a_common.h"
-#undef CONFIG_SYS_BOARD
-#define CONFIG_SYS_BOARD "ls1012afrwy"
-
/* Board Rev*/
#define BOARD_REV_A_B 0x0
#define BOARD_REV_C 0x00080000
diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index 98c04339af1..cbcb3f72a56 100644
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -75,19 +75,16 @@
DSPI_CTAR_PASC(0) | DSPI_CTAR_PDT(0) | \
DSPI_CTAR_CSSCK(2) | DSPI_CTAR_ASC(0) | \
DSPI_CTAR_DT(0))
-#define CONFIG_SPI_FLASH_SST /* cs1 */
#define CONFIG_SYS_DSPI_CTAR2 (DSPI_CTAR_TRSZ(7) | DSPI_CTAR_PCSSCK_1CLK |\
DSPI_CTAR_PASC(0) | DSPI_CTAR_PDT(0) | \
DSPI_CTAR_CSSCK(0) | DSPI_CTAR_ASC(0) | \
DSPI_CTAR_DT(0))
-#define CONFIG_SPI_FLASH_STMICRO /* cs2 */
#define CONFIG_SYS_DSPI_CTAR3 (DSPI_CTAR_TRSZ(7) | DSPI_CTAR_PCSSCK_1CLK |\
DSPI_CTAR_PASC(0) | DSPI_CTAR_PDT(0) | \
DSPI_CTAR_CSSCK(2) | DSPI_CTAR_ASC(0) | \
DSPI_CTAR_DT(0))
-#define CONFIG_SPI_FLASH_EON /* cs3 */
#define CONFIG_PCIE1 /* PCIE controller 1 */
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 222caa161d0..499dbe1c70d 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -48,8 +48,6 @@
#define SDRAM_CFG_BI 0x00000001
#ifdef CONFIG_SD_BOOT
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0xe8
-
#define CONFIG_SPL_MAX_SIZE 0x1a000
#define CONFIG_SPL_STACK 0x1001d000
#define CONFIG_SPL_PAD_TO 0x1c000
@@ -100,9 +98,6 @@
CONFIG_SYS_SCSI_MAX_LUN)
/* SPI */
-#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#define CONFIG_SPI_FLASH_SPANSION
-#endif
/*
* eTSEC
@@ -174,9 +169,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
#endif
-#define CONFIG_OF_BOARD_SETUP
-#define CONFIG_OF_STDOUT_VIA_ALIAS
-
#include <asm/fsl_secure_boot.h>
#endif
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 252e32f316c..1dfad1253ea 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -297,11 +297,6 @@ unsigned long get_board_sys_clk(void);
*/
/* GPIO */
-#ifdef CONFIG_DM_GPIO
-#ifndef CONFIG_MPC8XXX_GPIO
-#define CONFIG_MPC8XXX_GPIO
-#endif
-#endif
/* EEPROM */
#define CONFIG_SYS_I2C_EEPROM_NXID
diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index f70b6e94c07..3773a0a186b 100644
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -75,7 +75,6 @@
#endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */
#endif
-#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM 0x80000000
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index bbfee840014..6fae28e73cf 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -190,11 +190,6 @@
*/
/* GPIO */
-#ifdef CONFIG_DM_GPIO
-#ifndef CONFIG_MPC8XXX_GPIO
-#define CONFIG_MPC8XXX_GPIO
-#endif
-#endif
/* EEPROM */
#define CONFIG_SYS_I2C_EEPROM_NXID
diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h
index b4431806725..f47bc739843 100644
--- a/include/configs/ls1028a_common.h
+++ b/include/configs/ls1028a_common.h
@@ -7,7 +7,6 @@
#define __L1028A_COMMON_H
#define CONFIG_REMAKE_ELF
-#define CONFIG_MP
#include <asm/arch/stream_id_lsch3.h>
#include <asm/arch/config.h>
@@ -32,11 +31,6 @@
#define COUNTER_FREQUENCY 25000000 /* 25MHz */
/* GPIO */
-#ifdef CONFIG_DM_GPIO
-#ifndef CONFIG_MPC8XXX_GPIO
-#define CONFIG_MPC8XXX_GPIO
-#endif
-#endif
/* I2C */
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 0975c7416e9..3b4f822ecff 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -112,11 +112,6 @@
#endif
/* GPIO */
-#ifdef CONFIG_DM_GPIO
-#ifndef CONFIG_MPC8XXX_GPIO
-#define CONFIG_MPC8XXX_GPIO
-#endif
-#endif
/* IFC */
#ifndef SPL_NO_IFC
@@ -153,13 +148,6 @@
#endif
/* DSPI */
-#ifndef SPL_NO_DSPI
-#ifdef CONFIG_FSL_DSPI
-#define CONFIG_SPI_FLASH_STMICRO /* cs0 */
-#define CONFIG_SPI_FLASH_SST /* cs1 */
-#define CONFIG_SPI_FLASH_EON /* cs2 */
-#endif
-#endif
/* FMan ucode */
#ifndef SPL_NO_FMAN
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 515f4209bb9..d07d27d1f5c 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -110,11 +110,6 @@
#endif
/* GPIO */
-#ifdef CONFIG_DM_GPIO
-#ifndef CONFIG_MPC8XXX_GPIO
-#define CONFIG_MPC8XXX_GPIO
-#endif
-#endif
/* I2C */
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index 93edaaa103c..2e52108c23e 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -49,11 +49,6 @@
#define CPU_RELEASE_ADDR secondary_boot_addr
/* GPIO */
-#ifdef CONFIG_DM_GPIO
-#ifndef CONFIG_MPC8XXX_GPIO
-#define CONFIG_MPC8XXX_GPIO
-#endif
-#endif
/* I2C */
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index d001acfd68a..0c22fa98b9e 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -321,9 +321,6 @@ unsigned long get_board_sys_clk(void);
#define CONFIG_SYS_EEPROM_BUS_NUM 0
#ifdef CONFIG_FSL_DSPI
-#define CONFIG_SPI_FLASH_STMICRO
-#define CONFIG_SPI_FLASH_SST
-#define CONFIG_SPI_FLASH_EON
#if !defined(CONFIG_TFABOOT) && \
!defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
#endif
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index cd58ee54e43..eea6ce53db5 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -61,11 +61,6 @@
#define COUNTER_FREQUENCY 25000000 /* 25MHz */
/* GPIO */
-#ifdef CONFIG_DM_GPIO
-#ifndef CONFIG_MPC8XXX_GPIO
-#define CONFIG_MPC8XXX_GPIO
-#endif
-#endif
/* I2C */
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index e67dee0f00b..3fe0ce7bcfa 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -256,15 +256,7 @@ unsigned long get_board_sys_clk(void);
#define I2C_MUX_CH_DEFAULT 0x8
/* SPI */
-#ifdef CONFIG_FSL_DSPI
-#define CONFIG_SPI_FLASH_STMICRO
-#define CONFIG_SPI_FLASH_SST
-#define CONFIG_SPI_FLASH_EON
-#endif
-#ifdef CONFIG_FSL_QSPI
-#define CONFIG_SPI_FLASH_SPANSION
-#endif
/*
* Verify QSPI when boot from NAND, QIXIS brdcfg9 need configure.
* If boot from on-board NAND, ISO1 = 1, ISO2 = 0, IBOOT = 0
@@ -285,9 +277,7 @@ unsigned long get_board_sys_clk(void);
*/
#define RTC
#define CONFIG_RTC_DS3231 1
-#define CONFIG_RTC_ENABLE_32KHZ_OUTPUT
#define CONFIG_SYS_I2C_RTC_ADDR 0x68
-#define CONFIG_RTC_ENABLE_32KHZ_OUTPUT
/* EEPROM */
#define CONFIG_SYS_I2C_EEPROM_NXID
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 674d27ff8c5..50d6b03b3cc 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -258,9 +258,6 @@ unsigned long get_board_sys_clk(void);
#define I2C_MUX_CH_DEFAULT 0x8
/* SPI */
-#if defined(CONFIG_FSL_DSPI)
-#define CONFIG_SPI_FLASH_STMICRO
-#endif
/*
* RTC configuration
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index 0710004776e..7247736a0d2 100644
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -11,7 +11,6 @@
#include <asm/arch/soc.h>
#define CONFIG_REMAKE_ELF
-#define CONFIG_FSL_TZPC_BP147
#define CONFIG_FSL_MEMAC
#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE
@@ -129,11 +128,6 @@
#endif
/* GPIO */
-#ifdef CONFIG_DM_GPIO
-#ifndef CONFIG_MPC8XXX_GPIO
-#define CONFIG_MPC8XXX_GPIO
-#endif
-#endif
#ifndef __ASSEMBLY__
unsigned long get_board_sys_clk(void);
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index 5e857bd7057..e3f665fb81c 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -124,8 +124,6 @@
#define CONFIG_IOMUX_LPSR
-#define CONFIG_SOFT_SPI
-
#ifdef CONFIG_CMD_NET
#define CONFIG_FEC_ENET_DEV 1
#if (CONFIG_FEC_ENET_DEV == 0)
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index c575798bf06..081101941ad 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -21,7 +21,6 @@
/*
* High Level Configuration Options
*/
-#define CONFIG_SYS_L2CACHE_OFF /* pretend there is no L2 CACHE */
#include <asm/arch/cpu.h> /* get chip and board defs */
#include <asm/arch/omap.h>
diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index cf52a6d0f06..54f496f6ce1 100644
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -41,9 +41,4 @@
#define CONFIG_LBA48
#endif /* CONFIG_SATA */
-/* RTC driver configuration */
-#ifdef CONFIG_CMD_DATE
-#define CONFIG_RTC_MV
-#endif /* CONFIG_CMD_DATE */
-
#endif /* _CONFIG_NSA310S_H */
diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h
index bc21b795cf6..620bf884c52 100644
--- a/include/configs/octeontx2_common.h
+++ b/include/configs/octeontx2_common.h
@@ -7,8 +7,6 @@
#ifndef __OCTEONTX2_COMMON_H__
#define __OCTEONTX2_COMMON_H__
-#define CONFIG_SUPPORT_RAW_INITRD
-
/** Maximum size of image supported for bootm (and bootable FIT images) */
#define CONFIG_SYS_BOOTM_LEN (256 << 20)
diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h
index 46908be32a3..39e0d19cb74 100644
--- a/include/configs/octeontx_common.h
+++ b/include/configs/octeontx_common.h
@@ -61,12 +61,6 @@
# define CONFIG_SYS_64BIT_LBA
#endif
-/***** SPI Defines *********/
-#ifdef CONFIG_DM_SPI_FLASH
-# define CONFIG_SF_DEFAULT_BUS 0
-# define CONFIG_SF_DEFAULT_CS 0
-#endif
-
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /** Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 1a63f46160f..ed9b41d179d 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -13,7 +13,6 @@
#include <configs/exynos4-common.h>
-#define CONFIG_SYS_L2CACHE_OFF
#ifndef CONFIG_SYS_L2CACHE_OFF
#define CONFIG_SYS_L2_PL310
#define CONFIG_SYS_PL310_BASE 0x10502000
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 70481b5d0c8..a4825982a89 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -80,8 +80,6 @@
* Need to override existing one (smdk5420) with odroid so set_board_info will
* use proper prefix when creating full board_name (SYS_BOARD + type)
*/
-#undef CONFIG_SYS_BOARD
-#define CONFIG_SYS_BOARD "odroid"
/* Define new extra env settings, including DFU settings */
#undef CONFIG_EXTRA_ENV_SETTINGS
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 365f61bef88..a2958e78e4c 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -534,7 +534,6 @@
#if defined(CONFIG_HAS_FSL_DR_USB)
#ifdef CONFIG_USB_EHCI_HCD
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-#define CONFIG_USB_EHCI_FSL
#endif
#endif
diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h
index bc3dc81cb73..b03d3a433b7 100644
--- a/include/configs/p3450-0000.h
+++ b/include/configs/p3450-0000.h
@@ -26,8 +26,6 @@
/* Environment at end of QSPI, in the VER partition */
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
-#define CONFIG_PREBOOT
-
#define BOARD_EXTRA_ENV_SETTINGS \
"preboot=if test -e mmc 1:1 /u-boot-preboot.scr; then " \
"load mmc 1:1 ${scriptaddr} /u-boot-preboot.scr; " \
diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h
index a9797362a8c..d1d3d458ce9 100644
--- a/include/configs/phycore_imx8mm.h
+++ b/include/configs/phycore_imx8mm.h
@@ -14,8 +14,6 @@
#define CONFIG_SYS_BOOTM_LEN SZ_64M
#define CONFIG_SPL_MAX_SIZE (148 * SZ_1K)
#define CONFIG_SYS_MONITOR_LEN SZ_512K
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h
index 7ca3965fc61..7a15edd10fb 100644
--- a/include/configs/phycore_imx8mp.h
+++ b/include/configs/phycore_imx8mp.h
@@ -14,8 +14,6 @@
#define CONFIG_SPL_MAX_SIZE (152 * SZ_1K)
#define CONFIG_SYS_MONITOR_LEN SZ_512K
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index f1b406f0a8b..cd0116d28f8 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -11,8 +11,6 @@
#define CONFIG_SPL_MAX_SIZE (124 * 1024)
#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300
#ifdef CONFIG_SPL_BUILD
/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
@@ -115,10 +113,6 @@
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
-#define CONFIG_MXC_GPIO
-
-#define CONFIG_OF_SYSTEM_SETUP
-
#define CONFIG_SYS_BOOTM_LEN SZ_128M
#endif
diff --git a/include/configs/presidio_asic.h b/include/configs/presidio_asic.h
index 3df51437ca2..928ccb1e18a 100644
--- a/include/configs/presidio_asic.h
+++ b/include/configs/presidio_asic.h
@@ -10,8 +10,6 @@
#define CONFIG_REMAKE_ELF
-#define CONFIG_SUPPORT_RAW_INITRD
-
#define CONFIG_SYS_INIT_SP_ADDR 0x00100000
#define CONFIG_SYS_BOOTM_LEN 0x00c00000
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index b133d8ec48b..00c453d739d 100644
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -12,7 +12,6 @@
#define CONFIG_ROCKCHIP_STIMER_BASE 0x200440a0
#define COUNTER_FREQUENCY 24000000
-#define CONFIG_SYS_ARCH_TIMER
#define CONFIG_SYS_HZ_CLOCK 24000000
#define CONFIG_SYS_INIT_SP_ADDR 0x60100000
diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h
index 8b7a0bbbca1..97caceacfe6 100644
--- a/include/configs/rk3128_common.h
+++ b/include/configs/rk3128_common.h
@@ -13,7 +13,6 @@
#define CONFIG_ROCKCHIP_STIMER_BASE 0x200440a0
#define COUNTER_FREQUENCY 24000000
-#define CONFIG_SYS_ARCH_TIMER
#define CONFIG_SYS_HZ_CLOCK 24000000
#define CONFIG_IRAM_BASE 0x10080000
diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
index e7c09645ec6..7449e816b7d 100644
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -22,7 +22,6 @@
/* spl size 32kb sram - 2kb bootrom */
#define CONFIG_SPL_MAX_SIZE (0x8000 - 0x800)
-#define CONFIG_ROCKCHIP_SERIAL 1
#define CONFIG_SPL_STACK 0x10087fff
diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
index a46b1ffe865..ef55ef0a83b 100644
--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@@ -13,7 +13,6 @@
#define CONFIG_ROCKCHIP_STIMER_BASE 0x110d0020
#define COUNTER_FREQUENCY 24000000
-#define CONFIG_SYS_ARCH_TIMER
#define CONFIG_SYS_HZ_CLOCK 24000000
#define CONFIG_SYS_INIT_SP_ADDR 0x61100000
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index abbb27395e6..490da7cb23b 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -15,7 +15,6 @@
#define CONFIG_ROCKCHIP_STIMER_BASE 0xff810020
#define COUNTER_FREQUENCY 24000000
-#define CONFIG_SYS_ARCH_TIMER
#define CONFIG_SYS_HZ_CLOCK 24000000
#ifdef CONFIG_SPL_ROCKCHIP_BACK_TO_BROM
diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h
index 496f4628d34..1664707ca65 100644
--- a/include/configs/rk3308_common.h
+++ b/include/configs/rk3308_common.h
@@ -12,7 +12,6 @@
#define CONFIG_SPL_MAX_SIZE 0x20000
#define CONFIG_SPL_BSS_START_ADDR 0x00400000
#define CONFIG_SPL_BSS_MAX_SIZE 0x2000
-#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000
#define CONFIG_SYS_NS16550_MEM32
diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h
index 2e94613c37a..207ad007663 100644
--- a/include/configs/s5p4418_nanopi2.h
+++ b/include/configs/s5p4418_nanopi2.h
@@ -104,16 +104,6 @@
(void *)PHY_BASEADDR_UART3}
/*-----------------------------------------------------------------------
- * PLL
- */
-#define CONFIG_SYS_PLLFIN 24000000UL
-
-/*-----------------------------------------------------------------------
- * Timer
- */
-#define CONFIG_TIMER_SYS_TICK_CH 0
-
-/*-----------------------------------------------------------------------
* BACKLIGHT
*/
#ifndef CONFIG_S5P4418_ONEWIRE
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 680f6ce60be..29adab33924 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -14,7 +14,6 @@
#define CONFIG_TIZEN /* TIZEN lib */
/* Keep L2 Cache Disabled */
-#define CONFIG_SYS_L2CACHE_OFF 1
/* Universal has 2 banks of DRAM */
#define CONFIG_SYS_SDRAM_BASE 0x40000000
@@ -104,11 +103,6 @@
#define CONFIG_USB_GADGET_DWC2_OTG_PHY
-/*
- * SPI Settings
- */
-#define CONFIG_SOFT_SPI
-
#ifndef __ASSEMBLY__
void universal_spi_scl(int bit);
void universal_spi_sda(int bit);
diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
index 1eafff10ff3..c29b34e231a 100644
--- a/include/configs/salvator-x.h
+++ b/include/configs/salvator-x.h
@@ -23,7 +23,6 @@
#define CONFIG_FLASH_SHOW_PROGRESS 45
#define CONFIG_SYS_FLASH_QUIET_TEST
#define CONFIG_SYS_FLASH_BANKS_LIST { 0x08000000 }
-#define CONFIG_SYS_FLASH_CFI
#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1
#define CONFIG_SYS_MAX_FLASH_SECT 256
diff --git a/include/configs/sama5d2_icp.h b/include/configs/sama5d2_icp.h
index a62a5fa4183..c3a5c2ae323 100644
--- a/include/configs/sama5d2_icp.h
+++ b/include/configs/sama5d2_icp.h
@@ -25,11 +25,6 @@
(CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
#endif
-/* NAND flash */
-
-/* SPI flash */
-#define CONFIG_SF_DEFAULT_SPEED 66000000
-
#ifdef CONFIG_SD_BOOT
/* u-boot env in sd/mmc card */
#define FAT_ENV_INTERFACE "mmc"
diff --git a/include/configs/siemens-ccp-common.h b/include/configs/siemens-ccp-common.h
deleted file mode 100644
index 01051c8ad7d..00000000000
--- a/include/configs/siemens-ccp-common.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/* Be very careful updating CONFIG_IDENT_STRING
- * This string will control the update flow whether an U-Boot should be
- * updated or not. If the version of installed U-Boot (in flash) is smaller
- * than the version to be installed (from update file), an update will
- * be performed.
- *
- * General rules:
- * 1. First 4 characters ' ##v' or IDENT_MAGIC represent kind of a magic number
- * to identify the following strings after easily. Don't change them!
- *
- * 2. First 2 digits after 'v' or CCP_MAJOR are updated with U-Boot version
- * change, e.g. from 2015.04 to 2018.03
- *
- * 3. Second 2 digits after '.' or CCP_MINOR are updated if we want to upgrade
- * U-Boot within an U-Boot version.
- */
-#define CCP_IDENT_MAGIC " ##v"
-#define GENERATE_CCP_VERSION(MAJOR, MINOR) CCP_IDENT_MAGIC MAJOR "." MINOR
diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h
index 85356789eff..920f3140f64 100644
--- a/include/configs/sifive-unleashed.h
+++ b/include/configs/sifive-unleashed.h
@@ -74,10 +74,6 @@
"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
BOOTENV \
BOOTENV_SF
-
-#define CONFIG_PREBOOT \
- "setenv fdt_addr ${fdtcontroladdr};" \
- "fdt addr ${fdtcontroladdr};"
#endif
#endif /* __CONFIG_H */
diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h
index f68d7d7676f..574821cdeac 100644
--- a/include/configs/sifive-unmatched.h
+++ b/include/configs/sifive-unmatched.h
@@ -72,10 +72,6 @@
"partitions=" PARTS_DEFAULT "\0" \
"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
BOOTENV
-
-#define CONFIG_PREBOOT \
- "setenv fdt_addr ${fdtcontroladdr};" \
- "fdt addr ${fdtcontroladdr};"
#endif /* CONFIG_SPL_BUILD */
#define CONFIG_SYS_EEPROM_BUS_NUM 0
diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index de918e76803..3889a88ae98 100644
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -45,9 +45,6 @@
#define CONFIG_AT91_WANTS_COMMON_PHY
#define CONFIG_TFTP_PORT
-/* MMC */
-#define CONFIG_GENERIC_ATMEL_MCI
-
/* LCD */
#define CONFIG_ATMEL_LCD
#define CONFIG_GURNARD_SPLASH
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 31f95f52f8c..155aece4c31 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -187,10 +187,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
#if defined(CONFIG_SPL_FS_FAT) || defined(CONFIG_SPL_FS_EXT4)
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#endif
-#else
-#ifndef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION 1
-#endif
#endif
/* SPL QSPI boot support */
diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index 4d7072c4dbf..aa2c0324767 100644
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -60,7 +60,6 @@
/* Flash device info */
#ifndef CONFIG_SPL_BUILD
-#define CONFIG_MTD_PARTITIONS
#define MTDIDS_DEFAULT "nor0=ff705000.spi.0"
#endif /* CONFIG_SPL_BUILD */
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 673056ce517..99b7bd07aa0 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -12,7 +12,6 @@
/*
* High Level Configuration Options
*/
-#define CONFIG_SYS_L2CACHE_OFF /* No L2 cache */
#include <asm/arch/tegra.h> /* get chip and board defs */
diff --git a/include/configs/trats.h b/include/configs/trats.h
index d34b9e8e6cd..5217400b6bd 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -15,7 +15,6 @@
#define CONFIG_TIZEN /* TIZEN lib */
-#define CONFIG_SYS_L2CACHE_OFF
#ifndef CONFIG_SYS_L2CACHE_OFF
#define CONFIG_SYS_L2_PL310
#define CONFIG_SYS_PL310_BASE 0x10502000
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 32e7b91de9e..8d4b782372c 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -14,7 +14,6 @@
#define CONFIG_TIZEN /* TIZEN lib */
-#define CONFIG_SYS_L2CACHE_OFF
#ifndef CONFIG_SYS_L2CACHE_OFF
#define CONFIG_SYS_L2_PL310
#define CONFIG_SYS_PL310_BASE 0x10502000
diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h
index 1ce844f4920..bdd6b4b0d93 100644
--- a/include/configs/ulcb.h
+++ b/include/configs/ulcb.h
@@ -23,7 +23,6 @@
#define CONFIG_FLASH_SHOW_PROGRESS 45
#define CONFIG_SYS_FLASH_QUIET_TEST
#define CONFIG_SYS_FLASH_BANKS_LIST { 0x08000000 }
-#define CONFIG_SYS_FLASH_CFI
#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1
#define CONFIG_SYS_MAX_FLASH_SECT 256
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 7fbec270bff..36bbf704cdb 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -11,8 +11,6 @@
#define CONFIG_SPL_MAX_SIZE (148 * 1024)
#define CONFIG_SYS_MONITOR_LEN SZ_512K
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 990f5ed5470..91d50bc4a00 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -109,8 +109,6 @@
/* Board info register */
#define SYS_ID V2M_SYSREGS
-#define CONFIG_SYS_L2CACHE_OFF 1
-
#define SCTL_BASE V2M_SYSCTL
#define VEXPRESS_FLASHPROG_FLVPPEN (1 << 0)
diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 49679312e4c..7bd48820ed3 100644
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -34,13 +34,11 @@
#ifdef CONFIG_CMD_SF
#define CONFIG_ATMEL_SPI0
-#define CONFIG_SPI_FLASH_STMICRO
#endif
/* MMC */
#ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_ATMEL_MCI
#define ATMEL_BASE_MMCI 0xfc000000
#define CONFIG_SYS_MMC_CLK_OD 500000
diff --git a/include/configs/vocore2.h b/include/configs/vocore2.h
index 58888d4caf0..c60da8ac123 100644
--- a/include/configs/vocore2.h
+++ b/include/configs/vocore2.h
@@ -30,7 +30,6 @@
#define CONFIG_SYS_NS16550_CLK 40000000
#define CONFIG_SYS_NS16550_REG_SIZE -4
#define CONFIG_SYS_NS16550_COM3 0xb0000e00
-#define CONFIG_CONS_INDEX 3
/* RAM */
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index a45d3b4547b..9223aee5c16 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -64,8 +64,6 @@
* GPIO
*/
-#define CONFIG_LPC32XX_GPIO
-
/*
* Environment
*/
diff --git a/include/configs/xea.h b/include/configs/xea.h
index 5b968f0820c..aa48bb92631 100644
--- a/include/configs/xea.h
+++ b/include/configs/xea.h
@@ -29,10 +29,6 @@
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (SZ_32K / 0x200)
#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR (SZ_1M / 0x200)
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_SPI_FLASH_MTD
-#endif
-
/* Memory configuration */
#define PHYS_SDRAM_1 0x40000000 /* Base address */
#define PHYS_SDRAM_1_SIZE 0x10000000 /* Max 256 MB RAM */
diff --git a/include/configs/xenguest_arm64.h b/include/configs/xenguest_arm64.h
index c5e3d1678d0..408c7b5dd69 100644
--- a/include/configs/xenguest_arm64.h
+++ b/include/configs/xenguest_arm64.h
@@ -11,17 +11,8 @@
#define CONFIG_EXTRA_ENV_SETTINGS
-#undef CONFIG_NR_DRAM_BANKS
#undef CONFIG_SYS_SDRAM_BASE
-#define CONFIG_NR_DRAM_BANKS 1
-
-/*
- * This can be any arbitrary address as we are using PIE, but
- * please note, that CONFIG_SYS_TEXT_BASE must match the below.
- */
-#define CONFIG_LNX_KRNL_IMG_TEXT_OFFSET_BASE CONFIG_SYS_LOAD_ADDR
-
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_MAXARGS 64
@@ -29,8 +20,6 @@
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_OF_SYSTEM_SETUP
-
#undef CONFIG_EXTRA_ENV_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadimage=ext4load pvblock 0 0x90000000 /boot/Image;\0" \
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 4de2f94b040..8f8a9c7479c 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -17,7 +17,6 @@
#define CONFIG_REMAKE_ELF
/* Cache options */
-#define CONFIG_SYS_L2CACHE_OFF
#ifndef CONFIG_SYS_L2CACHE_OFF
# define CONFIG_SYS_L2_PL310
# define CONFIG_SYS_PL310_BASE 0xf8f02000