diff options
| author | Adam Ford <aford173@gmail.com> | 2020-07-03 06:48:56 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-28 16:18:06 -0400 |
| commit | e91907a1464e5b79673c37f46dcb76d3c5b7c0c7 (patch) | |
| tree | b1021100564628d83054a12ee179c90895d557b6 /include/configs | |
| parent | bd33a72f8362ff4a373c9eefaf6e4b3ade521fa4 (diff) | |
Convert CONFIG_ENV_OVERWRITE to Kconfig
This converts the following to Kconfig:
CONFIG_ENV_OVERWRITE
Signed-off-by: Adam Ford <aford173@gmail.com>
[trini: Rerun migration, remove some comments]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs')
198 files changed, 0 insertions, 351 deletions
diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index 6abfe393fc..768b4a6dfc 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -62,8 +62,6 @@ * (which is common practice). */ -#define CONFIG_ENV_OVERWRITE /* Serial change Ok */ - /* * MISC */ diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index 445eef8b15..30bbd716b2 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -62,8 +62,6 @@ * (which is common practice). */ -#define CONFIG_ENV_OVERWRITE /* Serial change Ok */ - /* * MISC */ diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 8261f4811c..8a52f809c7 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -164,7 +164,6 @@ * Environment is not embedded in u-boot. First time runing may have env * crc error warning if there is no correct environment on the flash. */ -#define CONFIG_ENV_OVERWRITE 1 /*----------------------------------------------------------------------- * FLASH organization diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index 2866bfd85f..5447f84ca1 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -211,8 +211,6 @@ * Environment is embedded in u-boot in the second sector of the flash */ -#undef CONFIG_ENV_OVERWRITE - /* FLASH organization */ #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index ec4284216f..f5bafb70e7 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -177,7 +177,6 @@ * Environment is not embedded in u-boot. First time runing may have env * crc error warning if there is no correct environment on the flash. */ -#undef CONFIG_ENV_OVERWRITE /* FLASH organization */ #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 291adeaf0d..f3621d6326 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -228,7 +228,6 @@ * Environment is not embedded in u-boot. First time runing may have env * crc error warning if there is no correct environment on the flash. */ -#undef CONFIG_ENV_OVERWRITE /*----------------------------------------------------------------------- * FLASH organization diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 557c2ebcdb..48e9ecdb80 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -91,7 +91,6 @@ /* Environment Configuration */ /* environment is in FLASH */ -#define CONFIG_ENV_OVERWRITE 1 /* Ethernet configuration part */ #define CONFIG_SYS_DISCOVER_PHY 1 diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index eccbe58676..af2916bf75 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -279,8 +279,6 @@ * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE - #if defined(CONFIG_TSEC_ENET) #define CONFIG_HAS_ETH0 #define CONFIG_HAS_ETH1 diff --git a/include/configs/MPC8313ERDB_NAND.h b/include/configs/MPC8313ERDB_NAND.h index e70b90765a..2db0c6fd78 100644 --- a/include/configs/MPC8313ERDB_NAND.h +++ b/include/configs/MPC8313ERDB_NAND.h @@ -335,7 +335,6 @@ /* * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_NETDEV "eth1" diff --git a/include/configs/MPC8313ERDB_NOR.h b/include/configs/MPC8313ERDB_NOR.h index 38245860ee..c223ea5613 100644 --- a/include/configs/MPC8313ERDB_NOR.h +++ b/include/configs/MPC8313ERDB_NOR.h @@ -304,7 +304,6 @@ /* * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_NETDEV "eth1" diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 21594b4d38..688aa5ea98 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -330,8 +330,6 @@ * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE - #if defined(CONFIG_TSEC_ENET) #define CONFIG_HAS_ETH0 #define CONFIG_HAS_ETH1 diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 0cd2e08459..6effaeaa98 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -242,7 +242,6 @@ /* * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_HAS_ETH0 /* add support for "ethaddr" */ #define CONFIG_HAS_ETH1 /* add support for "eth1addr" */ diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index ae79369c6b..94d73295de 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -263,10 +263,6 @@ #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #endif -/* - * Environment Configuration - */ #define CONFIG_ENV_OVERWRITE - #if defined(CONFIG_UEC_ETH) #define CONFIG_HAS_ETH0 #define CONFIG_HAS_ETH1 diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index c2f44416b9..2cf2e2de5e 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -315,7 +315,6 @@ /* * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE #if defined(CONFIG_TSEC_ENET) #define CONFIG_HAS_ETH1 diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h index 618e210e4e..cfec59e860 100644 --- a/include/configs/MPC8349EMDS_SDRAM.h +++ b/include/configs/MPC8349EMDS_SDRAM.h @@ -372,7 +372,6 @@ /* * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE #if defined(CONFIG_TSEC_ENET) #define CONFIG_HAS_ETH1 diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index dd517639ea..f50cdd717c 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -337,7 +337,6 @@ boards, we say we have two, but don't display a message if we find only one. */ /* * Environment */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ @@ -389,7 +388,6 @@ boards, we say we have two, but don't display a message if we find only one. */ /* * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_NETDEV "eth0" diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 49d4aef9ad..c42cb426d8 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -331,8 +331,6 @@ extern int board_pci_host_broken(void); * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE - #if defined(CONFIG_TSEC_ENET) #define CONFIG_HAS_ETH0 #define CONFIG_HAS_ETH1 diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 7ff0b77db5..ae368a1f1e 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -349,7 +349,6 @@ /* * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_HAS_FSL_DR_USB #define CONFIG_USB_EHCI_FSL diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 8b7e0da9ca..af90fe167a 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -28,7 +28,6 @@ #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_ENV_OVERWRITE /* * sysclk for MPC85xx diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index d174b27309..b1c8917f21 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -17,7 +17,6 @@ #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_FSL_VIA diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index e473c0f531..f4f41da498 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -18,7 +18,6 @@ #define CONFIG_PCI_INDIRECT_BRIDGE 1 /* indirect PCI bridge support */ #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_INTERRUPTS /* enable pci, srio, ddr interrupts */ #ifndef __ASSEMBLY__ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index f760518676..4efc182ef8 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -21,7 +21,6 @@ #undef CONFIG_PCI2 #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_INTERRUPTS /* enable pci, srio, ddr interrupts */ #define CONFIG_FSL_VIA diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index dcb09b056f..88999ef2b8 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -17,7 +17,6 @@ #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_FSL_VIA diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index a9f3029292..5e1bef8f3b 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -30,7 +30,6 @@ #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ #undef CONFIG_ETHER_ON_FCC /* cpm FCC ethernet support */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */ /* diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index c49f786ee0..2c43981a1c 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -17,7 +17,6 @@ #define CONFIG_FSL_PCI_INIT 1 /* use common fsl pci init code */ #define CONFIG_PCI_INDIRECT_BRIDGE 1 /* indirect PCI bridge support */ #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_ENV_OVERWRITE #ifndef __ASSEMBLY__ extern unsigned long get_clock_freq(void); diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index acb8dec819..f50f53ec3f 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -16,7 +16,6 @@ #define CONFIG_FSL_PCI_INIT 1 /* use common fsl pci init code */ #define CONFIG_PCI_INDIRECT_BRIDGE 1 /* indirect PCI bridge support */ #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_ENV_OVERWRITE #ifndef __ASSEMBLY__ extern unsigned long get_clock_freq(void); diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 57aebfd337..731d4a5a41 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -31,8 +31,6 @@ #define CONFIG_PCI_INDIRECT_BRIDGE 1 /* indirect PCI bridge support */ #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() /* sysclk for MPC85xx */ #define CONFIG_DDR_CLK_FREQ get_board_ddr_clk() /* ddrclk for MPC85xx */ #define CONFIG_ICS307_REFCLK_HZ 33333000 /* ICS307 clock chip ref freq */ diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index c0407bbc16..f444be0d86 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -41,7 +41,6 @@ #define CONFIG_PCI_INDIRECT_BRIDGE 1 /* indirect PCI bridge support */ #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_INTERRUPTS /* enable pci, srio, ddr interrupts */ #define CONFIG_BAT_RW 1 /* Use common BAT rw code */ diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 42fdcdd43f..e6e1e7943c 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -43,8 +43,6 @@ #define CONFIG_FSL_PCI_INIT 1 /* Use common FSL init code */ #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_BAT_RW 1 /* Use common BAT rw code */ #define CONFIG_ALTIVEC 1 diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index b6f315a47b..026ffbeb6c 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -73,7 +73,6 @@ #undef CONFIG_SYS_DIRECT_FLASH_TFTP /* ENV setting */ -#define CONFIG_ENV_OVERWRITE 1 /* Offset of env Flash sector relative to CONFIG_SYS_FLASH_BASE */ /* Board Clock */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index fc74d57497..d7dabf8821 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -181,8 +181,6 @@ #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ #endif -#define CONFIG_ENV_OVERWRITE - #define CONFIG_DDR_CLK_FREQ 66666666 /* DDRCLK on P1010 RDB */ #define CONFIG_SYS_CLK_FREQ 66666666 /* SYSCLK for P1010 RDB */ diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 6bf3cd5950..5c29a4f274 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -211,7 +211,6 @@ extern unsigned long get_clock_freq(void); /* * Environment */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index c6a64ee479..4542dafacb 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -46,8 +46,6 @@ #define CONFIG_SRIO_PCIE_BOOT_MASTER #define CONFIG_SYS_DPAA_RMAN /* RMan */ -#define CONFIG_ENV_OVERWRITE - #if defined(CONFIG_SPIFLASH) #elif defined(CONFIG_SDCARD) #define CONFIG_FSL_FIXED_MMC_LOCATION diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index ec0c531c46..b85f271643 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -89,7 +89,6 @@ #define CONFIG_MVGBE /* Enable kirkwood Gbe Controller Driver */ #define CONFIG_MVGBE_PORTS {1, 0} /* enable a single port */ #define CONFIG_PHY_BASE_ADR 0x01 -#define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ #endif /* CONFIG_CMD_NET */ #define CONFIG_SYS_LOAD_ADDR 0x1000000 /* default location for tftp and bootm */ diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index 90480520ab..84f24400fa 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -89,7 +89,6 @@ #define CONFIG_MVGBE /* Enable kirkwood Gbe Controller Driver */ #define CONFIG_MVGBE_PORTS {1, 0} /* enable a single port */ #define CONFIG_PHY_BASE_ADR 0x01 -#define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ #endif /* CONFIG_CMD_NET */ #define CONFIG_SYS_LOAD_ADDR 0x1000000 /* default location for tftp and bootm */ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index efd9b6b5e1..f5c1ec0647 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -20,8 +20,6 @@ #define CONFIG_SYS_FSL_CPC /* Corenet Platform Cache */ #define CONFIG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS -#define CONFIG_ENV_OVERWRITE - /* support deep sleep */ #ifdef CONFIG_ARCH_T1024 #define CONFIG_DEEP_SLEEP diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 8f9de56f07..a616871917 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -156,8 +156,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */ -#define CONFIG_ENV_OVERWRITE - #if defined(CONFIG_SPIFLASH) #elif defined(CONFIG_SDCARD) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index b502b0b138..25309b2319 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_FSL_CPC /* Corenet Platform Cache */ #define CONFIG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS -#define CONFIG_ENV_OVERWRITE #ifdef CONFIG_RAMBOOT_PBL #define CONFIG_SYS_FSL_PBL_PBI board/freescale/t208xqds/t208x_pbi.cfg diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index e666e4f4a4..104a5fd05d 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_FSL_CPC /* Corenet Platform Cache */ #define CONFIG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS -#define CONFIG_ENV_OVERWRITE #ifdef CONFIG_RAMBOOT_PBL #define CONFIG_SYS_FSL_PBL_PBI board/freescale/t208xrdb/t2080_pbi.cfg diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index ebe7a9cf92..86dc3ed919 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -66,8 +66,6 @@ #define CONFIG_PCIE3 /* PCIE controller 3 */ #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */ -#define CONFIG_ENV_OVERWRITE - /* * These can be toggled for performance analysis, otherwise use default. */ diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 2590a28867..c5daaadce7 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -148,8 +148,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #endif -#define CONFIG_ENV_OVERWRITE - #define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_LBA48 diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index 48dfe68ff9..6a65f7a292 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -199,7 +199,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 512 /* environments */ -#define CONFIG_ENV_OVERWRITE /* SPI FLASH */ diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 2c316a76e1..e37369b01e 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -317,7 +317,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 512 /* environments */ -#define CONFIG_ENV_OVERWRITE /* * For booting Linux, the board info and command line data diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 4bbb8d0148..181af9a3f6 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -56,9 +56,6 @@ /* Serial Flash */ -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_LOADADDR 0x12000000 #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 5c00191f4d..a08c746f81 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -56,8 +56,6 @@ */ #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 7cd9ec9659..7ccb286961 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -18,9 +18,6 @@ /* Hardware drivers */ -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* * USB configuration * Enable CONFIG_USB_MUSB_HOST for Host functionalities MSC, keyboard diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 6dad8216e9..b43e14012f 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -18,8 +18,6 @@ #define USDHC2_BASE_ADDR 0x5b020000 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* Networking */ diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index efd4aa295b..8f526daee0 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -76,9 +76,6 @@ #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Command definition */ #undef CONFIG_IPADDR diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 49ca97dc81..b69e5772a6 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -64,7 +64,6 @@ */ #define ACFG_MONITOR_OFFSET 0x00000000 #define CONFIG_SYS_MONITOR_LEN 0x00100000 /* 1MiB */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_RANGE 0X00080000 /* 512kB */ #define CONFIG_FIRMWARE_OFFSET 0x00200000 #define CONFIG_FIRMWARE_SIZE 0x00080000 /* 512kB */ diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h index b66069c81a..83f283593b 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Environment */ -#define CONFIG_ENV_OVERWRITE /* Environment is in MMC */ #if defined(CONFIG_CMD_MMC) && defined(CONFIG_ENV_IS_IN_MMC) diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index f85cd98140..06704e5e19 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -65,7 +65,6 @@ #define CONFIG_SYS_FLASH_UNLOCK_TOUT 3000 /* ENV setting */ -#define CONFIG_ENV_OVERWRITE 1 /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 diff --git a/include/configs/arndale.h b/include/configs/arndale.h index 308cd30cb3..79e7418b9b 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -14,9 +14,6 @@ #include "exynos5250-common.h" #include <configs/exynos5-common.h> -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* MMC SPL */ #define CONFIG_EXYNOS_SPL diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h index 6815c5ff2c..1295a6cd19 100644 --- a/include/configs/aspeed-common.h +++ b/include/configs/aspeed-common.h @@ -46,7 +46,6 @@ */ #define CONFIG_BOOTCOMMAND "bootm 20080000 20300000" -#define CONFIG_ENV_OVERWRITE #define CONFIG_EXTRA_ENV_SETTINGS \ "verify=yes\0" \ diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 5e1e590747..bf6a614348 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -145,7 +145,6 @@ /* default load address */ #define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE + SZ_16M -#define CONFIG_ENV_OVERWRITE /* * Shell Settings diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h index 34fc6b616e..bbae60b490 100644 --- a/include/configs/ax25-ae350.h +++ b/include/configs/ax25-ae350.h @@ -128,7 +128,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 512 /* environments */ -#define CONFIG_ENV_OVERWRITE /* SPI FLASH */ diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index 273f08e5e1..ac5cc4c1c1 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -36,9 +36,6 @@ */ #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Serial Info */ #define CONFIG_SYS_NS16550_SERIAL diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index 01cfed0b86..2660d18f35 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -142,7 +142,6 @@ extern phys_addr_t prior_stage_fdt_address; /* * Environment configuration. */ -#define CONFIG_ENV_OVERWRITE /* * Save the prior stage provided DTB. diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index 5a17a2a1c1..b541236361 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -11,7 +11,6 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Environment */ -#define CONFIG_ENV_OVERWRITE /* FEC Ethernet on SoC */ #ifdef CONFIG_CMD_NET diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h index 300b9c7b7a..2abbe7b2ba 100644 --- a/include/configs/bk4r1.h +++ b/include/configs/bk4r1.h @@ -68,9 +68,6 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 4 * SZ_1M) -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* NAND support */ #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h index e95769b2d7..333d3f44e2 100644 --- a/include/configs/brppt2.h +++ b/include/configs/brppt2.h @@ -36,7 +36,6 @@ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) /* Environment */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_EXTRA_ENV_SETTINGS \ BUR_COMMON_ENV \ diff --git a/include/configs/bur_cfg_common.h b/include/configs/bur_cfg_common.h index dff41239ba..50155368c1 100644 --- a/include/configs/bur_cfg_common.h +++ b/include/configs/bur_cfg_common.h @@ -31,8 +31,6 @@ #define CONFIG_NETCONSOLE 1 #define CONFIG_BOOTP_MAY_FAIL /* if we don't have DHCP environment */ -#define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */ - /* As stated above, the following choices are optional. */ /* We set the max number of command args high to avoid HUSH bugs. */ diff --git a/include/configs/caddy2.h b/include/configs/caddy2.h index e51398d531..78891fefd2 100644 --- a/include/configs/caddy2.h +++ b/include/configs/caddy2.h @@ -251,7 +251,6 @@ /* * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE #if defined(CONFIG_TSEC_ENET) #define CONFIG_HAS_ETH0 diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 38a56e897e..629e0e19d5 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -135,7 +135,6 @@ #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 /* Environment organisation */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC1, eMMC */ #define CONFIG_SYS_MMC_ENV_PART 2 /* 2nd boot partition */ diff --git a/include/configs/ci20.h b/include/configs/ci20.h index 67f5bbe9d8..c574337e84 100644 --- a/include/configs/ci20.h +++ b/include/configs/ci20.h @@ -40,7 +40,6 @@ /* Environment */ #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */ #define CONFIG_SYS_MAXARGS 32 /* Max number of command args */ diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 8d7222902c..a94d2bbeac 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -19,8 +19,6 @@ #define USDHC2_BASE_ADDR 0x5b020000 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* Networking */ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index dab96f038d..79003e3251 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -64,9 +64,6 @@ #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Command definition */ #undef CONFIG_IPADDR diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 29827f1ee8..4686b8946e 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -19,7 +19,6 @@ /* * Environment settings */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_MALLOC_LEN (128 * 1024) #define CONFIG_BOOTCOMMAND \ "if fatload mmc 0 0xa0000000 uImage; then " \ diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 012350d9bf..87c37ea0a5 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -31,9 +31,6 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * SZ_1M) -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* NAND support */ #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 0c36ea6610..f53d48d427 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -110,7 +110,6 @@ /* * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_HOSTNAME "ccdc" #define CONFIG_ROOTPATH "/opt/nfsroot" diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index d7812bd886..dafef2fe9c 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -59,8 +59,6 @@ #define CONFIG_PCIE2 /* PCIE controller 2 */ #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */ -#define CONFIG_ENV_OVERWRITE - #if defined(CONFIG_SPIFLASH) #elif defined(CONFIG_SDCARD) #define CONFIG_FSL_FIXED_MMC_LOCATION diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index b587cb8d77..82e8e72a0b 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -48,8 +48,6 @@ #define CONFIG_FSL_PCI_INIT /* Use common FSL init code */ #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */ -#define CONFIG_ENV_OVERWRITE - #if defined(CONFIG_SDCARD) #define CONFIG_FSL_FIXED_MMC_LOCATION #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 5d3187331f..637716b548 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -89,9 +89,6 @@ #define CONFIG_HW_WATCHDOG #endif -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_LOADADDR 0x12000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR diff --git a/include/configs/display5.h b/include/configs/display5.h index 94baa65610..40bb3b53a5 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -64,9 +64,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 2 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - #ifndef CONFIG_BOOTCOMMAND #define CONFIG_BOOTCOMMAND "if run check_em_pad; then " \ "run recovery;" \ diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index d801c66050..3b35b5ce11 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -169,8 +169,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_LEN (256 * 1024) -#define CONFIG_ENV_OVERWRITE /* Vendor params unprotected */ - #define CONFIG_USB_OHCI_NEW #define CONFIG_USB_OHCI_EP93XX #define CONFIG_SYS_USB_OHCI_CPU_INIT diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 9de054306f..19a923b501 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -116,7 +116,6 @@ #define CONFIG_RESET_PHY_R /* use reset_phy() to init mv8831116 PHY */ #define CONFIG_NETCONSOLE /* include NetConsole support */ #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN /* detect link using phy */ -#define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ #endif /* diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index 665550a5eb..d18342ade5 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -43,8 +43,6 @@ /* Commands */ -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_MXC_UART_BASE UART2_BASE #define CONFIG_BOARD_NAME EL6Q diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index bb34a9e83b..8adaf297fe 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -27,7 +27,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_CMDLINE_TAG #define CONFIG_INITRD_TAG -#define CONFIG_ENV_OVERWRITE /* Size of malloc() pool before and after relocation */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 << 20)) diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 545d30c635..f4753cf7c5 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -49,9 +49,6 @@ */ #define CONFIG_MXC_UART_BASE UART3_BASE -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* * Command definition */ diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h index f8df0c8ceb..560d6a3d10 100644 --- a/include/configs/gazerbeam.h +++ b/include/configs/gazerbeam.h @@ -80,7 +80,6 @@ /* * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_HAS_ETH0 #define CONFIG_HAS_ETH1 diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index a959488cb9..4fdc2b6596 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -46,9 +46,6 @@ /* Serial Flash */ -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_LOADADDR 0x12000000 #ifdef CONFIG_NFS_CMD diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h index 67301fabeb..4d5eab09f0 100644 --- a/include/configs/grpeach.h +++ b/include/configs/grpeach.h @@ -23,8 +23,6 @@ #define CONFIG_SYS_LOAD_ADDR \ (CONFIG_SYS_SDRAM_BASE + 4 * 1024 * 1024) -#define CONFIG_ENV_OVERWRITE 1 - /* Malloc */ #define CONFIG_SYS_MALLOC_LEN (1024 * 1024) #define CONFIG_SYS_MONITOR_LEN (512 * 1024) diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index ea8d54a307..ca40417e9a 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -375,8 +375,6 @@ void fpga_control_clear(unsigned int bus, int pin); * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE - #if defined(CONFIG_TSEC_ENET) #define CONFIG_HAS_ETH0 #endif diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 4c7a0cb0bb..c169347a75 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -18,9 +18,6 @@ /* Total Size of Environment Sector */ -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Environment */ #ifndef CONFIG_ENV_IS_NOWHERE /* Environment in MMC */ diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index d70c6dbc23..fd35bf598f 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -18,9 +18,6 @@ /* Total Size of Environment Sector */ -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Environment */ #ifndef CONFIG_ENV_IS_NOWHERE /* Environment in MMC */ diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h index ce3ba74924..0b4db97bd6 100644 --- a/include/configs/imx8mm_beacon.h +++ b/include/configs/imx8mm_beacon.h @@ -107,7 +107,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ /* Size of malloc() pool */ diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index d1c0e0ec2e..1808f4ff85 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -110,7 +110,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 4350b5a62a..0b1025b9ad 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -112,7 +112,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 9c13235982..453f49877a 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -120,7 +120,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 366577857a..50793d3440 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -162,7 +162,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 9c83e1b9f8..aa2e2cc806 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -154,7 +154,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 1864374a4f..ccc8fc01ec 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -43,8 +43,6 @@ #define USDHC2_BASE_ADDR 0x5B020000 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #ifdef CONFIG_AHAB_BOOT diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index 5621ba8232..0976b73ebb 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -24,8 +24,6 @@ #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* FUSE command */ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 5fdb67f0ec..8a3d842268 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -42,8 +42,6 @@ #define USDHC1_BASE_ADDR 0x5B010000 #define USDHC2_BASE_ADDR 0x5B020000 -#define CONFIG_ENV_OVERWRITE - #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #ifdef CONFIG_AHAB_BOOT diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 3f71739f83..4e9a567842 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -103,8 +103,6 @@ * Environment */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x82000000\0" \ "loadaddr=0x82000000\0" \ diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index 451baf8b80..7c7f2d4ec0 100644 --- a/include/configs/km/km-mpc83xx.h +++ b/include/configs/km/km-mpc83xx.h @@ -112,7 +112,6 @@ /* * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE #ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ #define CONFIG_KM_DEF_ENV "km-common=empty\0" #endif diff --git a/include/configs/kmp204x.h b/include/configs/kmp204x.h index 6cd77edf70..fb3a83ce67 100644 --- a/include/configs/kmp204x.h +++ b/include/configs/kmp204x.h @@ -362,7 +362,6 @@ int get_scl(void); /* * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE #ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ #define CONFIG_KM_DEF_ENV "km-common=empty\0" #endif diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h index 5e2af76c6e..cb24a896a1 100644 --- a/include/configs/kp_imx53.h +++ b/include/configs/kp_imx53.h @@ -24,9 +24,6 @@ #define CONFIG_SYS_EEPROM_BUS_NUM 1 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Command definition */ #define CONFIG_LOADADDR 0x72000000 /* loadaddr env var */ diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index 0f0fe63f4f..6c9a326b25 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -41,9 +41,6 @@ /* Watchdog */ -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_LOADADDR 0x12000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index b0a150dbfb..70bca320fb 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -218,8 +218,6 @@ * Environment */ -#define CONFIG_ENV_OVERWRITE - #if defined(CONFIG_SD_BOOT) #define CONFIG_SYS_MMC_ENV_DEV 0 #endif diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 18800ea07a..84b7f0e13d 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -472,7 +472,6 @@ unsigned long get_board_ddr_clk(void); /* * Environment */ -#define CONFIG_ENV_OVERWRITE #if defined(CONFIG_SD_BOOT) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index 72aed8fed6..e095e9ad10 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -236,7 +236,6 @@ #endif /* Environment */ -#define CONFIG_ENV_OVERWRITE #if defined(CONFIG_SD_BOOT) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 6f7d051bd8..914d059a56 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -445,7 +445,6 @@ /* * Environment */ -#define CONFIG_ENV_OVERWRITE #if defined(CONFIG_SD_BOOT) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h index 4863fb2b64..c2071e70b4 100644 --- a/include/configs/ls1028a_common.h +++ b/include/configs/ls1028a_common.h @@ -57,9 +57,6 @@ #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 128 -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 46baeb0d0d..6ff7f01834 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -394,7 +394,6 @@ unsigned long get_board_ddr_clk(void); /* * Environment */ -#define CONFIG_ENV_OVERWRITE #ifdef CONFIG_TFABOOT #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index bfaa574fc9..a3f47c37ac 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -240,9 +240,6 @@ /* * Environment */ -#ifndef SPL_NO_ENV -#define CONFIG_ENV_OVERWRITE -#endif #ifdef CONFIG_TFABOOT #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 5b83e61ab2..f9e349871c 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -162,9 +162,6 @@ unsigned long long get_qixis_addr(void); /* #define CONFIG_DISPLAY_CPUINFO */ #ifndef SPL_NO_ENV -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index d93ff291bd..444bb8c3b5 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -159,9 +159,6 @@ unsigned long long get_qixis_addr(void); #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 128 -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index 0c3d683551..d3b5c58742 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -172,9 +172,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MMC_ENV_DEV 0 -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index 74bfcee9f0..489200996c 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -257,8 +257,6 @@ * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE - #if defined(CONFIG_TSEC_ENET) #define CONFIG_HAS_ETH0 #define CONFIG_HAS_ETH1 diff --git a/include/configs/mt7622.h b/include/configs/mt7622.h index dfd506ed24..0d3e708683 100644 --- a/include/configs/mt7622.h +++ b/include/configs/mt7622.h @@ -20,9 +20,6 @@ #define CONFIG_SYS_MALLOC_LEN SZ_4M #define CONFIG_SYS_NONCACHED_MEMORY SZ_1M -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_SYS_MMC_ENV_DEV 0 /* Uboot definition */ diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index fe436cca38..d969297c82 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -27,8 +27,6 @@ #define CONFIG_SYS_NONCACHED_MEMORY SZ_1M /* Environment */ -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE /* Preloader -> Uboot */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_2M - \ diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h index 6a6c2f2414..08a4d01f55 100644 --- a/include/configs/mt7629.h +++ b/include/configs/mt7629.h @@ -27,8 +27,6 @@ #define CONFIG_SYS_NONCACHED_MEMORY SZ_1M /* Environment */ -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE /* Defines for SPL */ #define CONFIG_SPL_STACK 0x106000 diff --git a/include/configs/mt8512.h b/include/configs/mt8512.h index 253a54332c..4feff27139 100644 --- a/include/configs/mt8512.h +++ b/include/configs/mt8512.h @@ -32,7 +32,6 @@ /* ENV Setting */ #if defined(CONFIG_MMC_MTK) #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_ENV_OVERWRITE /* MMC offset in block unit,and block size is 0x200 */ #define ENV_BOOT_READ_IMAGE \ diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h index 276fbc285f..0d48211ce8 100644 --- a/include/configs/mt8518.h +++ b/include/configs/mt8518.h @@ -35,7 +35,6 @@ /* ENV Setting */ #if defined(CONFIG_MMC_MTK) #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_ENV_OVERWRITE /* MMC offset in block unit,and block size is 0x200 */ #define ENV_BOOT_READ_IMAGE \ diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 24a83fdbbe..ca662b0ce7 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -61,7 +61,6 @@ /* * Ethernet Driver configuration */ -#define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ #define CONFIG_ARP_TIMEOUT 200 #define CONFIG_NET_RETRY_COUNT 50 diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 19b5b5b386..21a2ad4acb 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -55,7 +55,6 @@ /* * Ethernet Driver configuration */ -#define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ #define CONFIG_ARP_TIMEOUT 200 #define CONFIG_NET_RETRY_COUNT 50 diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index 1f55e92091..ad95b8876e 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -16,7 +16,6 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Environment */ -#define CONFIG_ENV_OVERWRITE /* Environment is in MMC */ #if defined(CONFIG_CMD_MMC) && defined(CONFIG_ENV_IS_IN_MMC) diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index 595727aa30..560ec96c01 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Environment */ -#define CONFIG_ENV_OVERWRITE /* Environment is in MMC */ #if defined(CONFIG_CMD_MMC) && defined(CONFIG_ENV_IS_IN_MMC) diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index c114ec78e1..12bd75fe02 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -56,7 +56,6 @@ /* Ethernet */ #define CONFIG_FEC_MXC #define CONFIG_FEC_MXC_PHYADDR 0x1f -#define CONFIG_ENV_OVERWRITE /* ESDHC driver */ #define CONFIG_SYS_FSL_ESDHC_ADDR IMX_MMC_SDHC1_BASE diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 15b64ee03e..8ed139037e 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Environment */ -#define CONFIG_ENV_OVERWRITE /* Environment is in MMC */ #if defined(CONFIG_CMD_MMC) && defined(CONFIG_ENV_IS_IN_MMC) diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index f6da155fa4..d2dcc8179b 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -61,9 +61,6 @@ */ #define CONFIG_MXC_UART_BASE UART1_BASE -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* * Command definition */ diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index e99dcd2aa1..dda21198d6 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -70,9 +70,6 @@ #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_ETHPRIME "FEC0" #define CONFIG_LOADADDR 0x92000000 /* loadaddr env var */ diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index eb6aa0cda0..c20ca19557 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -45,9 +45,6 @@ /* Eth Configs */ #define CONFIG_HAS_ETH1 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Command definition */ #define CONFIG_ETHPRIME "smc911x" diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index e0210047ff..13135f0d8b 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -41,9 +41,6 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Command definition */ #define CONFIG_LOADADDR 0x70010000 /* loadaddr env var */ diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index 19f8408e45..1bb189f6db 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -49,9 +49,6 @@ #define IMX_FEC_BASE FEC_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x1F -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Command definition */ #define CONFIG_ETHPRIME "FEC0" diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index b19a849211..24c27505ae 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -57,9 +57,6 @@ #define CONFIG_SYS_DIALOG_PMIC_I2C_ADDR 0x48 #define CONFIG_SYS_FSL_PMIC_I2C_ADDR 0x8 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Command definition */ diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index 8c7d1395d0..a6905ec4bd 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -31,9 +31,6 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Command definition */ #define CONFIG_LOADADDR 0x72000000 /* loadaddr env var */ diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index a8d50507cb..c19f5b6383 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -42,9 +42,6 @@ #define IMX_FEC_BASE FEC_BASE_ADDR #define CONFIG_FEC_MXC_PHYADDR 0x1F -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Command definition */ #define CONFIG_ETHPRIME "FEC0" diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 0715509ec8..83895ab9d0 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -49,9 +49,6 @@ #endif #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MAXARGS 32 diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index c17cabc02f..bd779aecd7 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -30,9 +30,6 @@ #define CONFIG_LOADADDR 0x80800000 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MAXARGS 32 diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h index 78bdfab5a6..29d17bab74 100644 --- a/include/configs/mx7ulp_com.h +++ b/include/configs/mx7ulp_com.h @@ -43,9 +43,6 @@ /* UART */ #define LPUART_BASE LPUART4_RBASE -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Physical Memory Map */ #define PHYS_SDRAM 0x60000000 diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 9e93269074..65dc8c8d58 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -35,9 +35,6 @@ /* UART */ #define LPUART_BASE LPUART4_RBASE -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_SYS_CACHELINE_SIZE 64 /* Miscellaneous configurable options */ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index a9a0b1c998..cc55777ec0 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -66,8 +66,6 @@ */ #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 } /* USB device configuration */ diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 03229910b2..5cbee01092 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -46,7 +46,6 @@ #define CONFIG_SYS_MONITOR_BASE 0x00000000 #define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV -#define CONFIG_ENV_OVERWRITE /* Partitions name */ #define PARTS_BOOT "boot" diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index bc8aa7adf5..6563335f91 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -40,7 +40,6 @@ #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_HW #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 #define CONFIG_SYS_ENV_SECT_SIZE SZ_128K -#define CONFIG_ENV_OVERWRITE /* NAND: SPL falcon mode configs */ #if defined(CONFIG_SPL_OS_BOOT) #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x2a0000 diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index f1c2a9bd47..e2e871a9cb 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -44,7 +44,6 @@ #define CONFIG_SYS_NAND_ECCBYTES 3 #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW_DETECTION_SW #define CONFIG_SYS_ENV_SECT_SIZE SZ_128K -#define CONFIG_ENV_OVERWRITE /* NAND: SPL falcon mode configs */ #if defined(CONFIG_SPL_OS_BOOT) #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x2a0000 diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 835b7c299e..14eb363816 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -29,6 +29,4 @@ /* ENV related config options */ -#define CONFIG_ENV_OVERWRITE - #endif /* __CONFIG_PANDA_H */ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index a33f2f30ca..e686edcaef 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -212,8 +212,6 @@ #define CONFIG_PCIE2 /* PCIE controller 2 (slot 2) */ #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_LBA48 diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index ba7aad8b05..df5a2a1329 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -20,9 +20,6 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * SZ_1M) -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* NAND support */ #define CONFIG_SYS_NAND_ONFI_DETECTION diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index e880fe59ae..af4e61eab5 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -133,7 +133,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 9a4bfd1e0e..2cc47d1237 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -210,9 +210,6 @@ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #elif defined (CONFIG_SYS_USE_FLASH) - -#define CONFIG_ENV_OVERWRITE 1 - /* JFFS Partition offset set */ #define CONFIG_SYS_JFFS2_FIRST_BANK 0 #define CONFIG_SYS_JFFS2_NUM_BANKS 1 diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 7f87edb42d..0ed4b1aaa2 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -239,9 +239,6 @@ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #elif defined(CONFIG_SYS_USE_FLASH) /* CFG_USE_FLASH */ - -#define CONFIG_ENV_OVERWRITE 1 - /* JFFS Partition offset set */ #define CONFIG_SYS_JFFS2_FIRST_BANK 0 #define CONFIG_SYS_JFFS2_NUM_BANKS 1 diff --git a/include/configs/puma_rk3399.h b/include/configs/puma_rk3399.h index 27a8a7d9c3..63f58bdbfe 100644 --- a/include/configs/puma_rk3399.h +++ b/include/configs/puma_rk3399.h @@ -15,7 +15,6 @@ #define SDRAM_BANK_SIZE (2UL << 30) #define CONFIG_SERIAL_TAG -#define CONFIG_ENV_OVERWRITE #define CONFIG_BMP_16BPP #define CONFIG_BMP_24BPP diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index e96118a0cf..5e787d7209 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -84,8 +84,6 @@ /* Address and size of Primary Environment Sector */ -#define CONFIG_ENV_OVERWRITE 1 - #define MEM_SIZE 128 #endif /* __CONFIG_H */ diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index 676e7c1a15..0ed00bc88f 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -84,8 +84,6 @@ /* Address and size of Primary Environment Sector */ -#define CONFIG_ENV_OVERWRITE 1 - #define MEM_SIZE 128 #endif /* __CONFIG_H */ diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index b3ec43073c..ee6ef18224 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -17,8 +17,6 @@ #define CONFIG_FSL_PCI_INIT /* Use common FSL init code */ #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_ENABLE_36BIT_PHYS /* Needed to fill the ccsrbar pointer */ diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index a8886251e0..4fdf0a5b57 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -9,8 +9,6 @@ /* SCIF */ #define CONFIG_CONS_SCIF1 1 -#define CONFIG_ENV_OVERWRITE 1 - /* SDRAM */ #define CONFIG_SYS_SDRAM_BASE 0x8C000000 #define CONFIG_SYS_SDRAM_SIZE 0x04000000 diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index e32ab9d7ae..0455b1c2ec 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -18,8 +18,6 @@ #define CONFIG_CONS_SCIF0 1 -#define CONFIG_ENV_OVERWRITE 1 - #define CONFIG_SYS_SDRAM_BASE (0x08000000) #define CONFIG_SYS_SDRAM_SIZE (128 * 1024 * 1024) diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index b6c5cad433..f94e9d8979 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -38,7 +38,6 @@ /* ENV setting */ /* Common ENV setting */ -#define CONFIG_ENV_OVERWRITE /* SF MTD */ #ifdef CONFIG_SPL_BUILD diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index cf4d3bad2e..b9762f5beb 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -57,7 +57,6 @@ #define CONFIG_BOARD_SIZE_LIMIT 1048576 /* ENV setting */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0" diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index 11ae2c1c52..020d1e01fa 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -56,8 +56,6 @@ #define CONFIG_DEBUG_UART_LINFLEXUART #define CONFIG_DEBUG_UART_BASE LINFLEXUART_BASE -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_UART_PORT (1) #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC_BASE_ADDR diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 620217f528..be8865b9c0 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -97,7 +97,6 @@ #define CONFIG_MISC_COMMON -#define CONFIG_ENV_OVERWRITE #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_UPDATEB \ "updatek=" \ @@ -163,7 +162,6 @@ /* FLASH and environment organization */ #define CONFIG_MMC_DEFAULT_DEV 0 #define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV -#define CONFIG_ENV_OVERWRITE #define CONFIG_USE_ONENAND_BOARD_INIT #define CONFIG_SAMSUNG_ONENAND 1 diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h index 555b5ce686..5b0ea9a335 100644 --- a/include/configs/sansa_fuze_plus.h +++ b/include/configs/sansa_fuze_plus.h @@ -13,7 +13,6 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Environment */ -#define CONFIG_ENV_OVERWRITE /* Booting Linux */ #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 0561ec2024..929579efe1 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -262,7 +262,6 @@ /* * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE #if defined(CONFIG_TSEC_ENET) #define CONFIG_HAS_ETH0 diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index 6ac5d7b0c0..6e26d456ab 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -51,8 +51,6 @@ #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ #endif -#define CONFIG_ENV_OVERWRITE - #define CONFIG_INTERRUPTS /* enable pci, srio, ddr interrupts */ /* diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 27a15eddd3..3d5aee0dd5 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -42,8 +42,6 @@ #define CONFIG_FSL_PCI_INIT 1 /* Use common FSL init code */ #define CONFIG_PCI_INDIRECT_BRIDGE 1 /* indirect PCI bridge support */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_BAT_RW 1 /* Use common BAT rw code */ #undef CONFIG_SPD_EEPROM /* Do not use SPD EEPROM for DDR setup*/ diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index 7211a2afa6..aeb54032d1 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -56,7 +56,6 @@ #define CONFIG_SH_MMCIF_CLK 48000000 /* ENV setting */ -#define CONFIG_ENV_OVERWRITE 1 #define CONFIG_EXTRA_ENV_SETTINGS \ "netboot=bootp; bootm\0" diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index 464a552480..736b379ab7 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -56,7 +56,6 @@ #define CONFIG_SH_MMCIF_CLK 48000000 /* ENV setting */ -#define CONFIG_ENV_OVERWRITE 1 #define CONFIG_EXTRA_ENV_SETTINGS \ "netboot=bootp; bootm\0" diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index ac6338cec1..7067ad13bd 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -69,7 +69,6 @@ #define SH7757LCR_PCIEBRG_SIZE (96 * 1024) /* ENV setting */ -#define CONFIG_ENV_OVERWRITE 1 #define CONFIG_EXTRA_ENV_SETTINGS \ "netboot=bootp; bootm\0" diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index b664428806..5e27f3b8f1 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -12,8 +12,6 @@ #define CONFIG_CPU_SH7763 1 #define __LITTLE_ENDIAN 1 -#define CONFIG_ENV_OVERWRITE 1 - #define CONFIG_DISPLAY_BOARDINFO /* SCIF */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 6827552081..444fb30bfd 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -33,8 +33,6 @@ #define CONFIG_ROOTPATH "/opt/eldk" #endif -#define CONFIG_ENV_OVERWRITE 1 - #define CONFIG_SYS_AUTOLOAD "yes" /* Clock Defines */ diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 9498513f76..a9a0fd9977 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -50,7 +50,6 @@ /* setting board specific options */ #define CONFIG_MACH_TYPE MACH_TYPE_SMARTWEB -#define CONFIG_ENV_OVERWRITE 1 /* Overwrite ethaddr / serial# */ #define CONFIG_SYS_AUTOLOAD "yes" #define CONFIG_RESET_TO_RETRY diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 20d6063676..77773cdeaa 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -46,9 +46,6 @@ /* PWM */ #define CONFIG_PWM 1 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_BOOTCOMMAND "run ubifsboot" #define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext2" \ @@ -62,7 +59,6 @@ #define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x40000;" \ " onenand write 0x32008000 0x0 0x40000\0" -#define CONFIG_ENV_OVERWRITE #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_UPDATEB \ "updatek=" \ diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index 336571d4c4..0df5ef9628 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -30,9 +30,6 @@ /* select serial console configuration */ #define EXYNOS4_DEFAULT_UART_OFFSET 0x010000 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* MMC SPL */ #define CONFIG_SKIP_LOWLEVEL_INIT #define COPY_BL2_FNPTR_ADDR 0x00002488 diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index cbef61877e..f5f99ee0d2 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -106,7 +106,6 @@ #define CONFIG_BOOTP_BOOTFILESIZE /* Environment settings */ -#define CONFIG_ENV_OVERWRITE /* Console settings */ diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 24bbea7d03..bbd3b11877 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -70,7 +70,6 @@ #define CONFIG_BOOTP_BOOTFILESIZE /* Environment settings */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_EXTRA_ENV_SETTINGS \ "ethaddr=00:00:00:00:00:00\0" \ diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 5ea8efabfc..62e1405d1c 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -96,8 +96,6 @@ * Environment */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x82000000\0" \ "loadaddr=0x82000000\0" \ diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index eb17470ae6..2271f26a6b 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -47,7 +47,6 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Environment settings */ -#define CONFIG_ENV_OVERWRITE /* * Autoboot diff --git a/include/configs/socfpga_dbm_soc1.h b/include/configs/socfpga_dbm_soc1.h index befaeaaf54..bffedcb750 100644 --- a/include/configs/socfpga_dbm_soc1.h +++ b/include/configs/socfpga_dbm_soc1.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Environment is in MMC */ -#define CONFIG_ENV_OVERWRITE /* Extra Environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h index 590a9af274..50c5961703 100644 --- a/include/configs/socfpga_mcvevk.h +++ b/include/configs/socfpga_mcvevk.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Environment is in MMC */ -#define CONFIG_ENV_OVERWRITE /* Extra Environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index e74ba6cc34..4ba51d5327 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -88,7 +88,6 @@ /* * Default Environment Varible definitions */ -#define CONFIG_ENV_OVERWRITE /* * U-Boot Environment placing definitions. diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index d9c79907ac..d9a2f75e73 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -132,8 +132,6 @@ #define CONFIG_ENV_IS_IN_SPI_FLASH 1 #endif -#undef CONFIG_ENV_OVERWRITE - /* Cache Configuration */ #define CONFIG_SYS_CACHELINE_SIZE 16 #define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \ diff --git a/include/configs/strider.h b/include/configs/strider.h index f860865b7c..85db657077 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -408,8 +408,6 @@ void fpga_control_clear(unsigned int bus, int pin); * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE - #if defined(CONFIG_TSEC_ENET) #define CONFIG_HAS_ETH0 #endif diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index 1f6ae462ae..a5cbb112f3 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -28,8 +28,6 @@ #define CONFIG_SRIO1 /* SRIO port 1 */ #define CONFIG_SRIO2 /* SRIO port 2 */ -#define CONFIG_ENV_OVERWRITE - /* * These can be toggled for performance analysis, otherwise use default. */ diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 060030b838..0250d457f5 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -51,8 +51,6 @@ */ #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} /* EHCI */ diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index a283e1e029..4c2dc9993b 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -51,9 +51,6 @@ */ #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* commands to include */ #define CONFIG_SYS_I2C diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 32845978a6..f4c6bdd146 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -68,7 +68,6 @@ /* Environment organization */ #define CONFIG_SYS_MMC_ENV_DEV 2 /* overwritten on SD boot */ #define CONFIG_SYS_MMC_ENV_PART 1 /* overwritten on SD boot */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BOARD_SIZE_LIMIT 392192 /* (CONFIG_ENV_OFFSET - 1024) */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 175c55c613..2b968917d3 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -38,9 +38,6 @@ */ #define CONFIG_SYS_MMC_MAX_DEVICE 4 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* * Increasing the size of the IO buffer as default nfsargs size is more * than 256 and so it is not possible to edit it diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 0e5bd0dbbf..85ab34c083 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -36,7 +36,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 /* Environment in SPI NOR flash */ -#define CONFIG_ENV_OVERWRITE #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 264b1f1a4c..bba48f3c66 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -113,8 +113,6 @@ /* CPU */ -#define CONFIG_ENV_OVERWRITE - /* Defines for SPL */ #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 01a174b29f..7ca749a568 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -47,7 +47,6 @@ #define CONFIG_SYS_NS16550_COM1 0x48024000 /* Base EVM has UART2 */ /* allow overwriting serial config and ethaddr */ -#define CONFIG_ENV_OVERWRITE /* diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 08829781e3..d1bf2e8062 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -102,7 +102,6 @@ * console baudrate of 115200 and use the default baud rate table. */ #define CONFIG_SYS_MALLOC_LEN SZ_32M -#define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */ /* As stated above, the following choices are optional. */ diff --git a/include/configs/trats.h b/include/configs/trats.h index f39a7c726a..75b1989bb7 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -48,8 +48,6 @@ #define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV -#define CONFIG_ENV_OVERWRITE - /* Tizen - partitions definitions */ #define PARTS_CSA "csa-mmc" #define PARTS_BOOT "boot" diff --git a/include/configs/trats2.h b/include/configs/trats2.h index f6593e227b..b2e0170187 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -43,8 +43,6 @@ #define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV -#define CONFIG_ENV_OVERWRITE - /* Tizen - partitions definitions */ #define PARTS_CSA "csa-mmc" #define PARTS_BOOT "boot" diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 83aa3cd468..7ab368bd01 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -127,9 +127,6 @@ "bootm ${loadaddr} ${rdaddr}\0" #else /* CONFIG_FLASHCARD */ - -#define CONFIG_ENV_OVERWRITE /* allow to overwrite serial and ethaddr */ - #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_COMMON_ENV_SETTINGS \ "mmcargs=" \ diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index aca0d860af..f321c15203 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -55,9 +55,6 @@ #define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 0 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE /* disable vendor parameters protection (serial#, ethaddr) */ - /*********************************************************** * Command definition ***********************************************************/ diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index 49279fca40..51445ec60a 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -62,7 +62,6 @@ /* * Ethernet Driver configuration */ -#define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ #define CONFIG_ARP_TIMEOUT 200 #define CONFIG_NET_RETRY_COUNT 50 diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 878c4996df..3f1a145d09 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -83,7 +83,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_ENV_OVERWRITE #if defined(CONFIG_ENV_IS_IN_MMC) /* Environment in eMMC, before config block at the end of 1st "boot sector" */ #define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC1 eMMC */ diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index ffc3b43fc5..b131480e5b 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -229,7 +229,6 @@ * We don't know which end has the small erase blocks so we use the penultimate * sector location for the environment */ -#define CONFIG_ENV_OVERWRITE 1 /* Store environment at top of flash */ #define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */ diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 0ef2de33cc..20a03cff63 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -23,9 +23,6 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* NAND support */ #define CONFIG_SYS_NAND_ONFI_DETECTION diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index bd94352179..20fcce1870 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -251,7 +251,6 @@ /* * Environment Configuration */ -#define CONFIG_ENV_OVERWRITE #if defined(CONFIG_TSEC_ENET) #define CONFIG_HAS_ETH0 diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h index 6ae777507f..f6e67b963e 100644 --- a/include/configs/wb45n.h +++ b/include/configs/wb45n.h @@ -55,7 +55,6 @@ #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_MACB_SEARCH_PHY #define CONFIG_ETHADDR C0:EE:40:00:00:00 -#define CONFIG_ENV_OVERWRITE 1 /* System */ #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h index c65e591342..0ac036cf83 100644 --- a/include/configs/wb50n.h +++ b/include/configs/wb50n.h @@ -56,7 +56,6 @@ #define CONFIG_MACB_SEARCH_PHY #define CONFIG_RGMII #define CONFIG_ETHADDR C0:EE:40:00:00:00 -#define CONFIG_ENV_OVERWRITE 1 #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index bd62798d26..641ed2c5ec 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -65,9 +65,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN 0x200000 -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /*----------------------------------------------------------------------- * Environment configuration */ diff --git a/include/configs/xea.h b/include/configs/xea.h index 144f62e8f9..df058193d6 100644 --- a/include/configs/xea.h +++ b/include/configs/xea.h @@ -39,7 +39,6 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Environment */ -#define CONFIG_ENV_OVERWRITE /* Booting Linux */ #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h index 51efab1d2c..4fc7154fff 100644 --- a/include/configs/xfi3.h +++ b/include/configs/xfi3.h @@ -13,7 +13,6 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Environment */ -#define CONFIG_ENV_OVERWRITE /* Booting Linux */ #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/xilinx_zynqmp_r5.h b/include/configs/xilinx_zynqmp_r5.h index c6cf82e244..c0cd72e564 100644 --- a/include/configs/xilinx_zynqmp_r5.h +++ b/include/configs/xilinx_zynqmp_r5.h @@ -16,9 +16,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Boot configuration */ #define CONFIG_SYS_LOAD_ADDR 0 /* default? */ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 59e77f6ecc..246f7d138c 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -93,9 +93,6 @@ # define DFU_ALT_INFO #endif -/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* enable preboot to be loaded before CONFIG_BOOTDELAY */ /* Boot configuration */ |