[PATCH 21/41] global: Remove unused CONFIG symbols
Tom Rini
trini at konsulko.com
Fri Dec 2 22:42:31 CET 2022
This removes the following unreferenced CONFIG symbols:
CONFIG_FDTADDR
CONFIG_FDTFILE
CONFIG_FLASH_SECTOR_SIZE
CONFIG_FSL_CPLD
CONFIG_HDMI_ENCODER_I2C_ADDR
CONFIG_I2C_MVTWSI
CONFIG_I2C_RTC_ADDR
CONFIG_IRAM_END
CONFIG_IRAM_SIZE
CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
CONFIG_L1_INIT_RAM
CONFIG_MACB_SEARCH_PHY
CONFIG_MIU_2BIT_21_7_INTERLEAVED
CONFIG_MTD_NAND_VERIFY_WRITE
CONFIG_MVGBE_PORTS
CONFIG_NETDEV
CONFIG_NUM_DSP_CPUS
CONFIG_PHY_BASE_ADR
CONFIG_PHY_INTERFACE_MODE
CONFIG_PSRAM_SCFG
CONFIG_RAMBOOT_SPIFLASH
CONFIG_RAMBOOT_TEXT_BASE
CONFIG_RD_LVL
CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
CONFIG_SETUP_INITRD_TAG
CONFIG_SH_QSPI_BASE
CONFIG_SMDK5420
CONFIG_SOCRATES
CONFIG_SPI_ADDR
CONFIG_SPI_FLASH_QUAD
CONFIG_SPI_FLASH_SIZE
CONFIG_SPI_HALF_DUPLEX
CONFIG_SPI_N25Q256A_RESET
CONFIG_TEGRA_SLINK_CTRLS
CONFIG_TPM_TIS_BASE_ADDRESS
CONFIG_UBOOT_SECTOR_COUNT
CONFIG_UBOOT_SECTOR_START
CONFIG_VAR_SIZE_SPL
CONFIG_VERY_BIG_RAM
And also:
BL1_SIZE
PHY_NO
RESERVE_BLOCK_SIZE
Signed-off-by: Tom Rini <trini at konsulko.com>
---
README | 11 -----------
arch/arm/include/asm/arch-ls102xa/config.h | 1 -
arch/arm/mach-mvebu/include/mach/config.h | 9 ---------
arch/powerpc/include/asm/config_mpc85xx.h | 1 -
arch/xtensa/include/asm/config.h | 1 -
board/Marvell/openrd/openrd.c | 2 +-
drivers/net/mvgbe.c | 4 ----
drivers/net/mvgbe.h | 7 -------
drivers/ram/mpc83xx_sdram.c | 7 +------
include/configs/MPC837XERDB.h | 8 +++-----
include/configs/P1010RDB.h | 1 -
include/configs/P2041RDB.h | 9 ++-------
include/configs/SBx81LIFKW.h | 9 ---------
include/configs/SBx81LIFXCAT.h | 9 ---------
include/configs/T102xRDB.h | 2 --
include/configs/T104xRDB.h | 4 ----
include/configs/T208xQDS.h | 2 --
include/configs/T208xRDB.h | 2 --
include/configs/T4240RDB.h | 3 ---
include/configs/alt.h | 3 ---
include/configs/ax25-ae350.h | 3 ---
include/configs/beaver.h | 4 ----
include/configs/blanche.h | 4 +---
include/configs/cardhu.h | 4 ----
include/configs/cei-tk1-som.h | 3 ---
include/configs/colibri_vf.h | 4 ----
include/configs/dalmore.h | 3 ---
include/configs/dns325.h | 7 -------
include/configs/dockstar.h | 6 ------
include/configs/dra7xx_evm.h | 1 -
include/configs/dreamplug.h | 6 ------
include/configs/ds109.h | 8 --------
include/configs/eb_cpu5282.h | 8 --------
include/configs/efi-x86_app.h | 2 --
include/configs/embestmx6boards.h | 6 +++---
include/configs/ethernut5.h | 1 -
include/configs/exynos5-common.h | 2 --
include/configs/exynos5420-common.h | 2 --
include/configs/exynos7420-common.h | 4 ----
include/configs/goflexhome.h | 6 ------
include/configs/guruplug.h | 8 --------
include/configs/ib62x0.h | 8 --------
include/configs/iconnect.h | 10 ----------
include/configs/jetson-tk1.h | 5 -----
include/configs/k2e_evm.h | 1 -
include/configs/k2g_evm.h | 1 -
include/configs/k2l_evm.h | 1 -
include/configs/kmcent2.h | 1 -
include/configs/kontron_sl28.h | 1 -
include/configs/lacie_kw.h | 7 -------
include/configs/legoev3.h | 1 -
include/configs/ls1028a_common.h | 1 -
include/configs/ls1043a_common.h | 1 -
include/configs/ls1043aqds.h | 1 -
include/configs/ls1043ardb.h | 1 -
include/configs/ls1046a_common.h | 1 -
include/configs/ls1046afrwy.h | 1 -
include/configs/ls1046aqds.h | 1 -
include/configs/ls1046ardb.h | 1 -
include/configs/ls1088a_common.h | 1 -
include/configs/ls1088aqds.h | 1 -
include/configs/ls1088ardb.h | 1 -
include/configs/ls2080a_common.h | 1 -
include/configs/ls2080aqds.h | 1 -
include/configs/ls2080ardb.h | 1 -
include/configs/lx2160a_common.h | 1 -
include/configs/malta.h | 2 --
include/configs/mt7621.h | 1 -
include/configs/mt7629.h | 5 +----
include/configs/mxs.h | 5 -----
include/configs/nas220.h | 12 ------------
include/configs/nsa310s.h | 4 ----
include/configs/nyan-big.h | 3 ---
include/configs/openrd.h | 22 ----------------------
include/configs/origen.h | 6 ------
include/configs/p2371-0000.h | 3 ---
include/configs/p2371-2180.h | 3 ---
include/configs/p2571.h | 3 ---
include/configs/p3450-0000.h | 3 ---
include/configs/pm9263.h | 5 -----
include/configs/pogo_e02.h | 6 ------
include/configs/pogo_v4.h | 6 ------
include/configs/porter.h | 3 ---
include/configs/qemu-ppce500.h | 1 -
include/configs/rcar-gen3-common.h | 1 -
include/configs/rk3399_common.h | 10 ----------
include/configs/sheevaplug.h | 6 ------
include/configs/silk.h | 3 ---
include/configs/smdk5420.h | 2 --
include/configs/smdkv310.h | 3 ---
include/configs/socfpga_sr1500.h | 6 ------
include/configs/socrates.h | 4 ----
include/configs/stout.h | 3 ---
include/configs/synquacer.h | 1 -
include/configs/tec-ng.h | 6 ------
include/configs/venice2.h | 3 ---
include/configs/vinco.h | 3 ---
include/configs/x86-common.h | 16 ----------------
include/configs/xpress.h | 7 ++-----
99 files changed, 14 insertions(+), 391 deletions(-)
diff --git a/README b/README
index 120963317608..9e2627863ce5 100644
--- a/README
+++ b/README
@@ -373,12 +373,6 @@ The following options need to be configured:
such as ARM architectural timer initialization.
- Linux Kernel Interface:
- CONFIG_MEMSIZE_IN_BYTES [relevant for MIPS only]
-
- When transferring memsize parameter to Linux, some versions
- expect it to be in bytes, others in MB.
- Define CONFIG_MEMSIZE_IN_BYTES to make it in bytes.
-
CONFIG_OF_LIBFDT
New kernel versions are expecting firmware settings to be
@@ -585,11 +579,6 @@ The following options need to be configured:
Support for generic parallel port TPM devices. Only one device
per system is supported at this time.
- CONFIG_TPM_TIS_BASE_ADDRESS
- Base address where the generic TPM device is mapped
- to. Contemporary x86 systems usually map it at
- 0xfed40000.
-
CONFIG_TPM
Define this to enable the TPM support library which provides
functional interfaces to some TPM commands.
diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h
index 14f86df5ed5a..4a4d64244148 100644
--- a/arch/arm/include/asm/arch-ls102xa/config.h
+++ b/arch/arm/include/asm/arch-ls102xa/config.h
@@ -70,7 +70,6 @@
/* SATA */
#define AHCI_BASE_ADDR (CONFIG_SYS_IMMR + 0x02200000)
#ifdef CONFIG_DDR_SPD
-#define CONFIG_VERY_BIG_RAM
#define CONFIG_MAX_MEM_MAPPED ((phys_size_t)2 << 30)
#endif
diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h
index 2e06f2bdaee3..96a08104ff46 100644
--- a/arch/arm/mach-mvebu/include/mach/config.h
+++ b/arch/arm/mach-mvebu/include/mach/config.h
@@ -30,13 +30,4 @@
/* Needed for SPI NOR booting in SPL */
#define CONFIG_DM_SEQ_ALIAS 1
-/*
- * I2C related stuff
- */
-#ifdef CONFIG_CMD_I2C
-#ifndef CONFIG_SYS_I2C_SOFT
-#define CONFIG_I2C_MVTWSI
-#endif
-#endif
-
#endif /* __MVEBU_CONFIG_H */
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index edaf8baaaebe..e80599106066 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -133,7 +133,6 @@
#define CFG_SYS_FM_MURAM_SIZE 0x60000
#ifdef CONFIG_ARCH_B4860
-#define CONFIG_NUM_DSP_CPUS 6
#define CFG_SYS_FSL_CLUSTER_CLOCKS { 1, 4, 4, 4 }
#define CFG_SYS_NUM_FM1_DTSEC 6
#define CFG_SYS_NUM_FM1_10GEC 2
diff --git a/arch/xtensa/include/asm/config.h b/arch/xtensa/include/asm/config.h
index a1096ab1961b..21b334b93896 100644
--- a/arch/xtensa/include/asm/config.h
+++ b/arch/xtensa/include/asm/config.h
@@ -14,7 +14,6 @@
* restricting used physical memory to the first 128MB.
*/
#if XCHAL_HAVE_PTP_MMU
-#define CONFIG_VERY_BIG_RAM
#define CONFIG_MAX_MEM_MAPPED (128 << 20)
#endif
diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c
index f44ac3315ebc..581e2e084d6f 100644
--- a/board/Marvell/openrd/openrd.c
+++ b/board/Marvell/openrd/openrd.c
@@ -140,7 +140,7 @@ void mv_phy_init(char *name)
/* reset the phy */
miiphy_reset(name, devadr);
- printf(PHY_NO" Initialized on %s\n", name);
+ printf("Initialized on %s\n", name);
}
void reset_phy(void)
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 58363fce0570..3587ca2124e3 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -37,10 +37,6 @@
DECLARE_GLOBAL_DATA_PTR;
-#ifndef CONFIG_MVGBE_PORTS
-# define CONFIG_MVGBE_PORTS {0, 0}
-#endif
-
#define MV_PHY_ADR_REQUEST 0xee
#define MVGBE_SMI_REG (((struct mvgbe_registers *)MVGBE0_BASE)->smi)
#define MVGBE_PGADR_REG 22
diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h
index e3f5ac06399d..6514ab67bab9 100644
--- a/drivers/net/mvgbe.h
+++ b/drivers/net/mvgbe.h
@@ -11,13 +11,6 @@
#ifndef __MVGBE_H__
#define __MVGBE_H__
-/* PHY_BASE_ADR is board specific and can be configured */
-#if defined (CONFIG_PHY_BASE_ADR)
-#define PHY_BASE_ADR CONFIG_PHY_BASE_ADR
-#else
-#define PHY_BASE_ADR 0x08 /* default phy base addr */
-#endif
-
/* Constants */
#define INT_CAUSE_UNMASK_ALL 0x0007ffff
#define INT_CAUSE_UNMASK_ALL_EXT 0x0011ffff
diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c
index a53ff93a6b06..11676d4fae7e 100644
--- a/drivers/ram/mpc83xx_sdram.c
+++ b/drivers/ram/mpc83xx_sdram.c
@@ -118,12 +118,7 @@ int dram_init(void)
phys_size_t get_effective_memsize(void)
{
- if (!IS_ENABLED(CONFIG_VERY_BIG_RAM))
- return gd->ram_size;
-
- /* Limit stack to what we can reasonable map */
- return ((gd->ram_size > CONFIG_MAX_MEM_MAPPED) ?
- CONFIG_MAX_MEM_MAPPED : gd->ram_size);
+ return gd->ram_size;
}
/**
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 7dff3cc69136..7b932eb38901 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -195,12 +195,10 @@
* Environment Configuration
*/
-#define CONFIG_NETDEV "eth1"
-
-#define CONFIG_FDTFILE "mpc8379_rdb.dtb"
+#define FDTFILE "mpc8379_rdb.dtb"
#define CONFIG_EXTRA_ENV_SETTINGS \
- "netdev=" CONFIG_NETDEV "\0" \
+ "netdev=eth1\0" \
"uboot=" CONFIG_UBOOTPATH "\0" \
"tftpflash=tftp $loadaddr $uboot;" \
"protect off " __stringify(CONFIG_TEXT_BASE) \
@@ -214,7 +212,7 @@
"cmp.b $loadaddr " __stringify(CONFIG_TEXT_BASE) \
" $filesize\0" \
"fdtaddr=780000\0" \
- "fdtfile=" CONFIG_FDTFILE "\0" \
+ "fdtfile=" FDTFILE "\0" \
"ramdiskaddr=1000000\0" \
"ramdiskfile=rootfs.ext2.gz.uboot\0" \
"console=ttyS0\0" \
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index d83563d6181d..02d49c3d3407 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -24,7 +24,6 @@
#ifdef CONFIG_SPIFLASH
#ifdef CONFIG_NXP_ESBC
-#define CONFIG_RAMBOOT_SPIFLASH
#define CONFIG_RESET_VECTOR_ADDRESS 0x110bfffc
#else
#define CFG_SYS_SPI_FLASH_U_BOOT_SIZE (512 << 10)
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 0f0cdb3a6815..1a157a7da05d 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -12,7 +12,6 @@
#define __CONFIG_H
#ifdef CONFIG_RAMBOOT_PBL
-#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_TEXT_BASE
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
#endif
@@ -46,10 +45,9 @@
/*
* Config the L3 Cache as L3 SRAM
*/
-#define CFG_SYS_INIT_L3_ADDR CONFIG_RAMBOOT_TEXT_BASE
+#define CFG_SYS_INIT_L3_ADDR CONFIG_TEXT_BASE
#ifdef CONFIG_PHYS_64BIT
-#define CFG_SYS_INIT_L3_ADDR_PHYS (0xf00000000ull | \
- CONFIG_RAMBOOT_TEXT_BASE)
+#define CFG_SYS_INIT_L3_ADDR_PHYS (0xf00000000ull | CONFIG_TEXT_BASE)
#else
#define CFG_SYS_INIT_L3_ADDR_PHYS CFG_SYS_INIT_L3_ADDR
#endif
@@ -62,7 +60,6 @@
/*
* DDR Setup
*/
-#define CONFIG_VERY_BIG_RAM
#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
@@ -88,7 +85,6 @@
#define CFG_SYS_FLASH_BASE_PHYS CFG_SYS_FLASH_BASE
#endif
-#define CONFIG_FSL_CPLD
#define CPLD_BASE 0xffdf0000 /* CPLD registers */
#ifdef CONFIG_PHYS_64BIT
#define CPLD_BASE_PHYS 0xfffdf0000ull
@@ -131,7 +127,6 @@
#define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS + 0x8000000}
/* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
#define CFG_SYS_INIT_RAM_ADDR 0xffd00000 /* Initial L1 address */
#ifdef CONFIG_PHYS_64BIT
#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf
diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index bad34d9771ec..eb302348800b 100644
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -37,14 +37,5 @@
/* size in bytes reserved for initial data */
#include <asm/arch/config.h>
-/* There is no PHY directly connected so don't ask it for link status */
-
-/*
- * Ethernet Driver configuration
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable a single port */
-#define CONFIG_PHY_BASE_ADR 0x01
-#endif /* CONFIG_CMD_NET */
#endif /* _CONFIG_SBX81LIFKW_H */
diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h
index 9a9663b34ba8..8c5e81aebd9b 100644
--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -42,14 +42,5 @@
/* size in bytes reserved for initial data */
#include <asm/arch/config.h>
-/* There is no PHY directly connected so don't ask it for link status */
-
-/*
- * Ethernet Driver configuration
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable a single port */
-#define CONFIG_PHY_BASE_ADR 0x01
-#endif /* CONFIG_CMD_NET */
#endif /* _CONFIG_SBX81LIFXCAT_H */
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index e815d9f81a1e..4b443c750425 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -112,7 +112,6 @@
/*
* DDR Setup
*/
-#define CONFIG_VERY_BIG_RAM
#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
#if defined(CONFIG_TARGET_T1024RDB)
@@ -269,7 +268,6 @@
#endif
/* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
#define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */
#ifdef CONFIG_PHYS_64BIT
#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 6fe0bd682801..dfad76e16f11 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -86,7 +86,6 @@
/*
* DDR Setup
*/
-#define CONFIG_VERY_BIG_RAM
#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
@@ -247,7 +246,6 @@
#endif
/* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
#define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */
#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf
#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000
@@ -285,8 +283,6 @@
*/
#define CFG_SYS_I2C_RTC_ADDR 0x68
-/*DVI encoder*/
-#define CONFIG_HDMI_ENCODER_I2C_ADDR 0x75
#endif
/*
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 79b3d7af4eac..24c1daf9985f 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -78,7 +78,6 @@
/*
* DDR Setup
*/
-#define CONFIG_VERY_BIG_RAM
#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
#define CFG_SYS_SDRAM_SIZE 2048 /* for fixed parameter use */
@@ -245,7 +244,6 @@
#endif
/* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
#define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */
#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf
#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 2a32fe37aa92..c825e7fa0c65 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -78,7 +78,6 @@
/*
* DDR Setup
*/
-#define CONFIG_VERY_BIG_RAM
#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
#define CFG_SYS_SDRAM_SIZE 2048 /* for fixed parameter use */
@@ -210,7 +209,6 @@
#endif
/* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
#define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */
#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf
#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index d8c4de5b3d73..95735f3fcb1e 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -16,7 +16,6 @@
#ifdef CONFIG_RAMBOOT_PBL
#ifndef CONFIG_SDCARD
-#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_TEXT_BASE
#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
#else
#define RESET_VECTOR_OFFSET 0x27FFC
@@ -60,7 +59,6 @@
/*
* DDR Setup
*/
-#define CONFIG_VERY_BIG_RAM
#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
@@ -71,7 +69,6 @@
#define CFG_SYS_FLASH_BASE_PHYS (0xf00000000ull | CFG_SYS_FLASH_BASE)
/* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
#define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */
#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf
#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000
diff --git a/include/configs/alt.h b/include/configs/alt.h
index fe303fda78a0..f27740016927 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -20,9 +20,6 @@
#define RCAR_GEN2_SDRAM_SIZE (1024u * 1024 * 1024)
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)
-/* FLASH */
-#define CONFIG_SPI_FLASH_QUAD
-
/* SH Ether */
#define CONFIG_SH_ETHER_USE_PORT 0
#define CONFIG_SH_ETHER_PHY_ADDR 0x1
diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h
index 03e04e6e6805..d70f0382300f 100644
--- a/include/configs/ax25-ae350.h
+++ b/include/configs/ax25-ae350.h
@@ -49,9 +49,6 @@
*/
#define CFG_SYS_FLASH_BANKS_SIZES {0x4000000}
-/* max number of sectors on one chip */
-#define CONFIG_FLASH_SECTOR_SIZE (0x10000*2)
-
/* environments */
/* SPI FLASH */
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 6b5f650811b8..7078c2745c8e 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -20,10 +20,6 @@
#define CONFIG_TEGRA_ENABLE_UARTA
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-/* SPI */
-#define CONFIG_TEGRA_SLINK_CTRLS 6
-#define CONFIG_SPI_FLASH_SIZE (4 << 20)
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index fe09997e1784..d4e0f677e67b 100644
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -22,9 +22,7 @@
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)
/* FLASH */
-#if !defined(CONFIG_MTD_NOR_FLASH)
-#define CONFIG_SH_QSPI_BASE 0xE6B10000
-#else
+#if defined(CONFIG_MTD_NOR_FLASH)
#define CFG_SYS_FLASH_BASE 0x00000000
#define CFG_SYS_FLASH_SIZE 0x04000000 /* 64 MB */
#define CFG_SYS_FLASH_BANKS_LIST { (CFG_SYS_FLASH_BASE) }
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 35c5a4f12261..5cca1e18348d 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -24,10 +24,6 @@
#define CONFIG_TEGRA_ENABLE_UARTA
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-/* SPI */
-#define CONFIG_TEGRA_SLINK_CTRLS 6
-#define CONFIG_SPI_FLASH_SIZE (4 << 20)
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index 55e2d744c4a0..e3519ed75169 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -22,9 +22,6 @@
#define CONFIG_TEGRA_ENABLE_UARTD
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-/* SPI */
-#define CONFIG_SPI_FLASH_SIZE (4 << 20)
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 8a790400b46d..e8918df69e05 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -14,10 +14,6 @@
#include <asm/arch/imx-regs.h>
#include <linux/sizes.h>
-/* NAND support */
-
-#define CONFIG_FDTADDR 0x84000000
-
#define MEM_LAYOUT_ENV_SETTINGS \
"bootm_size=0x10000000\0" \
"fdt_addr_r=0x82000000\0" \
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 24cf554649ba..82b2efdfe897 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -19,9 +19,6 @@
/* Environment in eMMC, at the end of 2nd "boot sector" */
-/* SPI */
-#define CONFIG_SPI_FLASH_SIZE (4 << 20)
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 015bc78648f3..1bfb741346a7 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -16,13 +16,6 @@
/* Remove or override few declarations from mv-common.h */
-/*
- * Ethernet Driver configuration
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
-#endif
-
/*
* Enable GPI0 support
*/
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index 33ae7d654b0b..a6c1e9c6d029 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -28,10 +28,4 @@
"initrd=/boot/uInitrd\0" \
"bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"
-/*
- * Ethernet Driver configuration
- */
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR 0
-
#endif /* _CONFIG_DOCKSTAR_H */
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index b8f518612ee3..f8afcc7826e9 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -13,7 +13,6 @@
#include <environment/ti/dfu.h>
-#define CONFIG_VERY_BIG_RAM
#define CONFIG_MAX_MEM_MAPPED 0x80000000
#ifndef CONFIG_QSPI_BOOT
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index fbd83d629c02..98322a54f631 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -24,10 +24,4 @@
"x_bootargs=console=ttyS0,115200\0" \
"x_bootargs_root=root=/dev/sda2 rootdelay=10\0"
-/*
- * Ethernet Driver configuration
- */
-#define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */
-#define CONFIG_PHY_BASE_ADR 0
-
#endif /* _CONFIG_DREAMPLUG_H */
diff --git a/include/configs/ds109.h b/include/configs/ds109.h
index 8553ea0b95f2..8e7a86e06262 100644
--- a/include/configs/ds109.h
+++ b/include/configs/ds109.h
@@ -35,12 +35,4 @@
"ipaddr=192.168.1.5\0" \
"usb0Mode=host\0"
-/*
- * Ethernet Driver configuration
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable one port */
-#define CONFIG_PHY_BASE_ADR 8
-#endif /* CONFIG_CMD_NET */
-
#endif /* _CONFIG_DS109_H */
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 717f49ca29d8..029f13dad36f 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -144,13 +144,5 @@
#define CFG_SYS_DDRUA 0x05
#define CFG_SYS_PJPAR 0xFF
-/*-----------------------------------------------------------------------
- * I2C
- */
-
-#ifdef CONFIG_CMD_DATE
-#define CONFIG_I2C_RTC_ADDR 0x68
-#endif
-
#endif /* _CONFIG_M5282EVB_H */
/*---------------------------------------------------------------------*/
diff --git a/include/configs/efi-x86_app.h b/include/configs/efi-x86_app.h
index 6061a6db0a40..17a785140262 100644
--- a/include/configs/efi-x86_app.h
+++ b/include/configs/efi-x86_app.h
@@ -8,8 +8,6 @@
#include <configs/x86-common.h>
-#undef CONFIG_TPM_TIS_BASE_ADDRESS
-
#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \
"stdout=vidconsole\0" \
"stderr=vidconsole\0"
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 22e0fa5aabfd..1742b1192fb4 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -35,11 +35,11 @@
#if defined(CONFIG_ENV_IS_IN_MMC)
/* RiOTboard */
-#define CONFIG_FDTFILE "imx6dl-riotboard.dtb"
+#define FDTFILE "imx6dl-riotboard.dtb"
#define CFG_SYS_FSL_USDHC_NUM 3
#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
/* MarSBoard */
-#define CONFIG_FDTFILE "imx6q-marsboard.dtb"
+#define FDTFILE "imx6q-marsboard.dtb"
#define CFG_SYS_FSL_USDHC_NUM 2
#endif
@@ -79,7 +79,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
CONSOLE_ENV_SETTINGS \
MEM_LAYOUT_ENV_SETTINGS \
- "fdtfile=" CONFIG_FDTFILE "\0" \
+ "fdtfile=" FDTFILE "\0" \
"finduuid=part uuid mmc 0:1 uuid\0" \
BOOTENV
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 52eb0be67611..3fd58d6bd4a7 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -49,7 +49,6 @@
/* Ethernet */
#define CONFIG_PHY_ID 0
-#define CONFIG_MACB_SEARCH_PHY
/* MMC */
#ifdef CONFIG_CMD_MMC
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 9b5c329bda18..8e277ce7ff26 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -27,8 +27,6 @@
/* MMC SPL */
#define COPY_BL2_FNPTR_ADDR 0x02020030
-#define CONFIG_RD_LVL
-
#define PHYS_SDRAM_1 CFG_SYS_SDRAM_BASE
#define PHYS_SDRAM_1_SIZE SDRAM_BANK_SIZE
#define PHYS_SDRAM_2 (CFG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h
index 7a9307ccc3db..934a4ef9d1f1 100644
--- a/include/configs/exynos5420-common.h
+++ b/include/configs/exynos5420-common.h
@@ -8,8 +8,6 @@
#ifndef __CONFIG_EXYNOS5420_H
#define __CONFIG_EXYNOS5420_H
-#define CONFIG_VAR_SIZE_SPL
-
#define CONFIG_IRAM_TOP 0x02074000
#define CONFIG_PHY_IRAM_BASE 0x02020000
diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h
index cff910c1bd5b..e22dd036ccb8 100644
--- a/include/configs/exynos7420-common.h
+++ b/include/configs/exynos7420-common.h
@@ -15,10 +15,6 @@
/* select serial console configuration */
-/* IRAM Layout */
-#define CONFIG_IRAM_BASE 0x02100000
-#define CONFIG_IRAM_SIZE 0x58000
-#define CONFIG_IRAM_END (CONFIG_IRAM_BASE + CONFIG_IRAM_SIZE)
#define CPU_RELEASE_ADDR secondary_boot_addr
/* select serial console configuration */
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index 66eed9e14f81..1c86dcb1f6dd 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -36,10 +36,4 @@
"kernel=/boot/uImage\0" \
"bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0"
-/*
- * Ethernet Driver configuration
- */
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR 0
-
#endif /* _CONFIG_GOFLEXHOME_H */
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index 4954c5ca0800..d196c4eda535 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -30,12 +30,4 @@
"fdt=/boot/guruplug-server-plus.dtb\0" \
"bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
-/*
- * Ethernet Driver configuration
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */
-#define CONFIG_PHY_BASE_ADR 0
-#endif /* CONFIG_CMD_NET */
-
#endif /* _CONFIG_GURUPLUG_H */
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index 05192218d225..76fc4ac8b66c 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -24,14 +24,6 @@
"fdt=/boot/ib62x0.dtb\0" \
"bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
-/*
- * Ethernet driver configuration
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR 0
-#endif /* CONFIG_CMD_NET */
-
/*
* SATA driver configuration
*/
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index f2e3608d3a3f..6d2104b3a1cd 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -16,14 +16,4 @@
"kernel=/boot/uImage\0" \
"bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
-/*
- * Ethernet driver configuration
- *
- * This board has PCIe Wifi card, so allow Ethernet to be disabled
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR 11
-#endif /* CONFIG_CMD_NET */
-
#endif /* _CONFIG_ICONNECT_H */
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index b846889541c7..ea4964b13d67 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -18,11 +18,6 @@
#define CONFIG_TEGRA_ENABLE_UARTD
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-
-/* SPI */
-#define CONFIG_SPI_FLASH_SIZE (4 << 20)
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index bbc58be511e4..174a91c83e19 100644
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -39,6 +39,5 @@
/* Network */
#define CONFIG_KSNET_NETCP_V1_5
#define CONFIG_KSNET_CPSW_NUM_PORTS 9
-#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
#endif /* __CONFIG_K2E_EVM_H */
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index bb91751d5d90..dc06d5943e5c 100644
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -53,7 +53,6 @@
/* Network */
#define CONFIG_KSNET_NETCP_V1_5
#define CONFIG_KSNET_CPSW_NUM_PORTS 2
-#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
#define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */
#define SPI_MTD_PARTS KEYSTONE_SPI1_MTD_PARTS
diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index a18158a7eb33..5d629452bae4 100644
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -39,6 +39,5 @@
/* Network */
#define CONFIG_KSNET_NETCP_V1_5
#define CONFIG_KSNET_CPSW_NUM_PORTS 5
-#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
#endif /* __CONFIG_K2L_EVM_H */
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 366272d49e86..580d3a0faf01 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -160,7 +160,6 @@
/*
* DDR Setup
*/
-#define CONFIG_VERY_BIG_RAM
#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h
index 9c3174d0e02c..f7bb97aa0e6c 100644
--- a/include/configs/kontron_sl28.h
+++ b/include/configs/kontron_sl28.h
@@ -18,7 +18,6 @@
/* DDR */
#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
-#define CONFIG_VERY_BIG_RAM
#define CFG_SYS_DDR_SDRAM_BASE 0x80000000
#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 828f91096344..7a66df548a3b 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -14,13 +14,6 @@
* Enable platform initialisation via misc_init_r() function
*/
-/*
- * Ethernet Driver configuration
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
-#endif
-
/*
* Enable GPI0 support
*/
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index abe470fe890b..794c1fcbed06 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -48,7 +48,6 @@
* Linux Information
*/
#define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100)
-#define CONFIG_SETUP_INITRD_TAG
#define CONFIG_EXTRA_ENV_SETTINGS \
"bootenvfile=uEnv.txt\0" \
"fdtfile=da850-lego-ev3.dtb\0" \
diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h
index b190bfe9c8e0..2ccb20192d4f 100644
--- a/include/configs/ls1028a_common.h
+++ b/include/configs/ls1028a_common.h
@@ -12,7 +12,6 @@
/* Link Definitions */
-#define CONFIG_VERY_BIG_RAM
#define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL
#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index e54e903a8a94..d0380b33732d 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -31,7 +31,6 @@
/* Link Definitions */
-#define CONFIG_VERY_BIG_RAM
#define CFG_SYS_DDR_SDRAM_BASE 0x80000000
#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index dab57382eddf..1dca7f0aa6b9 100644
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -107,7 +107,6 @@
#define CFG_SYS_NAND_FTIM3 0x0
#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
#endif
#ifdef CONFIG_NAND_BOOT
diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index 12c4853ea963..043904197f01 100644
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -82,7 +82,6 @@
#define CFG_SYS_NAND_FTIM3 0x0
#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
#ifdef CONFIG_NAND_BOOT
#define CFG_SYS_NAND_U_BOOT_SIZE (1024 << 10)
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 4ed5481c3e74..250891e9e301 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -31,7 +31,6 @@
/* Link Definitions */
-#define CONFIG_VERY_BIG_RAM
#define CFG_SYS_DDR_SDRAM_BASE 0x80000000
#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/ls1046afrwy.h b/include/configs/ls1046afrwy.h
index 1759d25f3a39..5e03a962d10e 100644
--- a/include/configs/ls1046afrwy.h
+++ b/include/configs/ls1046afrwy.h
@@ -45,7 +45,6 @@
#define CFG_SYS_NAND_FTIM3 0x0
#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
/* IFC Timing Params */
#define CFG_SYS_CSPR0_EXT CFG_SYS_NAND_CSPR_EXT
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index e9b8ad0c0b7f..c4e5f4928d22 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -123,7 +123,6 @@
#define CFG_SYS_NAND_FTIM3 0x0
#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
#endif
#ifdef CONFIG_NAND_BOOT
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index f3904e7b3f7b..ad766b034b16 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -50,7 +50,6 @@
#define CFG_SYS_NAND_FTIM3 0x0
#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
/*
* CPLD
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index 57429d4bbe32..bcba8d81c04c 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -29,7 +29,6 @@
/* Link Definitions */
#define CFG_SYS_FSL_QSPI_BASE 0x20000000
-#define CONFIG_VERY_BIG_RAM
#define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL
#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index dc9cded49fdf..49ad14692623 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -97,7 +97,6 @@
#define CFG_SYS_NAND_FTIM3 0x0
#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
#define CFG_SYS_I2C_FPGA_ADDR 0x66
#define QIXIS_LBMAP_SWITCH 6
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index e2444cd8eb4b..9033f6e937c2 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -81,7 +81,6 @@
#define CFG_SYS_NAND_FTIM3 0x0
#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
#define CFG_SYS_I2C_FPGA_ADDR 0x66
#define QIXIS_BRDCFG4_OFFSET 0x54
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index e82456fd8148..bd78bdb793a6 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -16,7 +16,6 @@
/* Link Definitions */
-#define CONFIG_VERY_BIG_RAM
#define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL
#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 4e6d40afbf1c..7d3e8912c3b0 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -98,7 +98,6 @@
#define CFG_SYS_NAND_FTIM3 0x0
#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
#define QIXIS_LBMAP_SWITCH 0x06
#define QIXIS_LBMAP_MASK 0x0f
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 8f36958f7103..4573906115eb 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -95,7 +95,6 @@
#define CFG_SYS_NAND_FTIM3 0x0
#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
#define QIXIS_LBMAP_SWITCH 0x06
#define QIXIS_LBMAP_MASK 0x0f
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index a469c83fa4eb..3347920f03f7 100644
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -13,7 +13,6 @@
#define CFG_SYS_FLASH_BASE 0x20000000
/* DDR */
-#define CONFIG_VERY_BIG_RAM
#define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL
#define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0
#define CFG_SYS_DDR_BLOCK2_BASE 0x2080000000ULL
diff --git a/include/configs/malta.h b/include/configs/malta.h
index 65f4b05649b2..8ba04b4e6c31 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -11,8 +11,6 @@
*/
#define CONFIG_MALTA
-#define CONFIG_MEMSIZE_IN_BYTES
-
/*
* CPU Configuration
*/
diff --git a/include/configs/mt7621.h b/include/configs/mt7621.h
index 7c8c67f44697..b6e680bcc78e 100644
--- a/include/configs/mt7621.h
+++ b/include/configs/mt7621.h
@@ -10,7 +10,6 @@
#define CFG_SYS_SDRAM_BASE 0x80000000
-#define CONFIG_VERY_BIG_RAM
#define CONFIG_MAX_MEM_MAPPED 0x1c000000
#define CFG_SYS_INIT_SP_OFFSET 0x800000
diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h
index 99b09ad41e74..f6ab486fa292 100644
--- a/include/configs/mt7629.h
+++ b/include/configs/mt7629.h
@@ -15,10 +15,7 @@
/* Environment */
-/* Defines for SPL */
-
-#define CONFIG_SPI_ADDR 0x30000000
-#define CFG_SYS_UBOOT_BASE (CONFIG_SPI_ADDR + CONFIG_SPL_PAD_TO)
+#define CFG_SYS_UBOOT_BASE (0x30000000 + CONFIG_SPL_PAD_TO)
/* SPL -> Uboot */
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 30f27e7f0c19..32e0e06617e5 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -86,9 +86,4 @@
#define CFG_SYS_NAND_BASE 0x60000000
#endif
-/* SPI */
-#ifdef CONFIG_CMD_SPI
-#define CONFIG_SPI_HALF_DUPLEX
-#endif
-
#endif /* __CONFIGS_MXS_H__ */
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 1b7eb3433483..85691ca94f08 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -39,16 +39,4 @@
"bootargs=console=ttyS0,115200\0" \
"autostart=no\0"
-/*
- * Ethernet Driver configuration
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR 8
-#endif /* CONFIG_CMD_NET */
-
-/*
- * EFI partition
- */
-
#endif /* _CONFIG_NAS220_H */
diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 62f07011809c..e2ad77072cd5 100644
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -46,8 +46,4 @@
#endif /* CONFIG_SPL_BUILD */
-/* Ethernet driver configuration */
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR 1
-
#endif /* _CONFIG_NSA310S_H */
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index baa452156ecd..21002f99dc88 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -18,9 +18,6 @@
#define CONFIG_TEGRA_ENABLE_UARTA
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-/* SPI */
-#define CONFIG_SPI_FLASH_SIZE (4 << 20)
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index 006f06e6af5c..2cec20ca4259 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -33,26 +33,4 @@
"x_bootcmd_usb=usb start\0" \
"x_bootargs_root=root=ubi0:rootfs rootfstype=ubifs\0"
-/*
- * Ethernet Driver configuration
- */
-#ifdef CONFIG_CMD_NET
-# ifdef CONFIG_BOARD_IS_OPENRD_BASE
-# define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
-# else
-# define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */
-# endif
-# ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE
-# define CONFIG_PHY_BASE_ADR 0x0
-# define PHY_NO "88E1121"
-# else
-# define CONFIG_PHY_BASE_ADR 0x8
-# define PHY_NO "88E1116"
-# endif
-#endif /* CONFIG_CMD_NET */
-
-/*
- * SATA Driver configuration
- */
-
#endif /* _CONFIG_OPENRD_BASE_H */
diff --git a/include/configs/origen.h b/include/configs/origen.h
index 6633d541a31b..a608df44e80e 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -38,10 +38,4 @@
"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
"source ${loadaddr}\0"
-/* MIU (Memory Interleaving Unit) */
-#define CONFIG_MIU_2BIT_21_7_INTERLEAVED
-
-#define RESERVE_BLOCK_SIZE (512)
-#define BL1_SIZE (16 << 10) /*16 K reserved for BL1*/
-
#endif /* __CONFIG_H */
diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index ecd0405d297b..653b4c583ad2 100644
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -19,9 +19,6 @@
/* Environment in eMMC, at the end of 2nd "boot sector" */
-/* SPI */
-#define CONFIG_SPI_FLASH_SIZE (4 << 20)
-
#include "tegra-common-post.h"
#endif /* _P2371_0000_H */
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 7f942888e74d..2913d5304be7 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -19,9 +19,6 @@
/* Environment in eMMC, at the end of 2nd "boot sector" */
-/* SPI */
-#define CONFIG_SPI_FLASH_SIZE (4 << 20)
-
#include "tegra-common-post.h"
#endif /* _P2371_2180_H */
diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index 50cddb4a4acb..e78e3c4d6b09 100644
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -19,9 +19,6 @@
/* Environment in eMMC, at the end of 2nd "boot sector" */
-/* SPI */
-#define CONFIG_SPI_FLASH_SIZE (4 << 20)
-
#include "tegra-common-post.h"
#endif /* _P2571_H */
diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h
index ec1a8634e718..bab02dc2d6ed 100644
--- a/include/configs/p3450-0000.h
+++ b/include/configs/p3450-0000.h
@@ -23,9 +23,6 @@
func(PXE, pxe, na) \
func(DHCP, dhcp, na)
-/* Environment at end of QSPI, in the VER partition */
-#define CONFIG_SPI_FLASH_SIZE (4 << 20)
-
#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/pm9263.h b/include/configs/pm9263.h
index 9fd897958a4f..fa08744b6feb 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -159,11 +159,6 @@
/* PSRAM */
#define PHYS_PSRAM 0x70000000
#define PHYS_PSRAM_SIZE 0x00400000 /* 4MB */
-/* Slave EBI1, PSRAM connected */
-#define CONFIG_PSRAM_SCFG (AT91_MATRIX_SCFG_ARBT_FIXED_PRIORITY | \
- AT91_MATRIX_SCFG_FIXED_DEFMSTR(5) | \
- AT91_MATRIX_SCFG_DEFMSTR_TYPE_FIXED | \
- AT91_MATRIX_SCFG_SLOT_CYCLE(255))
/* USB */
#define CFG_SYS_USB_OHCI_REGS_BASE 0x00a00000 /* AT91SAM9263_UHP_BASE */
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index 085732214e50..fc9f113dee66 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -23,10 +23,4 @@
"bootcmd_usb=usb start; ext2load usb 0:1 0x00800000 /uImage; " \
"ext2load usb 0:1 0x01100000 /uInitrd\0"
-/*
- * Ethernet Driver configuration
- */
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR 0
-
#endif /* _CONFIG_POGO_E02_H */
diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h
index b5ce2dd13d08..239d33d8e9de 100644
--- a/include/configs/pogo_v4.h
+++ b/include/configs/pogo_v4.h
@@ -69,10 +69,4 @@
BOOTENV
#endif /* CONFIG_SPL_BUILD */
-/*
- * Ethernet Driver configuration
- */
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR 0
-
#endif /* _CONFIG_POGO_V4_H */
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 88fa65e0ffc1..e0f77f358b95 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -21,9 +21,6 @@
#define RCAR_GEN2_SDRAM_SIZE (2048u * 1024 * 1024)
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (1024u * 1024 * 1024)
-/* FLASH */
-#define CONFIG_SPI_FLASH_QUAD
-
/* SH Ether */
#define CONFIG_SH_ETHER_USE_PORT 0
#define CONFIG_SH_ETHER_PHY_ADDR 0x1
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index d05618995861..20be4af4628f 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -29,7 +29,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
/*
* DDR Setup
*/
-#define CONFIG_VERY_BIG_RAM
#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index e9cbd2538240..86012adfb36f 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -28,7 +28,6 @@
#define DRAM_RSV_SIZE 0x08000000
#define CFG_SYS_SDRAM_BASE (0x40000000 + DRAM_RSV_SIZE)
#define CFG_SYS_SDRAM_SIZE (0x80000000u - DRAM_RSV_SIZE)
-#define CONFIG_VERY_BIG_RAM
#define CONFIG_MAX_MEM_MAPPED (0x80000000u - DRAM_RSV_SIZE)
/* ENV setting */
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 78f624d31ca2..67e0c20dca29 100644
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -10,16 +10,6 @@
#define CONFIG_IRAM_BASE 0xff8c0000
-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_TPL_BOOTROM_SUPPORT)
-#else
-/* BSS setup */
-#endif
-
-/* MMC/SD IP block */
-#define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000
-
-/* RAW SD card / eMMC locations. */
-
/* FAT sd card locations. */
#define CFG_SYS_SDRAM_BASE 0
#define SDRAM_MAX_SIZE 0xf8000000
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 19701ccce22e..d7923967a721 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -21,10 +21,4 @@
"x_bootcmd_usb=usb start\0" \
"x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"
-/*
- * Ethernet Driver configuration
- */
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR 0
-
#endif /* _CONFIG_SHEEVAPLUG_H */
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 58613effaf47..6d605edf7886 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -21,9 +21,6 @@
#define RCAR_GEN2_SDRAM_SIZE (1024u * 1024 * 1024)
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)
-/* FLASH */
-#define CONFIG_SPI_FLASH_QUAD
-
/* SH Ether */
#define CONFIG_SH_ETHER_USE_PORT 0
#define CONFIG_SH_ETHER_PHY_ADDR 0x1
diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index 0392530c0adf..0cb70762d925 100644
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -12,8 +12,6 @@
#include <configs/exynos5-dt-common.h>
#include <configs/exynos5-common.h>
-#define CONFIG_SMDK5420 /* which is in a SMDK5420 */
-
#define CFG_SYS_SDRAM_BASE 0x20000000
/* DRAM Memory Banks */
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 601c16ea4538..38de1fa9849f 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -34,9 +34,6 @@
/* FLASH and environment organization */
-#define RESERVE_BLOCK_SIZE (512)
-#define BL1_SIZE (16 << 10) /*16 K reserved for BL1*/
-
/* Ethernet Controllor Driver */
#ifdef CONFIG_CMD_NET
#define CONFIG_ENV_SROM_BANK 1
diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
index 432144cb40ce..caff0cf25234 100644
--- a/include/configs/socfpga_sr1500.h
+++ b/include/configs/socfpga_sr1500.h
@@ -11,15 +11,9 @@
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SR1500 */
/* Ethernet on SoC (EMAC) */
-#define CONFIG_PHY_INTERFACE_MODE PHY_INTERFACE_MODE_RGMII
/* The PHY is autodetected, so no MII PHY address is needed here */
#define PHY_ANEG_TIMEOUT 8000
-/* Enable SPI NOR flash reset, needed for SPI booting */
-#define CONFIG_SPI_N25Q256A_RESET
-
-/* Environment setting for SPI flash */
-
/* The rest of the configuration is shared */
#include <configs/socfpga_common.h>
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 2a076716023f..11d840223312 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -16,9 +16,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-/* High Level Configuration Options */
-#define CONFIG_SOCRATES 1
-
/*
* Only possible on E500 Version 2 or newer cores.
*/
@@ -55,7 +52,6 @@
#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE
-#define CONFIG_VERY_BIG_RAM
/* I2C addresses of SPD EEPROMs */
#define SPD_EEPROM_ADDRESS 0x50 /* CTLR 0 DIMM 0 */
diff --git a/include/configs/stout.h b/include/configs/stout.h
index f49e88cb17cb..977c0adc5f02 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -25,9 +25,6 @@
/* SCIF */
#define CONFIG_SCIF_A
-/* SPI */
-#define CONFIG_SPI_FLASH_QUAD
-
/* SH Ether */
#define CONFIG_SH_ETHER_USE_PORT 0
#define CONFIG_SH_ETHER_PHY_ADDR 0x1
diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
index 699268900109..a2b6a1f57d7c 100644
--- a/include/configs/synquacer.h
+++ b/include/configs/synquacer.h
@@ -14,7 +14,6 @@
#define CFG_SYS_SDRAM_BASE (0x80000000) /* Start address of DDR3 */
#define PHYS_SDRAM_SIZE (0x7c000000) /* Default size (2GB - Secure memory) */
-#define CONFIG_VERY_BIG_RAM /* SynQuacer supports up to 64GB */
#define CONFIG_MAX_MEM_MAPPED PHYS_SDRAM_SIZE
#define SQ_DRAMINFO_BASE (0x2e00ffc0) /* DRAM info from TF-A */
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 098796637010..c98322cf0845 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -16,12 +16,6 @@
#define CONFIG_TEGRA_ENABLE_UARTD
#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-
-/* SPI */
-#define CONFIG_TEGRA_SLINK_CTRLS 6
-#define CONFIG_SPI_FLASH_SIZE (4 << 20)
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index b2dc04a975ad..a4eb4bf4aaf3 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -20,9 +20,6 @@
/* Environment in eMMC, at the end of 2nd "boot sector" */
-/* SPI */
-#define CONFIG_SPI_FLASH_SIZE (4 << 20)
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 9f72bdde8167..1c1789ac3fb8 100644
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -39,9 +39,6 @@
/* USB device */
-/* Ethernet Hardware */
-#define CONFIG_MACB_SEARCH_PHY
-
#ifdef CONFIG_SPI_BOOT
/* bootstrap + u-boot + env + linux in serial flash */
/* Use our own mapping for the VInCo platform */
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 9bf2462010de..d71108dd3186 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -10,22 +10,6 @@
#ifndef __CONFIG_X86_COMMON_H
#define __CONFIG_X86_COMMON_H
-/*
- * High Level Configuration Options
- * (easy to change)
- */
-
-/* Generic TPM interfaced through LPC bus */
-#define CONFIG_TPM_TIS_BASE_ADDRESS 0xfed40000
-
-/*-----------------------------------------------------------------------
- * Serial Configuration
- */
-
-/*
- * Miscellaneous configurable options
- */
-
/*-----------------------------------------------------------------------
* CPU Features
*/
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 3e604894ad48..9f1f2d90dbe1 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -34,9 +34,6 @@
#define CONFIG_FEC_ENET_DEV 0
#define CONFIG_FEC_MXC_PHYADDR 0x0
-#define CONFIG_UBOOT_SECTOR_START 0x2
-#define CONFIG_UBOOT_SECTOR_COUNT 0x3fe
-
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
"image=zImage\0" \
@@ -75,8 +72,8 @@
"bootz; " \
"fi;\0" \
"uboot=ccv/u-boot.imx\0" \
- "uboot_start="__stringify(CONFIG_UBOOT_SECTOR_START)"\0" \
- "uboot_size="__stringify(CONFIG_UBOOT_SECTOR_COUNT)"\0" \
+ "uboot_start=0x2\0" \
+ "uboot_size=0x3fe\0" \
"update_uboot=if tftp ${uboot}; then " \
"if itest ${filesize} > 0; then " \
"mmc dev 0 1;" \
--
2.25.1
More information about the U-Boot
mailing list