* [U-Boot] [RFC PATCH 0/8] Complex config moves
@ 2015-05-14 4:29 Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 1/8] Add env persist location to Kconfig Joe Hershberger
` (7 more replies)
0 siblings, 8 replies; 10+ messages in thread
From: Joe Hershberger @ 2015-05-14 4:29 UTC (permalink / raw)
To: u-boot
I made a pass at some of the configs that seem to be less straightforward
in the include configs. Especially the environment location a number of
boards select based on other variables. Blackfin even has its own
bootmode variable that it keys off of. This is of course simply set for
each board, so the actual resulting value is still singular per board.
How much of this sort of selection do we want to retain on these boards
vs. just resolving to what it ends up being for each board (which is
what tools/moveconfig.py does)?
Joe Hershberger (8):
Add env persist location to Kconfig
Move env location selection from include to defconfig
Add RBTREE to Kconfig
Add CMD_UBI to Kconfig
Add decompression to Kconfig
Add CMD_UBIFS to Kconfig
Move compression and UBI from include to defconfig
Move setexpr to Kconfig
common/Kconfig | 126 +++++++++++++++++++++
configs/A10-OLinuXino-Lime_defconfig | 2 +
configs/A10s-OLinuXino-M_defconfig | 2 +
configs/A13-OLinuXinoM_defconfig | 2 +
configs/A13-OLinuXino_defconfig | 2 +
configs/A20-OLinuXino-Lime2_defconfig | 2 +
configs/A20-OLinuXino-Lime_defconfig | 2 +
configs/A20-OLinuXino_MICRO_defconfig | 2 +
configs/Ainol_AW1_defconfig | 2 +
configs/Ampe_A76_defconfig | 2 +
configs/Astar_MID756_defconfig | 2 +
configs/Auxtek-T004_defconfig | 2 +
configs/B4420QDS_NAND_defconfig | 2 +
configs/B4420QDS_SPIFLASH_defconfig | 2 +
configs/B4420QDS_defconfig | 1 +
configs/B4860QDS_NAND_defconfig | 2 +
configs/B4860QDS_SECURE_BOOT_defconfig | 1 +
configs/B4860QDS_SPIFLASH_defconfig | 2 +
configs/B4860QDS_SRIO_PCIE_BOOT_defconfig | 2 +
configs/B4860QDS_defconfig | 1 +
configs/BSC9131RDB_NAND_SYSCLK100_defconfig | 2 +
configs/BSC9131RDB_NAND_defconfig | 2 +
configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig | 2 +
configs/BSC9131RDB_SPIFLASH_defconfig | 2 +
configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig | 1 +
configs/BSC9132QDS_NAND_DDRCLK100_defconfig | 2 +
configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig | 1 +
configs/BSC9132QDS_NAND_DDRCLK133_defconfig | 2 +
configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig | 1 +
configs/BSC9132QDS_NOR_DDRCLK100_defconfig | 2 +
configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig | 1 +
configs/BSC9132QDS_NOR_DDRCLK133_defconfig | 2 +
.../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig | 1 +
configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig | 2 +
.../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig | 1 +
configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig | 2 +
.../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig | 1 +
configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig | 2 +
.../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig | 1 +
configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig | 2 +
configs/Bananapi_defconfig | 2 +
configs/Bananapro_defconfig | 2 +
configs/C29XPCIE_NAND_defconfig | 2 +
configs/C29XPCIE_NOR_SECBOOT_defconfig | 1 +
configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig | 1 +
configs/C29XPCIE_SPIFLASH_defconfig | 2 +
configs/C29XPCIE_defconfig | 2 +
configs/CPCI2DP_defconfig | 1 +
configs/CPCI4052_defconfig | 1 +
configs/CSQ_CS908_defconfig | 2 +
configs/Chuwi_V7_CW0825_defconfig | 2 +
configs/Colombus_defconfig | 2 +
configs/Cubieboard2_defconfig | 2 +
configs/Cubieboard_defconfig | 2 +
configs/Cubietruck_defconfig | 2 +
configs/Hummingbird_A31_defconfig | 2 +
configs/Hyundai_A7HD_defconfig | 2 +
configs/Ippo_q8h_v1_2_a33_1024x600_defconfig | 2 +
configs/Ippo_q8h_v1_2_defconfig | 2 +
configs/Ippo_q8h_v5_defconfig | 2 +
configs/Linksprite_pcDuino3_Nano_defconfig | 2 +
configs/Linksprite_pcDuino3_defconfig | 2 +
configs/Linksprite_pcDuino_defconfig | 2 +
configs/M5208EVBE_defconfig | 1 +
configs/M52277EVB_defconfig | 1 +
configs/M52277EVB_stmicro_defconfig | 1 +
configs/M5235EVB_Flash32_defconfig | 1 +
configs/M5235EVB_defconfig | 1 +
configs/M5249EVB_defconfig | 1 +
configs/M5253DEMO_defconfig | 1 +
configs/M5253EVBE_defconfig | 1 +
configs/M5272C3_defconfig | 1 +
configs/M5275EVB_defconfig | 1 +
configs/M5282EVB_defconfig | 1 +
configs/M53017EVB_defconfig | 1 +
configs/M5329AFEE_defconfig | 1 +
configs/M5329BFEE_defconfig | 1 +
configs/M5373EVB_defconfig | 1 +
configs/M54418TWR_defconfig | 1 +
configs/M54418TWR_serial_mii_defconfig | 1 +
configs/M54418TWR_serial_rmii_defconfig | 1 +
configs/M54451EVB_defconfig | 1 +
configs/M54451EVB_stmicro_defconfig | 1 +
configs/M54455EVB_a66_defconfig | 1 +
configs/M54455EVB_defconfig | 1 +
configs/M54455EVB_i66_defconfig | 1 +
configs/M54455EVB_intel_defconfig | 1 +
configs/M54455EVB_stm33_defconfig | 1 +
configs/M5475AFE_defconfig | 1 +
configs/M5475BFE_defconfig | 1 +
configs/M5475CFE_defconfig | 1 +
configs/M5475DFE_defconfig | 1 +
configs/M5475EFE_defconfig | 1 +
configs/M5475FFE_defconfig | 1 +
configs/M5475GFE_defconfig | 1 +
configs/M5485AFE_defconfig | 1 +
configs/M5485BFE_defconfig | 1 +
configs/M5485CFE_defconfig | 1 +
configs/M5485DFE_defconfig | 1 +
configs/M5485EFE_defconfig | 1 +
configs/M5485FFE_defconfig | 1 +
configs/M5485GFE_defconfig | 1 +
configs/M5485HFE_defconfig | 1 +
configs/MIP405T_defconfig | 2 +
configs/MIP405_defconfig | 2 +
configs/MK808C_defconfig | 2 +
configs/MPC8308RDB_defconfig | 1 +
configs/MPC8313ERDB_33_defconfig | 1 +
configs/MPC8313ERDB_66_defconfig | 1 +
configs/MPC8313ERDB_NAND_33_defconfig | 1 +
configs/MPC8313ERDB_NAND_66_defconfig | 1 +
configs/MPC8315ERDB_defconfig | 1 +
configs/MPC8323ERDB_defconfig | 1 +
configs/MPC832XEMDS_ATM_defconfig | 1 +
configs/MPC832XEMDS_HOST_33_defconfig | 1 +
configs/MPC832XEMDS_HOST_66_defconfig | 1 +
configs/MPC832XEMDS_SLAVE_defconfig | 1 +
configs/MPC832XEMDS_defconfig | 1 +
configs/MPC8349EMDS_defconfig | 1 +
configs/MPC8349ITXGP_defconfig | 1 +
configs/MPC8349ITX_LOWBOOT_defconfig | 1 +
configs/MPC837XEMDS_HOST_defconfig | 1 +
configs/MPC837XEMDS_defconfig | 1 +
configs/MPC837XERDB_defconfig | 1 +
configs/MPC8536DS_36BIT_defconfig | 2 +
configs/MPC8536DS_SDCARD_defconfig | 2 +
configs/MPC8536DS_SPIFLASH_defconfig | 2 +
configs/MPC8536DS_defconfig | 2 +
configs/MPC8540ADS_defconfig | 2 +
configs/MPC8541CDS_defconfig | 2 +
configs/MPC8541CDS_legacy_defconfig | 2 +
configs/MPC8544DS_defconfig | 2 +
configs/MPC8548CDS_36BIT_defconfig | 2 +
configs/MPC8548CDS_defconfig | 2 +
configs/MPC8548CDS_legacy_defconfig | 2 +
configs/MPC8555CDS_defconfig | 2 +
configs/MPC8555CDS_legacy_defconfig | 2 +
configs/MPC8560ADS_defconfig | 2 +
configs/MPC8568MDS_defconfig | 2 +
configs/MPC8569MDS_ATM_defconfig | 2 +
configs/MPC8569MDS_defconfig | 2 +
configs/MPC8572DS_36BIT_defconfig | 2 +
configs/MPC8572DS_defconfig | 2 +
configs/MPC8610HPCD_defconfig | 1 +
configs/MPC8641HPCN_36BIT_defconfig | 1 +
configs/MPC8641HPCN_defconfig | 1 +
configs/MSI_Primo73_defconfig | 2 +
configs/MSI_Primo81_defconfig | 2 +
configs/Marsboard_A10_defconfig | 2 +
configs/Mele_A1000_defconfig | 2 +
configs/Mele_I7_defconfig | 2 +
configs/Mele_M3_defconfig | 2 +
configs/Mele_M5_defconfig | 2 +
configs/Mele_M9_defconfig | 2 +
configs/MigoR_defconfig | 1 +
configs/Mini-X_defconfig | 2 +
configs/MiniFAP_defconfig | 1 +
configs/O2D300_defconfig | 1 +
configs/O2DNT2_RAMBOOT_defconfig | 1 +
configs/O2DNT2_defconfig | 1 +
configs/O2D_defconfig | 2 +
configs/O2MNT_O2M110_defconfig | 1 +
configs/O2MNT_O2M112_defconfig | 2 +
configs/O2MNT_O2M113_defconfig | 1 +
configs/O2MNT_defconfig | 1 +
configs/O3DNT_defconfig | 1 +
configs/Orangepi_defconfig | 2 +
configs/Orangepi_mini_defconfig | 2 +
configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig | 1 +
configs/P1010RDB-PA_36BIT_NAND_defconfig | 2 +
configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig | 1 +
configs/P1010RDB-PA_36BIT_NOR_defconfig | 2 +
configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 2 +
.../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig | 1 +
configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 2 +
configs/P1010RDB-PA_NAND_SECBOOT_defconfig | 1 +
configs/P1010RDB-PA_NAND_defconfig | 2 +
configs/P1010RDB-PA_NOR_SECBOOT_defconfig | 1 +
configs/P1010RDB-PA_NOR_defconfig | 2 +
configs/P1010RDB-PA_SDCARD_defconfig | 2 +
configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig | 1 +
configs/P1010RDB-PA_SPIFLASH_defconfig | 2 +
configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig | 1 +
configs/P1010RDB-PB_36BIT_NAND_defconfig | 2 +
configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig | 1 +
configs/P1010RDB-PB_36BIT_NOR_defconfig | 2 +
configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 2 +
.../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig | 1 +
configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 2 +
configs/P1010RDB-PB_NAND_SECBOOT_defconfig | 1 +
configs/P1010RDB-PB_NAND_defconfig | 2 +
configs/P1010RDB-PB_NOR_SECBOOT_defconfig | 1 +
configs/P1010RDB-PB_NOR_defconfig | 2 +
configs/P1010RDB-PB_SDCARD_defconfig | 2 +
configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig | 1 +
configs/P1010RDB-PB_SPIFLASH_defconfig | 2 +
configs/P1020MBG-PC_36BIT_SDCARD_defconfig | 2 +
configs/P1020MBG-PC_36BIT_defconfig | 2 +
configs/P1020MBG-PC_SDCARD_defconfig | 2 +
configs/P1020MBG-PC_defconfig | 2 +
configs/P1020RDB-PC_36BIT_NAND_defconfig | 2 +
configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 2 +
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 2 +
configs/P1020RDB-PC_36BIT_defconfig | 2 +
configs/P1020RDB-PC_NAND_defconfig | 2 +
configs/P1020RDB-PC_SDCARD_defconfig | 2 +
configs/P1020RDB-PC_SPIFLASH_defconfig | 2 +
configs/P1020RDB-PC_defconfig | 2 +
configs/P1020RDB-PD_NAND_defconfig | 2 +
configs/P1020RDB-PD_SDCARD_defconfig | 2 +
configs/P1020RDB-PD_SPIFLASH_defconfig | 2 +
configs/P1020RDB-PD_defconfig | 2 +
configs/P1020UTM-PC_36BIT_SDCARD_defconfig | 2 +
configs/P1020UTM-PC_36BIT_defconfig | 2 +
configs/P1020UTM-PC_SDCARD_defconfig | 2 +
configs/P1020UTM-PC_defconfig | 2 +
configs/P1021RDB-PC_36BIT_NAND_defconfig | 2 +
configs/P1021RDB-PC_36BIT_SDCARD_defconfig | 2 +
configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig | 2 +
configs/P1021RDB-PC_36BIT_defconfig | 2 +
configs/P1021RDB-PC_NAND_defconfig | 2 +
configs/P1021RDB-PC_SDCARD_defconfig | 2 +
configs/P1021RDB-PC_SPIFLASH_defconfig | 2 +
configs/P1021RDB-PC_defconfig | 2 +
configs/P1022DS_36BIT_NAND_defconfig | 2 +
configs/P1022DS_36BIT_SDCARD_defconfig | 2 +
configs/P1022DS_36BIT_SPIFLASH_defconfig | 2 +
configs/P1022DS_36BIT_defconfig | 2 +
configs/P1022DS_NAND_defconfig | 2 +
configs/P1022DS_SDCARD_defconfig | 2 +
configs/P1022DS_SPIFLASH_defconfig | 2 +
configs/P1022DS_defconfig | 2 +
configs/P1023RDB_defconfig | 2 +
configs/P1024RDB_36BIT_defconfig | 2 +
configs/P1024RDB_NAND_defconfig | 2 +
configs/P1024RDB_SDCARD_defconfig | 2 +
configs/P1024RDB_SPIFLASH_defconfig | 2 +
configs/P1024RDB_defconfig | 2 +
configs/P1025RDB_36BIT_defconfig | 2 +
configs/P1025RDB_NAND_defconfig | 2 +
configs/P1025RDB_SDCARD_defconfig | 2 +
configs/P1025RDB_SPIFLASH_defconfig | 2 +
configs/P1025RDB_defconfig | 2 +
configs/P2020RDB-PC_36BIT_NAND_defconfig | 2 +
configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 2 +
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 2 +
configs/P2020RDB-PC_36BIT_defconfig | 2 +
configs/P2020RDB-PC_NAND_defconfig | 2 +
configs/P2020RDB-PC_SDCARD_defconfig | 2 +
configs/P2020RDB-PC_SPIFLASH_defconfig | 2 +
configs/P2020RDB-PC_defconfig | 2 +
configs/P2041RDB_NAND_defconfig | 2 +
configs/P2041RDB_SDCARD_defconfig | 2 +
configs/P2041RDB_SECURE_BOOT_defconfig | 1 +
configs/P2041RDB_SPIFLASH_defconfig | 2 +
configs/P2041RDB_SRIO_PCIE_BOOT_defconfig | 2 +
configs/P2041RDB_defconfig | 1 +
configs/P3041DS_NAND_defconfig | 2 +
configs/P3041DS_SDCARD_defconfig | 2 +
configs/P3041DS_SECURE_BOOT_defconfig | 1 +
configs/P3041DS_SPIFLASH_defconfig | 2 +
configs/P3041DS_SRIO_PCIE_BOOT_defconfig | 2 +
configs/P3041DS_defconfig | 1 +
configs/P4080DS_SDCARD_defconfig | 2 +
configs/P4080DS_SECURE_BOOT_defconfig | 1 +
configs/P4080DS_SPIFLASH_defconfig | 2 +
configs/P4080DS_SRIO_PCIE_BOOT_defconfig | 2 +
configs/P4080DS_defconfig | 1 +
configs/P5020DS_NAND_defconfig | 2 +
configs/P5020DS_SDCARD_defconfig | 2 +
configs/P5020DS_SECURE_BOOT_defconfig | 1 +
configs/P5020DS_SPIFLASH_defconfig | 2 +
configs/P5020DS_SRIO_PCIE_BOOT_defconfig | 2 +
configs/P5020DS_defconfig | 1 +
configs/P5040DS_NAND_defconfig | 2 +
configs/P5040DS_SDCARD_defconfig | 2 +
configs/P5040DS_SECURE_BOOT_defconfig | 1 +
configs/P5040DS_SPIFLASH_defconfig | 2 +
configs/P5040DS_defconfig | 1 +
configs/PATI_defconfig | 1 +
configs/PIP405_defconfig | 2 +
configs/PLU405_defconfig | 3 +
configs/PMC405DE_defconfig | 1 +
configs/PMC440_defconfig | 1 +
configs/T1023RDB_NAND_defconfig | 2 +
configs/T1023RDB_SDCARD_defconfig | 2 +
configs/T1023RDB_SECURE_BOOT_defconfig | 1 +
configs/T1023RDB_SPIFLASH_defconfig | 2 +
configs/T1023RDB_defconfig | 1 +
configs/T1024QDS_D4_SECURE_BOOT_defconfig | 1 +
configs/T1024QDS_NAND_defconfig | 2 +
configs/T1024QDS_SDCARD_defconfig | 2 +
configs/T1024QDS_SECURE_BOOT_defconfig | 1 +
configs/T1024QDS_SPIFLASH_defconfig | 2 +
configs/T1024QDS_defconfig | 1 +
configs/T1024RDB_NAND_defconfig | 2 +
configs/T1024RDB_SDCARD_defconfig | 2 +
configs/T1024RDB_SECURE_BOOT_defconfig | 1 +
configs/T1024RDB_SPIFLASH_defconfig | 2 +
configs/T1024RDB_defconfig | 1 +
configs/T1040QDS_D4_defconfig | 2 +
configs/T1040QDS_SECURE_BOOT_defconfig | 1 +
configs/T1040QDS_defconfig | 2 +
configs/T1040RDB_NAND_defconfig | 2 +
configs/T1040RDB_SDCARD_defconfig | 2 +
configs/T1040RDB_SECURE_BOOT_defconfig | 1 +
configs/T1040RDB_SPIFLASH_defconfig | 2 +
configs/T1040RDB_defconfig | 2 +
configs/T1042RDB_PI_NAND_defconfig | 2 +
configs/T1042RDB_PI_SDCARD_defconfig | 2 +
configs/T1042RDB_PI_SPIFLASH_defconfig | 2 +
configs/T1042RDB_PI_defconfig | 2 +
configs/T1042RDB_SECURE_BOOT_defconfig | 1 +
configs/T1042RDB_defconfig | 2 +
configs/T2080QDS_NAND_defconfig | 2 +
configs/T2080QDS_SDCARD_defconfig | 2 +
configs/T2080QDS_SECURE_BOOT_defconfig | 1 +
configs/T2080QDS_SPIFLASH_defconfig | 2 +
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 2 +
configs/T2080QDS_defconfig | 1 +
configs/T2080RDB_NAND_defconfig | 2 +
configs/T2080RDB_SDCARD_defconfig | 2 +
configs/T2080RDB_SECURE_BOOT_defconfig | 1 +
configs/T2080RDB_SPIFLASH_defconfig | 2 +
configs/T2080RDB_SRIO_PCIE_BOOT_defconfig | 2 +
configs/T2080RDB_defconfig | 1 +
configs/T2081QDS_NAND_defconfig | 2 +
configs/T2081QDS_SDCARD_defconfig | 2 +
configs/T2081QDS_SPIFLASH_defconfig | 2 +
configs/T2081QDS_SRIO_PCIE_BOOT_defconfig | 2 +
configs/T2081QDS_defconfig | 1 +
configs/T4160QDS_NAND_defconfig | 2 +
configs/T4160QDS_SDCARD_defconfig | 2 +
configs/T4160QDS_SECURE_BOOT_defconfig | 1 +
configs/T4160QDS_defconfig | 1 +
configs/T4160RDB_defconfig | 1 +
configs/T4240QDS_NAND_defconfig | 2 +
configs/T4240QDS_SDCARD_defconfig | 2 +
configs/T4240QDS_SECURE_BOOT_defconfig | 1 +
configs/T4240QDS_SRIO_PCIE_BOOT_defconfig | 2 +
configs/T4240QDS_defconfig | 1 +
configs/T4240RDB_SDCARD_defconfig | 2 +
configs/T4240RDB_defconfig | 1 +
configs/TQM5200S_HIGHBOOT_defconfig | 1 +
configs/TQM5200S_defconfig | 1 +
configs/TQM5200_B_HIGHBOOT_defconfig | 1 +
configs/TQM5200_B_defconfig | 1 +
configs/TQM5200_STK100_defconfig | 1 +
configs/TQM5200_defconfig | 1 +
configs/TQM823L_LCD_defconfig | 1 +
configs/TQM823L_defconfig | 1 +
configs/TQM823M_defconfig | 1 +
configs/TQM834x_defconfig | 1 +
configs/TQM850L_defconfig | 1 +
configs/TQM850M_defconfig | 1 +
configs/TQM855L_defconfig | 1 +
configs/TQM855M_defconfig | 1 +
configs/TQM860L_defconfig | 1 +
configs/TQM860M_defconfig | 1 +
configs/TQM862L_defconfig | 1 +
configs/TQM862M_defconfig | 1 +
configs/TQM866M_defconfig | 1 +
configs/TQM885D_defconfig | 1 +
configs/TTTech_defconfig | 1 +
configs/TWR-P1025_defconfig | 2 +
configs/TZX-Q8-713B7_defconfig | 2 +
configs/UCP1020_SPIFLASH_defconfig | 2 +
configs/UCP1020_defconfig | 2 +
configs/UTOO_P66_defconfig | 2 +
configs/VCMA9_defconfig | 5 +
configs/VOM405_defconfig | 1 +
configs/Wexler_TAB7200_defconfig | 2 +
configs/Wits_Pro_A20_DKT_defconfig | 2 +
configs/Yones_Toptech_BD1078_defconfig | 2 +
configs/a3m071_defconfig | 3 +
configs/a4m072_defconfig | 1 +
configs/a4m2k_defconfig | 3 +
configs/ac14xx_defconfig | 1 +
configs/acadia_defconfig | 2 +
configs/adp-ag101_defconfig | 1 +
configs/adp-ag101p_defconfig | 1 +
configs/afeb9260_defconfig | 1 +
configs/alpr_defconfig | 1 +
configs/alt_defconfig | 1 +
configs/am335x_boneblack_defconfig | 2 +
configs/am335x_boneblack_vboot_defconfig | 2 +
configs/am335x_evm_defconfig | 2 +
configs/am335x_evm_nor_defconfig | 2 +
configs/am335x_evm_norboot_defconfig | 2 +
configs/am335x_evm_spiboot_defconfig | 2 +
configs/am335x_evm_usbspl_defconfig | 2 +
configs/am335x_igep0033_defconfig | 3 +
configs/am3517_crane_defconfig | 1 +
configs/am3517_evm_defconfig | 1 +
configs/am43xx_evm_defconfig | 1 +
configs/am43xx_evm_qspiboot_defconfig | 1 +
configs/amcore_defconfig | 1 +
configs/ap325rxa_defconfig | 1 +
configs/ap_sh4a_4a_defconfig | 1 +
configs/apalis_t30_defconfig | 2 +
configs/apf27_defconfig | 4 +
configs/apx4devkit_defconfig | 3 +
configs/arches_defconfig | 2 +
configs/aria_defconfig | 1 +
configs/aristainetos_defconfig | 4 +
configs/armadillo-800eva_defconfig | 1 +
configs/arndale_defconfig | 1 +
configs/astro_mcf5373l_defconfig | 1 +
configs/at91rm9200ek_defconfig | 1 +
configs/at91rm9200ek_ram_defconfig | 1 +
configs/at91sam9260ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9260ek_dataflash_cs1_defconfig | 1 +
configs/at91sam9260ek_nandflash_defconfig | 1 +
configs/at91sam9261ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9261ek_dataflash_cs3_defconfig | 1 +
configs/at91sam9261ek_nandflash_defconfig | 1 +
configs/at91sam9263ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9263ek_dataflash_defconfig | 1 +
configs/at91sam9263ek_nandflash_defconfig | 1 +
configs/at91sam9263ek_norflash_boot_defconfig | 1 +
configs/at91sam9263ek_norflash_defconfig | 1 +
configs/at91sam9g10ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9g10ek_dataflash_cs3_defconfig | 1 +
configs/at91sam9g10ek_nandflash_defconfig | 1 +
configs/at91sam9g20ek_2mmc_defconfig | 1 +
configs/at91sam9g20ek_2mmc_nandflash_defconfig | 1 +
configs/at91sam9g20ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9g20ek_dataflash_cs1_defconfig | 1 +
configs/at91sam9g20ek_nandflash_defconfig | 1 +
configs/at91sam9m10g45ek_mmc_defconfig | 1 +
configs/at91sam9m10g45ek_nandflash_defconfig | 1 +
configs/at91sam9n12ek_mmc_defconfig | 1 +
configs/at91sam9n12ek_nandflash_defconfig | 1 +
configs/at91sam9n12ek_spiflash_defconfig | 1 +
configs/at91sam9rlek_dataflash_defconfig | 1 +
configs/at91sam9rlek_mmc_defconfig | 1 +
configs/at91sam9rlek_nandflash_defconfig | 1 +
configs/at91sam9x5ek_dataflash_defconfig | 3 +
configs/at91sam9x5ek_mmc_defconfig | 3 +
configs/at91sam9x5ek_nandflash_defconfig | 3 +
configs/at91sam9x5ek_spiflash_defconfig | 3 +
configs/at91sam9xeek_dataflash_cs0_defconfig | 1 +
configs/at91sam9xeek_dataflash_cs1_defconfig | 1 +
configs/at91sam9xeek_nandflash_defconfig | 1 +
configs/atngw100_defconfig | 1 +
configs/atngw100mkii_defconfig | 1 +
configs/atstk1002_defconfig | 1 +
configs/atstk1003_defconfig | 1 +
configs/atstk1004_defconfig | 1 +
configs/atstk1006_defconfig | 1 +
configs/axm_defconfig | 1 +
configs/axs101_defconfig | 1 +
configs/axs103_defconfig | 1 +
configs/ba10_tv_box_defconfig | 2 +
configs/balloon3_defconfig | 2 +
configs/bamboo_defconfig | 2 +
configs/bct-brettl2_defconfig | 1 +
configs/beagle_x15_defconfig | 1 +
configs/beaver_defconfig | 1 +
configs/bf506f-ezkit_defconfig | 1 +
configs/bf518f-ezbrd_defconfig | 1 +
configs/bf525-ucr2_defconfig | 1 +
configs/bf526-ezbrd_defconfig | 2 +
configs/bf527-ad7160-eval_defconfig | 1 +
configs/bf527-ezkit-v2_defconfig | 1 +
configs/bf527-ezkit_defconfig | 2 +
configs/bf527-sdp_defconfig | 1 +
configs/bf533-ezkit_defconfig | 1 +
configs/bf533-stamp_defconfig | 2 +
configs/bf537-minotaur_defconfig | 1 +
configs/bf537-srv1_defconfig | 1 +
configs/bf537-stamp_defconfig | 1 +
configs/bf538f-ezkit_defconfig | 2 +
configs/bf548-ezkit_defconfig | 2 +
configs/bf561-acvilon_defconfig | 2 +
configs/bf561-ezkit_defconfig | 1 +
configs/bf609-ezkit_defconfig | 1 +
configs/bg0900_defconfig | 1 +
configs/birdland_bav335a_defconfig | 1 +
configs/birdland_bav335b_defconfig | 1 +
configs/blackvme_defconfig | 1 +
configs/br4_defconfig | 1 +
configs/bubinga_defconfig | 2 +
configs/caddy2_defconfig | 1 +
configs/cairo_defconfig | 2 +
configs/calimain_defconfig | 1 +
configs/cam5200_defconfig | 1 +
configs/cam5200_niosflash_defconfig | 1 +
configs/cam_enc_4xx_defconfig | 3 +
configs/canmb_defconfig | 1 +
configs/canyonlands_defconfig | 2 +
configs/cardhu_defconfig | 1 +
configs/cgtqmx6qeval_defconfig | 1 +
configs/charon_defconfig | 1 +
configs/chromebook_link_defconfig | 3 +
configs/chromebox_panther_defconfig | 3 +
configs/cm-bf527_defconfig | 1 +
configs/cm-bf533_defconfig | 2 +
configs/cm-bf537e_defconfig | 3 +
configs/cm-bf537u_defconfig | 1 +
configs/cm-bf548_defconfig | 3 +
configs/cm-bf561_defconfig | 1 +
configs/cm5200_defconfig | 1 +
configs/cm_fx6_defconfig | 1 +
configs/cm_t335_defconfig | 1 +
configs/cm_t3517_defconfig | 1 +
configs/cm_t35_defconfig | 1 +
configs/cm_t54_defconfig | 1 +
configs/cmi_mpc5xx_defconfig | 1 +
configs/cobra5272_defconfig | 1 +
configs/colibri_pxa270_defconfig | 2 +
configs/colibri_t20_defconfig | 2 +
configs/colibri_t30_defconfig | 2 +
configs/colibri_vf_defconfig | 3 +
.../controlcenterd_36BIT_SDCARD_DEVELOP_defconfig | 2 +
configs/controlcenterd_36BIT_SDCARD_defconfig | 2 +
configs/coreboot-x86_defconfig | 3 +
configs/corvus_defconfig | 1 +
configs/cpu9260_128M_defconfig | 1 +
configs/cpu9260_defconfig | 1 +
configs/cpu9260_nand_128M_defconfig | 1 +
configs/cpu9260_nand_defconfig | 1 +
configs/cpu9G20_128M_defconfig | 1 +
configs/cpu9G20_defconfig | 1 +
configs/cpu9G20_nand_128M_defconfig | 1 +
configs/cpu9G20_nand_defconfig | 1 +
configs/cpuat91_defconfig | 1 +
configs/cpuat91_ram_defconfig | 1 +
configs/crownbay_defconfig | 3 +
configs/csb272_defconfig | 1 +
configs/csb472_defconfig | 1 +
configs/d2net_v2_defconfig | 1 +
configs/da830evm_defconfig | 1 +
configs/da850_am18xxevm_defconfig | 1 +
configs/da850evm_defconfig | 1 +
configs/da850evm_direct_nor_defconfig | 1 +
configs/dalmore_defconfig | 1 +
configs/davinci_dm355evm_defconfig | 2 +
configs/davinci_dm355leopard_defconfig | 2 +
configs/davinci_dm365evm_defconfig | 2 +
configs/davinci_dm6467Tevm_defconfig | 1 +
configs/davinci_dm6467evm_defconfig | 1 +
configs/davinci_dvevm_defconfig | 1 +
configs/davinci_schmoogie_defconfig | 1 +
configs/davinci_sffsdr_defconfig | 1 +
configs/davinci_sonata_defconfig | 1 +
configs/db-88f6820-gp_defconfig | 1 +
configs/db-mv784mp-gp_defconfig | 1 +
configs/devconcenter_defconfig | 2 +
configs/devkit8000_defconfig | 1 +
configs/dig297_defconfig | 3 +
configs/digsy_mtc_RAMBOOT_defconfig | 2 +
configs/digsy_mtc_defconfig | 2 +
configs/digsy_mtc_rev5_RAMBOOT_defconfig | 2 +
configs/digsy_mtc_rev5_defconfig | 2 +
configs/dlvision-10g_defconfig | 2 +
configs/dlvision_defconfig | 2 +
configs/dnp5370_defconfig | 2 +
configs/dns325_defconfig | 3 +
configs/dockstar_defconfig | 3 +
configs/dra7xx_evm_defconfig | 1 +
configs/dra7xx_evm_qspiboot_defconfig | 1 +
configs/dra7xx_evm_uart3_defconfig | 1 +
configs/draco_defconfig | 1 +
configs/dreamplug_defconfig | 1 +
configs/dxr2_defconfig | 1 +
configs/ea20_defconfig | 3 +
configs/eb_cpu5282_defconfig | 1 +
configs/eb_cpu5282_internal_defconfig | 1 +
configs/eb_cpux9k2_defconfig | 3 +
configs/eb_cpux9k2_ram_defconfig | 3 +
configs/ebony_defconfig | 2 +
configs/eco5pk_defconfig | 3 +
configs/ecovec_defconfig | 1 +
configs/edb9315a_defconfig | 1 +
configs/edminiv2_defconfig | 1 +
configs/enbw_cmc_defconfig | 3 +
configs/espt_defconfig | 1 +
configs/ethernut5_defconfig | 4 +
configs/favr-32-ezkit_defconfig | 1 +
configs/flea3_defconfig | 1 +
configs/fo300_defconfig | 1 +
configs/forfun_q88db_defconfig | 2 +
configs/fx12mm_defconfig | 1 +
configs/fx12mm_flash_defconfig | 1 +
configs/galileo_defconfig | 3 +
configs/gdppc440etx_defconfig | 2 +
configs/glacier_defconfig | 2 +
configs/glacier_ramboot_defconfig | 2 +
configs/goflexhome_defconfig | 3 +
configs/gose_defconfig | 1 +
configs/gplugd_defconfig | 1 +
configs/gr_cpci_ax2000_defconfig | 1 +
configs/gr_ep2s60_defconfig | 1 +
configs/gr_xc3s_1500_defconfig | 1 +
configs/grasshopper_defconfig | 1 +
configs/guruplug_defconfig | 5 +
configs/gwventana_defconfig | 4 +
configs/haleakala_defconfig | 2 +
configs/hammerhead_defconfig | 1 +
configs/harmony_defconfig | 1 +
configs/highbank_defconfig | 1 +
configs/hrcon_defconfig | 1 +
configs/hummingboard_solo_defconfig | 2 +
configs/i12-tvbox_defconfig | 2 +
configs/iNet_3F_defconfig | 2 +
configs/iNet_3W_defconfig | 2 +
configs/iNet_86VS_defconfig | 2 +
configs/ib62x0_defconfig | 5 +
configs/ibf-dsp561_defconfig | 1 +
configs/icon_defconfig | 2 +
configs/iconnect_defconfig | 5 +
configs/ids8313_defconfig | 3 +
configs/igep0020_defconfig | 1 +
configs/igep0020_nand_defconfig | 1 +
configs/igep0030_defconfig | 1 +
configs/igep0030_nand_defconfig | 1 +
configs/igep0032_defconfig | 1 +
configs/ima3-mx53_defconfig | 1 +
configs/imx27lite_defconfig | 1 +
configs/imx31_litekit_defconfig | 1 +
configs/imx31_phycore_defconfig | 1 +
configs/imx31_phycore_eet_defconfig | 1 +
configs/inetspace_v2_defconfig | 1 +
configs/inka4x0_defconfig | 1 +
configs/integratorcp_cm1136_defconfig | 1 +
configs/integratorcp_cm920t_defconfig | 1 +
configs/integratorcp_cm926ejs_defconfig | 1 +
configs/integratorcp_cm946es_defconfig | 1 +
configs/intip_defconfig | 2 +
configs/io64_defconfig | 2 +
configs/io_defconfig | 2 +
configs/iocon_defconfig | 2 +
configs/ip04_defconfig | 1 +
configs/ipam390_defconfig | 3 +
configs/ipek01_defconfig | 1 +
configs/jesurun_q5_defconfig | 2 +
configs/jetson-tk1_defconfig | 1 +
configs/jornada_defconfig | 1 +
configs/jupiter_defconfig | 1 +
configs/k2e_evm_defconfig | 3 +
configs/k2hk_evm_defconfig | 3 +
configs/k2l_evm_defconfig | 3 +
configs/katmai_defconfig | 2 +
configs/kilauea_defconfig | 2 +
configs/km_kirkwood_128m16_defconfig | 3 +
configs/km_kirkwood_defconfig | 3 +
configs/km_kirkwood_pci_defconfig | 3 +
configs/kmcoge4_defconfig | 3 +
configs/kmcoge5ne_defconfig | 3 +
configs/kmcoge5un_defconfig | 3 +
configs/kmeter1_defconfig | 3 +
configs/kmlion1_defconfig | 3 +
configs/kmnusa_defconfig | 3 +
configs/kmopti2_defconfig | 3 +
configs/kmsugp1_defconfig | 3 +
configs/kmsupx5_defconfig | 3 +
configs/kmsuv31_defconfig | 3 +
configs/kmvect1_defconfig | 3 +
configs/koelsch_defconfig | 1 +
configs/kwb_defconfig | 1 +
configs/kzm9g_defconfig | 1 +
configs/lager_defconfig | 1 +
configs/lcd4_lwmon5_defconfig | 1 +
configs/lp8x4x_defconfig | 2 +
configs/ls1021aqds_ddr4_nor_defconfig | 1 +
configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 +
configs/ls1021aqds_nand_defconfig | 1 +
configs/ls1021aqds_nor_defconfig | 1 +
configs/ls1021aqds_nor_lpuart_defconfig | 1 +
configs/ls1021aqds_qspi_defconfig | 1 +
configs/ls1021aqds_sdcard_defconfig | 1 +
configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 1 +
configs/ls1021atwr_nor_defconfig | 1 +
configs/ls1021atwr_nor_lpuart_defconfig | 1 +
configs/ls1021atwr_qspi_defconfig | 1 +
configs/ls1021atwr_sdcard_defconfig | 1 +
configs/ls2085aqds_defconfig | 1 +
configs/ls2085aqds_nand_defconfig | 1 +
configs/ls2085ardb_defconfig | 1 +
configs/ls2085ardb_nand_defconfig | 1 +
configs/lschlv2_defconfig | 1 +
configs/lsxhl_defconfig | 1 +
configs/luan_defconfig | 2 +
configs/lwmon5_defconfig | 1 +
configs/m28evk_defconfig | 4 +
configs/m53evk_defconfig | 4 +
configs/magnesium_defconfig | 1 +
configs/makalu_defconfig | 2 +
configs/malta_defconfig | 1 +
configs/maltael_defconfig | 1 +
configs/marsboard_defconfig | 2 +
configs/maxbcm_defconfig | 1 +
configs/mcx_defconfig | 3 +
configs/mecp5123_defconfig | 1 +
configs/medcom-wide_defconfig | 1 +
configs/meesc_dataflash_defconfig | 1 +
configs/meesc_defconfig | 1 +
configs/mgcoge3ne_defconfig | 3 +
configs/mgcoge3un_defconfig | 3 +
configs/mgcoge_defconfig | 3 +
configs/microblaze-generic_defconfig | 2 +
configs/mimc200_defconfig | 1 +
configs/minnowmax_defconfig | 2 +
configs/mixtile_loftq_defconfig | 2 +
configs/mk802_a10s_defconfig | 2 +
configs/mk802_defconfig | 2 +
configs/mk802ii_defconfig | 2 +
configs/ml507_defconfig | 1 +
configs/ml507_flash_defconfig | 1 +
configs/motionpro_defconfig | 1 +
configs/mpc5121ads_defconfig | 1 +
configs/mpc5121ads_rev2_defconfig | 1 +
configs/mpc8308_p1m_defconfig | 1 +
configs/mpr2_defconfig | 1 +
configs/ms7720se_defconfig | 1 +
configs/ms7722se_defconfig | 1 +
configs/ms7750se_defconfig | 1 +
configs/mt_ventoux_defconfig | 3 +
configs/munices_defconfig | 1 +
configs/mv88f6281gtw_ge_defconfig | 1 +
configs/mx23_olinuxino_defconfig | 1 +
configs/mx23evk_defconfig | 1 +
configs/mx25pdk_defconfig | 1 +
configs/mx28evk_auart_console_defconfig | 4 +
configs/mx28evk_defconfig | 4 +
configs/mx28evk_nand_defconfig | 4 +
configs/mx28evk_spi_defconfig | 4 +
configs/mx31ads_defconfig | 1 +
configs/mx31pdk_defconfig | 1 +
configs/mx35pdk_defconfig | 1 +
configs/mx51_efikamx_defconfig | 1 +
configs/mx51_efikasb_defconfig | 1 +
configs/mx51evk_defconfig | 1 +
configs/mx53ard_defconfig | 2 +
configs/mx53evk_defconfig | 1 +
configs/mx53loco_defconfig | 1 +
configs/mx53smd_defconfig | 1 +
configs/mx6cuboxi_defconfig | 2 +
configs/mx6dlarm2_defconfig | 1 +
configs/mx6dlarm2_lpddr2_defconfig | 1 +
configs/mx6dlsabreauto_defconfig | 2 +
configs/mx6dlsabresd_defconfig | 2 +
configs/mx6qarm2_defconfig | 1 +
configs/mx6qarm2_lpddr2_defconfig | 1 +
configs/mx6qsabreauto_defconfig | 2 +
configs/mx6qsabrelite_defconfig | 2 +
configs/mx6qsabresd_defconfig | 2 +
configs/mx6sabresd_spl_defconfig | 2 +
configs/mx6slevk_defconfig | 1 +
configs/mx6slevk_spinor_defconfig | 1 +
configs/mx6sxsabresd_defconfig | 1 +
configs/mx6sxsabresd_spl_defconfig | 1 +
configs/nas220_defconfig | 3 +
configs/neo_defconfig | 2 +
configs/net2big_v2_defconfig | 1 +
configs/netspace_lite_v2_defconfig | 1 +
configs/netspace_max_v2_defconfig | 1 +
configs/netspace_mini_v2_defconfig | 1 +
configs/netspace_v2_defconfig | 1 +
configs/nhk8815_defconfig | 1 +
configs/nhk8815_onenand_defconfig | 1 +
configs/nios2-generic_defconfig | 1 +
configs/nitrogen6dl2g_defconfig | 2 +
configs/nitrogen6dl_defconfig | 2 +
configs/nitrogen6q2g_defconfig | 2 +
configs/nitrogen6q_defconfig | 2 +
configs/nitrogen6s1g_defconfig | 2 +
configs/nitrogen6s_defconfig | 2 +
configs/novena_defconfig | 2 +
configs/nyan-big_defconfig | 1 +
configs/ocotea_defconfig | 2 +
configs/odroid-xu3_defconfig | 1 +
configs/odroid_defconfig | 2 +
configs/omap3_beagle_defconfig | 2 +
configs/omap3_ha_defconfig | 1 +
configs/omap3_logic_defconfig | 2 +
configs/omap3_overo_defconfig | 3 +
configs/omap3_pandora_defconfig | 3 +
configs/omap3_sdp3430_defconfig | 1 +
configs/omap3_zoom1_defconfig | 1 +
configs/omap4_panda_defconfig | 1 +
configs/omap4_sdp4430_defconfig | 1 +
configs/omap5_uevm_defconfig | 1 +
configs/omapl138_lcdk_defconfig | 3 +
configs/openrd_base_defconfig | 3 +
configs/openrd_client_defconfig | 3 +
configs/openrd_ultimate_defconfig | 3 +
configs/origen_defconfig | 2 +
configs/ot1200_defconfig | 2 +
configs/ot1200_spl_defconfig | 2 +
configs/otc570_dataflash_defconfig | 1 +
configs/otc570_defconfig | 1 +
configs/p3p440_defconfig | 1 +
configs/palmld_defconfig | 2 +
configs/palmtc_defconfig | 2 +
configs/palmtreo680_defconfig | 1 +
configs/paz00_defconfig | 1 +
configs/pcm030_LOWBOOT_defconfig | 1 +
configs/pcm030_defconfig | 1 +
configs/pcs440ep_defconfig | 1 +
configs/pdm360ng_defconfig | 1 +
configs/peach-pi_defconfig | 1 +
configs/peach-pit_defconfig | 1 +
configs/pengwyn_defconfig | 1 +
configs/platinum_picon_defconfig | 3 +
configs/platinum_titanium_defconfig | 3 +
configs/plutux_defconfig | 1 +
configs/pm9261_defconfig | 1 +
configs/pm9263_defconfig | 1 +
configs/pm9g45_defconfig | 1 +
configs/pogo_e02_defconfig | 3 +
configs/polaris_defconfig | 1 +
configs/porter_defconfig | 1 +
configs/portl2_defconfig | 3 +
configs/portuxg20_defconfig | 1 +
configs/pr1_defconfig | 1 +
configs/pxa255_idp_defconfig | 1 +
configs/pxm2_defconfig | 3 +
configs/qemu-ppce500_defconfig | 1 +
configs/qemu_mips64_defconfig | 2 +
configs/qemu_mips64el_defconfig | 2 +
configs/qemu_mips_defconfig | 2 +
configs/qemu_mipsel_defconfig | 2 +
configs/qong_defconfig | 4 +
configs/r0p7734_defconfig | 1 +
configs/r2dplus_defconfig | 1 +
configs/r7-tv-dongle_defconfig | 2 +
configs/r7780mp_defconfig | 1 +
configs/rainier_defconfig | 2 +
configs/rainier_ramboot_defconfig | 1 +
configs/rd6281a_defconfig | 1 +
configs/redwood_defconfig | 2 +
configs/riotboard_defconfig | 2 +
configs/rpi_2_defconfig | 1 +
configs/rpi_defconfig | 1 +
configs/rsk7203_defconfig | 1 +
configs/rsk7264_defconfig | 1 +
configs/rsk7269_defconfig | 1 +
configs/rut_defconfig | 3 +
configs/s5p_goni_defconfig | 1 +
configs/s5pc210_universal_defconfig | 2 +
configs/sama5d3_xplained_mmc_defconfig | 4 +
configs/sama5d3_xplained_nandflash_defconfig | 4 +
configs/sama5d3xek_mmc_defconfig | 2 +
configs/sama5d3xek_nandflash_defconfig | 2 +
configs/sama5d3xek_spiflash_defconfig | 2 +
configs/sama5d4_xplained_mmc_defconfig | 2 +
configs/sama5d4_xplained_nandflash_defconfig | 2 +
configs/sama5d4_xplained_spiflash_defconfig | 2 +
configs/sama5d4ek_mmc_defconfig | 2 +
configs/sama5d4ek_nandflash_defconfig | 2 +
configs/sama5d4ek_spiflash_defconfig | 2 +
configs/sandbox_defconfig | 3 +
configs/sbc35_a9g20_eeprom_defconfig | 1 +
configs/sbc35_a9g20_nandflash_defconfig | 1 +
configs/sbc405_defconfig | 1 +
configs/sbc8349_PCI_33_defconfig | 1 +
configs/sbc8349_PCI_66_defconfig | 1 +
configs/sbc8349_defconfig | 1 +
configs/sbc8548_PCI_33_PCIE_defconfig | 1 +
configs/sbc8548_PCI_33_defconfig | 1 +
configs/sbc8548_PCI_66_PCIE_defconfig | 1 +
configs/sbc8548_PCI_66_defconfig | 1 +
configs/sbc8548_defconfig | 1 +
configs/sbc8641d_defconfig | 1 +
configs/sc_sps_1_defconfig | 2 +
configs/scb9328_defconfig | 1 +
configs/seaboard_defconfig | 1 +
configs/secomx6quq7_defconfig | 2 +
configs/sequoia_defconfig | 2 +
configs/sequoia_ramboot_defconfig | 1 +
configs/sh7752evb_defconfig | 1 +
configs/sh7753evb_defconfig | 1 +
configs/sh7757lcr_defconfig | 1 +
configs/sh7763rdp_defconfig | 1 +
configs/sh7785lcr_32bit_defconfig | 1 +
configs/sh7785lcr_defconfig | 1 +
configs/sheevaplug_defconfig | 5 +
configs/shmin_defconfig | 1 +
configs/silk_defconfig | 1 +
configs/smdk2410_defconfig | 5 +
configs/smdk5250_defconfig | 1 +
configs/smdk5420_defconfig | 1 +
configs/smdkc100_defconfig | 1 +
configs/smdkv310_defconfig | 2 +
configs/snapper9260_defconfig | 1 +
configs/snapper9g20_defconfig | 1 +
configs/snow_defconfig | 1 +
configs/snowball_defconfig | 1 +
configs/socfpga_arria5_defconfig | 1 +
configs/socfpga_cyclone5_defconfig | 1 +
configs/socfpga_socrates_defconfig | 1 +
configs/socrates_defconfig | 1 +
configs/spear300_defconfig | 1 +
configs/spear300_nand_defconfig | 1 +
configs/spear300_usbtty_defconfig | 1 +
configs/spear300_usbtty_nand_defconfig | 1 +
configs/spear310_defconfig | 1 +
configs/spear310_nand_defconfig | 1 +
configs/spear310_pnor_defconfig | 1 +
configs/spear310_usbtty_defconfig | 1 +
configs/spear310_usbtty_nand_defconfig | 1 +
configs/spear310_usbtty_pnor_defconfig | 1 +
configs/spear320_defconfig | 1 +
configs/spear320_nand_defconfig | 1 +
configs/spear320_pnor_defconfig | 1 +
configs/spear320_usbtty_defconfig | 1 +
configs/spear320_usbtty_nand_defconfig | 1 +
configs/spear320_usbtty_pnor_defconfig | 1 +
configs/spear600_defconfig | 1 +
configs/spear600_nand_defconfig | 1 +
configs/spear600_usbtty_defconfig | 1 +
configs/spear600_usbtty_nand_defconfig | 1 +
configs/stamp9g20_defconfig | 1 +
configs/stm32f429-discovery_defconfig | 1 +
configs/stv0991_defconfig | 1 +
configs/stxgp3_defconfig | 1 +
configs/stxssa_4M_defconfig | 1 +
configs/stxssa_defconfig | 1 +
configs/sunxi_Gemei_G9_defconfig | 2 +
configs/suvd3_defconfig | 3 +
configs/sycamore_defconfig | 2 +
configs/t3corp_defconfig | 2 +
configs/taihu_defconfig | 2 +
configs/taishan_defconfig | 2 +
configs/tao3530_defconfig | 1 +
configs/taurus_defconfig | 1 +
configs/tbs2910_defconfig | 2 +
configs/tcm-bf518_defconfig | 1 +
configs/tcm-bf537_defconfig | 1 +
configs/tec-ng_defconfig | 1 +
configs/tec_defconfig | 1 +
configs/titanium_defconfig | 3 +
configs/tk71_defconfig | 1 +
configs/tny_a9260_eeprom_defconfig | 1 +
configs/tny_a9260_nandflash_defconfig | 1 +
configs/tny_a9g20_eeprom_defconfig | 1 +
configs/tny_a9g20_nandflash_defconfig | 1 +
configs/tqma6q_mba6_mmc_defconfig | 2 +
configs/tqma6q_mba6_spi_defconfig | 2 +
configs/tqma6s_mba6_mmc_defconfig | 2 +
configs/tqma6s_mba6_spi_defconfig | 2 +
configs/trats2_defconfig | 2 +
configs/trats_defconfig | 2 +
configs/tricorder_defconfig | 3 +
configs/tricorder_flash_defconfig | 2 +
configs/trimslice_defconfig | 1 +
configs/trizepsiv_defconfig | 1 +
configs/tseries_mmc_defconfig | 1 +
configs/tseries_nand_defconfig | 1 +
configs/tseries_spi_defconfig | 1 +
configs/tt01_defconfig | 1 +
configs/tuge1_defconfig | 3 +
configs/tuxx1_defconfig | 3 +
configs/twister_defconfig | 3 +
configs/tx25_defconfig | 1 +
configs/u8500_href_defconfig | 1 +
configs/udoo_quad_defconfig | 2 +
configs/usb_a9263_dataflash_defconfig | 1 +
configs/usbarmory_defconfig | 1 +
configs/v38b_defconfig | 1 +
configs/v5fx30teval_defconfig | 1 +
configs/v5fx30teval_flash_defconfig | 1 +
configs/vct_platinum_defconfig | 1 +
configs/vct_platinum_onenand_defconfig | 2 +
configs/vct_platinum_onenand_small_defconfig | 2 +
configs/vct_platinum_small_defconfig | 1 +
configs/vct_platinumavc_defconfig | 1 +
configs/vct_platinumavc_onenand_defconfig | 2 +
configs/vct_platinumavc_onenand_small_defconfig | 2 +
configs/vct_platinumavc_small_defconfig | 1 +
configs/vct_premium_defconfig | 1 +
configs/vct_premium_onenand_defconfig | 2 +
configs/vct_premium_onenand_small_defconfig | 2 +
configs/vct_premium_small_defconfig | 1 +
configs/ve8313_defconfig | 1 +
configs/venice2_defconfig | 1 +
configs/ventana_defconfig | 1 +
configs/versatileab_defconfig | 1 +
configs/versatilepb_defconfig | 1 +
configs/vexpress_ca15_tc2_defconfig | 1 +
configs/vexpress_ca5x2_defconfig | 1 +
configs/vexpress_ca9x4_defconfig | 1 +
configs/vf610twr_defconfig | 3 +
configs/vf610twr_nand_defconfig | 3 +
configs/vision2_defconfig | 1 +
configs/vl_ma2sc_defconfig | 1 +
configs/vl_ma2sc_ram_defconfig | 1 +
configs/vme8349_defconfig | 1 +
configs/vpac270_nor_128_defconfig | 2 +
configs/vpac270_nor_256_defconfig | 2 +
configs/vpac270_ond_256_defconfig | 2 +
configs/walnut_defconfig | 2 +
configs/wandboard_dl_defconfig | 2 +
configs/wandboard_quad_defconfig | 2 +
configs/wandboard_solo_defconfig | 2 +
configs/warp_defconfig | 1 +
configs/whistler_defconfig | 1 +
configs/wireless_space_defconfig | 1 +
configs/woodburn_defconfig | 1 +
configs/woodburn_sd_defconfig | 1 +
configs/work_92105_defconfig | 1 +
configs/wtk_defconfig | 1 +
configs/x600_defconfig | 3 +
configs/xaeniax_defconfig | 1 +
configs/xilinx-ppc405-generic_defconfig | 1 +
configs/xilinx-ppc405-generic_flash_defconfig | 1 +
configs/xilinx-ppc440-generic_defconfig | 1 +
configs/xilinx-ppc440-generic_flash_defconfig | 1 +
configs/xpedite1000_defconfig | 1 +
configs/xpedite517x_defconfig | 1 +
configs/xpedite520x_defconfig | 1 +
configs/xpedite537x_defconfig | 1 +
configs/xpedite550x_defconfig | 1 +
configs/yellowstone_defconfig | 2 +
configs/yosemite_defconfig | 2 +
configs/yucca_defconfig | 2 +
configs/zeus_defconfig | 1 +
configs/zipitz2_defconfig | 2 +
configs/zmx25_defconfig | 2 +
include/config_cmd_all.h | 3 -
include/config_defaults.h | 1 -
include/config_fsl_secboot.h | 5 -
include/configs/B4860QDS.h | 7 --
include/configs/BSC9131RDB.h | 4 -
include/configs/BSC9132QDS.h | 6 -
include/configs/C29XPCIE.h | 4 -
include/configs/CPCI2DP.h | 1 -
include/configs/CPCI4052.h | 2 -
include/configs/M5208EVBE.h | 1 -
include/configs/M52277EVB.h | 2 -
include/configs/M5235EVB.h | 1 -
include/configs/M5249EVB.h | 1 -
include/configs/M5253DEMO.h | 2 -
include/configs/M5253EVBE.h | 2 -
include/configs/M5272C3.h | 2 -
include/configs/M5275EVB.h | 2 -
include/configs/M5282EVB.h | 1 -
include/configs/M53017EVB.h | 1 -
include/configs/M5329EVB.h | 1 -
include/configs/M5373EVB.h | 1 -
include/configs/M54418TWR.h | 4 -
include/configs/M54451EVB.h | 2 -
include/configs/M54455EVB.h | 2 -
include/configs/M5475EVB.h | 1 -
include/configs/M5485EVB.h | 1 -
include/configs/MIP405.h | 2 -
include/configs/MPC8308RDB.h | 1 -
include/configs/MPC8313ERDB.h | 3 -
include/configs/MPC8315ERDB.h | 2 -
include/configs/MPC8323ERDB.h | 2 -
include/configs/MPC832XEMDS.h | 2 -
include/configs/MPC8349EMDS.h | 2 -
include/configs/MPC8349ITX.h | 2 -
include/configs/MPC837XEMDS.h | 2 -
include/configs/MPC837XERDB.h | 2 -
include/configs/MPC8536DS.h | 5 -
include/configs/MPC8540ADS.h | 3 -
include/configs/MPC8541CDS.h | 2 -
include/configs/MPC8544DS.h | 2 -
include/configs/MPC8548CDS.h | 2 -
include/configs/MPC8555CDS.h | 2 -
include/configs/MPC8560ADS.h | 3 -
include/configs/MPC8568MDS.h | 2 -
include/configs/MPC8569MDS.h | 2 -
include/configs/MPC8572DS.h | 2 -
include/configs/MPC8610HPCD.h | 2 -
include/configs/MPC8641HPCN.h | 2 -
include/configs/MigoR.h | 1 -
include/configs/P1010RDB.h | 6 -
include/configs/P1022DS.h | 6 -
include/configs/P1023RDB.h | 2 -
include/configs/P2041RDB.h | 7 --
include/configs/PATI.h | 2 -
include/configs/PIP405.h | 2 -
include/configs/PLU405.h | 4 -
include/configs/PMC405DE.h | 1 -
include/configs/PMC440.h | 1 -
include/configs/T102xQDS.h | 6 -
include/configs/T102xRDB.h | 6 -
include/configs/T1040QDS.h | 6 -
include/configs/T104xRDB.h | 5 -
include/configs/T208xQDS.h | 6 -
include/configs/T208xRDB.h | 6 -
include/configs/T4240QDS.h | 6 -
include/configs/T4240RDB.h | 6 -
include/configs/TQM5200.h | 1 -
include/configs/TQM823L.h | 1 -
include/configs/TQM823M.h | 1 -
include/configs/TQM834x.h | 1 -
include/configs/TQM850L.h | 1 -
include/configs/TQM850M.h | 1 -
include/configs/TQM855L.h | 1 -
include/configs/TQM855M.h | 1 -
include/configs/TQM860L.h | 1 -
include/configs/TQM860M.h | 1 -
include/configs/TQM862L.h | 1 -
include/configs/TQM862M.h | 1 -
include/configs/TQM866M.h | 1 -
include/configs/TQM885D.h | 1 -
include/configs/UCP1020.h | 6 -
include/configs/VCMA9.h | 8 --
include/configs/VOM405.h | 1 -
include/configs/a3m071.h | 5 -
include/configs/a4m072.h | 1 -
include/configs/ac14xx.h | 1 -
include/configs/acadia.h | 1 -
include/configs/adp-ag101.h | 1 -
include/configs/adp-ag101p.h | 1 -
include/configs/adp-ag102.h | 1 -
include/configs/afeb9260.h | 1 -
include/configs/alpr.h | 1 -
include/configs/am335x_evm.h | 9 --
include/configs/am335x_igep0033.h | 5 -
include/configs/am3517_crane.h | 1 -
include/configs/am3517_evm.h | 1 -
include/configs/am43xx_evm.h | 3 -
include/configs/amcc-common.h | 1 -
include/configs/amcore.h | 1 -
include/configs/ap325rxa.h | 1 -
include/configs/ap_sh4a_4a.h | 1 -
include/configs/apalis_t30.h | 2 -
include/configs/apf27.h | 6 -
include/configs/apx4devkit.h | 5 -
include/configs/arcangel4.h | 1 -
include/configs/aria.h | 1 -
include/configs/aristainetos.h | 6 -
include/configs/armadillo-800eva.h | 1 -
include/configs/arndale.h | 1 -
include/configs/aspenite.h | 1 -
include/configs/astro_mcf5373l.h | 2 -
include/configs/at91-sama5_common.h | 1 -
include/configs/at91rm9200ek.h | 1 -
include/configs/at91sam9260ek.h | 4 -
include/configs/at91sam9261ek.h | 3 -
include/configs/at91sam9263ek.h | 3 -
include/configs/at91sam9m10g45ek.h | 2 -
include/configs/at91sam9n12ek.h | 3 -
include/configs/at91sam9rlek.h | 3 -
include/configs/at91sam9x5ek.h | 8 --
include/configs/atngw100.h | 1 -
include/configs/atngw100mkii.h | 1 -
include/configs/atstk1002.h | 1 -
include/configs/atstk1003.h | 1 -
include/configs/atstk1004.h | 1 -
include/configs/atstk1006.h | 1 -
include/configs/axs101.h | 1 -
include/configs/balloon3.h | 3 -
include/configs/bamboo.h | 1 -
include/configs/bav335x.h | 8 --
include/configs/bcm28155_ap.h | 1 -
include/configs/bcm_ep_board.h | 1 -
include/configs/bct-brettl2.h | 2 -
include/configs/beagle_x15.h | 1 -
include/configs/beaver.h | 1 -
include/configs/bf506f-ezkit.h | 2 -
include/configs/bf518f-ezbrd.h | 2 -
include/configs/bf525-ucr2.h | 1 -
include/configs/bf526-ezbrd.h | 2 -
include/configs/bf527-ad7160-eval.h | 3 -
include/configs/bf527-ezkit.h | 3 -
include/configs/bf527-sdp.h | 2 -
include/configs/bf533-ezkit.h | 1 -
include/configs/bf533-stamp.h | 2 -
include/configs/bf537-minotaur.h | 1 -
include/configs/bf537-pnav.h | 2 -
include/configs/bf537-srv1.h | 1 -
include/configs/bf537-stamp.h | 2 -
include/configs/bf538f-ezkit.h | 2 -
include/configs/bf548-ezkit.h | 3 -
include/configs/bf561-acvilon.h | 1 -
include/configs/bf561-ezkit.h | 1 -
include/configs/bf609-ezkit.h | 3 -
include/configs/bfin_adi_common.h | 1 -
include/configs/bg0900.h | 2 -
include/configs/blackstamp.h | 1 -
include/configs/blackvme.h | 1 -
include/configs/br4.h | 1 -
include/configs/bubinga.h | 2 -
include/configs/calimain.h | 1 -
include/configs/cam_enc_4xx.h | 8 --
include/configs/canmb.h | 1 -
include/configs/canyonlands.h | 1 -
include/configs/cardhu.h | 1 -
include/configs/cgtqmx6eval.h | 1 -
include/configs/cm-bf527.h | 1 -
include/configs/cm-bf533.h | 1 -
include/configs/cm-bf537e.h | 1 -
include/configs/cm-bf537u.h | 1 -
include/configs/cm-bf548.h | 1 -
include/configs/cm-bf561.h | 1 -
include/configs/cm5200.h | 1 -
include/configs/cm_fx6.h | 1 -
include/configs/cm_t335.h | 1 -
include/configs/cm_t35.h | 1 -
include/configs/cm_t3517.h | 1 -
include/configs/cm_t54.h | 1 -
include/configs/cmi_mpc5xx.h | 1 -
include/configs/cobra5272.h | 2 -
include/configs/colibri_pxa270.h | 3 -
include/configs/colibri_t20.h | 2 -
include/configs/colibri_t30.h | 2 -
include/configs/colibri_vf.h | 4 -
include/configs/controlcenterd.h | 4 -
include/configs/corenet_ds.h | 7 --
include/configs/corvus.h | 1 -
include/configs/cpu9260.h | 2 -
include/configs/cpuat91.h | 1 -
include/configs/csb272.h | 3 -
include/configs/csb472.h | 3 -
include/configs/da830evm.h | 7 --
include/configs/da850evm.h | 11 --
include/configs/dalmore.h | 1 -
include/configs/davinci_dm355evm.h | 6 -
include/configs/davinci_dm355leopard.h | 4 -
include/configs/davinci_dm365evm.h | 6 -
include/configs/davinci_dm6467evm.h | 3 -
include/configs/davinci_dvevm.h | 3 -
include/configs/davinci_schmoogie.h | 2 -
include/configs/davinci_sffsdr.h | 2 -
include/configs/davinci_sonata.h | 3 -
include/configs/db-88f6820-gp.h | 1 -
include/configs/db-mv784mp-gp.h | 1 -
include/configs/dbau1x00.h | 1 -
include/configs/devkit3250.h | 1 -
include/configs/devkit8000.h | 1 -
include/configs/dig297.h | 5 -
include/configs/digsy_mtc.h | 2 -
include/configs/dlvision-10g.h | 1 -
include/configs/dlvision.h | 1 -
include/configs/dnp5370.h | 1 -
include/configs/dns325.h | 2 -
include/configs/dockstar.h | 6 -
include/configs/dra7xx_evm.h | 3 -
include/configs/dreamplug.h | 2 -
include/configs/duovero.h | 1 -
include/configs/ea20.h | 8 --
include/configs/eb_cpu5282.h | 1 -
include/configs/eb_cpux9k2.h | 5 -
include/configs/ebony.h | 2 -
include/configs/ecovec.h | 1 -
include/configs/edb93xx.h | 1 -
include/configs/edminiv2.h | 1 -
include/configs/embestmx6boards.h | 1 -
include/configs/enbw_cmc.h | 7 --
include/configs/espt.h | 1 -
include/configs/ethernut5.h | 6 -
include/configs/exynos4-common.h | 1 -
include/configs/favr-32-ezkit.h | 1 -
include/configs/flea3.h | 1 -
include/configs/fx12mm.h | 1 -
include/configs/gdppc440etx.h | 1 -
include/configs/goflexhome.h | 2 -
include/configs/gplugd.h | 1 -
include/configs/gr_cpci_ax2000.h | 2 -
include/configs/gr_ep2s60.h | 2 -
include/configs/gr_xc3s_1500.h | 2 -
include/configs/grasshopper.h | 1 -
include/configs/grsim.h | 2 -
include/configs/grsim_leon2.h | 2 -
include/configs/guruplug.h | 8 --
include/configs/gw_ventana.h | 7 --
include/configs/h2200.h | 1 -
include/configs/hammerhead.h | 1 -
include/configs/harmony.h | 1 -
include/configs/highbank.h | 1 -
include/configs/hrcon.h | 2 -
include/configs/hummingboard.h | 2 -
include/configs/ib62x0.h | 8 --
include/configs/ibf-dsp561.h | 1 -
include/configs/icon.h | 1 -
include/configs/iconnect.h | 8 --
include/configs/ids8313.h | 5 -
include/configs/ima3-mx53.h | 1 -
include/configs/imx27lite-common.h | 1 -
include/configs/imx31_litekit.h | 1 -
include/configs/imx31_phycore.h | 1 -
include/configs/inka4x0.h | 1 -
include/configs/integratorap.h | 1 -
include/configs/integratorcp.h | 1 -
include/configs/intip.h | 1 -
include/configs/io.h | 1 -
include/configs/io64.h | 1 -
include/configs/iocon.h | 1 -
include/configs/ip04.h | 1 -
include/configs/ipam390.h | 5 -
include/configs/ipek01.h | 1 -
include/configs/jetson-tk1.h | 1 -
include/configs/jornada.h | 1 -
include/configs/jupiter.h | 1 -
include/configs/katmai.h | 1 -
include/configs/kilauea.h | 1 -
include/configs/km/keymile-common.h | 3 -
include/configs/km/km83xx-common.h | 2 -
include/configs/km/km_arm.h | 2 -
include/configs/km/kmp204x-common.h | 1 -
include/configs/km82xx.h | 1 -
include/configs/ks2_evm.h | 5 -
include/configs/kwb.h | 2 -
include/configs/kzm9g.h | 1 -
include/configs/lacie_kw.h | 2 -
include/configs/lp8x4x.h | 2 -
include/configs/ls1021aqds.h | 4 -
include/configs/ls1021atwr.h | 3 -
include/configs/ls2085a_emu.h | 1 -
include/configs/ls2085a_simu.h | 1 -
include/configs/ls2085aqds.h | 2 -
include/configs/ls2085ardb.h | 2 -
include/configs/lsxl.h | 2 -
include/configs/luan.h | 1 -
include/configs/lwmon5.h | 1 -
include/configs/m28evk.h | 7 --
include/configs/m53evk.h | 7 --
include/configs/makalu.h | 1 -
include/configs/malta.h | 1 -
include/configs/manroland/mpc5200-common.h | 1 -
include/configs/maxbcm.h | 1 -
include/configs/mcx.h | 5 -
include/configs/mecp5123.h | 1 -
include/configs/medcom-wide.h | 1 -
include/configs/meesc.h | 2 -
include/configs/microblaze-generic.h | 12 --
include/configs/mimc200.h | 1 -
include/configs/minnowmax.h | 2 -
include/configs/ml507.h | 1 -
include/configs/motionpro.h | 1 -
include/configs/mpc5121ads.h | 1 -
include/configs/mpc8308_p1m.h | 1 -
include/configs/mpr2.h | 1 -
include/configs/ms7720se.h | 1 -
include/configs/ms7722se.h | 1 -
include/configs/ms7750se.h | 1 -
include/configs/munices.h | 1 -
include/configs/mv-common.h | 4 -
include/configs/mv88f6281gtw_ge.h | 5 -
include/configs/mx23_olinuxino.h | 1 -
include/configs/mx23evk.h | 1 -
include/configs/mx25pdk.h | 1 -
include/configs/mx28evk.h | 5 -
include/configs/mx31ads.h | 1 -
include/configs/mx31pdk.h | 1 -
include/configs/mx35pdk.h | 2 -
include/configs/mx51_efikamx.h | 2 -
include/configs/mx51evk.h | 1 -
include/configs/mx53ard.h | 2 -
include/configs/mx53evk.h | 1 -
include/configs/mx53loco.h | 1 -
include/configs/mx53smd.h | 1 -
include/configs/mx6cuboxi.h | 2 -
include/configs/mx6qarm2.h | 1 -
include/configs/mx6sabre_common.h | 2 -
include/configs/mx6slevk.h | 2 -
include/configs/mx6sxsabresd.h | 1 -
include/configs/nas220.h | 6 -
include/configs/neo.h | 1 -
include/configs/nhk8815.h | 2 -
include/configs/nios2-generic.h | 1 -
include/configs/nitrogen6x.h | 3 -
include/configs/nokia_rx51.h | 5 -
include/configs/novena.h | 3 -
include/configs/nyan-big.h | 1 -
include/configs/o2dnt-common.h | 1 -
include/configs/ocotea.h | 2 -
include/configs/odroid.h | 1 -
include/configs/odroid_xu3.h | 1 -
include/configs/omap3_beagle.h | 2 -
include/configs/omap3_cairo.h | 2 -
include/configs/omap3_evm_common.h | 2 -
include/configs/omap3_evm_quick_mmc.h | 1 -
include/configs/omap3_evm_quick_nand.h | 1 -
include/configs/omap3_igep00x0.h | 3 -
include/configs/omap3_logic.h | 2 -
include/configs/omap3_mvblx.h | 1 -
include/configs/omap3_overo.h | 5 -
include/configs/omap3_pandora.h | 5 -
include/configs/omap3_sdp3430.h | 1 -
include/configs/omap3_zoom1.h | 1 -
include/configs/omap4_panda.h | 1 -
include/configs/omap4_sdp4430.h | 1 -
include/configs/omap5_uevm.h | 1 -
include/configs/omapl138_lcdk.h | 15 ---
include/configs/openrd.h | 2 -
include/configs/openrisc-generic.h | 1 -
include/configs/origen.h | 1 -
include/configs/ot1200.h | 2 -
include/configs/otc570.h | 2 -
include/configs/p1_p2_rdb_pc.h | 6 -
include/configs/p1_twr.h | 4 -
include/configs/p3p440.h | 1 -
include/configs/palmld.h | 3 -
include/configs/palmtc.h | 3 -
include/configs/palmtreo680.h | 2 -
include/configs/paz00.h | 1 -
include/configs/pb1x00.h | 1 -
include/configs/pcm030.h | 1 -
include/configs/pcm051.h | 1 -
include/configs/pcs440ep.h | 1 -
include/configs/pdm360ng.h | 1 -
include/configs/peach-pi.h | 1 -
include/configs/peach-pit.h | 1 -
include/configs/pengwyn.h | 1 -
include/configs/pepper.h | 1 -
include/configs/platinum.h | 6 -
include/configs/plutux.h | 1 -
include/configs/pm9261.h | 3 -
include/configs/pm9263.h | 3 -
include/configs/pm9g45.h | 1 -
include/configs/pogo_e02.h | 6 -
include/configs/pr1.h | 1 -
include/configs/pxa255_idp.h | 1 -
include/configs/pxm2.h | 4 -
include/configs/qemu-mips.h | 2 -
include/configs/qemu-mips64.h | 2 -
include/configs/qemu-ppce500.h | 2 -
include/configs/qong.h | 6 -
include/configs/r0p7734.h | 1 -
include/configs/r2dplus.h | 1 -
include/configs/r7780mp.h | 1 -
include/configs/rcar-gen2-common.h | 1 -
include/configs/rd6281a.h | 2 -
include/configs/redwood.h | 3 -
include/configs/rpi-common.h | 1 -
include/configs/rsk7203.h | 1 -
include/configs/rsk7264.h | 1 -
include/configs/rsk7269.h | 1 -
include/configs/rut.h | 4 -
include/configs/s5p_goni.h | 1 -
include/configs/s5pc210_universal.h | 1 -
include/configs/sama5d3_xplained.h | 7 --
include/configs/sama5d3xek.h | 4 -
include/configs/sama5d4_xplained.h | 3 -
include/configs/sama5d4ek.h | 3 -
include/configs/sandbox.h | 4 -
include/configs/sansa_fuze_plus.h | 1 -
include/configs/sbc35_a9g20.h | 2 -
include/configs/sbc405.h | 1 -
include/configs/sbc8349.h | 2 -
include/configs/sbc8548.h | 1 -
include/configs/sbc8641d.h | 1 -
include/configs/sc_sps_1.h | 3 -
include/configs/scb9328.h | 1 -
include/configs/seaboard.h | 1 -
include/configs/secomx6quq7.h | 1 -
include/configs/sequoia.h | 2 -
include/configs/sh7752evb.h | 1 -
include/configs/sh7753evb.h | 1 -
include/configs/sh7757lcr.h | 1 -
include/configs/sh7763rdp.h | 1 -
include/configs/sh7785lcr.h | 1 -
include/configs/sheevaplug.h | 8 --
include/configs/shmin.h | 1 -
include/configs/siemens-am33x-common.h | 5 -
include/configs/smdk2410.h | 7 --
include/configs/smdk5250.h | 1 -
include/configs/smdk5420.h | 1 -
include/configs/smdkc100.h | 1 -
include/configs/smdkv310.h | 1 -
include/configs/snapper9260.h | 1 -
include/configs/snow.h | 1 -
include/configs/snowball.h | 1 -
include/configs/socfpga_arria5.h | 1 -
include/configs/socfpga_common.h | 1 -
include/configs/socfpga_cyclone5.h | 1 -
include/configs/socrates.h | 1 -
include/configs/spear3xx_evb.h | 2 -
include/configs/spear6xx_evb.h | 2 -
include/configs/stamp9g20.h | 1 -
include/configs/stm32f429-discovery.h | 1 -
include/configs/stv0991.h | 1 -
include/configs/stxgp3.h | 2 -
include/configs/stxssa.h | 2 -
include/configs/sunxi-common.h | 3 -
include/configs/t3corp.h | 1 -
include/configs/t4qds.h | 1 -
include/configs/taihu.h | 1 -
include/configs/taishan.h | 1 -
include/configs/tam3517-common.h | 5 -
include/configs/tao3530.h | 1 -
include/configs/taurus.h | 1 -
include/configs/tb100.h | 1 -
include/configs/tbs2910.h | 2 -
include/configs/tcm-bf518.h | 1 -
include/configs/tcm-bf537.h | 1 -
include/configs/tec-ng.h | 1 -
include/configs/tec.h | 1 -
include/configs/ti814x_evm.h | 1 -
include/configs/ti816x_evm.h | 1 -
include/configs/titanium.h | 6 -
include/configs/tk71.h | 2 -
include/configs/tny_a9260.h | 2 -
include/configs/tqma6.h | 3 -
include/configs/trats.h | 1 -
include/configs/trats2.h | 1 -
include/configs/tricorder.h | 6 -
include/configs/trimslice.h | 1 -
include/configs/trizepsiv.h | 1 -
include/configs/tseries.h | 6 -
include/configs/tt01.h | 1 -
include/configs/tx25.h | 1 -
include/configs/u8500_href.h | 1 -
include/configs/udoo.h | 2 -
include/configs/uniphier.h | 2 -
include/configs/usb_a9263.h | 1 -
include/configs/usbarmory.h | 1 -
include/configs/v38b.h | 1 -
include/configs/v5fx30teval.h | 1 -
include/configs/vct.h | 4 -
include/configs/ve8313.h | 1 -
include/configs/venice2.h | 1 -
include/configs/ventana.h | 1 -
include/configs/versatile.h | 2 -
include/configs/vexpress_aemv8a.h | 1 -
include/configs/vexpress_common.h | 1 -
include/configs/vf610twr.h | 4 -
include/configs/vision2.h | 1 -
include/configs/vl_ma2sc.h | 1 -
include/configs/vme8349.h | 2 -
include/configs/vpac270.h | 4 -
include/configs/walnut.h | 2 -
include/configs/wandboard.h | 2 -
include/configs/warp.h | 1 -
include/configs/whistler.h | 1 -
include/configs/wireless_space.h | 2 -
include/configs/woodburn_common.h | 1 -
include/configs/work_92105.h | 1 -
include/configs/x600.h | 5 -
include/configs/x86-chromebook.h | 2 -
include/configs/x86-common.h | 3 -
include/configs/xaeniax.h | 1 -
include/configs/xfi3.h | 1 -
include/configs/xilinx-ppc.h | 1 -
include/configs/xilinx-ppc405-generic.h | 1 -
include/configs/xilinx-ppc440-generic.h | 1 -
include/configs/xilinx_zynqmp.h | 1 -
include/configs/xpedite1000.h | 1 -
include/configs/xpedite517x.h | 1 -
include/configs/xpedite520x.h | 1 -
include/configs/xpedite537x.h | 1 -
include/configs/xpedite550x.h | 1 -
include/configs/yosemite.h | 2 -
include/configs/yucca.h | 3 -
include/configs/zeus.h | 1 -
include/configs/zipitz2.h | 2 -
include/configs/zmx25.h | 2 -
include/configs/zynq-common.h | 2 -
lib/Kconfig | 35 ++++++
1547 files changed, 1757 insertions(+), 1138 deletions(-)
--
1.7.11.5
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [RFC PATCH 1/8] Add env persist location to Kconfig
2015-05-14 4:29 [U-Boot] [RFC PATCH 0/8] Complex config moves Joe Hershberger
@ 2015-05-14 4:29 ` Joe Hershberger
2015-05-14 4:43 ` Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 2/8] Move env location selection from include to defconfig Joe Hershberger
` (6 subsequent siblings)
7 siblings, 1 reply; 10+ messages in thread
From: Joe Hershberger @ 2015-05-14 4:29 UTC (permalink / raw)
To: u-boot
All of the ENV_IS_IN_* configs moved to Kconfig.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
common/Kconfig | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 85 insertions(+)
diff --git a/common/Kconfig b/common/Kconfig
index 15759f7..4397e69 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1,3 +1,88 @@
+menu "Environment"
+
+choice
+ prompt "Environment location"
+ default ENV_IS_NOWHERE
+ help
+ Select where the environment is persisted.
+
+config ENV_IS_IN_DATAFLASH
+ bool "Data Flash"
+ help
+ Select this if you have a DataFlash memory device which you
+ want to use for the environment.
+
+config ENV_IS_IN_EEPROM
+ bool "EEPROM"
+ help
+ Select this if you have an EEPROM or similar serial access
+ device and a driver for it.
+
+config ENV_IS_IN_FLASH
+ bool "Flash"
+ help
+ Select this if the environment is in flash memory.
+
+config ENV_IS_IN_MMC
+ bool "MMC"
+ help
+ Select this if you have an MMC device which you want to use
+ for the environment.
+
+config ENV_IS_IN_FAT
+ bool "FAT"
+ help
+ Select this if you want to use the FAT file system for the
+ environment.
+
+config ENV_IS_IN_NAND
+ bool "NAND"
+ help
+ Select this if you have a NAND device which you want to use
+ for the environment.
+
+config ENV_IS_IN_NVRAM
+ bool "NVRAM"
+ help
+ Select this if you have some non-volatile memory device
+ (NVRAM, battery buffered SRAM) which you want to use for the
+ environment.
+
+config ENV_IS_IN_ONENAND
+ bool "OneNAND"
+ help
+ Select this if you have a OneNAND device which you want to use
+ for the environment.
+
+config ENV_IS_IN_SPI_FLASH
+ bool "SPI Flash"
+ help
+ Select this if you have a SPI Flash memory device which you
+ want to use for the environment.
+
+config ENV_IS_IN_REMOTE
+ bool "Remote"
+ help
+ Select this if you have a remote memory space which you
+ want to use for the local device's environment.
+
+config ENV_IS_IN_UBI
+ bool "UBI"
+ help
+ Select this if you have an UBI volume that you want to use for
+ the environment. This has the benefit of wear-leveling the
+ environment accesses, which is important on NAND.
+
+config ENV_IS_NOWHERE
+ bool "Nowhere"
+ help
+ Select this if there is no storage for the environment and
+ each boot U-Boot will use the default environment.
+
+endchoice
+
+endmenu
+
menu "Command line interface"
config HUSH_PARSER
--
1.7.11.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [RFC PATCH 2/8] Move env location selection from include to defconfig
2015-05-14 4:29 [U-Boot] [RFC PATCH 0/8] Complex config moves Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 1/8] Add env persist location to Kconfig Joe Hershberger
@ 2015-05-14 4:29 ` Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 3/8] Add RBTREE to Kconfig Joe Hershberger
` (5 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Joe Hershberger @ 2015-05-14 4:29 UTC (permalink / raw)
To: u-boot
This was moved by tools/moveconfig.py with these settings:
ENV_IS_IN_DATAFLASH bool n y
ENV_IS_IN_EEPROM bool n y
ENV_IS_IN_FLASH bool n y
ENV_IS_IN_MMC bool n y
ENV_IS_IN_FAT bool n y
ENV_IS_IN_NAND bool n y
ENV_IS_IN_NVRAM bool n y
ENV_IS_IN_ONENAND bool n y
ENV_IS_IN_SPI_FLASH bool n y
ENV_IS_IN_REMOTE bool n y
ENV_IS_IN_UBI bool n y
ENV_IS_NOWHERE bool y y
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
configs/A10-OLinuXino-Lime_defconfig | 1 +
configs/A10s-OLinuXino-M_defconfig | 1 +
configs/A13-OLinuXinoM_defconfig | 1 +
configs/A13-OLinuXino_defconfig | 1 +
configs/A20-OLinuXino-Lime2_defconfig | 1 +
configs/A20-OLinuXino-Lime_defconfig | 1 +
configs/A20-OLinuXino_MICRO_defconfig | 1 +
configs/Ainol_AW1_defconfig | 1 +
configs/Ampe_A76_defconfig | 1 +
configs/Astar_MID756_defconfig | 1 +
configs/Auxtek-T004_defconfig | 1 +
configs/B4420QDS_NAND_defconfig | 1 +
configs/B4420QDS_SPIFLASH_defconfig | 1 +
configs/B4860QDS_NAND_defconfig | 1 +
configs/B4860QDS_SPIFLASH_defconfig | 1 +
configs/B4860QDS_SRIO_PCIE_BOOT_defconfig | 1 +
configs/BSC9131RDB_NAND_SYSCLK100_defconfig | 1 +
configs/BSC9131RDB_NAND_defconfig | 1 +
configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig | 1 +
configs/BSC9131RDB_SPIFLASH_defconfig | 1 +
configs/BSC9132QDS_NAND_DDRCLK100_defconfig | 1 +
configs/BSC9132QDS_NAND_DDRCLK133_defconfig | 1 +
configs/BSC9132QDS_NOR_DDRCLK100_defconfig | 1 +
configs/BSC9132QDS_NOR_DDRCLK133_defconfig | 1 +
configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig | 1 +
configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig | 1 +
configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig | 1 +
configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig | 1 +
configs/Bananapi_defconfig | 1 +
configs/Bananapro_defconfig | 1 +
configs/C29XPCIE_NAND_defconfig | 1 +
configs/C29XPCIE_SPIFLASH_defconfig | 1 +
configs/C29XPCIE_defconfig | 1 +
configs/CPCI2DP_defconfig | 1 +
configs/CPCI4052_defconfig | 1 +
configs/CSQ_CS908_defconfig | 1 +
configs/Chuwi_V7_CW0825_defconfig | 1 +
configs/Colombus_defconfig | 1 +
configs/Cubieboard2_defconfig | 1 +
configs/Cubieboard_defconfig | 1 +
configs/Cubietruck_defconfig | 1 +
configs/Hummingbird_A31_defconfig | 1 +
configs/Hyundai_A7HD_defconfig | 1 +
configs/Ippo_q8h_v1_2_a33_1024x600_defconfig | 1 +
configs/Ippo_q8h_v1_2_defconfig | 1 +
configs/Ippo_q8h_v5_defconfig | 1 +
configs/Linksprite_pcDuino3_Nano_defconfig | 1 +
configs/Linksprite_pcDuino3_defconfig | 1 +
configs/Linksprite_pcDuino_defconfig | 1 +
configs/M5208EVBE_defconfig | 1 +
configs/M52277EVB_defconfig | 1 +
configs/M52277EVB_stmicro_defconfig | 1 +
configs/M5235EVB_Flash32_defconfig | 1 +
configs/M5235EVB_defconfig | 1 +
configs/M5249EVB_defconfig | 1 +
configs/M5253DEMO_defconfig | 1 +
configs/M5253EVBE_defconfig | 1 +
configs/M5272C3_defconfig | 1 +
configs/M5275EVB_defconfig | 1 +
configs/M5282EVB_defconfig | 1 +
configs/M53017EVB_defconfig | 1 +
configs/M5329AFEE_defconfig | 1 +
configs/M5329BFEE_defconfig | 1 +
configs/M5373EVB_defconfig | 1 +
configs/M54418TWR_defconfig | 1 +
configs/M54418TWR_serial_mii_defconfig | 1 +
configs/M54418TWR_serial_rmii_defconfig | 1 +
configs/M54451EVB_defconfig | 1 +
configs/M54451EVB_stmicro_defconfig | 1 +
configs/M54455EVB_a66_defconfig | 1 +
configs/M54455EVB_defconfig | 1 +
configs/M54455EVB_i66_defconfig | 1 +
configs/M54455EVB_intel_defconfig | 1 +
configs/M54455EVB_stm33_defconfig | 1 +
configs/M5475AFE_defconfig | 1 +
configs/M5475BFE_defconfig | 1 +
configs/M5475CFE_defconfig | 1 +
configs/M5475DFE_defconfig | 1 +
configs/M5475EFE_defconfig | 1 +
configs/M5475FFE_defconfig | 1 +
configs/M5475GFE_defconfig | 1 +
configs/M5485AFE_defconfig | 1 +
configs/M5485BFE_defconfig | 1 +
configs/M5485CFE_defconfig | 1 +
configs/M5485DFE_defconfig | 1 +
configs/M5485EFE_defconfig | 1 +
configs/M5485FFE_defconfig | 1 +
configs/M5485GFE_defconfig | 1 +
configs/M5485HFE_defconfig | 1 +
configs/MIP405T_defconfig | 1 +
configs/MIP405_defconfig | 1 +
configs/MK808C_defconfig | 1 +
configs/MPC8308RDB_defconfig | 1 +
configs/MPC8313ERDB_33_defconfig | 1 +
configs/MPC8313ERDB_66_defconfig | 1 +
configs/MPC8313ERDB_NAND_33_defconfig | 1 +
configs/MPC8313ERDB_NAND_66_defconfig | 1 +
configs/MPC8315ERDB_defconfig | 1 +
configs/MPC8323ERDB_defconfig | 1 +
configs/MPC832XEMDS_ATM_defconfig | 1 +
configs/MPC832XEMDS_HOST_33_defconfig | 1 +
configs/MPC832XEMDS_HOST_66_defconfig | 1 +
configs/MPC832XEMDS_SLAVE_defconfig | 1 +
configs/MPC832XEMDS_defconfig | 1 +
configs/MPC8349EMDS_defconfig | 1 +
configs/MPC8349ITXGP_defconfig | 1 +
configs/MPC8349ITX_LOWBOOT_defconfig | 1 +
configs/MPC837XEMDS_HOST_defconfig | 1 +
configs/MPC837XEMDS_defconfig | 1 +
configs/MPC837XERDB_defconfig | 1 +
configs/MPC8536DS_36BIT_defconfig | 1 +
configs/MPC8536DS_SDCARD_defconfig | 1 +
configs/MPC8536DS_SPIFLASH_defconfig | 1 +
configs/MPC8536DS_defconfig | 1 +
configs/MPC8540ADS_defconfig | 1 +
configs/MPC8541CDS_defconfig | 1 +
configs/MPC8541CDS_legacy_defconfig | 1 +
configs/MPC8544DS_defconfig | 1 +
configs/MPC8548CDS_36BIT_defconfig | 1 +
configs/MPC8548CDS_defconfig | 1 +
configs/MPC8548CDS_legacy_defconfig | 1 +
configs/MPC8555CDS_defconfig | 1 +
configs/MPC8555CDS_legacy_defconfig | 1 +
configs/MPC8560ADS_defconfig | 1 +
configs/MPC8568MDS_defconfig | 1 +
configs/MPC8569MDS_ATM_defconfig | 1 +
configs/MPC8569MDS_defconfig | 1 +
configs/MPC8572DS_36BIT_defconfig | 1 +
configs/MPC8572DS_defconfig | 1 +
configs/MPC8610HPCD_defconfig | 1 +
configs/MPC8641HPCN_36BIT_defconfig | 1 +
configs/MPC8641HPCN_defconfig | 1 +
configs/MSI_Primo73_defconfig | 1 +
configs/MSI_Primo81_defconfig | 1 +
configs/Marsboard_A10_defconfig | 1 +
configs/Mele_A1000_defconfig | 1 +
configs/Mele_I7_defconfig | 1 +
configs/Mele_M3_defconfig | 1 +
configs/Mele_M5_defconfig | 1 +
configs/Mele_M9_defconfig | 1 +
configs/MigoR_defconfig | 1 +
configs/Mini-X_defconfig | 1 +
configs/MiniFAP_defconfig | 1 +
configs/O2D300_defconfig | 1 +
configs/O2DNT2_RAMBOOT_defconfig | 1 +
configs/O2DNT2_defconfig | 1 +
configs/O2D_defconfig | 1 +
configs/O2MNT_O2M110_defconfig | 1 +
configs/O2MNT_O2M112_defconfig | 1 +
configs/O2MNT_O2M113_defconfig | 1 +
configs/O3DNT_defconfig | 1 +
configs/Orangepi_defconfig | 1 +
configs/Orangepi_mini_defconfig | 1 +
configs/P1010RDB-PA_36BIT_NAND_defconfig | 1 +
configs/P1010RDB-PA_36BIT_NOR_defconfig | 1 +
configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 1 +
configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 1 +
configs/P1010RDB-PA_NAND_defconfig | 1 +
configs/P1010RDB-PA_NOR_defconfig | 1 +
configs/P1010RDB-PA_SDCARD_defconfig | 1 +
configs/P1010RDB-PA_SPIFLASH_defconfig | 1 +
configs/P1010RDB-PB_36BIT_NAND_defconfig | 1 +
configs/P1010RDB-PB_36BIT_NOR_defconfig | 1 +
configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 1 +
configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 1 +
configs/P1010RDB-PB_NAND_defconfig | 1 +
configs/P1010RDB-PB_NOR_defconfig | 1 +
configs/P1010RDB-PB_SDCARD_defconfig | 1 +
configs/P1010RDB-PB_SPIFLASH_defconfig | 1 +
configs/P1020MBG-PC_36BIT_SDCARD_defconfig | 1 +
configs/P1020MBG-PC_36BIT_defconfig | 1 +
configs/P1020MBG-PC_SDCARD_defconfig | 1 +
configs/P1020MBG-PC_defconfig | 1 +
configs/P1020RDB-PC_36BIT_NAND_defconfig | 1 +
configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 1 +
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
configs/P1020RDB-PC_36BIT_defconfig | 1 +
configs/P1020RDB-PC_NAND_defconfig | 1 +
configs/P1020RDB-PC_SDCARD_defconfig | 1 +
configs/P1020RDB-PC_SPIFLASH_defconfig | 1 +
configs/P1020RDB-PC_defconfig | 1 +
configs/P1020RDB-PD_NAND_defconfig | 1 +
configs/P1020RDB-PD_SDCARD_defconfig | 1 +
configs/P1020RDB-PD_SPIFLASH_defconfig | 1 +
configs/P1020RDB-PD_defconfig | 1 +
configs/P1020UTM-PC_36BIT_SDCARD_defconfig | 1 +
configs/P1020UTM-PC_36BIT_defconfig | 1 +
configs/P1020UTM-PC_SDCARD_defconfig | 1 +
configs/P1020UTM-PC_defconfig | 1 +
configs/P1021RDB-PC_36BIT_NAND_defconfig | 1 +
configs/P1021RDB-PC_36BIT_SDCARD_defconfig | 1 +
configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
configs/P1021RDB-PC_36BIT_defconfig | 1 +
configs/P1021RDB-PC_NAND_defconfig | 1 +
configs/P1021RDB-PC_SDCARD_defconfig | 1 +
configs/P1021RDB-PC_SPIFLASH_defconfig | 1 +
configs/P1021RDB-PC_defconfig | 1 +
configs/P1022DS_36BIT_NAND_defconfig | 1 +
configs/P1022DS_36BIT_SDCARD_defconfig | 1 +
configs/P1022DS_36BIT_SPIFLASH_defconfig | 1 +
configs/P1022DS_36BIT_defconfig | 1 +
configs/P1022DS_NAND_defconfig | 1 +
configs/P1022DS_SDCARD_defconfig | 1 +
configs/P1022DS_SPIFLASH_defconfig | 1 +
configs/P1022DS_defconfig | 1 +
configs/P1023RDB_defconfig | 1 +
configs/P1024RDB_36BIT_defconfig | 1 +
configs/P1024RDB_NAND_defconfig | 1 +
configs/P1024RDB_SDCARD_defconfig | 1 +
configs/P1024RDB_SPIFLASH_defconfig | 1 +
configs/P1024RDB_defconfig | 1 +
configs/P1025RDB_36BIT_defconfig | 1 +
configs/P1025RDB_NAND_defconfig | 1 +
configs/P1025RDB_SDCARD_defconfig | 1 +
configs/P1025RDB_SPIFLASH_defconfig | 1 +
configs/P1025RDB_defconfig | 1 +
configs/P2020RDB-PC_36BIT_NAND_defconfig | 1 +
configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 1 +
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
configs/P2020RDB-PC_36BIT_defconfig | 1 +
configs/P2020RDB-PC_NAND_defconfig | 1 +
configs/P2020RDB-PC_SDCARD_defconfig | 1 +
configs/P2020RDB-PC_SPIFLASH_defconfig | 1 +
configs/P2020RDB-PC_defconfig | 1 +
configs/P2041RDB_NAND_defconfig | 1 +
configs/P2041RDB_SDCARD_defconfig | 1 +
configs/P2041RDB_SPIFLASH_defconfig | 1 +
configs/P2041RDB_SRIO_PCIE_BOOT_defconfig | 1 +
configs/P3041DS_NAND_defconfig | 1 +
configs/P3041DS_SDCARD_defconfig | 1 +
configs/P3041DS_SPIFLASH_defconfig | 1 +
configs/P3041DS_SRIO_PCIE_BOOT_defconfig | 1 +
configs/P4080DS_SDCARD_defconfig | 1 +
configs/P4080DS_SPIFLASH_defconfig | 1 +
configs/P4080DS_SRIO_PCIE_BOOT_defconfig | 1 +
configs/P5020DS_NAND_defconfig | 1 +
configs/P5020DS_SDCARD_defconfig | 1 +
configs/P5020DS_SPIFLASH_defconfig | 1 +
configs/P5020DS_SRIO_PCIE_BOOT_defconfig | 1 +
configs/P5040DS_NAND_defconfig | 1 +
configs/P5040DS_SDCARD_defconfig | 1 +
configs/P5040DS_SPIFLASH_defconfig | 1 +
configs/PATI_defconfig | 1 +
configs/PIP405_defconfig | 1 +
configs/PLU405_defconfig | 1 +
configs/PMC405DE_defconfig | 1 +
configs/PMC440_defconfig | 1 +
configs/T1023RDB_NAND_defconfig | 1 +
configs/T1023RDB_SDCARD_defconfig | 1 +
configs/T1023RDB_SPIFLASH_defconfig | 1 +
configs/T1024QDS_NAND_defconfig | 1 +
configs/T1024QDS_SDCARD_defconfig | 1 +
configs/T1024QDS_SPIFLASH_defconfig | 1 +
configs/T1024RDB_NAND_defconfig | 1 +
configs/T1024RDB_SDCARD_defconfig | 1 +
configs/T1024RDB_SPIFLASH_defconfig | 1 +
configs/T1040QDS_D4_defconfig | 1 +
configs/T1040QDS_defconfig | 1 +
configs/T1040RDB_NAND_defconfig | 1 +
configs/T1040RDB_SDCARD_defconfig | 1 +
configs/T1040RDB_SPIFLASH_defconfig | 1 +
configs/T1040RDB_defconfig | 1 +
configs/T1042RDB_PI_NAND_defconfig | 1 +
configs/T1042RDB_PI_SDCARD_defconfig | 1 +
configs/T1042RDB_PI_SPIFLASH_defconfig | 1 +
configs/T1042RDB_PI_defconfig | 1 +
configs/T1042RDB_defconfig | 1 +
configs/T2080QDS_NAND_defconfig | 1 +
configs/T2080QDS_SDCARD_defconfig | 1 +
configs/T2080QDS_SPIFLASH_defconfig | 1 +
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 1 +
configs/T2080RDB_NAND_defconfig | 1 +
configs/T2080RDB_SDCARD_defconfig | 1 +
configs/T2080RDB_SPIFLASH_defconfig | 1 +
configs/T2080RDB_SRIO_PCIE_BOOT_defconfig | 1 +
configs/T2081QDS_NAND_defconfig | 1 +
configs/T2081QDS_SDCARD_defconfig | 1 +
configs/T2081QDS_SPIFLASH_defconfig | 1 +
configs/T2081QDS_SRIO_PCIE_BOOT_defconfig | 1 +
configs/T4160QDS_NAND_defconfig | 1 +
configs/T4160QDS_SDCARD_defconfig | 1 +
configs/T4240QDS_NAND_defconfig | 1 +
configs/T4240QDS_SDCARD_defconfig | 1 +
configs/T4240QDS_SRIO_PCIE_BOOT_defconfig | 1 +
configs/T4240RDB_SDCARD_defconfig | 1 +
configs/TQM5200S_HIGHBOOT_defconfig | 1 +
configs/TQM5200S_defconfig | 1 +
configs/TQM5200_B_HIGHBOOT_defconfig | 1 +
configs/TQM5200_B_defconfig | 1 +
configs/TQM5200_STK100_defconfig | 1 +
configs/TQM5200_defconfig | 1 +
configs/TQM823L_LCD_defconfig | 1 +
configs/TQM823L_defconfig | 1 +
configs/TQM823M_defconfig | 1 +
configs/TQM834x_defconfig | 1 +
configs/TQM850L_defconfig | 1 +
configs/TQM850M_defconfig | 1 +
configs/TQM855L_defconfig | 1 +
configs/TQM855M_defconfig | 1 +
configs/TQM860L_defconfig | 1 +
configs/TQM860M_defconfig | 1 +
configs/TQM862L_defconfig | 1 +
configs/TQM862M_defconfig | 1 +
configs/TQM866M_defconfig | 1 +
configs/TQM885D_defconfig | 1 +
configs/TTTech_defconfig | 1 +
configs/TWR-P1025_defconfig | 1 +
configs/TZX-Q8-713B7_defconfig | 1 +
configs/UCP1020_SPIFLASH_defconfig | 1 +
configs/UCP1020_defconfig | 1 +
configs/UTOO_P66_defconfig | 1 +
configs/VCMA9_defconfig | 1 +
configs/VOM405_defconfig | 1 +
configs/Wexler_TAB7200_defconfig | 1 +
configs/Wits_Pro_A20_DKT_defconfig | 1 +
configs/Yones_Toptech_BD1078_defconfig | 1 +
configs/a3m071_defconfig | 1 +
configs/a4m072_defconfig | 1 +
configs/a4m2k_defconfig | 1 +
configs/ac14xx_defconfig | 1 +
configs/acadia_defconfig | 1 +
configs/adp-ag101_defconfig | 1 +
configs/adp-ag101p_defconfig | 1 +
configs/afeb9260_defconfig | 1 +
configs/alpr_defconfig | 1 +
configs/alt_defconfig | 1 +
configs/am335x_boneblack_defconfig | 1 +
configs/am335x_boneblack_vboot_defconfig | 1 +
configs/am335x_evm_defconfig | 1 +
configs/am335x_evm_nor_defconfig | 1 +
configs/am335x_evm_norboot_defconfig | 1 +
configs/am335x_evm_spiboot_defconfig | 1 +
configs/am335x_evm_usbspl_defconfig | 1 +
configs/am335x_igep0033_defconfig | 1 +
configs/am3517_crane_defconfig | 1 +
configs/am3517_evm_defconfig | 1 +
configs/am43xx_evm_defconfig | 1 +
configs/am43xx_evm_qspiboot_defconfig | 1 +
configs/amcore_defconfig | 1 +
configs/ap325rxa_defconfig | 1 +
configs/ap_sh4a_4a_defconfig | 1 +
configs/apalis_t30_defconfig | 1 +
configs/apf27_defconfig | 1 +
configs/apx4devkit_defconfig | 1 +
configs/arches_defconfig | 1 +
configs/aria_defconfig | 1 +
configs/aristainetos_defconfig | 1 +
configs/armadillo-800eva_defconfig | 1 +
configs/arndale_defconfig | 1 +
configs/astro_mcf5373l_defconfig | 1 +
configs/at91rm9200ek_defconfig | 1 +
configs/at91rm9200ek_ram_defconfig | 1 +
configs/at91sam9260ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9260ek_dataflash_cs1_defconfig | 1 +
configs/at91sam9260ek_nandflash_defconfig | 1 +
configs/at91sam9261ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9261ek_dataflash_cs3_defconfig | 1 +
configs/at91sam9261ek_nandflash_defconfig | 1 +
configs/at91sam9263ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9263ek_dataflash_defconfig | 1 +
configs/at91sam9263ek_nandflash_defconfig | 1 +
configs/at91sam9263ek_norflash_boot_defconfig | 1 +
configs/at91sam9263ek_norflash_defconfig | 1 +
configs/at91sam9g10ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9g10ek_dataflash_cs3_defconfig | 1 +
configs/at91sam9g10ek_nandflash_defconfig | 1 +
configs/at91sam9g20ek_2mmc_defconfig | 1 +
configs/at91sam9g20ek_2mmc_nandflash_defconfig | 1 +
configs/at91sam9g20ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9g20ek_dataflash_cs1_defconfig | 1 +
configs/at91sam9g20ek_nandflash_defconfig | 1 +
configs/at91sam9m10g45ek_mmc_defconfig | 1 +
configs/at91sam9m10g45ek_nandflash_defconfig | 1 +
configs/at91sam9n12ek_mmc_defconfig | 1 +
configs/at91sam9n12ek_nandflash_defconfig | 1 +
configs/at91sam9n12ek_spiflash_defconfig | 1 +
configs/at91sam9rlek_dataflash_defconfig | 1 +
configs/at91sam9rlek_mmc_defconfig | 1 +
configs/at91sam9rlek_nandflash_defconfig | 1 +
configs/at91sam9x5ek_dataflash_defconfig | 1 +
configs/at91sam9x5ek_mmc_defconfig | 1 +
configs/at91sam9x5ek_nandflash_defconfig | 1 +
configs/at91sam9x5ek_spiflash_defconfig | 1 +
configs/at91sam9xeek_dataflash_cs0_defconfig | 1 +
configs/at91sam9xeek_dataflash_cs1_defconfig | 1 +
configs/at91sam9xeek_nandflash_defconfig | 1 +
configs/atngw100_defconfig | 1 +
configs/atngw100mkii_defconfig | 1 +
configs/atstk1002_defconfig | 1 +
configs/atstk1003_defconfig | 1 +
configs/atstk1004_defconfig | 1 +
configs/atstk1006_defconfig | 1 +
configs/axm_defconfig | 1 +
configs/axs101_defconfig | 1 +
configs/axs103_defconfig | 1 +
configs/ba10_tv_box_defconfig | 1 +
configs/balloon3_defconfig | 1 +
configs/bamboo_defconfig | 1 +
configs/bct-brettl2_defconfig | 1 +
configs/beagle_x15_defconfig | 1 +
configs/beaver_defconfig | 1 +
configs/bf506f-ezkit_defconfig | 1 +
configs/bf525-ucr2_defconfig | 1 +
configs/bf526-ezbrd_defconfig | 1 +
configs/bf527-ezkit-v2_defconfig | 1 +
configs/bf527-ezkit_defconfig | 1 +
configs/bf533-ezkit_defconfig | 1 +
configs/bf533-stamp_defconfig | 1 +
configs/bf537-minotaur_defconfig | 1 +
configs/bf537-srv1_defconfig | 1 +
configs/bf537-stamp_defconfig | 1 +
configs/bf538f-ezkit_defconfig | 1 +
configs/bf548-ezkit_defconfig | 1 +
configs/bf561-acvilon_defconfig | 1 +
configs/bf561-ezkit_defconfig | 1 +
configs/bf609-ezkit_defconfig | 1 +
configs/blackvme_defconfig | 1 +
configs/br4_defconfig | 1 +
configs/bubinga_defconfig | 1 +
configs/caddy2_defconfig | 1 +
configs/cairo_defconfig | 1 +
configs/calimain_defconfig | 1 +
configs/cam5200_defconfig | 1 +
configs/cam5200_niosflash_defconfig | 1 +
configs/cam_enc_4xx_defconfig | 1 +
configs/canmb_defconfig | 1 +
configs/canyonlands_defconfig | 1 +
configs/cardhu_defconfig | 1 +
configs/cgtqmx6qeval_defconfig | 1 +
configs/charon_defconfig | 1 +
configs/chromebook_link_defconfig | 1 +
configs/chromebox_panther_defconfig | 1 +
configs/cm-bf527_defconfig | 1 +
configs/cm-bf533_defconfig | 1 +
configs/cm-bf537e_defconfig | 1 +
configs/cm-bf537u_defconfig | 1 +
configs/cm-bf548_defconfig | 1 +
configs/cm-bf561_defconfig | 1 +
configs/cm5200_defconfig | 1 +
configs/cm_fx6_defconfig | 1 +
configs/cm_t335_defconfig | 1 +
configs/cm_t3517_defconfig | 1 +
configs/cm_t35_defconfig | 1 +
configs/cm_t54_defconfig | 1 +
configs/cmi_mpc5xx_defconfig | 1 +
configs/cobra5272_defconfig | 1 +
configs/colibri_pxa270_defconfig | 1 +
configs/colibri_t20_defconfig | 1 +
configs/colibri_t30_defconfig | 1 +
configs/colibri_vf_defconfig | 1 +
configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig | 1 +
configs/controlcenterd_36BIT_SDCARD_defconfig | 1 +
configs/coreboot-x86_defconfig | 1 +
configs/corvus_defconfig | 1 +
configs/cpu9260_128M_defconfig | 1 +
configs/cpu9260_defconfig | 1 +
configs/cpu9260_nand_128M_defconfig | 1 +
configs/cpu9260_nand_defconfig | 1 +
configs/cpu9G20_128M_defconfig | 1 +
configs/cpu9G20_defconfig | 1 +
configs/cpu9G20_nand_128M_defconfig | 1 +
configs/cpu9G20_nand_defconfig | 1 +
configs/cpuat91_defconfig | 1 +
configs/cpuat91_ram_defconfig | 1 +
configs/crownbay_defconfig | 1 +
configs/csb272_defconfig | 1 +
configs/csb472_defconfig | 1 +
configs/d2net_v2_defconfig | 1 +
configs/da830evm_defconfig | 1 +
configs/da850_am18xxevm_defconfig | 1 +
configs/da850evm_defconfig | 1 +
configs/da850evm_direct_nor_defconfig | 1 +
configs/dalmore_defconfig | 1 +
configs/davinci_dm355evm_defconfig | 1 +
configs/davinci_dm355leopard_defconfig | 1 +
configs/davinci_dm365evm_defconfig | 1 +
configs/davinci_dm6467Tevm_defconfig | 1 +
configs/davinci_dm6467evm_defconfig | 1 +
configs/davinci_dvevm_defconfig | 1 +
configs/davinci_schmoogie_defconfig | 1 +
configs/davinci_sffsdr_defconfig | 1 +
configs/davinci_sonata_defconfig | 1 +
configs/db-88f6820-gp_defconfig | 1 +
configs/db-mv784mp-gp_defconfig | 1 +
configs/devconcenter_defconfig | 1 +
configs/devkit8000_defconfig | 1 +
configs/dig297_defconfig | 1 +
configs/digsy_mtc_RAMBOOT_defconfig | 1 +
configs/digsy_mtc_defconfig | 1 +
configs/digsy_mtc_rev5_RAMBOOT_defconfig | 1 +
configs/digsy_mtc_rev5_defconfig | 1 +
configs/dlvision-10g_defconfig | 1 +
configs/dlvision_defconfig | 1 +
configs/dnp5370_defconfig | 1 +
configs/dns325_defconfig | 1 +
configs/dockstar_defconfig | 1 +
configs/dra7xx_evm_defconfig | 1 +
configs/dra7xx_evm_qspiboot_defconfig | 1 +
configs/dra7xx_evm_uart3_defconfig | 1 +
configs/draco_defconfig | 1 +
configs/dreamplug_defconfig | 1 +
configs/dxr2_defconfig | 1 +
configs/ea20_defconfig | 1 +
configs/eb_cpu5282_defconfig | 1 +
configs/eb_cpu5282_internal_defconfig | 1 +
configs/eb_cpux9k2_defconfig | 1 +
configs/eb_cpux9k2_ram_defconfig | 1 +
configs/ebony_defconfig | 1 +
configs/eco5pk_defconfig | 1 +
configs/ecovec_defconfig | 1 +
configs/edb9315a_defconfig | 1 +
configs/edminiv2_defconfig | 1 +
configs/enbw_cmc_defconfig | 1 +
configs/espt_defconfig | 1 +
configs/ethernut5_defconfig | 1 +
configs/favr-32-ezkit_defconfig | 1 +
configs/flea3_defconfig | 1 +
configs/fo300_defconfig | 1 +
configs/forfun_q88db_defconfig | 1 +
configs/fx12mm_defconfig | 1 +
configs/fx12mm_flash_defconfig | 1 +
configs/galileo_defconfig | 1 +
configs/gdppc440etx_defconfig | 1 +
configs/glacier_defconfig | 1 +
configs/glacier_ramboot_defconfig | 1 +
configs/goflexhome_defconfig | 1 +
configs/gose_defconfig | 1 +
configs/gplugd_defconfig | 1 +
configs/gr_cpci_ax2000_defconfig | 1 +
configs/gr_ep2s60_defconfig | 1 +
configs/gr_xc3s_1500_defconfig | 1 +
configs/grasshopper_defconfig | 1 +
configs/guruplug_defconfig | 1 +
configs/gwventana_defconfig | 1 +
configs/haleakala_defconfig | 1 +
configs/hammerhead_defconfig | 1 +
configs/harmony_defconfig | 1 +
configs/highbank_defconfig | 1 +
configs/hrcon_defconfig | 1 +
configs/hummingboard_solo_defconfig | 1 +
configs/i12-tvbox_defconfig | 1 +
configs/iNet_3F_defconfig | 1 +
configs/iNet_3W_defconfig | 1 +
configs/iNet_86VS_defconfig | 1 +
configs/ib62x0_defconfig | 1 +
configs/ibf-dsp561_defconfig | 1 +
configs/icon_defconfig | 1 +
configs/iconnect_defconfig | 1 +
configs/ids8313_defconfig | 1 +
configs/igep0020_defconfig | 1 +
configs/igep0020_nand_defconfig | 1 +
configs/igep0030_defconfig | 1 +
configs/igep0030_nand_defconfig | 1 +
configs/igep0032_defconfig | 1 +
configs/ima3-mx53_defconfig | 1 +
configs/imx27lite_defconfig | 1 +
configs/imx31_litekit_defconfig | 1 +
configs/imx31_phycore_defconfig | 1 +
configs/imx31_phycore_eet_defconfig | 1 +
configs/inetspace_v2_defconfig | 1 +
configs/inka4x0_defconfig | 1 +
configs/integratorcp_cm1136_defconfig | 1 +
configs/integratorcp_cm920t_defconfig | 1 +
configs/integratorcp_cm926ejs_defconfig | 1 +
configs/integratorcp_cm946es_defconfig | 1 +
configs/intip_defconfig | 1 +
configs/io64_defconfig | 1 +
configs/io_defconfig | 1 +
configs/iocon_defconfig | 1 +
configs/ipam390_defconfig | 1 +
configs/ipek01_defconfig | 1 +
configs/jesurun_q5_defconfig | 1 +
configs/jetson-tk1_defconfig | 1 +
configs/jornada_defconfig | 1 +
configs/jupiter_defconfig | 1 +
configs/k2e_evm_defconfig | 1 +
configs/k2hk_evm_defconfig | 1 +
configs/k2l_evm_defconfig | 1 +
configs/katmai_defconfig | 1 +
configs/kilauea_defconfig | 1 +
configs/km_kirkwood_128m16_defconfig | 1 +
configs/km_kirkwood_defconfig | 1 +
configs/km_kirkwood_pci_defconfig | 1 +
configs/kmcoge4_defconfig | 1 +
configs/kmcoge5ne_defconfig | 1 +
configs/kmcoge5un_defconfig | 1 +
configs/kmeter1_defconfig | 1 +
configs/kmlion1_defconfig | 1 +
configs/kmnusa_defconfig | 1 +
configs/kmopti2_defconfig | 1 +
configs/kmsugp1_defconfig | 1 +
configs/kmsupx5_defconfig | 1 +
configs/kmsuv31_defconfig | 1 +
configs/kmvect1_defconfig | 1 +
configs/koelsch_defconfig | 1 +
configs/kwb_defconfig | 1 +
configs/kzm9g_defconfig | 1 +
configs/lager_defconfig | 1 +
configs/lcd4_lwmon5_defconfig | 1 +
configs/lp8x4x_defconfig | 1 +
configs/ls1021aqds_ddr4_nor_defconfig | 1 +
configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 +
configs/ls1021aqds_nand_defconfig | 1 +
configs/ls1021aqds_nor_defconfig | 1 +
configs/ls1021aqds_nor_lpuart_defconfig | 1 +
configs/ls1021aqds_qspi_defconfig | 1 +
configs/ls1021aqds_sdcard_defconfig | 1 +
configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 1 +
configs/ls1021atwr_nor_defconfig | 1 +
configs/ls1021atwr_nor_lpuart_defconfig | 1 +
configs/ls1021atwr_qspi_defconfig | 1 +
configs/ls1021atwr_sdcard_defconfig | 1 +
configs/ls2085aqds_defconfig | 1 +
configs/ls2085aqds_nand_defconfig | 1 +
configs/ls2085ardb_defconfig | 1 +
configs/ls2085ardb_nand_defconfig | 1 +
configs/lschlv2_defconfig | 1 +
configs/lsxhl_defconfig | 1 +
configs/luan_defconfig | 1 +
configs/lwmon5_defconfig | 1 +
configs/m28evk_defconfig | 1 +
configs/m53evk_defconfig | 1 +
configs/magnesium_defconfig | 1 +
configs/makalu_defconfig | 1 +
configs/malta_defconfig | 1 +
configs/maltael_defconfig | 1 +
configs/marsboard_defconfig | 1 +
configs/maxbcm_defconfig | 1 +
configs/mcx_defconfig | 1 +
configs/mecp5123_defconfig | 1 +
configs/medcom-wide_defconfig | 1 +
configs/meesc_dataflash_defconfig | 1 +
configs/meesc_defconfig | 1 +
configs/mgcoge3ne_defconfig | 1 +
configs/mgcoge3un_defconfig | 1 +
configs/mgcoge_defconfig | 1 +
configs/microblaze-generic_defconfig | 1 +
configs/mimc200_defconfig | 1 +
configs/mixtile_loftq_defconfig | 1 +
configs/mk802_a10s_defconfig | 1 +
configs/mk802_defconfig | 1 +
configs/mk802ii_defconfig | 1 +
configs/ml507_defconfig | 1 +
configs/ml507_flash_defconfig | 1 +
configs/motionpro_defconfig | 1 +
configs/mpc5121ads_defconfig | 1 +
configs/mpc5121ads_rev2_defconfig | 1 +
configs/mpc8308_p1m_defconfig | 1 +
configs/ms7720se_defconfig | 1 +
configs/ms7722se_defconfig | 1 +
configs/ms7750se_defconfig | 1 +
configs/mt_ventoux_defconfig | 1 +
configs/munices_defconfig | 1 +
configs/mv88f6281gtw_ge_defconfig | 1 +
configs/mx23_olinuxino_defconfig | 1 +
configs/mx23evk_defconfig | 1 +
configs/mx25pdk_defconfig | 1 +
configs/mx28evk_auart_console_defconfig | 1 +
configs/mx28evk_defconfig | 1 +
configs/mx28evk_nand_defconfig | 1 +
configs/mx28evk_spi_defconfig | 1 +
configs/mx31ads_defconfig | 1 +
configs/mx31pdk_defconfig | 1 +
configs/mx35pdk_defconfig | 1 +
configs/mx51_efikamx_defconfig | 1 +
configs/mx51_efikasb_defconfig | 1 +
configs/mx51evk_defconfig | 1 +
configs/mx53ard_defconfig | 1 +
configs/mx53evk_defconfig | 1 +
configs/mx53loco_defconfig | 1 +
configs/mx53smd_defconfig | 1 +
configs/mx6cuboxi_defconfig | 1 +
configs/mx6dlarm2_defconfig | 1 +
configs/mx6dlarm2_lpddr2_defconfig | 1 +
configs/mx6dlsabreauto_defconfig | 1 +
configs/mx6dlsabresd_defconfig | 1 +
configs/mx6qarm2_defconfig | 1 +
configs/mx6qarm2_lpddr2_defconfig | 1 +
configs/mx6qsabreauto_defconfig | 1 +
configs/mx6qsabrelite_defconfig | 1 +
configs/mx6qsabresd_defconfig | 1 +
configs/mx6sabresd_spl_defconfig | 1 +
configs/mx6slevk_defconfig | 1 +
configs/mx6slevk_spinor_defconfig | 1 +
configs/mx6sxsabresd_defconfig | 1 +
configs/mx6sxsabresd_spl_defconfig | 1 +
configs/nas220_defconfig | 1 +
configs/neo_defconfig | 1 +
configs/net2big_v2_defconfig | 1 +
configs/netspace_lite_v2_defconfig | 1 +
configs/netspace_max_v2_defconfig | 1 +
configs/netspace_mini_v2_defconfig | 1 +
configs/netspace_v2_defconfig | 1 +
configs/nhk8815_defconfig | 1 +
configs/nhk8815_onenand_defconfig | 1 +
configs/nios2-generic_defconfig | 1 +
configs/nitrogen6dl2g_defconfig | 1 +
configs/nitrogen6dl_defconfig | 1 +
configs/nitrogen6q2g_defconfig | 1 +
configs/nitrogen6q_defconfig | 1 +
configs/nitrogen6s1g_defconfig | 1 +
configs/nitrogen6s_defconfig | 1 +
configs/novena_defconfig | 1 +
configs/nyan-big_defconfig | 1 +
configs/ocotea_defconfig | 1 +
configs/odroid-xu3_defconfig | 1 +
configs/odroid_defconfig | 1 +
configs/omap3_beagle_defconfig | 1 +
configs/omap3_ha_defconfig | 1 +
configs/omap3_logic_defconfig | 1 +
configs/omap3_overo_defconfig | 1 +
configs/omap3_pandora_defconfig | 1 +
configs/omap3_sdp3430_defconfig | 1 +
configs/omap3_zoom1_defconfig | 1 +
configs/omap4_panda_defconfig | 1 +
configs/omap4_sdp4430_defconfig | 1 +
configs/omap5_uevm_defconfig | 1 +
configs/omapl138_lcdk_defconfig | 1 +
configs/openrd_base_defconfig | 1 +
configs/openrd_client_defconfig | 1 +
configs/openrd_ultimate_defconfig | 1 +
configs/origen_defconfig | 1 +
configs/ot1200_defconfig | 1 +
configs/ot1200_spl_defconfig | 1 +
configs/otc570_dataflash_defconfig | 1 +
configs/otc570_defconfig | 1 +
configs/p3p440_defconfig | 1 +
configs/palmld_defconfig | 1 +
configs/palmtc_defconfig | 1 +
configs/paz00_defconfig | 1 +
configs/pcm030_LOWBOOT_defconfig | 1 +
configs/pcm030_defconfig | 1 +
configs/pcs440ep_defconfig | 1 +
configs/pdm360ng_defconfig | 1 +
configs/peach-pi_defconfig | 1 +
configs/peach-pit_defconfig | 1 +
configs/pengwyn_defconfig | 1 +
configs/platinum_picon_defconfig | 1 +
configs/platinum_titanium_defconfig | 1 +
configs/plutux_defconfig | 1 +
configs/pm9261_defconfig | 1 +
configs/pm9263_defconfig | 1 +
configs/pm9g45_defconfig | 1 +
configs/pogo_e02_defconfig | 1 +
configs/polaris_defconfig | 1 +
configs/porter_defconfig | 1 +
configs/portl2_defconfig | 1 +
configs/portuxg20_defconfig | 1 +
configs/pxa255_idp_defconfig | 1 +
configs/pxm2_defconfig | 1 +
configs/qemu_mips64_defconfig | 1 +
configs/qemu_mips64el_defconfig | 1 +
configs/qemu_mips_defconfig | 1 +
configs/qemu_mipsel_defconfig | 1 +
configs/qong_defconfig | 1 +
configs/r0p7734_defconfig | 1 +
configs/r2dplus_defconfig | 1 +
configs/r7-tv-dongle_defconfig | 1 +
configs/r7780mp_defconfig | 1 +
configs/rainier_defconfig | 1 +
configs/rd6281a_defconfig | 1 +
configs/redwood_defconfig | 1 +
configs/riotboard_defconfig | 1 +
configs/rpi_2_defconfig | 1 +
configs/rpi_defconfig | 1 +
configs/rsk7203_defconfig | 1 +
configs/rsk7264_defconfig | 1 +
configs/rsk7269_defconfig | 1 +
configs/rut_defconfig | 1 +
configs/s5p_goni_defconfig | 1 +
configs/s5pc210_universal_defconfig | 1 +
configs/sama5d3_xplained_mmc_defconfig | 1 +
configs/sama5d3_xplained_nandflash_defconfig | 1 +
configs/sama5d3xek_mmc_defconfig | 1 +
configs/sama5d3xek_nandflash_defconfig | 1 +
configs/sama5d3xek_spiflash_defconfig | 1 +
configs/sama5d4_xplained_mmc_defconfig | 1 +
configs/sama5d4_xplained_nandflash_defconfig | 1 +
configs/sama5d4_xplained_spiflash_defconfig | 1 +
configs/sama5d4ek_mmc_defconfig | 1 +
configs/sama5d4ek_nandflash_defconfig | 1 +
configs/sama5d4ek_spiflash_defconfig | 1 +
configs/sbc35_a9g20_eeprom_defconfig | 1 +
configs/sbc35_a9g20_nandflash_defconfig | 1 +
configs/sbc405_defconfig | 1 +
configs/sbc8349_PCI_33_defconfig | 1 +
configs/sbc8349_PCI_66_defconfig | 1 +
configs/sbc8349_defconfig | 1 +
configs/sbc8548_PCI_33_PCIE_defconfig | 1 +
configs/sbc8548_PCI_33_defconfig | 1 +
configs/sbc8548_PCI_66_PCIE_defconfig | 1 +
configs/sbc8548_PCI_66_defconfig | 1 +
configs/sbc8548_defconfig | 1 +
configs/sbc8641d_defconfig | 1 +
configs/sc_sps_1_defconfig | 1 +
configs/scb9328_defconfig | 1 +
configs/seaboard_defconfig | 1 +
configs/secomx6quq7_defconfig | 1 +
configs/sequoia_defconfig | 1 +
configs/sh7752evb_defconfig | 1 +
configs/sh7753evb_defconfig | 1 +
configs/sh7757lcr_defconfig | 1 +
configs/sh7763rdp_defconfig | 1 +
configs/sh7785lcr_32bit_defconfig | 1 +
configs/sh7785lcr_defconfig | 1 +
configs/sheevaplug_defconfig | 1 +
configs/shmin_defconfig | 1 +
configs/silk_defconfig | 1 +
configs/smdk2410_defconfig | 1 +
configs/smdk5250_defconfig | 1 +
configs/smdk5420_defconfig | 1 +
configs/smdkc100_defconfig | 1 +
configs/smdkv310_defconfig | 1 +
configs/snapper9260_defconfig | 1 +
configs/snapper9g20_defconfig | 1 +
configs/snow_defconfig | 1 +
configs/snowball_defconfig | 1 +
configs/socrates_defconfig | 1 +
configs/spear300_defconfig | 1 +
configs/spear300_nand_defconfig | 1 +
configs/spear300_usbtty_defconfig | 1 +
configs/spear300_usbtty_nand_defconfig | 1 +
configs/spear310_defconfig | 1 +
configs/spear310_nand_defconfig | 1 +
configs/spear310_pnor_defconfig | 1 +
configs/spear310_usbtty_defconfig | 1 +
configs/spear310_usbtty_nand_defconfig | 1 +
configs/spear310_usbtty_pnor_defconfig | 1 +
configs/spear320_defconfig | 1 +
configs/spear320_nand_defconfig | 1 +
configs/spear320_pnor_defconfig | 1 +
configs/spear320_usbtty_defconfig | 1 +
configs/spear320_usbtty_nand_defconfig | 1 +
configs/spear320_usbtty_pnor_defconfig | 1 +
configs/spear600_defconfig | 1 +
configs/spear600_nand_defconfig | 1 +
configs/spear600_usbtty_defconfig | 1 +
configs/spear600_usbtty_nand_defconfig | 1 +
configs/stamp9g20_defconfig | 1 +
configs/stm32f429-discovery_defconfig | 1 +
configs/stv0991_defconfig | 1 +
configs/stxgp3_defconfig | 1 +
configs/stxssa_4M_defconfig | 1 +
configs/stxssa_defconfig | 1 +
configs/sunxi_Gemei_G9_defconfig | 1 +
configs/suvd3_defconfig | 1 +
configs/sycamore_defconfig | 1 +
configs/t3corp_defconfig | 1 +
configs/taihu_defconfig | 1 +
configs/taishan_defconfig | 1 +
configs/tao3530_defconfig | 1 +
configs/taurus_defconfig | 1 +
configs/tbs2910_defconfig | 1 +
configs/tcm-bf518_defconfig | 1 +
configs/tcm-bf537_defconfig | 1 +
configs/tec-ng_defconfig | 1 +
configs/tec_defconfig | 1 +
configs/titanium_defconfig | 1 +
configs/tk71_defconfig | 1 +
configs/tny_a9260_eeprom_defconfig | 1 +
configs/tny_a9260_nandflash_defconfig | 1 +
configs/tny_a9g20_eeprom_defconfig | 1 +
configs/tny_a9g20_nandflash_defconfig | 1 +
configs/tqma6q_mba6_mmc_defconfig | 1 +
configs/tqma6q_mba6_spi_defconfig | 1 +
configs/tqma6s_mba6_mmc_defconfig | 1 +
configs/tqma6s_mba6_spi_defconfig | 1 +
configs/trats2_defconfig | 1 +
configs/trats_defconfig | 1 +
configs/tricorder_defconfig | 1 +
configs/trimslice_defconfig | 1 +
configs/trizepsiv_defconfig | 1 +
configs/tseries_mmc_defconfig | 1 +
configs/tseries_nand_defconfig | 1 +
configs/tseries_spi_defconfig | 1 +
configs/tt01_defconfig | 1 +
configs/tuge1_defconfig | 1 +
configs/tuxx1_defconfig | 1 +
configs/twister_defconfig | 1 +
configs/tx25_defconfig | 1 +
configs/u8500_href_defconfig | 1 +
configs/udoo_quad_defconfig | 1 +
configs/usb_a9263_dataflash_defconfig | 1 +
configs/usbarmory_defconfig | 1 +
configs/v38b_defconfig | 1 +
configs/v5fx30teval_defconfig | 1 +
configs/v5fx30teval_flash_defconfig | 1 +
configs/vct_platinum_defconfig | 1 +
configs/vct_platinum_onenand_defconfig | 1 +
configs/vct_platinum_onenand_small_defconfig | 1 +
configs/vct_platinum_small_defconfig | 1 +
configs/vct_platinumavc_defconfig | 1 +
configs/vct_platinumavc_onenand_defconfig | 1 +
configs/vct_platinumavc_onenand_small_defconfig | 1 +
configs/vct_platinumavc_small_defconfig | 1 +
configs/vct_premium_defconfig | 1 +
configs/vct_premium_onenand_defconfig | 1 +
configs/vct_premium_onenand_small_defconfig | 1 +
configs/vct_premium_small_defconfig | 1 +
configs/ve8313_defconfig | 1 +
configs/venice2_defconfig | 1 +
configs/ventana_defconfig | 1 +
configs/versatileab_defconfig | 1 +
configs/versatilepb_defconfig | 1 +
configs/vexpress_ca15_tc2_defconfig | 1 +
configs/vexpress_ca5x2_defconfig | 1 +
configs/vexpress_ca9x4_defconfig | 1 +
configs/vf610twr_defconfig | 1 +
configs/vf610twr_nand_defconfig | 1 +
configs/vision2_defconfig | 1 +
configs/vl_ma2sc_defconfig | 1 +
configs/vl_ma2sc_ram_defconfig | 1 +
configs/vme8349_defconfig | 1 +
configs/vpac270_nor_128_defconfig | 1 +
configs/vpac270_nor_256_defconfig | 1 +
configs/vpac270_ond_256_defconfig | 1 +
configs/walnut_defconfig | 1 +
configs/wandboard_dl_defconfig | 1 +
configs/wandboard_quad_defconfig | 1 +
configs/wandboard_solo_defconfig | 1 +
configs/warp_defconfig | 1 +
configs/whistler_defconfig | 1 +
configs/wireless_space_defconfig | 1 +
configs/woodburn_defconfig | 1 +
configs/woodburn_sd_defconfig | 1 +
configs/work_92105_defconfig | 1 +
configs/wtk_defconfig | 1 +
configs/x600_defconfig | 1 +
configs/xaeniax_defconfig | 1 +
configs/xilinx-ppc405-generic_defconfig | 1 +
configs/xilinx-ppc405-generic_flash_defconfig | 1 +
configs/xilinx-ppc440-generic_defconfig | 1 +
configs/xilinx-ppc440-generic_flash_defconfig | 1 +
configs/xpedite1000_defconfig | 1 +
configs/xpedite517x_defconfig | 1 +
configs/xpedite520x_defconfig | 1 +
configs/xpedite537x_defconfig | 1 +
configs/xpedite550x_defconfig | 1 +
configs/yellowstone_defconfig | 1 +
configs/yosemite_defconfig | 1 +
configs/yucca_defconfig | 1 +
configs/zeus_defconfig | 1 +
configs/zipitz2_defconfig | 1 +
configs/zmx25_defconfig | 1 +
include/config_fsl_secboot.h | 5 -----
include/configs/B4860QDS.h | 6 ------
include/configs/BSC9131RDB.h | 3 ---
include/configs/BSC9132QDS.h | 5 -----
include/configs/C29XPCIE.h | 3 ---
include/configs/CPCI2DP.h | 1 -
include/configs/CPCI4052.h | 2 --
include/configs/M5208EVBE.h | 1 -
include/configs/M52277EVB.h | 2 --
include/configs/M5235EVB.h | 1 -
include/configs/M5249EVB.h | 1 -
include/configs/M5253DEMO.h | 2 --
include/configs/M5253EVBE.h | 2 --
include/configs/M5272C3.h | 2 --
include/configs/M5275EVB.h | 2 --
include/configs/M5282EVB.h | 1 -
include/configs/M53017EVB.h | 1 -
include/configs/M5329EVB.h | 1 -
include/configs/M5373EVB.h | 1 -
include/configs/M54418TWR.h | 2 --
include/configs/M54451EVB.h | 2 --
include/configs/M54455EVB.h | 2 --
include/configs/M5475EVB.h | 1 -
include/configs/M5485EVB.h | 1 -
include/configs/MIP405.h | 1 -
include/configs/MPC8308RDB.h | 1 -
include/configs/MPC8313ERDB.h | 3 ---
include/configs/MPC8315ERDB.h | 2 --
include/configs/MPC8323ERDB.h | 2 --
include/configs/MPC832XEMDS.h | 2 --
include/configs/MPC8349EMDS.h | 2 --
include/configs/MPC8349ITX.h | 2 --
include/configs/MPC837XEMDS.h | 2 --
include/configs/MPC837XERDB.h | 2 --
include/configs/MPC8536DS.h | 4 ----
include/configs/MPC8540ADS.h | 2 --
include/configs/MPC8541CDS.h | 1 -
include/configs/MPC8544DS.h | 1 -
include/configs/MPC8548CDS.h | 1 -
include/configs/MPC8555CDS.h | 1 -
include/configs/MPC8560ADS.h | 2 --
include/configs/MPC8568MDS.h | 1 -
include/configs/MPC8569MDS.h | 1 -
include/configs/MPC8572DS.h | 1 -
include/configs/MPC8610HPCD.h | 2 --
include/configs/MPC8641HPCN.h | 2 --
include/configs/MigoR.h | 1 -
include/configs/P1010RDB.h | 5 -----
include/configs/P1022DS.h | 5 -----
include/configs/P1023RDB.h | 1 -
include/configs/P2041RDB.h | 6 ------
include/configs/PATI.h | 2 --
include/configs/PIP405.h | 1 -
include/configs/PLU405.h | 1 -
include/configs/PMC405DE.h | 1 -
include/configs/PMC440.h | 1 -
include/configs/T102xQDS.h | 5 -----
include/configs/T102xRDB.h | 5 -----
include/configs/T1040QDS.h | 5 -----
include/configs/T104xRDB.h | 4 ----
include/configs/T208xQDS.h | 5 -----
include/configs/T208xRDB.h | 5 -----
include/configs/T4240QDS.h | 6 ------
include/configs/T4240RDB.h | 5 -----
include/configs/TQM5200.h | 1 -
include/configs/TQM823L.h | 1 -
include/configs/TQM823M.h | 1 -
include/configs/TQM834x.h | 1 -
include/configs/TQM850L.h | 1 -
include/configs/TQM850M.h | 1 -
include/configs/TQM855L.h | 1 -
include/configs/TQM855M.h | 1 -
include/configs/TQM860L.h | 1 -
include/configs/TQM860M.h | 1 -
include/configs/TQM862L.h | 1 -
include/configs/TQM862M.h | 1 -
include/configs/TQM866M.h | 1 -
include/configs/TQM885D.h | 1 -
include/configs/UCP1020.h | 5 -----
include/configs/VCMA9.h | 1 -
include/configs/VOM405.h | 1 -
include/configs/a3m071.h | 1 -
include/configs/a4m072.h | 1 -
include/configs/ac14xx.h | 1 -
include/configs/acadia.h | 1 -
include/configs/adp-ag101.h | 1 -
include/configs/adp-ag101p.h | 1 -
include/configs/adp-ag102.h | 1 -
include/configs/afeb9260.h | 1 -
include/configs/alpr.h | 1 -
include/configs/am335x_evm.h | 8 --------
include/configs/am335x_igep0033.h | 1 -
include/configs/am3517_crane.h | 1 -
include/configs/am3517_evm.h | 1 -
include/configs/am43xx_evm.h | 3 ---
include/configs/amcore.h | 1 -
include/configs/ap325rxa.h | 1 -
include/configs/ap_sh4a_4a.h | 1 -
include/configs/apalis_t30.h | 1 -
include/configs/apf27.h | 1 -
include/configs/apx4devkit.h | 1 -
include/configs/arcangel4.h | 1 -
include/configs/aria.h | 1 -
include/configs/aristainetos.h | 1 -
include/configs/armadillo-800eva.h | 1 -
include/configs/arndale.h | 1 -
include/configs/aspenite.h | 1 -
include/configs/astro_mcf5373l.h | 2 --
include/configs/at91rm9200ek.h | 1 -
include/configs/at91sam9260ek.h | 4 ----
include/configs/at91sam9261ek.h | 3 ---
include/configs/at91sam9263ek.h | 3 ---
include/configs/at91sam9m10g45ek.h | 2 --
include/configs/at91sam9n12ek.h | 3 ---
include/configs/at91sam9rlek.h | 3 ---
include/configs/at91sam9x5ek.h | 4 ----
include/configs/atngw100.h | 1 -
include/configs/atngw100mkii.h | 1 -
include/configs/atstk1002.h | 1 -
include/configs/atstk1003.h | 1 -
include/configs/atstk1004.h | 1 -
include/configs/atstk1006.h | 1 -
include/configs/axs101.h | 1 -
include/configs/balloon3.h | 2 --
include/configs/bamboo.h | 1 -
include/configs/bav335x.h | 7 -------
include/configs/bcm28155_ap.h | 1 -
include/configs/bcm_ep_board.h | 1 -
include/configs/bct-brettl2.h | 1 -
include/configs/beagle_x15.h | 1 -
include/configs/beaver.h | 1 -
include/configs/bf506f-ezkit.h | 1 -
include/configs/bf518f-ezbrd.h | 2 --
include/configs/bf525-ucr2.h | 1 -
include/configs/bf526-ezbrd.h | 2 --
include/configs/bf527-ad7160-eval.h | 3 ---
include/configs/bf527-ezkit.h | 3 ---
include/configs/bf527-sdp.h | 2 --
include/configs/bf533-ezkit.h | 1 -
include/configs/bf533-stamp.h | 2 --
include/configs/bf537-minotaur.h | 1 -
include/configs/bf537-pnav.h | 2 --
include/configs/bf537-srv1.h | 1 -
include/configs/bf537-stamp.h | 2 --
include/configs/bf538f-ezkit.h | 2 --
include/configs/bf548-ezkit.h | 3 ---
include/configs/bf561-acvilon.h | 1 -
include/configs/bf561-ezkit.h | 1 -
include/configs/bf609-ezkit.h | 3 ---
include/configs/bg0900.h | 1 -
include/configs/blackstamp.h | 1 -
include/configs/blackvme.h | 1 -
include/configs/br4.h | 1 -
include/configs/bubinga.h | 2 --
include/configs/calimain.h | 1 -
include/configs/cam_enc_4xx.h | 4 ----
include/configs/canmb.h | 1 -
include/configs/canyonlands.h | 1 -
include/configs/cardhu.h | 1 -
include/configs/cgtqmx6eval.h | 1 -
include/configs/cm-bf527.h | 1 -
include/configs/cm-bf533.h | 1 -
include/configs/cm-bf537e.h | 1 -
include/configs/cm-bf537u.h | 1 -
include/configs/cm-bf548.h | 1 -
include/configs/cm-bf561.h | 1 -
include/configs/cm5200.h | 1 -
include/configs/cm_fx6.h | 1 -
include/configs/cm_t335.h | 1 -
include/configs/cm_t35.h | 1 -
include/configs/cm_t3517.h | 1 -
include/configs/cm_t54.h | 1 -
include/configs/cmi_mpc5xx.h | 1 -
include/configs/cobra5272.h | 2 --
include/configs/colibri_pxa270.h | 2 --
include/configs/colibri_t20.h | 1 -
include/configs/colibri_t30.h | 1 -
include/configs/controlcenterd.h | 3 ---
include/configs/corenet_ds.h | 6 ------
include/configs/corvus.h | 1 -
include/configs/cpu9260.h | 2 --
include/configs/cpuat91.h | 1 -
include/configs/csb272.h | 3 ---
include/configs/csb472.h | 3 ---
include/configs/da830evm.h | 7 -------
include/configs/da850evm.h | 7 -------
include/configs/dalmore.h | 1 -
include/configs/davinci_dm355evm.h | 4 ----
include/configs/davinci_dm355leopard.h | 2 --
include/configs/davinci_dm365evm.h | 4 ----
include/configs/davinci_dm6467evm.h | 3 ---
include/configs/davinci_dvevm.h | 3 ---
include/configs/davinci_schmoogie.h | 2 --
include/configs/davinci_sffsdr.h | 2 --
include/configs/davinci_sonata.h | 3 ---
include/configs/db-88f6820-gp.h | 1 -
include/configs/db-mv784mp-gp.h | 1 -
include/configs/dbau1x00.h | 1 -
include/configs/devkit3250.h | 1 -
include/configs/devkit8000.h | 1 -
include/configs/dig297.h | 1 -
include/configs/digsy_mtc.h | 1 -
include/configs/dlvision-10g.h | 1 -
include/configs/dlvision.h | 1 -
include/configs/dnp5370.h | 1 -
include/configs/dns325.h | 2 --
include/configs/dockstar.h | 2 --
include/configs/dra7xx_evm.h | 3 ---
include/configs/dreamplug.h | 2 --
include/configs/duovero.h | 1 -
include/configs/ea20.h | 4 ----
include/configs/eb_cpu5282.h | 1 -
include/configs/eb_cpux9k2.h | 1 -
include/configs/ebony.h | 2 --
include/configs/ecovec.h | 1 -
include/configs/edb93xx.h | 1 -
include/configs/edminiv2.h | 1 -
include/configs/enbw_cmc.h | 3 ---
include/configs/espt.h | 1 -
include/configs/ethernut5.h | 1 -
include/configs/favr-32-ezkit.h | 1 -
include/configs/flea3.h | 1 -
include/configs/fx12mm.h | 1 -
include/configs/gdppc440etx.h | 1 -
include/configs/goflexhome.h | 2 --
include/configs/gplugd.h | 1 -
include/configs/gr_cpci_ax2000.h | 2 --
include/configs/gr_ep2s60.h | 2 --
include/configs/gr_xc3s_1500.h | 2 --
include/configs/grasshopper.h | 1 -
include/configs/grsim.h | 2 --
include/configs/grsim_leon2.h | 2 --
include/configs/guruplug.h | 2 --
include/configs/gw_ventana.h | 2 --
include/configs/h2200.h | 1 -
include/configs/hammerhead.h | 1 -
include/configs/harmony.h | 1 -
include/configs/highbank.h | 1 -
include/configs/hrcon.h | 2 --
include/configs/hummingboard.h | 1 -
include/configs/ib62x0.h | 2 --
include/configs/ibf-dsp561.h | 1 -
include/configs/icon.h | 1 -
include/configs/iconnect.h | 2 --
include/configs/ids8313.h | 1 -
include/configs/ima3-mx53.h | 1 -
include/configs/imx27lite-common.h | 1 -
include/configs/imx31_litekit.h | 1 -
include/configs/imx31_phycore.h | 1 -
include/configs/inka4x0.h | 1 -
include/configs/integratorap.h | 1 -
include/configs/integratorcp.h | 1 -
include/configs/intip.h | 1 -
include/configs/io.h | 1 -
include/configs/io64.h | 1 -
include/configs/iocon.h | 1 -
include/configs/ip04.h | 1 -
include/configs/ipam390.h | 1 -
include/configs/ipek01.h | 1 -
include/configs/jetson-tk1.h | 1 -
include/configs/jornada.h | 1 -
include/configs/jupiter.h | 1 -
include/configs/katmai.h | 1 -
include/configs/kilauea.h | 1 -
include/configs/km/km83xx-common.h | 2 --
include/configs/km/km_arm.h | 2 --
include/configs/km/kmp204x-common.h | 1 -
include/configs/km82xx.h | 1 -
include/configs/ks2_evm.h | 1 -
include/configs/kwb.h | 2 --
include/configs/kzm9g.h | 1 -
include/configs/lacie_kw.h | 1 -
include/configs/lp8x4x.h | 1 -
include/configs/ls1021aqds.h | 4 ----
include/configs/ls1021atwr.h | 3 ---
include/configs/ls2085a_emu.h | 1 -
include/configs/ls2085a_simu.h | 1 -
include/configs/ls2085aqds.h | 2 --
include/configs/ls2085ardb.h | 2 --
include/configs/lsxl.h | 2 --
include/configs/luan.h | 1 -
include/configs/lwmon5.h | 1 -
include/configs/m28evk.h | 2 --
include/configs/m53evk.h | 2 --
include/configs/makalu.h | 1 -
include/configs/malta.h | 1 -
include/configs/manroland/mpc5200-common.h | 1 -
include/configs/maxbcm.h | 1 -
include/configs/mcx.h | 1 -
include/configs/mecp5123.h | 1 -
include/configs/medcom-wide.h | 1 -
include/configs/meesc.h | 2 --
include/configs/microblaze-generic.h | 5 -----
include/configs/mimc200.h | 1 -
include/configs/minnowmax.h | 2 --
include/configs/ml507.h | 1 -
include/configs/motionpro.h | 1 -
include/configs/mpc5121ads.h | 1 -
include/configs/mpc8308_p1m.h | 1 -
include/configs/mpr2.h | 1 -
include/configs/ms7720se.h | 1 -
include/configs/ms7722se.h | 1 -
include/configs/ms7750se.h | 1 -
include/configs/munices.h | 1 -
include/configs/mv88f6281gtw_ge.h | 2 --
include/configs/mx23_olinuxino.h | 1 -
include/configs/mx23evk.h | 1 -
include/configs/mx25pdk.h | 1 -
include/configs/mx31ads.h | 1 -
include/configs/mx31pdk.h | 1 -
include/configs/mx35pdk.h | 2 --
include/configs/mx51_efikamx.h | 2 --
include/configs/mx51evk.h | 1 -
include/configs/mx53ard.h | 1 -
include/configs/mx53evk.h | 1 -
include/configs/mx53loco.h | 1 -
include/configs/mx53smd.h | 1 -
include/configs/mx6cuboxi.h | 1 -
include/configs/mx6qarm2.h | 1 -
include/configs/mx6sabre_common.h | 1 -
include/configs/mx6slevk.h | 2 --
include/configs/mx6sxsabresd.h | 1 -
include/configs/nas220.h | 2 --
include/configs/neo.h | 1 -
include/configs/nhk8815.h | 2 --
include/configs/nios2-generic.h | 1 -
include/configs/nitrogen6x.h | 2 --
include/configs/nokia_rx51.h | 1 -
include/configs/novena.h | 2 --
include/configs/nyan-big.h | 1 -
include/configs/o2dnt-common.h | 1 -
include/configs/ocotea.h | 2 --
include/configs/odroid.h | 1 -
include/configs/odroid_xu3.h | 1 -
include/configs/omap3_beagle.h | 1 -
include/configs/omap3_cairo.h | 1 -
include/configs/omap3_evm_common.h | 2 --
include/configs/omap3_evm_quick_mmc.h | 1 -
include/configs/omap3_evm_quick_nand.h | 1 -
include/configs/omap3_igep00x0.h | 3 ---
include/configs/omap3_logic.h | 1 -
include/configs/omap3_mvblx.h | 1 -
include/configs/omap3_overo.h | 1 -
include/configs/omap3_pandora.h | 1 -
include/configs/omap3_sdp3430.h | 1 -
include/configs/omap3_zoom1.h | 1 -
include/configs/omap4_panda.h | 1 -
include/configs/omap4_sdp4430.h | 1 -
include/configs/omap5_uevm.h | 1 -
include/configs/omapl138_lcdk.h | 11 -----------
include/configs/openrd.h | 2 --
include/configs/openrisc-generic.h | 1 -
include/configs/origen.h | 1 -
include/configs/ot1200.h | 1 -
include/configs/otc570.h | 2 --
include/configs/p1_p2_rdb_pc.h | 5 -----
include/configs/p1_twr.h | 3 ---
include/configs/p3p440.h | 1 -
include/configs/palmld.h | 2 --
include/configs/palmtc.h | 2 --
include/configs/palmtreo680.h | 1 -
include/configs/paz00.h | 1 -
include/configs/pb1x00.h | 1 -
include/configs/pcm030.h | 1 -
include/configs/pcm051.h | 1 -
include/configs/pcs440ep.h | 1 -
include/configs/pdm360ng.h | 1 -
include/configs/peach-pi.h | 1 -
include/configs/peach-pit.h | 1 -
include/configs/pengwyn.h | 1 -
include/configs/pepper.h | 1 -
include/configs/platinum.h | 2 --
include/configs/plutux.h | 1 -
include/configs/pm9261.h | 3 ---
include/configs/pm9263.h | 3 ---
include/configs/pm9g45.h | 1 -
include/configs/pogo_e02.h | 2 --
include/configs/pr1.h | 1 -
include/configs/pxa255_idp.h | 1 -
include/configs/qemu-mips.h | 1 -
include/configs/qemu-mips64.h | 1 -
include/configs/qemu-ppce500.h | 1 -
include/configs/qong.h | 1 -
include/configs/r0p7734.h | 1 -
include/configs/r2dplus.h | 1 -
include/configs/r7780mp.h | 1 -
include/configs/rcar-gen2-common.h | 1 -
include/configs/rd6281a.h | 2 --
include/configs/redwood.h | 3 ---
include/configs/rpi-common.h | 1 -
include/configs/rsk7203.h | 1 -
include/configs/rsk7264.h | 1 -
include/configs/rsk7269.h | 1 -
include/configs/s5p_goni.h | 1 -
include/configs/s5pc210_universal.h | 1 -
include/configs/sama5d3_xplained.h | 3 ---
include/configs/sama5d3xek.h | 4 ----
include/configs/sama5d4_xplained.h | 3 ---
include/configs/sama5d4ek.h | 3 ---
include/configs/sandbox.h | 1 -
include/configs/sansa_fuze_plus.h | 1 -
include/configs/sbc35_a9g20.h | 2 --
include/configs/sbc405.h | 1 -
include/configs/sbc8349.h | 2 --
include/configs/sbc8548.h | 1 -
include/configs/sbc8641d.h | 1 -
include/configs/sc_sps_1.h | 2 --
include/configs/scb9328.h | 1 -
include/configs/seaboard.h | 1 -
include/configs/sequoia.h | 2 --
include/configs/sh7752evb.h | 1 -
include/configs/sh7753evb.h | 1 -
include/configs/sh7757lcr.h | 1 -
include/configs/sh7763rdp.h | 1 -
include/configs/sh7785lcr.h | 1 -
include/configs/sheevaplug.h | 2 --
include/configs/shmin.h | 1 -
include/configs/siemens-am33x-common.h | 5 -----
include/configs/smdk2410.h | 1 -
include/configs/smdk5250.h | 1 -
include/configs/smdk5420.h | 1 -
include/configs/smdkc100.h | 1 -
include/configs/smdkv310.h | 1 -
include/configs/snapper9260.h | 1 -
include/configs/snow.h | 1 -
include/configs/snowball.h | 1 -
include/configs/socfpga_common.h | 1 -
include/configs/socrates.h | 1 -
include/configs/spear3xx_evb.h | 2 --
include/configs/spear6xx_evb.h | 2 --
include/configs/stamp9g20.h | 1 -
include/configs/stm32f429-discovery.h | 1 -
include/configs/stv0991.h | 1 -
include/configs/stxgp3.h | 2 --
include/configs/stxssa.h | 2 --
include/configs/sunxi-common.h | 2 --
include/configs/t3corp.h | 1 -
include/configs/taihu.h | 1 -
include/configs/taishan.h | 1 -
include/configs/tam3517-common.h | 1 -
include/configs/tao3530.h | 1 -
include/configs/taurus.h | 1 -
include/configs/tb100.h | 1 -
include/configs/tbs2910.h | 1 -
include/configs/tcm-bf518.h | 1 -
include/configs/tcm-bf537.h | 1 -
include/configs/tec-ng.h | 1 -
include/configs/tec.h | 1 -
include/configs/ti814x_evm.h | 1 -
include/configs/ti816x_evm.h | 1 -
include/configs/titanium.h | 2 --
include/configs/tk71.h | 2 --
include/configs/tny_a9260.h | 2 --
include/configs/tqma6.h | 2 --
include/configs/trats.h | 1 -
include/configs/trats2.h | 1 -
include/configs/tricorder.h | 2 --
include/configs/trimslice.h | 1 -
include/configs/trizepsiv.h | 1 -
include/configs/tseries.h | 6 ------
include/configs/tt01.h | 1 -
include/configs/tx25.h | 1 -
include/configs/u8500_href.h | 1 -
include/configs/udoo.h | 1 -
include/configs/uniphier.h | 2 --
include/configs/usb_a9263.h | 1 -
include/configs/usbarmory.h | 1 -
include/configs/v38b.h | 1 -
include/configs/v5fx30teval.h | 1 -
include/configs/vct.h | 2 --
include/configs/ve8313.h | 1 -
include/configs/venice2.h | 1 -
include/configs/ventana.h | 1 -
include/configs/versatile.h | 2 --
include/configs/vexpress_aemv8a.h | 1 -
include/configs/vexpress_common.h | 1 -
include/configs/vision2.h | 1 -
include/configs/vl_ma2sc.h | 1 -
include/configs/vme8349.h | 2 --
include/configs/vpac270.h | 3 ---
include/configs/walnut.h | 2 --
include/configs/wandboard.h | 1 -
include/configs/warp.h | 1 -
include/configs/whistler.h | 1 -
include/configs/wireless_space.h | 1 -
include/configs/woodburn_common.h | 1 -
include/configs/work_92105.h | 1 -
include/configs/x600.h | 1 -
include/configs/x86-chromebook.h | 2 --
include/configs/x86-common.h | 1 -
include/configs/xaeniax.h | 1 -
include/configs/xfi3.h | 1 -
include/configs/xilinx-ppc.h | 1 -
include/configs/xilinx-ppc405-generic.h | 1 -
include/configs/xilinx-ppc440-generic.h | 1 -
include/configs/xilinx_zynqmp.h | 1 -
include/configs/xpedite1000.h | 1 -
include/configs/xpedite517x.h | 1 -
include/configs/xpedite520x.h | 1 -
include/configs/xpedite537x.h | 1 -
include/configs/xpedite550x.h | 1 -
include/configs/yosemite.h | 2 --
include/configs/yucca.h | 3 ---
include/configs/zeus.h | 1 -
include/configs/zipitz2.h | 1 -
include/configs/zmx25.h | 1 -
include/configs/zynq-common.h | 2 --
1451 files changed, 944 insertions(+), 818 deletions(-)
diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
index 971e11a..1f67b19 100644
--- a/configs/A10-OLinuXino-Lime_defconfig
+++ b/configs/A10-OLinuXino-Lime_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_CLK_FREQ=912000000
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig
index d4953aa..541ffe1 100644
--- a/configs/A10s-OLinuXino-M_defconfig
+++ b/configs/A10s-OLinuXino-M_defconfig
@@ -9,3 +9,4 @@ CONFIG_USB1_VBUS_PIN="PB10"
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-olinuxino-micro"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,SUNXI_EMAC,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
index 4bee362..db39010 100644
--- a/configs/A13-OLinuXinoM_defconfig
+++ b/configs/A13-OLinuXinoM_defconfig
@@ -13,3 +13,4 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino-micro"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index 43d5fa1..2e14996 100644
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -14,3 +14,4 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
index 78eee6a..8f2a5ba 100644
--- a/configs/A20-OLinuXino-Lime2_defconfig
+++ b/configs/A20-OLinuXino-Lime2_defconfig
@@ -8,4 +8,5 @@ CONFIG_USB0_VBUS_DET="PH5"
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
index 0b64d94..55614fc 100644
--- a/configs/A20-OLinuXino-Lime_defconfig
+++ b/configs/A20-OLinuXino-Lime_defconfig
@@ -5,4 +5,5 @@ CONFIG_DRAM_CLK=480
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
index e61067d..d911e61 100644
--- a/configs/A20-OLinuXino_MICRO_defconfig
+++ b/configs/A20-OLinuXino_MICRO_defconfig
@@ -9,4 +9,5 @@ CONFIG_VIDEO_VGA=y
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig
index 94c5443..4a45c74 100644
--- a/configs/Ainol_AW1_defconfig
+++ b/configs/Ainol_AW1_defconfig
@@ -15,3 +15,4 @@ CONFIG_USB_MUSB_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-ainol-aw1"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/Ampe_A76_defconfig b/configs/Ampe_A76_defconfig
index 63307b8..10f0864 100644
--- a/configs/Ampe_A76_defconfig
+++ b/configs/Ampe_A76_defconfig
@@ -14,3 +14,4 @@ CONFIG_USB_MUSB_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-ampe-a76"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/Astar_MID756_defconfig b/configs/Astar_MID756_defconfig
index b779f88..ded3d81 100644
--- a/configs/Astar_MID756_defconfig
+++ b/configs/Astar_MID756_defconfig
@@ -15,5 +15,6 @@ CONFIG_USB_MUSB_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-astar-mid756"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_AXP221_DLDO1_VOLT=3300
CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig
index 6e320bd..b32353b 100644
--- a/configs/Auxtek-T004_defconfig
+++ b/configs/Auxtek-T004_defconfig
@@ -6,3 +6,4 @@ CONFIG_USB1_VBUS_PIN="PG13"
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-auxtek-t004"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/B4420QDS_NAND_defconfig b/configs/B4420QDS_NAND_defconfig
index a043659..8f9f7af 100644
--- a/configs/B4420QDS_NAND_defconfig
+++ b/configs/B4420QDS_NAND_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/B4420QDS_SPIFLASH_defconfig b/configs/B4420QDS_SPIFLASH_defconfig
index 29afd8a..1a1d290 100644
--- a/configs/B4420QDS_SPIFLASH_defconfig
+++ b/configs/B4420QDS_SPIFLASH_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/B4860QDS_NAND_defconfig b/configs/B4860QDS_NAND_defconfig
index 9e7462d..222fbbc 100644
--- a/configs/B4860QDS_NAND_defconfig
+++ b/configs/B4860QDS_NAND_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/B4860QDS_SPIFLASH_defconfig b/configs/B4860QDS_SPIFLASH_defconfig
index 275e494..4466fec 100644
--- a/configs/B4860QDS_SPIFLASH_defconfig
+++ b/configs/B4860QDS_SPIFLASH_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig b/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
index 928fc67..729b033 100644
--- a/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_REMOTE=y
diff --git a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
index 88127b7..1853b1e 100644
--- a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
+++ b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9131RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND,SYS_CLK_100"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/BSC9131RDB_NAND_defconfig b/configs/BSC9131RDB_NAND_defconfig
index f80d9c6..145e462 100644
--- a/configs/BSC9131RDB_NAND_defconfig
+++ b/configs/BSC9131RDB_NAND_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9131RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
index fbe1ccd..4a99bcb 100644
--- a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
+++ b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9131RDB=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,SPIFLASH,SYS_CLK_100"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/BSC9131RDB_SPIFLASH_defconfig b/configs/BSC9131RDB_SPIFLASH_defconfig
index baaf91c..4cae008 100644
--- a/configs/BSC9131RDB_SPIFLASH_defconfig
+++ b/configs/BSC9131RDB_SPIFLASH_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9131RDB=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
index 71f8faa..c997f3d 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_100"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
index 37e413d..ff99256 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_133"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
index 5e13188..f6b60df 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_100"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
index aeaf1e8..ec1eeee 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_133"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
index 85731bc..90d705c 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_100"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
index 5bcaae5..d47a04a 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
index 177dec4..d01e740 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
index 7eed6cc..6a8741e 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_133"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
index 904d27d..9aae387 100644
--- a/configs/Bananapi_defconfig
+++ b/configs/Bananapi_defconfig
@@ -6,4 +6,5 @@ CONFIG_GMAC_TX_DELAY=3
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig
index 7b7556b..ac8cef4 100644
--- a/configs/Bananapro_defconfig
+++ b/configs/Bananapro_defconfig
@@ -8,4 +8,5 @@ CONFIG_GMAC_TX_DELAY=3
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapro"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/C29XPCIE_NAND_defconfig b/configs/C29XPCIE_NAND_defconfig
index b86dea8..0c1ab94 100644
--- a/configs/C29XPCIE_NAND_defconfig
+++ b/configs/C29XPCIE_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_C29XPCIE=y
CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/C29XPCIE_SPIFLASH_defconfig b/configs/C29XPCIE_SPIFLASH_defconfig
index ab196e7..6562990 100644
--- a/configs/C29XPCIE_SPIFLASH_defconfig
+++ b/configs/C29XPCIE_SPIFLASH_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_C29XPCIE=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/C29XPCIE_defconfig b/configs/C29XPCIE_defconfig
index b968504..234c1f0 100644
--- a/configs/C29XPCIE_defconfig
+++ b/configs/C29XPCIE_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_C29XPCIE=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/CPCI2DP_defconfig b/configs/CPCI2DP_defconfig
index 23631e9..15d93ce 100644
--- a/configs/CPCI2DP_defconfig
+++ b/configs/CPCI2DP_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_CPCI2DP=y
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/CPCI4052_defconfig b/configs/CPCI4052_defconfig
index 5d30b79..3559700 100644
--- a/configs/CPCI4052_defconfig
+++ b/configs/CPCI4052_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_CPCI4052=y
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/CSQ_CS908_defconfig b/configs/CSQ_CS908_defconfig
index 850d70d..e97b01d 100644
--- a/configs/CSQ_CS908_defconfig
+++ b/configs/CSQ_CS908_defconfig
@@ -7,6 +7,7 @@ CONFIG_USB2_VBUS_PIN=""
CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-cs908"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP221_DLDO1_VOLT=3300
CONFIG_AXP221_ALDO1_VOLT=3300
diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig
index 819b353..18e89be 100644
--- a/configs/Chuwi_V7_CW0825_defconfig
+++ b/configs/Chuwi_V7_CW0825_defconfig
@@ -14,6 +14,7 @@ CONFIG_USB_MUSB_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-chuwi-v7-cw0825"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_VIDEO_LCD_SPI_CS="PA0"
CONFIG_VIDEO_LCD_SPI_SCLK="PA1"
CONFIG_VIDEO_LCD_SPI_MOSI="PA2"
diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
index e6bed2d..68e34c5 100644
--- a/configs/Colombus_defconfig
+++ b/configs/Colombus_defconfig
@@ -7,5 +7,6 @@ CONFIG_USB1_VBUS_PIN=""
CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-colombus"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP221_ALDO1_VOLT=3300
diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
index e88cce4..bc5f2a6 100644
--- a/configs/Cubieboard2_defconfig
+++ b/configs/Cubieboard2_defconfig
@@ -6,4 +6,5 @@ CONFIG_MMC0_CD_PIN="PH1"
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
index ce9591d..b9e5dab 100644
--- a/configs/Cubieboard_defconfig
+++ b/configs/Cubieboard_defconfig
@@ -5,3 +5,4 @@ CONFIG_DRAM_CLK=480
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index c34ab50..ba98c9a 100644
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -7,4 +7,5 @@ CONFIG_GMAC_TX_DELAY=1
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig
index 015140f..5193f75 100644
--- a/configs/Hummingbird_A31_defconfig
+++ b/configs/Hummingbird_A31_defconfig
@@ -9,5 +9,6 @@ CONFIG_VIDEO_VGA_EXTERNAL_DAC_EN="PH25"
CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-hummingbird"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP221_ALDO1_VOLT=3300
diff --git a/configs/Hyundai_A7HD_defconfig b/configs/Hyundai_A7HD_defconfig
index e26f4f0..e0cb47d 100644
--- a/configs/Hyundai_A7HD_defconfig
+++ b/configs/Hyundai_A7HD_defconfig
@@ -16,3 +16,4 @@ CONFIG_USB_MUSB_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-hyundai-a7hd"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
index 5b1080f..499c7e9 100644
--- a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
+++ b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
@@ -15,5 +15,6 @@ CONFIG_USB_MUSB_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ippo-q8h-v1.2-lcd1024x600"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_AXP221_DLDO1_VOLT=3300
CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Ippo_q8h_v1_2_defconfig b/configs/Ippo_q8h_v1_2_defconfig
index 8d03300..e6eb8e6 100644
--- a/configs/Ippo_q8h_v1_2_defconfig
+++ b/configs/Ippo_q8h_v1_2_defconfig
@@ -15,5 +15,6 @@ CONFIG_USB_MUSB_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v1.2"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_AXP221_DLDO1_VOLT=3300
CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Ippo_q8h_v5_defconfig b/configs/Ippo_q8h_v5_defconfig
index 1a07064..d8c0ced 100644
--- a/configs/Ippo_q8h_v5_defconfig
+++ b/configs/Ippo_q8h_v5_defconfig
@@ -15,5 +15,6 @@ CONFIG_USB_MUSB_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v5"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_AXP221_DLDO1_VOLT=3300
CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig
index be381ef..1a5f854 100644
--- a/configs/Linksprite_pcDuino3_Nano_defconfig
+++ b/configs/Linksprite_pcDuino3_Nano_defconfig
@@ -8,4 +8,5 @@ CONFIG_GMAC_TX_DELAY=3
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3-nano"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
index 2c846f9..95038b3 100644
--- a/configs/Linksprite_pcDuino3_defconfig
+++ b/configs/Linksprite_pcDuino3_defconfig
@@ -6,4 +6,5 @@ CONFIG_DRAM_ZQ=122
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Linksprite_pcDuino_defconfig b/configs/Linksprite_pcDuino_defconfig
index aed5b59..929406a 100644
--- a/configs/Linksprite_pcDuino_defconfig
+++ b/configs/Linksprite_pcDuino_defconfig
@@ -5,3 +5,4 @@ CONFIG_DRAM_CLK=408
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-pcduino"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig
index c727683..c84e1d4 100644
--- a/configs/M5208EVBE_defconfig
+++ b/configs/M5208EVBE_defconfig
@@ -1,2 +1,3 @@
CONFIG_M68K=y
CONFIG_TARGET_M5208EVBE=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M52277EVB_defconfig b/configs/M52277EVB_defconfig
index a13cc8b..c179b7c 100644
--- a/configs/M52277EVB_defconfig
+++ b/configs/M52277EVB_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M52277EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_SPANSION_BOOT,SYS_TEXT_BASE=0x00000000"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M52277EVB_stmicro_defconfig b/configs/M52277EVB_stmicro_defconfig
index 65de4d5..b3b2f54 100644
--- a/configs/M52277EVB_stmicro_defconfig
+++ b/configs/M52277EVB_stmicro_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M52277EVB=y
CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x43E00000"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/M5235EVB_Flash32_defconfig b/configs/M5235EVB_Flash32_defconfig
index e19b730..4184fc3 100644
--- a/configs/M5235EVB_Flash32_defconfig
+++ b/configs/M5235EVB_Flash32_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5235EVB=y
CONFIG_SYS_EXTRA_OPTIONS="NORFLASH_PS32BIT,SYS_TEXT_BASE=0xFFC00000"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig
index afb14b0..0c4b635 100644
--- a/configs/M5235EVB_defconfig
+++ b/configs/M5235EVB_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5235EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFE00000"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5249EVB_defconfig b/configs/M5249EVB_defconfig
index fb29274..de5d7ec 100644
--- a/configs/M5249EVB_defconfig
+++ b/configs/M5249EVB_defconfig
@@ -1,2 +1,3 @@
CONFIG_M68K=y
CONFIG_TARGET_M5249EVB=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig
index 68cad2f..00249fc 100644
--- a/configs/M5253DEMO_defconfig
+++ b/configs/M5253DEMO_defconfig
@@ -1,2 +1,3 @@
CONFIG_M68K=y
CONFIG_TARGET_M5253DEMO=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5253EVBE_defconfig b/configs/M5253EVBE_defconfig
index 5c562fe..ff3e873 100644
--- a/configs/M5253EVBE_defconfig
+++ b/configs/M5253EVBE_defconfig
@@ -1,2 +1,3 @@
CONFIG_M68K=y
CONFIG_TARGET_M5253EVBE=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig
index fdb872a..6aabb72 100644
--- a/configs/M5272C3_defconfig
+++ b/configs/M5272C3_defconfig
@@ -1,2 +1,3 @@
CONFIG_M68K=y
CONFIG_TARGET_M5272C3=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5275EVB_defconfig b/configs/M5275EVB_defconfig
index 1e33649..25e7b7a 100644
--- a/configs/M5275EVB_defconfig
+++ b/configs/M5275EVB_defconfig
@@ -1,2 +1,3 @@
CONFIG_M68K=y
CONFIG_TARGET_M5275EVB=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5282EVB_defconfig b/configs/M5282EVB_defconfig
index 66d742f..17dee7a 100644
--- a/configs/M5282EVB_defconfig
+++ b/configs/M5282EVB_defconfig
@@ -1,2 +1,3 @@
CONFIG_M68K=y
CONFIG_TARGET_M5282EVB=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig
index d83e638..cc0e22b 100644
--- a/configs/M53017EVB_defconfig
+++ b/configs/M53017EVB_defconfig
@@ -1,2 +1,3 @@
CONFIG_M68K=y
CONFIG_TARGET_M53017EVB=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig
index c52bfa3..74bb875 100644
--- a/configs/M5329AFEE_defconfig
+++ b/configs/M5329AFEE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5329EVB=y
CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=0"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig
index 4154742..4518e24 100644
--- a/configs/M5329BFEE_defconfig
+++ b/configs/M5329BFEE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5329EVB=y
CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig
index f71c0bf..fa18de9 100644
--- a/configs/M5373EVB_defconfig
+++ b/configs/M5373EVB_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5373EVB=y
CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M54418TWR_defconfig b/configs/M54418TWR_defconfig
index dceaab3..dfa0f22 100644
--- a/configs/M54418TWR_defconfig
+++ b/configs/M54418TWR_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M54418TWR=y
CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/M54418TWR_serial_mii_defconfig b/configs/M54418TWR_serial_mii_defconfig
index 83bbb98..21f2d7c 100644
--- a/configs/M54418TWR_serial_mii_defconfig
+++ b/configs/M54418TWR_serial_mii_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M54418TWR=y
CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/M54418TWR_serial_rmii_defconfig b/configs/M54418TWR_serial_rmii_defconfig
index dceaab3..dfa0f22 100644
--- a/configs/M54418TWR_serial_rmii_defconfig
+++ b/configs/M54418TWR_serial_rmii_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M54418TWR=y
CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/M54451EVB_defconfig b/configs/M54451EVB_defconfig
index 804e888..4cfacef 100644
--- a/configs/M54451EVB_defconfig
+++ b/configs/M54451EVB_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M54451EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=24000000"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M54451EVB_stmicro_defconfig b/configs/M54451EVB_stmicro_defconfig
index 93412d0..0a649ec 100644
--- a/configs/M54451EVB_stmicro_defconfig
+++ b/configs/M54451EVB_stmicro_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M54451EVB=y
CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x47e00000,SYS_INPUT_CLKSRC=24000000"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/M54455EVB_a66_defconfig b/configs/M54455EVB_a66_defconfig
index e137545..3b47b0c 100644
--- a/configs/M54455EVB_a66_defconfig
+++ b/configs/M54455EVB_a66_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M54455EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=66666666"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M54455EVB_defconfig b/configs/M54455EVB_defconfig
index 2eddfd6..2616868 100644
--- a/configs/M54455EVB_defconfig
+++ b/configs/M54455EVB_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M54455EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=33333333"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M54455EVB_i66_defconfig b/configs/M54455EVB_i66_defconfig
index 583d847..c8054e6 100644
--- a/configs/M54455EVB_i66_defconfig
+++ b/configs/M54455EVB_i66_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M54455EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=66666666"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M54455EVB_intel_defconfig b/configs/M54455EVB_intel_defconfig
index 2ec20f4..883ea5c 100644
--- a/configs/M54455EVB_intel_defconfig
+++ b/configs/M54455EVB_intel_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M54455EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=33333333"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M54455EVB_stm33_defconfig b/configs/M54455EVB_stm33_defconfig
index e50c124..2640645 100644
--- a/configs/M54455EVB_stm33_defconfig
+++ b/configs/M54455EVB_stm33_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M54455EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_STMICRO_BOOT,CF_SBF,SYS_TEXT_BASE=0x4FE00000,SYS_INPUT_CLKSRC=33333333"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/M5475AFE_defconfig b/configs/M5475AFE_defconfig
index 7eb5ec8..f1c037b 100644
--- a/configs/M5475AFE_defconfig
+++ b/configs/M5475AFE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5475EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5475BFE_defconfig b/configs/M5475BFE_defconfig
index bcf67ca..6d6b413 100644
--- a/configs/M5475BFE_defconfig
+++ b/configs/M5475BFE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5475EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5475CFE_defconfig b/configs/M5475CFE_defconfig
index d51fa15..e3c0564 100644
--- a/configs/M5475CFE_defconfig
+++ b/configs/M5475CFE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5475EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5475DFE_defconfig b/configs/M5475DFE_defconfig
index 25bee35..f129ed7 100644
--- a/configs/M5475DFE_defconfig
+++ b/configs/M5475DFE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5475EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5475EFE_defconfig b/configs/M5475EFE_defconfig
index e5d7fa8..87e197a 100644
--- a/configs/M5475EFE_defconfig
+++ b/configs/M5475EFE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5475EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5475FFE_defconfig b/configs/M5475FFE_defconfig
index dd26c62..55b63eb 100644
--- a/configs/M5475FFE_defconfig
+++ b/configs/M5475FFE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5475EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5475GFE_defconfig b/configs/M5475GFE_defconfig
index d1560bb..3f7d0aa 100644
--- a/configs/M5475GFE_defconfig
+++ b/configs/M5475GFE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5475EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=4,SYS_DRAMSZ=64"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5485AFE_defconfig b/configs/M5485AFE_defconfig
index 7f5ae64..9aba4ae 100644
--- a/configs/M5485AFE_defconfig
+++ b/configs/M5485AFE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5485EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5485BFE_defconfig b/configs/M5485BFE_defconfig
index 7fa7fb1..0a2353f 100644
--- a/configs/M5485BFE_defconfig
+++ b/configs/M5485BFE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5485EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5485CFE_defconfig b/configs/M5485CFE_defconfig
index a8b9ea7..8431bf2 100644
--- a/configs/M5485CFE_defconfig
+++ b/configs/M5485CFE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5485EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5485DFE_defconfig b/configs/M5485DFE_defconfig
index f6174ec..a319029 100644
--- a/configs/M5485DFE_defconfig
+++ b/configs/M5485DFE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5485EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5485EFE_defconfig b/configs/M5485EFE_defconfig
index 868c7f2..ee83e66 100644
--- a/configs/M5485EFE_defconfig
+++ b/configs/M5485EFE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5485EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5485FFE_defconfig b/configs/M5485FFE_defconfig
index 773c4f4..4cd128b 100644
--- a/configs/M5485FFE_defconfig
+++ b/configs/M5485FFE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5485EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5485GFE_defconfig b/configs/M5485GFE_defconfig
index ff1e8f4..157e161 100644
--- a/configs/M5485GFE_defconfig
+++ b/configs/M5485GFE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5485EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/M5485HFE_defconfig b/configs/M5485HFE_defconfig
index ba87cb7..d97b285 100644
--- a/configs/M5485HFE_defconfig
+++ b/configs/M5485HFE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5485EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig
index f8ccc81..8777200 100644
--- a/configs/MIP405T_defconfig
+++ b/configs/MIP405T_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_MIP405=y
CONFIG_SYS_EXTRA_OPTIONS="MIP405T"
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig
index 57004e8..c8d1494 100644
--- a/configs/MIP405_defconfig
+++ b/configs/MIP405_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_MIP405=y
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/MK808C_defconfig b/configs/MK808C_defconfig
index 88df54c..2f64b26 100644
--- a/configs/MK808C_defconfig
+++ b/configs/MK808C_defconfig
@@ -5,3 +5,4 @@ CONFIG_DRAM_CLK=384
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-mk808c"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/MPC8308RDB_defconfig b/configs/MPC8308RDB_defconfig
index 64717ec..59403df 100644
--- a/configs/MPC8308RDB_defconfig
+++ b/configs/MPC8308RDB_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8308RDB=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8313ERDB_33_defconfig b/configs/MPC8313ERDB_33_defconfig
index b272d9b..e094052 100644
--- a/configs/MPC8313ERDB_33_defconfig
+++ b/configs/MPC8313ERDB_33_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8313ERDB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_33MHZ"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8313ERDB_66_defconfig b/configs/MPC8313ERDB_66_defconfig
index 3df3653..dff99cc 100644
--- a/configs/MPC8313ERDB_66_defconfig
+++ b/configs/MPC8313ERDB_66_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8313ERDB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_66MHZ"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8313ERDB_NAND_33_defconfig b/configs/MPC8313ERDB_NAND_33_defconfig
index 5b798e4..951e395 100644
--- a/configs/MPC8313ERDB_NAND_33_defconfig
+++ b/configs/MPC8313ERDB_NAND_33_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8313ERDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_33MHZ,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/MPC8313ERDB_NAND_66_defconfig b/configs/MPC8313ERDB_NAND_66_defconfig
index 0feef7b..c1fdce4 100644
--- a/configs/MPC8313ERDB_NAND_66_defconfig
+++ b/configs/MPC8313ERDB_NAND_66_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8313ERDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_66MHZ,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig
index ebebbed..ee35563 100644
--- a/configs/MPC8315ERDB_defconfig
+++ b/configs/MPC8315ERDB_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8315ERDB=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8323ERDB_defconfig b/configs/MPC8323ERDB_defconfig
index 7c03842..cf98e7f 100644
--- a/configs/MPC8323ERDB_defconfig
+++ b/configs/MPC8323ERDB_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8323ERDB=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC832XEMDS_ATM_defconfig b/configs/MPC832XEMDS_ATM_defconfig
index 6c96e3a..e6db35d 100644
--- a/configs/MPC832XEMDS_ATM_defconfig
+++ b/configs/MPC832XEMDS_ATM_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC832XEMDS=y
CONFIG_SYS_EXTRA_OPTIONS="PQ_MDS_PIB=1,PQ_MDS_PIB_ATM=1"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC832XEMDS_HOST_33_defconfig b/configs/MPC832XEMDS_HOST_33_defconfig
index 81d3059..47e0e89 100644
--- a/configs/MPC832XEMDS_HOST_33_defconfig
+++ b/configs/MPC832XEMDS_HOST_33_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC832XEMDS=y
CONFIG_SYS_EXTRA_OPTIONS="PCI,PCI_33M,PQ_MDS_PIB=1"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC832XEMDS_HOST_66_defconfig b/configs/MPC832XEMDS_HOST_66_defconfig
index 93b6860..2ea815a 100644
--- a/configs/MPC832XEMDS_HOST_66_defconfig
+++ b/configs/MPC832XEMDS_HOST_66_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC832XEMDS=y
CONFIG_SYS_EXTRA_OPTIONS="PCI,PCI_66M,PQ_MDS_PIB=1"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC832XEMDS_SLAVE_defconfig b/configs/MPC832XEMDS_SLAVE_defconfig
index 304e035..ed7a4eb 100644
--- a/configs/MPC832XEMDS_SLAVE_defconfig
+++ b/configs/MPC832XEMDS_SLAVE_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC832XEMDS=y
CONFIG_SYS_EXTRA_OPTIONS="PCI,PCISLAVE"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC832XEMDS_defconfig b/configs/MPC832XEMDS_defconfig
index 0398472..3a12755 100644
--- a/configs/MPC832XEMDS_defconfig
+++ b/configs/MPC832XEMDS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC832XEMDS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8349EMDS_defconfig b/configs/MPC8349EMDS_defconfig
index f6af218..fdd2897 100644
--- a/configs/MPC8349EMDS_defconfig
+++ b/configs/MPC8349EMDS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8349EMDS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8349ITXGP_defconfig b/configs/MPC8349ITXGP_defconfig
index 53ed247..3c3b6c6 100644
--- a/configs/MPC8349ITXGP_defconfig
+++ b/configs/MPC8349ITXGP_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8349ITX=y
CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITXGP,SYS_TEXT_BASE=0xFE000000"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig
index baae2c0..2fa2e76 100644
--- a/configs/MPC8349ITX_LOWBOOT_defconfig
+++ b/configs/MPC8349ITX_LOWBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8349ITX=y
CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX,SYS_TEXT_BASE=0xFE000000"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC837XEMDS_HOST_defconfig b/configs/MPC837XEMDS_HOST_defconfig
index 8bc56ef..c6511fa 100644
--- a/configs/MPC837XEMDS_HOST_defconfig
+++ b/configs/MPC837XEMDS_HOST_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC837XEMDS=y
CONFIG_SYS_EXTRA_OPTIONS="PCI"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC837XEMDS_defconfig b/configs/MPC837XEMDS_defconfig
index d3b7c1d..ab9b17f 100644
--- a/configs/MPC837XEMDS_defconfig
+++ b/configs/MPC837XEMDS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC837XEMDS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig
index bb4411a..5c2c0b5 100644
--- a/configs/MPC837XERDB_defconfig
+++ b/configs/MPC837XERDB_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC837XERDB=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8536DS_36BIT_defconfig b/configs/MPC8536DS_36BIT_defconfig
index f39153b..52f2fd8 100644
--- a/configs/MPC8536DS_36BIT_defconfig
+++ b/configs/MPC8536DS_36BIT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8536DS=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8536DS_SDCARD_defconfig b/configs/MPC8536DS_SDCARD_defconfig
index 0ea8835..f87f845 100644
--- a/configs/MPC8536DS_SDCARD_defconfig
+++ b/configs/MPC8536DS_SDCARD_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8536DS=y
CONFIG_SYS_EXTRA_OPTIONS="SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/MPC8536DS_SPIFLASH_defconfig b/configs/MPC8536DS_SPIFLASH_defconfig
index 02410ee..293eabc 100644
--- a/configs/MPC8536DS_SPIFLASH_defconfig
+++ b/configs/MPC8536DS_SPIFLASH_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8536DS=y
CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/MPC8536DS_defconfig b/configs/MPC8536DS_defconfig
index 62edc91..b4a1cc8 100644
--- a/configs/MPC8536DS_defconfig
+++ b/configs/MPC8536DS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8536DS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8540ADS_defconfig b/configs/MPC8540ADS_defconfig
index 41af349..d82f140 100644
--- a/configs/MPC8540ADS_defconfig
+++ b/configs/MPC8540ADS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8540ADS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8541CDS_defconfig b/configs/MPC8541CDS_defconfig
index bc9c246..755698c 100644
--- a/configs/MPC8541CDS_defconfig
+++ b/configs/MPC8541CDS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8541CDS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8541CDS_legacy_defconfig b/configs/MPC8541CDS_legacy_defconfig
index 55478ab..4855a1d 100644
--- a/configs/MPC8541CDS_legacy_defconfig
+++ b/configs/MPC8541CDS_legacy_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8541CDS=y
CONFIG_SYS_EXTRA_OPTIONS="LEGACY"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8544DS_defconfig b/configs/MPC8544DS_defconfig
index faeaa94..bf22323 100644
--- a/configs/MPC8544DS_defconfig
+++ b/configs/MPC8544DS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8544DS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8548CDS_36BIT_defconfig b/configs/MPC8548CDS_36BIT_defconfig
index dfe1fca..c8fa818 100644
--- a/configs/MPC8548CDS_36BIT_defconfig
+++ b/configs/MPC8548CDS_36BIT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8548CDS=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8548CDS_defconfig b/configs/MPC8548CDS_defconfig
index ba52e94..916e197 100644
--- a/configs/MPC8548CDS_defconfig
+++ b/configs/MPC8548CDS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8548CDS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8548CDS_legacy_defconfig b/configs/MPC8548CDS_legacy_defconfig
index 69c44af..638dba4 100644
--- a/configs/MPC8548CDS_legacy_defconfig
+++ b/configs/MPC8548CDS_legacy_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8548CDS=y
CONFIG_SYS_EXTRA_OPTIONS="LEGACY"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8555CDS_defconfig b/configs/MPC8555CDS_defconfig
index 3bdbb0c..1a628e6 100644
--- a/configs/MPC8555CDS_defconfig
+++ b/configs/MPC8555CDS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8555CDS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8555CDS_legacy_defconfig b/configs/MPC8555CDS_legacy_defconfig
index 8e53ee0..e8b6e4d 100644
--- a/configs/MPC8555CDS_legacy_defconfig
+++ b/configs/MPC8555CDS_legacy_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8555CDS=y
CONFIG_SYS_EXTRA_OPTIONS="LEGACY"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8560ADS_defconfig b/configs/MPC8560ADS_defconfig
index aa84d28..bae46d6 100644
--- a/configs/MPC8560ADS_defconfig
+++ b/configs/MPC8560ADS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8560ADS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8568MDS_defconfig b/configs/MPC8568MDS_defconfig
index ac0ec8c..1c35df5 100644
--- a/configs/MPC8568MDS_defconfig
+++ b/configs/MPC8568MDS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8568MDS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8569MDS_ATM_defconfig b/configs/MPC8569MDS_ATM_defconfig
index 326983d..14810a2 100644
--- a/configs/MPC8569MDS_ATM_defconfig
+++ b/configs/MPC8569MDS_ATM_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8569MDS=y
CONFIG_SYS_EXTRA_OPTIONS="ATM"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8569MDS_defconfig b/configs/MPC8569MDS_defconfig
index 81fb82a..ba70896 100644
--- a/configs/MPC8569MDS_defconfig
+++ b/configs/MPC8569MDS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8569MDS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8572DS_36BIT_defconfig b/configs/MPC8572DS_36BIT_defconfig
index 0ce85e4..27e2a03 100644
--- a/configs/MPC8572DS_36BIT_defconfig
+++ b/configs/MPC8572DS_36BIT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8572DS=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8572DS_defconfig b/configs/MPC8572DS_defconfig
index dde9eb2..c780e8b 100644
--- a/configs/MPC8572DS_defconfig
+++ b/configs/MPC8572DS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8572DS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8610HPCD_defconfig b/configs/MPC8610HPCD_defconfig
index f4e8951..6d2f817 100644
--- a/configs/MPC8610HPCD_defconfig
+++ b/configs/MPC8610HPCD_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC86xx=y
CONFIG_TARGET_MPC8610HPCD=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8641HPCN_36BIT_defconfig b/configs/MPC8641HPCN_36BIT_defconfig
index 6005c59..0fadd53 100644
--- a/configs/MPC8641HPCN_36BIT_defconfig
+++ b/configs/MPC8641HPCN_36BIT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC86xx=y
CONFIG_TARGET_MPC8641HPCN=y
CONFIG_SYS_EXTRA_OPTIONS="PHYS_64BIT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MPC8641HPCN_defconfig b/configs/MPC8641HPCN_defconfig
index 6c117d5..b89c3a1 100644
--- a/configs/MPC8641HPCN_defconfig
+++ b/configs/MPC8641HPCN_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC86xx=y
CONFIG_TARGET_MPC8641HPCN=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/MSI_Primo73_defconfig b/configs/MSI_Primo73_defconfig
index 00f0796..32ba84f 100644
--- a/configs/MSI_Primo73_defconfig
+++ b/configs/MSI_Primo73_defconfig
@@ -11,3 +11,4 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-primo73"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig
index 83a95cb..4c3378b 100644
--- a/configs/MSI_Primo81_defconfig
+++ b/configs/MSI_Primo81_defconfig
@@ -10,6 +10,7 @@ CONFIG_VIDEO_LCD_PANEL_MIPI_4_LANE_513_MBPS_VIA_SSD2828=y
# CONFIG_USB_KEYBOARD is not set
CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-primo81"
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_AXP221_DLDO1_VOLT=3300
CONFIG_VIDEO_LCD_SSD2828_TX_CLK=27
CONFIG_VIDEO_LCD_SSD2828_RESET="PA26"
diff --git a/configs/Marsboard_A10_defconfig b/configs/Marsboard_A10_defconfig
index 5a9703d..7d221cf 100644
--- a/configs/Marsboard_A10_defconfig
+++ b/configs/Marsboard_A10_defconfig
@@ -4,3 +4,4 @@ CONFIG_MACH_SUN4I=y
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-marsboard"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,AHCI,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
index 6678e4c..ea90996 100644
--- a/configs/Mele_A1000_defconfig
+++ b/configs/Mele_A1000_defconfig
@@ -5,3 +5,4 @@ CONFIG_VIDEO_VGA=y
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-a1000"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/Mele_I7_defconfig b/configs/Mele_I7_defconfig
index bf67433..aa33c71 100644
--- a/configs/Mele_I7_defconfig
+++ b/configs/Mele_I7_defconfig
@@ -7,6 +7,7 @@ CONFIG_USB2_VBUS_PIN=""
CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-i7"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP221_DCDC1_VOLT=3300
CONFIG_AXP221_DLDO1_VOLT=3300
diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig
index 9c2eb86..f1974da 100644
--- a/configs/Mele_M3_defconfig
+++ b/configs/Mele_M3_defconfig
@@ -8,4 +8,5 @@ CONFIG_VIDEO_VGA=y
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m3"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig
index 5ee648b..3344970 100644
--- a/configs/Mele_M5_defconfig
+++ b/configs/Mele_M5_defconfig
@@ -7,4 +7,5 @@ CONFIG_MMC0_CD_PIN="PH1"
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m5"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,USB_EHCI,STATUSLED=234"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig
index 4708133..4416bfd 100644
--- a/configs/Mele_M9_defconfig
+++ b/configs/Mele_M9_defconfig
@@ -7,6 +7,7 @@ CONFIG_USB2_VBUS_PIN=""
CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-m9"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP221_DCDC1_VOLT=3300
CONFIG_AXP221_DLDO1_VOLT=3300
diff --git a/configs/MigoR_defconfig b/configs/MigoR_defconfig
index dd79ff5..dcabc53 100644
--- a/configs/MigoR_defconfig
+++ b/configs/MigoR_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_MIGOR=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig
index 918b639..a7a83f5 100644
--- a/configs/Mini-X_defconfig
+++ b/configs/Mini-X_defconfig
@@ -4,3 +4,4 @@ CONFIG_MACH_SUN4I=y
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mini-xplus"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/MiniFAP_defconfig b/configs/MiniFAP_defconfig
index 6b4f2b2..5fc0081 100644
--- a/configs/MiniFAP_defconfig
+++ b/configs/MiniFAP_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_SYS_EXTRA_OPTIONS="MINIFAP"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/O2D300_defconfig b/configs/O2D300_defconfig
index c63b5da..79ab8da 100644
--- a/configs/O2D300_defconfig
+++ b/configs/O2D300_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2D300=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/O2DNT2_RAMBOOT_defconfig b/configs/O2DNT2_RAMBOOT_defconfig
index 8549b8e..7b8da5f 100644
--- a/configs/O2DNT2_RAMBOOT_defconfig
+++ b/configs/O2DNT2_RAMBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2DNT2=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/O2DNT2_defconfig b/configs/O2DNT2_defconfig
index 9df3b88..8f6c411 100644
--- a/configs/O2DNT2_defconfig
+++ b/configs/O2DNT2_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2DNT2=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/O2D_defconfig b/configs/O2D_defconfig
index f2d3663..af665a4 100644
--- a/configs/O2D_defconfig
+++ b/configs/O2D_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2D=y
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/O2MNT_O2M110_defconfig b/configs/O2MNT_O2M110_defconfig
index 320b898..0c8f2c9 100644
--- a/configs/O2MNT_O2M110_defconfig
+++ b/configs/O2MNT_O2M110_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2MNT=y
CONFIG_SYS_EXTRA_OPTIONS="IFM_SENSOR_TYPE=\"O2M110\""
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/O2MNT_O2M112_defconfig b/configs/O2MNT_O2M112_defconfig
index b17330a..cc2e5b3 100644
--- a/configs/O2MNT_O2M112_defconfig
+++ b/configs/O2MNT_O2M112_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2MNT=y
CONFIG_SYS_EXTRA_OPTIONS="IFM_SENSOR_TYPE=\"O2M112\""
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/O2MNT_O2M113_defconfig b/configs/O2MNT_O2M113_defconfig
index 86ec47a..e586f7b 100644
--- a/configs/O2MNT_O2M113_defconfig
+++ b/configs/O2MNT_O2M113_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2MNT=y
CONFIG_SYS_EXTRA_OPTIONS="IFM_SENSOR_TYPE=\"O2M113\""
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/O3DNT_defconfig b/configs/O3DNT_defconfig
index 1f28a43..efdc564 100644
--- a/configs/O3DNT_defconfig
+++ b/configs/O3DNT_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_O3DNT=y
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig
index 9d5e5dc..fc1638e 100644
--- a/configs/Orangepi_defconfig
+++ b/configs/Orangepi_defconfig
@@ -9,4 +9,5 @@ CONFIG_GMAC_TX_DELAY=3
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
index 99cc600..40ed1b9 100644
--- a/configs/Orangepi_mini_defconfig
+++ b/configs/Orangepi_mini_defconfig
@@ -11,4 +11,5 @@ CONFIG_GMAC_TX_DELAY=3
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi-mini"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig
index 35c47de..34b37ab 100644
--- a/configs/P1010RDB-PA_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig
index d3b99d1..8422511 100644
--- a/configs/P1010RDB-PA_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
index 50598f0..bed268a 100644
--- a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
index 54f0664..bd4acf6 100644
--- a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig
index d2a4268..a3132f9 100644
--- a/configs/P1010RDB-PA_NAND_defconfig
+++ b/configs/P1010RDB-PA_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig
index 223f783..5d5d4b1 100644
--- a/configs/P1010RDB-PA_NOR_defconfig
+++ b/configs/P1010RDB-PA_NOR_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig
index 6229dad..98018f9 100644
--- a/configs/P1010RDB-PA_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig b/configs/P1010RDB-PA_SPIFLASH_defconfig
index de54e1d..0fdea34 100644
--- a/configs/P1010RDB-PA_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig
index 54bd88d..822f7b9 100644
--- a/configs/P1010RDB-PB_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig
index ac78763..f1eb666 100644
--- a/configs/P1010RDB-PB_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
index 50e8005..5833f90 100644
--- a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
index 7461016..9e3a56a 100644
--- a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig
index c6bec43..9c31d1e 100644
--- a/configs/P1010RDB-PB_NAND_defconfig
+++ b/configs/P1010RDB-PB_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig
index 4bf4ac9..815982a 100644
--- a/configs/P1010RDB-PB_NOR_defconfig
+++ b/configs/P1010RDB-PB_NOR_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig
index af9a4dd..c8d1a81 100644
--- a/configs/P1010RDB-PB_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig b/configs/P1010RDB-PB_SPIFLASH_defconfig
index 83f434d..40a8793 100644
--- a/configs/P1010RDB-PB_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P1020MBG-PC_36BIT_SDCARD_defconfig b/configs/P1020MBG-PC_36BIT_SDCARD_defconfig
index 59aa9be..b5bd709 100644
--- a/configs/P1020MBG-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020MBG-PC_36BIT_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020MBG,SDCARD,36BIT"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P1020MBG-PC_36BIT_defconfig b/configs/P1020MBG-PC_36BIT_defconfig
index b8d9c53..9f15bf5 100644
--- a/configs/P1020MBG-PC_36BIT_defconfig
+++ b/configs/P1020MBG-PC_36BIT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1020MBG,36BIT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1020MBG-PC_SDCARD_defconfig b/configs/P1020MBG-PC_SDCARD_defconfig
index 0e64e82..4e58b5d 100644
--- a/configs/P1020MBG-PC_SDCARD_defconfig
+++ b/configs/P1020MBG-PC_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020MBG,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P1020MBG-PC_defconfig b/configs/P1020MBG-PC_defconfig
index 905b94c..c4e87ab 100644
--- a/configs/P1020MBG-PC_defconfig
+++ b/configs/P1020MBG-PC_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1020MBG"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig b/configs/P1020RDB-PC_36BIT_NAND_defconfig
index d61c848..bfd3b11 100644
--- a/configs/P1020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P1020RDB-PC_36BIT_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
index 1e59860..50f4953 100644
--- a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
index 073b77c..c6c47a9 100644
--- a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P1020RDB-PC_36BIT_defconfig b/configs/P1020RDB-PC_36BIT_defconfig
index b95841c..d4ed23e 100644
--- a/configs/P1020RDB-PC_36BIT_defconfig
+++ b/configs/P1020RDB-PC_36BIT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1020RDB-PC_NAND_defconfig b/configs/P1020RDB-PC_NAND_defconfig
index f8106a0..f78eebb 100644
--- a/configs/P1020RDB-PC_NAND_defconfig
+++ b/configs/P1020RDB-PC_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P1020RDB-PC_SDCARD_defconfig b/configs/P1020RDB-PC_SDCARD_defconfig
index f781a7b..c4d1e6f 100644
--- a/configs/P1020RDB-PC_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P1020RDB-PC_SPIFLASH_defconfig b/configs/P1020RDB-PC_SPIFLASH_defconfig
index 32d91e4..e4c60cc 100644
--- a/configs/P1020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig
index e3f11d5..cff654c 100644
--- a/configs/P1020RDB-PC_defconfig
+++ b/configs/P1020RDB-PC_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig
index a869d68..a1d0c75 100644
--- a/configs/P1020RDB-PD_NAND_defconfig
+++ b/configs/P1020RDB-PD_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig
index 10827e5..945fbfc 100644
--- a/configs/P1020RDB-PD_SDCARD_defconfig
+++ b/configs/P1020RDB-PD_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig b/configs/P1020RDB-PD_SPIFLASH_defconfig
index 02cbb69..618c42d 100644
--- a/configs/P1020RDB-PD_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PD_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig
index 74f6c6d..a1cbcd8 100644
--- a/configs/P1020RDB-PD_defconfig
+++ b/configs/P1020RDB-PD_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1020UTM-PC_36BIT_SDCARD_defconfig b/configs/P1020UTM-PC_36BIT_SDCARD_defconfig
index f94345c..9f5fde7 100644
--- a/configs/P1020UTM-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020UTM-PC_36BIT_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020UTM,36BIT,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P1020UTM-PC_36BIT_defconfig b/configs/P1020UTM-PC_36BIT_defconfig
index ac4bbd3..a0b6d29 100644
--- a/configs/P1020UTM-PC_36BIT_defconfig
+++ b/configs/P1020UTM-PC_36BIT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1020UTM,36BIT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1020UTM-PC_SDCARD_defconfig b/configs/P1020UTM-PC_SDCARD_defconfig
index c4cd42e..a27d507 100644
--- a/configs/P1020UTM-PC_SDCARD_defconfig
+++ b/configs/P1020UTM-PC_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020UTM,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P1020UTM-PC_defconfig b/configs/P1020UTM-PC_defconfig
index aae966b..9f8ecd9 100644
--- a/configs/P1020UTM-PC_defconfig
+++ b/configs/P1020UTM-PC_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1020UTM"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1021RDB-PC_36BIT_NAND_defconfig b/configs/P1021RDB-PC_36BIT_NAND_defconfig
index 2ef7735..7c16f4b 100644
--- a/configs/P1021RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P1021RDB-PC_36BIT_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P1021RDB-PC_36BIT_SDCARD_defconfig b/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
index ae9280a..b687972 100644
--- a/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
index 260d1eb..fe6c49a 100644
--- a/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P1021RDB-PC_36BIT_defconfig b/configs/P1021RDB-PC_36BIT_defconfig
index 8349514..18649ce 100644
--- a/configs/P1021RDB-PC_36BIT_defconfig
+++ b/configs/P1021RDB-PC_36BIT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1021RDB-PC_NAND_defconfig b/configs/P1021RDB-PC_NAND_defconfig
index fda74df..bb37e2e 100644
--- a/configs/P1021RDB-PC_NAND_defconfig
+++ b/configs/P1021RDB-PC_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P1021RDB-PC_SDCARD_defconfig b/configs/P1021RDB-PC_SDCARD_defconfig
index 9da9221..eff8ad4 100644
--- a/configs/P1021RDB-PC_SDCARD_defconfig
+++ b/configs/P1021RDB-PC_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P1021RDB-PC_SPIFLASH_defconfig b/configs/P1021RDB-PC_SPIFLASH_defconfig
index e126d65..561d6c1 100644
--- a/configs/P1021RDB-PC_SPIFLASH_defconfig
+++ b/configs/P1021RDB-PC_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P1021RDB-PC_defconfig b/configs/P1021RDB-PC_defconfig
index 761edd6..169c0a5 100644
--- a/configs/P1021RDB-PC_defconfig
+++ b/configs/P1021RDB-PC_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1022DS_36BIT_NAND_defconfig b/configs/P1022DS_36BIT_NAND_defconfig
index 9590558..0c72820 100644
--- a/configs/P1022DS_36BIT_NAND_defconfig
+++ b/configs/P1022DS_36BIT_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1022DS=y
CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P1022DS_36BIT_SDCARD_defconfig b/configs/P1022DS_36BIT_SDCARD_defconfig
index cb297b3..4b39a0b 100644
--- a/configs/P1022DS_36BIT_SDCARD_defconfig
+++ b/configs/P1022DS_36BIT_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1022DS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P1022DS_36BIT_SPIFLASH_defconfig b/configs/P1022DS_36BIT_SPIFLASH_defconfig
index df57db6..128db2d 100644
--- a/configs/P1022DS_36BIT_SPIFLASH_defconfig
+++ b/configs/P1022DS_36BIT_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1022DS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P1022DS_36BIT_defconfig b/configs/P1022DS_36BIT_defconfig
index d62f9f7..abd425d 100644
--- a/configs/P1022DS_36BIT_defconfig
+++ b/configs/P1022DS_36BIT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1022DS=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1022DS_NAND_defconfig b/configs/P1022DS_NAND_defconfig
index cf73c18..85fbb03 100644
--- a/configs/P1022DS_NAND_defconfig
+++ b/configs/P1022DS_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1022DS=y
CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P1022DS_SDCARD_defconfig b/configs/P1022DS_SDCARD_defconfig
index b69467e..ce2eae1 100644
--- a/configs/P1022DS_SDCARD_defconfig
+++ b/configs/P1022DS_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1022DS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P1022DS_SPIFLASH_defconfig b/configs/P1022DS_SPIFLASH_defconfig
index 808b366..a87565e 100644
--- a/configs/P1022DS_SPIFLASH_defconfig
+++ b/configs/P1022DS_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1022DS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P1022DS_defconfig b/configs/P1022DS_defconfig
index d2953a4..5791714 100644
--- a/configs/P1022DS_defconfig
+++ b/configs/P1022DS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1022DS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1023RDB_defconfig b/configs/P1023RDB_defconfig
index fc15e4b..e796e96 100644
--- a/configs/P1023RDB_defconfig
+++ b/configs/P1023RDB_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1023RDB=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1024RDB_36BIT_defconfig b/configs/P1024RDB_36BIT_defconfig
index b1cd35c..5883e1d 100644
--- a/configs/P1024RDB_36BIT_defconfig
+++ b/configs/P1024RDB_36BIT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,36BIT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1024RDB_NAND_defconfig b/configs/P1024RDB_NAND_defconfig
index 7afa100..f2503da 100644
--- a/configs/P1024RDB_NAND_defconfig
+++ b/configs/P1024RDB_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P1024RDB_SDCARD_defconfig b/configs/P1024RDB_SDCARD_defconfig
index 4a2e3ed..002acf0 100644
--- a/configs/P1024RDB_SDCARD_defconfig
+++ b/configs/P1024RDB_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P1024RDB_SPIFLASH_defconfig b/configs/P1024RDB_SPIFLASH_defconfig
index 883d95e..dbde60e 100644
--- a/configs/P1024RDB_SPIFLASH_defconfig
+++ b/configs/P1024RDB_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P1024RDB_defconfig b/configs/P1024RDB_defconfig
index 5a9edb7..d03f82c 100644
--- a/configs/P1024RDB_defconfig
+++ b/configs/P1024RDB_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1024RDB"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1025RDB_36BIT_defconfig b/configs/P1025RDB_36BIT_defconfig
index 832eeb3..caf5e42 100644
--- a/configs/P1025RDB_36BIT_defconfig
+++ b/configs/P1025RDB_36BIT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,36BIT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P1025RDB_NAND_defconfig b/configs/P1025RDB_NAND_defconfig
index baf055e..e2cf251 100644
--- a/configs/P1025RDB_NAND_defconfig
+++ b/configs/P1025RDB_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P1025RDB_SDCARD_defconfig b/configs/P1025RDB_SDCARD_defconfig
index 95f841e..0dbb48e 100644
--- a/configs/P1025RDB_SDCARD_defconfig
+++ b/configs/P1025RDB_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P1025RDB_SPIFLASH_defconfig b/configs/P1025RDB_SPIFLASH_defconfig
index 3affb9e..ee7c4fb 100644
--- a/configs/P1025RDB_SPIFLASH_defconfig
+++ b/configs/P1025RDB_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P1025RDB_defconfig b/configs/P1025RDB_defconfig
index 43b38a1..9fea0bb 100644
--- a/configs/P1025RDB_defconfig
+++ b/configs/P1025RDB_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1025RDB"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig
index aaf9450..050cc63 100644
--- a/configs/P2020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
index 054bebf..dce97cb 100644
--- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
index dd20fe0..f081fc8 100644
--- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig
index bcae073..6ab00e2 100644
--- a/configs/P2020RDB-PC_36BIT_defconfig
+++ b/configs/P2020RDB-PC_36BIT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig
index f58795e..6ca1b7e 100644
--- a/configs/P2020RDB-PC_NAND_defconfig
+++ b/configs/P2020RDB-PC_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig
index e72a17b..78736b5 100644
--- a/configs/P2020RDB-PC_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig
index f56dac4..0000096 100644
--- a/configs/P2020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig
index a9c3d76..a17fd76 100644
--- a/configs/P2020RDB-PC_defconfig
+++ b/configs/P2020RDB-PC_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/P2041RDB_NAND_defconfig b/configs/P2041RDB_NAND_defconfig
index 6a6a98f..a5bb3f2 100644
--- a/configs/P2041RDB_NAND_defconfig
+++ b/configs/P2041RDB_NAND_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P2041RDB=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P2041RDB_SDCARD_defconfig b/configs/P2041RDB_SDCARD_defconfig
index 48df22c..ec9e0fd 100644
--- a/configs/P2041RDB_SDCARD_defconfig
+++ b/configs/P2041RDB_SDCARD_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P2041RDB=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P2041RDB_SPIFLASH_defconfig b/configs/P2041RDB_SPIFLASH_defconfig
index 6939ed9..9161a07 100644
--- a/configs/P2041RDB_SPIFLASH_defconfig
+++ b/configs/P2041RDB_SPIFLASH_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P2041RDB=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig b/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
index f5dd3af..0d4984d 100644
--- a/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P2041RDB=y
CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_REMOTE=y
diff --git a/configs/P3041DS_NAND_defconfig b/configs/P3041DS_NAND_defconfig
index 20d2449..9fb255a 100644
--- a/configs/P3041DS_NAND_defconfig
+++ b/configs/P3041DS_NAND_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P3041DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P3041DS_SDCARD_defconfig b/configs/P3041DS_SDCARD_defconfig
index 870d783..0312127 100644
--- a/configs/P3041DS_SDCARD_defconfig
+++ b/configs/P3041DS_SDCARD_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P3041DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P3041DS_SPIFLASH_defconfig b/configs/P3041DS_SPIFLASH_defconfig
index 17e6413..be23e04 100644
--- a/configs/P3041DS_SPIFLASH_defconfig
+++ b/configs/P3041DS_SPIFLASH_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P3041DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P3041DS_SRIO_PCIE_BOOT_defconfig b/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
index 4d06bed..46f8224 100644
--- a/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P3041DS=y
CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_REMOTE=y
diff --git a/configs/P4080DS_SDCARD_defconfig b/configs/P4080DS_SDCARD_defconfig
index ba3ea16..4432926 100644
--- a/configs/P4080DS_SDCARD_defconfig
+++ b/configs/P4080DS_SDCARD_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P4080DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P4080DS_SPIFLASH_defconfig b/configs/P4080DS_SPIFLASH_defconfig
index 8c74031..afa2aaf 100644
--- a/configs/P4080DS_SPIFLASH_defconfig
+++ b/configs/P4080DS_SPIFLASH_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P4080DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P4080DS_SRIO_PCIE_BOOT_defconfig b/configs/P4080DS_SRIO_PCIE_BOOT_defconfig
index e1c1e43..5b683bc 100644
--- a/configs/P4080DS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P4080DS_SRIO_PCIE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P4080DS=y
CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_REMOTE=y
diff --git a/configs/P5020DS_NAND_defconfig b/configs/P5020DS_NAND_defconfig
index 1693cae..97061c4 100644
--- a/configs/P5020DS_NAND_defconfig
+++ b/configs/P5020DS_NAND_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P5020DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P5020DS_SDCARD_defconfig b/configs/P5020DS_SDCARD_defconfig
index b1bd63c..661c035 100644
--- a/configs/P5020DS_SDCARD_defconfig
+++ b/configs/P5020DS_SDCARD_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P5020DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P5020DS_SPIFLASH_defconfig b/configs/P5020DS_SPIFLASH_defconfig
index 4a4b112..240e44c 100644
--- a/configs/P5020DS_SPIFLASH_defconfig
+++ b/configs/P5020DS_SPIFLASH_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P5020DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/P5020DS_SRIO_PCIE_BOOT_defconfig b/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
index 7ebaebd..ef231b8 100644
--- a/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P5020DS=y
CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_REMOTE=y
diff --git a/configs/P5040DS_NAND_defconfig b/configs/P5040DS_NAND_defconfig
index f738dd4..0daaea1 100644
--- a/configs/P5040DS_NAND_defconfig
+++ b/configs/P5040DS_NAND_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P5040DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/P5040DS_SDCARD_defconfig b/configs/P5040DS_SDCARD_defconfig
index da37167..dc76d37 100644
--- a/configs/P5040DS_SDCARD_defconfig
+++ b/configs/P5040DS_SDCARD_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P5040DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/P5040DS_SPIFLASH_defconfig b/configs/P5040DS_SPIFLASH_defconfig
index a8fb94a..cc5793e 100644
--- a/configs/P5040DS_SPIFLASH_defconfig
+++ b/configs/P5040DS_SPIFLASH_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P5040DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/PATI_defconfig b/configs/PATI_defconfig
index 14ca871..9e6f50f 100644
--- a/configs/PATI_defconfig
+++ b/configs/PATI_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_5xx=y
CONFIG_TARGET_PATI=y
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig
index 38b3acb..1a62e08 100644
--- a/configs/PIP405_defconfig
+++ b/configs/PIP405_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_PIP405=y
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/PLU405_defconfig b/configs/PLU405_defconfig
index 15477c4..129475d 100644
--- a/configs/PLU405_defconfig
+++ b/configs/PLU405_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_PLU405=y
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/PMC405DE_defconfig b/configs/PMC405DE_defconfig
index 78c5d39..e31269e 100644
--- a/configs/PMC405DE_defconfig
+++ b/configs/PMC405DE_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_PMC405DE=y
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/PMC440_defconfig b/configs/PMC440_defconfig
index 27869ac..56211a4 100644
--- a/configs/PMC440_defconfig
+++ b/configs/PMC440_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_PMC440=y
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/T1023RDB_NAND_defconfig b/configs/T1023RDB_NAND_defconfig
index 54cee92..e5b9780 100644
--- a/configs/T1023RDB_NAND_defconfig
+++ b/configs/T1023RDB_NAND_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T102XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/T1023RDB_SDCARD_defconfig b/configs/T1023RDB_SDCARD_defconfig
index f39b94a..5113fb1 100644
--- a/configs/T1023RDB_SDCARD_defconfig
+++ b/configs/T1023RDB_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T102XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/T1023RDB_SPIFLASH_defconfig b/configs/T1023RDB_SPIFLASH_defconfig
index a8e8e7c..1ac7667 100644
--- a/configs/T1023RDB_SPIFLASH_defconfig
+++ b/configs/T1023RDB_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T102XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/T1024QDS_NAND_defconfig b/configs/T1024QDS_NAND_defconfig
index 3563b14..2d21c1b 100644
--- a/configs/T1024QDS_NAND_defconfig
+++ b/configs/T1024QDS_NAND_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T102XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/T1024QDS_SDCARD_defconfig b/configs/T1024QDS_SDCARD_defconfig
index f4cf6be..67acf88 100644
--- a/configs/T1024QDS_SDCARD_defconfig
+++ b/configs/T1024QDS_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T102XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/T1024QDS_SPIFLASH_defconfig b/configs/T1024QDS_SPIFLASH_defconfig
index 91f0ab8..2c42e8d 100644
--- a/configs/T1024QDS_SPIFLASH_defconfig
+++ b/configs/T1024QDS_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T102XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig
index 5c90d3a..e34cab2 100644
--- a/configs/T1024RDB_NAND_defconfig
+++ b/configs/T1024RDB_NAND_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T102XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig
index 5d295ac..04f75fd 100644
--- a/configs/T1024RDB_SDCARD_defconfig
+++ b/configs/T1024RDB_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T102XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig
index 474da0b..a288848 100644
--- a/configs/T1024RDB_SPIFLASH_defconfig
+++ b/configs/T1024RDB_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T102XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/T1040QDS_D4_defconfig b/configs/T1040QDS_D4_defconfig
index ce70c37..b4f6fac 100644
--- a/configs/T1040QDS_D4_defconfig
+++ b/configs/T1040QDS_D4_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T1040QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SYS_FSL_DDR4"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/T1040QDS_defconfig b/configs/T1040QDS_defconfig
index 6de2bd6..5eb8c83 100644
--- a/configs/T1040QDS_defconfig
+++ b/configs/T1040QDS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T1040QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/T1040RDB_NAND_defconfig b/configs/T1040RDB_NAND_defconfig
index fdd25c3..9e04b77 100644
--- a/configs/T1040RDB_NAND_defconfig
+++ b/configs/T1040RDB_NAND_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/T1040RDB_SDCARD_defconfig b/configs/T1040RDB_SDCARD_defconfig
index af20611..9f503e7 100644
--- a/configs/T1040RDB_SDCARD_defconfig
+++ b/configs/T1040RDB_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/T1040RDB_SPIFLASH_defconfig b/configs/T1040RDB_SPIFLASH_defconfig
index 598dedf..878873f 100644
--- a/configs/T1040RDB_SPIFLASH_defconfig
+++ b/configs/T1040RDB_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/T1040RDB_defconfig b/configs/T1040RDB_defconfig
index 71ecc81..1b89f04 100644
--- a/configs/T1040RDB_defconfig
+++ b/configs/T1040RDB_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/T1042RDB_PI_NAND_defconfig b/configs/T1042RDB_PI_NAND_defconfig
index 164def3..4520073 100644
--- a/configs/T1042RDB_PI_NAND_defconfig
+++ b/configs/T1042RDB_PI_NAND_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/T1042RDB_PI_SDCARD_defconfig b/configs/T1042RDB_PI_SDCARD_defconfig
index 581a8f6..a3c7f45 100644
--- a/configs/T1042RDB_PI_SDCARD_defconfig
+++ b/configs/T1042RDB_PI_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig
index 4bd853c..acb15f5 100644
--- a/configs/T1042RDB_PI_SPIFLASH_defconfig
+++ b/configs/T1042RDB_PI_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/T1042RDB_PI_defconfig b/configs/T1042RDB_PI_defconfig
index 078a105..26f4579 100644
--- a/configs/T1042RDB_PI_defconfig
+++ b/configs/T1042RDB_PI_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/T1042RDB_defconfig b/configs/T1042RDB_defconfig
index 7c6de00..07baf20 100644
--- a/configs/T1042RDB_defconfig
+++ b/configs/T1042RDB_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig
index 83697da..9531449 100644
--- a/configs/T2080QDS_NAND_defconfig
+++ b/configs/T2080QDS_NAND_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T208XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/T2080QDS_SDCARD_defconfig b/configs/T2080QDS_SDCARD_defconfig
index 830ced3..0a7378f 100644
--- a/configs/T2080QDS_SDCARD_defconfig
+++ b/configs/T2080QDS_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T208XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig
index 805a730..250f4a9 100644
--- a/configs/T2080QDS_SPIFLASH_defconfig
+++ b/configs/T2080QDS_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T208XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
index c086c2b..9f3ade2 100644
--- a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T208XQDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_REMOTE=y
diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig
index ed38d0c..36173cf 100644
--- a/configs/T2080RDB_NAND_defconfig
+++ b/configs/T2080RDB_NAND_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T208XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/T2080RDB_SDCARD_defconfig b/configs/T2080RDB_SDCARD_defconfig
index 7cb4a72..7062b49 100644
--- a/configs/T2080RDB_SDCARD_defconfig
+++ b/configs/T2080RDB_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T208XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig
index 0dce597..5a3eacf 100644
--- a/configs/T2080RDB_SPIFLASH_defconfig
+++ b/configs/T2080RDB_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T208XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig b/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
index 824f021..a767e28 100644
--- a/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T208XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_REMOTE=y
diff --git a/configs/T2081QDS_NAND_defconfig b/configs/T2081QDS_NAND_defconfig
index ca0259c..97662c4 100644
--- a/configs/T2081QDS_NAND_defconfig
+++ b/configs/T2081QDS_NAND_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T208XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/T2081QDS_SDCARD_defconfig b/configs/T2081QDS_SDCARD_defconfig
index a76cf42..73d5f1f 100644
--- a/configs/T2081QDS_SDCARD_defconfig
+++ b/configs/T2081QDS_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T208XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/T2081QDS_SPIFLASH_defconfig b/configs/T2081QDS_SPIFLASH_defconfig
index 32376b6..17cff49 100644
--- a/configs/T2081QDS_SPIFLASH_defconfig
+++ b/configs/T2081QDS_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T208XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
index 4d4e44f..61a5d86 100644
--- a/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T208XQDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_REMOTE=y
diff --git a/configs/T4160QDS_NAND_defconfig b/configs/T4160QDS_NAND_defconfig
index 191005a..675c1bb 100644
--- a/configs/T4160QDS_NAND_defconfig
+++ b/configs/T4160QDS_NAND_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T4240QDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/T4160QDS_SDCARD_defconfig b/configs/T4160QDS_SDCARD_defconfig
index 4f1148a..af16c35 100644
--- a/configs/T4160QDS_SDCARD_defconfig
+++ b/configs/T4160QDS_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T4240QDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/T4240QDS_NAND_defconfig b/configs/T4240QDS_NAND_defconfig
index 9922f13..008e140 100644
--- a/configs/T4240QDS_NAND_defconfig
+++ b/configs/T4240QDS_NAND_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T4240QDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/T4240QDS_SDCARD_defconfig b/configs/T4240QDS_SDCARD_defconfig
index d31e836..9c24e9e 100644
--- a/configs/T4240QDS_SDCARD_defconfig
+++ b/configs/T4240QDS_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T4240QDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig b/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
index 5ded552..7c66da1 100644
--- a/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T4240QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_ENV_IS_IN_REMOTE=y
diff --git a/configs/T4240RDB_SDCARD_defconfig b/configs/T4240RDB_SDCARD_defconfig
index eac2bc4..9815c63 100644
--- a/configs/T4240RDB_SDCARD_defconfig
+++ b/configs/T4240RDB_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T4240RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/TQM5200S_HIGHBOOT_defconfig b/configs/TQM5200S_HIGHBOOT_defconfig
index 3e2c400..2c68145 100644
--- a/configs/TQM5200S_HIGHBOOT_defconfig
+++ b/configs/TQM5200S_HIGHBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_SYS_EXTRA_OPTIONS="TQM5200_B,TQM5200S,SYS_TEXT_BASE=0xFFF00000"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM5200S_defconfig b/configs/TQM5200S_defconfig
index 050410a..3ce74e6 100644
--- a/configs/TQM5200S_defconfig
+++ b/configs/TQM5200S_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_SYS_EXTRA_OPTIONS="TQM5200_B,TQM5200S"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM5200_B_HIGHBOOT_defconfig b/configs/TQM5200_B_HIGHBOOT_defconfig
index 68b0843..6b6099f 100644
--- a/configs/TQM5200_B_HIGHBOOT_defconfig
+++ b/configs/TQM5200_B_HIGHBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_SYS_EXTRA_OPTIONS="TQM5200_B,SYS_TEXT_BASE=0xFFF00000"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM5200_B_defconfig b/configs/TQM5200_B_defconfig
index 0ddfe9b..0b6aaf4 100644
--- a/configs/TQM5200_B_defconfig
+++ b/configs/TQM5200_B_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_SYS_EXTRA_OPTIONS="TQM5200_B"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM5200_STK100_defconfig b/configs/TQM5200_STK100_defconfig
index 24be3d9..914d0c4 100644
--- a/configs/TQM5200_STK100_defconfig
+++ b/configs/TQM5200_STK100_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_SYS_EXTRA_OPTIONS="STK52XX_REV100"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM5200_defconfig b/configs/TQM5200_defconfig
index 1fe9682..47d21b1 100644
--- a/configs/TQM5200_defconfig
+++ b/configs/TQM5200_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM823L_LCD_defconfig b/configs/TQM823L_LCD_defconfig
index 2ccd1bc..94358b8 100644
--- a/configs/TQM823L_LCD_defconfig
+++ b/configs/TQM823L_LCD_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM823L=y
CONFIG_SYS_EXTRA_OPTIONS="LCD,NEC_NL6448BC20"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM823L_defconfig b/configs/TQM823L_defconfig
index 5678bf2..f363591 100644
--- a/configs/TQM823L_defconfig
+++ b/configs/TQM823L_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM823L=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM823M_defconfig b/configs/TQM823M_defconfig
index 974bc91..9d582aa 100644
--- a/configs/TQM823M_defconfig
+++ b/configs/TQM823M_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM823M=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig
index 2cf89b4..f8c4188 100644
--- a/configs/TQM834x_defconfig
+++ b/configs/TQM834x_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_TQM834X=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM850L_defconfig b/configs/TQM850L_defconfig
index f3d5f4d..e5aff98 100644
--- a/configs/TQM850L_defconfig
+++ b/configs/TQM850L_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM850L=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM850M_defconfig b/configs/TQM850M_defconfig
index 6052ada..c156514 100644
--- a/configs/TQM850M_defconfig
+++ b/configs/TQM850M_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM850M=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM855L_defconfig b/configs/TQM855L_defconfig
index b7d5891..7f6c563 100644
--- a/configs/TQM855L_defconfig
+++ b/configs/TQM855L_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM855L=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM855M_defconfig b/configs/TQM855M_defconfig
index 367a709..4f2b681 100644
--- a/configs/TQM855M_defconfig
+++ b/configs/TQM855M_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM855M=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM860L_defconfig b/configs/TQM860L_defconfig
index 0a215a7..82eeeee 100644
--- a/configs/TQM860L_defconfig
+++ b/configs/TQM860L_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM860L=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM860M_defconfig b/configs/TQM860M_defconfig
index 5c9a4f1..c955f57 100644
--- a/configs/TQM860M_defconfig
+++ b/configs/TQM860M_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM860M=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM862L_defconfig b/configs/TQM862L_defconfig
index 24a290e..3c150d9 100644
--- a/configs/TQM862L_defconfig
+++ b/configs/TQM862L_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM862L=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM862M_defconfig b/configs/TQM862M_defconfig
index ca8dba1..6b6e127 100644
--- a/configs/TQM862M_defconfig
+++ b/configs/TQM862M_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM862M=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM866M_defconfig b/configs/TQM866M_defconfig
index bcf039a..abef2f5 100644
--- a/configs/TQM866M_defconfig
+++ b/configs/TQM866M_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM866M=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TQM885D_defconfig b/configs/TQM885D_defconfig
index 6a0268a..a78524d 100644
--- a/configs/TQM885D_defconfig
+++ b/configs/TQM885D_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM885D=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TTTech_defconfig b/configs/TTTech_defconfig
index 5270094..e44551c 100644
--- a/configs/TTTech_defconfig
+++ b/configs/TTTech_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM823L=y
CONFIG_SYS_EXTRA_OPTIONS="LCD,SHARP_LQ104V7DS01"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TWR-P1025_defconfig b/configs/TWR-P1025_defconfig
index c86900a..f995ead 100644
--- a/configs/TWR-P1025_defconfig
+++ b/configs/TWR-P1025_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1_TWR=y
CONFIG_SYS_EXTRA_OPTIONS="TWR_P1025"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/TZX-Q8-713B7_defconfig b/configs/TZX-Q8-713B7_defconfig
index c33317e..43c9e64 100644
--- a/configs/TZX-Q8-713B7_defconfig
+++ b/configs/TZX-Q8-713B7_defconfig
@@ -14,3 +14,4 @@ CONFIG_USB_MUSB_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-tzx-q8-713b7"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/UCP1020_SPIFLASH_defconfig b/configs/UCP1020_SPIFLASH_defconfig
index c512439..91f2b18 100644
--- a/configs/UCP1020_SPIFLASH_defconfig
+++ b/configs/UCP1020_SPIFLASH_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_UCP1020=y
CONFIG_TARGET_UCP1020_SPIFLASH=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/UCP1020_defconfig b/configs/UCP1020_defconfig
index 1c272d6..76a3974 100644
--- a/configs/UCP1020_defconfig
+++ b/configs/UCP1020_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_UCP1020=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/UTOO_P66_defconfig b/configs/UTOO_P66_defconfig
index 9ab2fa5..12e2fad 100644
--- a/configs/UTOO_P66_defconfig
+++ b/configs/UTOO_P66_defconfig
@@ -20,3 +20,4 @@ CONFIG_USB_MUSB_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-utoo-p66"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/VCMA9_defconfig b/configs/VCMA9_defconfig
index 6aa8de0..a6bbb38 100644
--- a/configs/VCMA9_defconfig
+++ b/configs/VCMA9_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_VCMA9=y
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/VOM405_defconfig b/configs/VOM405_defconfig
index b65515f..94a1f6f 100644
--- a/configs/VOM405_defconfig
+++ b/configs/VOM405_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_VOM405=y
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/Wexler_TAB7200_defconfig b/configs/Wexler_TAB7200_defconfig
index 011e921..0221d28 100644
--- a/configs/Wexler_TAB7200_defconfig
+++ b/configs/Wexler_TAB7200_defconfig
@@ -9,3 +9,4 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wexler-tab7200"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig
index 8bdca23..0f2b90a 100644
--- a/configs/Wits_Pro_A20_DKT_defconfig
+++ b/configs/Wits_Pro_A20_DKT_defconfig
@@ -11,4 +11,5 @@ CONFIG_VIDEO_LCD_PANEL_LVDS=y
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wits-pro-a20-dkt"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Yones_Toptech_BD1078_defconfig b/configs/Yones_Toptech_BD1078_defconfig
index 346e689..9550012 100644
--- a/configs/Yones_Toptech_BD1078_defconfig
+++ b/configs/Yones_Toptech_BD1078_defconfig
@@ -20,3 +20,4 @@ CONFIG_USB_MUSB_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-yones-toptech-bd1078"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/a3m071_defconfig b/configs/a3m071_defconfig
index eeaff87..6797017 100644
--- a/configs/a3m071_defconfig
+++ b/configs/a3m071_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_A3M071=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/a4m072_defconfig b/configs/a4m072_defconfig
index ddc8d3f..901b7a9 100644
--- a/configs/a4m072_defconfig
+++ b/configs/a4m072_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_A4M072=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/a4m2k_defconfig b/configs/a4m2k_defconfig
index 15c6411..e71d755 100644
--- a/configs/a4m2k_defconfig
+++ b/configs/a4m2k_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC5xxx=y
CONFIG_TARGET_A3M071=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="A4M2K"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ac14xx_defconfig b/configs/ac14xx_defconfig
index 3796632..a235444 100644
--- a/configs/ac14xx_defconfig
+++ b/configs/ac14xx_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC512X=y
CONFIG_TARGET_AC14XX=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/acadia_defconfig b/configs/acadia_defconfig
index 4e0d81c..d59c925 100644
--- a/configs/acadia_defconfig
+++ b/configs/acadia_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_ACADIA=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/adp-ag101_defconfig b/configs/adp-ag101_defconfig
index 2891154..9ea9d3b 100644
--- a/configs/adp-ag101_defconfig
+++ b/configs/adp-ag101_defconfig
@@ -1,2 +1,3 @@
CONFIG_NDS32=y
CONFIG_TARGET_ADP_AG101=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig
index 0a7a64c..f2ce174 100644
--- a/configs/adp-ag101p_defconfig
+++ b/configs/adp-ag101p_defconfig
@@ -1,2 +1,3 @@
CONFIG_NDS32=y
CONFIG_TARGET_ADP_AG101P=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/afeb9260_defconfig b/configs/afeb9260_defconfig
index 694d24d..c44e4c0 100644
--- a/configs/afeb9260_defconfig
+++ b/configs/afeb9260_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AFEB9260=y
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/alpr_defconfig b/configs/alpr_defconfig
index 9f613c8..336cbff 100644
--- a/configs/alpr_defconfig
+++ b/configs/alpr_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_ALPR=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index 0a18409..3cc89b1 100644
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_TARGET_ALT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SH_SDHI=y
diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
index 624717c..a514075 100644
--- a/configs/am335x_boneblack_defconfig
+++ b/configs/am335x_boneblack_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index e805c9d..31b7753 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -8,4 +8,5 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT,ENABLE_VBOOT"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_OF_CONTROL=y
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index f23c0e3..144e993 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_SYS_EXTRA_OPTIONS="NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
index 0f62bbc..b94d3e1 100644
--- a/configs/am335x_evm_nor_defconfig
+++ b/configs/am335x_evm_nor_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_SYS_EXTRA_OPTIONS="NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
index 1e25d89..6ba8bf3 100644
--- a/configs/am335x_evm_norboot_defconfig
+++ b/configs/am335x_evm_norboot_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_AM335X_EVM=y
CONFIG_NOR=y
CONFIG_NOR_BOOT=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
index 5c992e1..7dbbead 100644
--- a/configs/am335x_evm_spiboot_defconfig
+++ b/configs/am335x_evm_spiboot_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_SYS_EXTRA_OPTIONS="SPI_BOOT"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
index 0cc86e3..790b43f 100644
--- a/configs/am335x_evm_usbspl_defconfig
+++ b/configs/am335x_evm_usbspl_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_SYS_EXTRA_OPTIONS="NAND,SPL_USBETH_SUPPORT"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig
index 8b212c6..62a62b4 100644
--- a/configs/am335x_igep0033_defconfig
+++ b/configs/am335x_igep0033_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_AM335X_IGEP0033=y
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig
index abdd345..197e1fd 100644
--- a/configs/am3517_crane_defconfig
+++ b/configs/am3517_crane_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_AM3517_CRANE=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
index d084f77..872181d 100644
--- a/configs/am3517_evm_defconfig
+++ b/configs/am3517_evm_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_AM3517_EVM=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index 46d2fd2..d4d616a 100644
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_AM43XX_EVM=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
+CONFIG_ENV_IS_IN_FAT=y
diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig
index a0a18f2..84fddbc 100644
--- a/configs/am43xx_evm_qspiboot_defconfig
+++ b/configs/am43xx_evm_qspiboot_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_AM43XX_EVM=y
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,QSPI,QSPI_BOOT"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig
index 705c400..5c91fac 100644
--- a/configs/amcore_defconfig
+++ b/configs/amcore_defconfig
@@ -1,2 +1,3 @@
CONFIG_M68K=y
CONFIG_TARGET_AMCORE=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ap325rxa_defconfig b/configs/ap325rxa_defconfig
index ae2039c..d1e7bf4 100644
--- a/configs/ap325rxa_defconfig
+++ b/configs/ap325rxa_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_AP325RXA=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ap_sh4a_4a_defconfig b/configs/ap_sh4a_4a_defconfig
index f76329b..f7062fc 100644
--- a/configs/ap_sh4a_4a_defconfig
+++ b/configs/ap_sh4a_4a_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_AP_SH4A_4A=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index 3d9ae96..d2e5e92 100644
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA30=y
CONFIG_TARGET_APALIS_T30=y
CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
index 87f6986..ea9b4a6 100644
--- a/configs/apf27_defconfig
+++ b/configs/apf27_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_APF27=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/apx4devkit_defconfig b/configs/apx4devkit_defconfig
index 2d78654..0585b11 100644
--- a/configs/apx4devkit_defconfig
+++ b/configs/apx4devkit_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_APX4DEVKIT=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/arches_defconfig b/configs/arches_defconfig
index 9084a3a..155b323 100644
--- a/configs/arches_defconfig
+++ b/configs/arches_defconfig
@@ -3,4 +3,5 @@ CONFIG_4xx=y
CONFIG_TARGET_CANYONLANDS=y
CONFIG_ARCHES=y
CONFIG_DEFAULT_DEVICE_TREE="arches"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_OF_CONTROL=y
diff --git a/configs/aria_defconfig b/configs/aria_defconfig
index f7ebfa6..0ec0776 100644
--- a/configs/aria_defconfig
+++ b/configs/aria_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC512X=y
CONFIG_TARGET_ARIA=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
index 162e739..16df93e 100644
--- a/configs/aristainetos_defconfig
+++ b/configs/aristainetos_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_ARISTAINETOS=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig
index 22dc1f8..7428070 100644
--- a/configs/armadillo-800eva_defconfig
+++ b/configs/armadillo-800eva_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_TARGET_ARMADILLO_800EVA=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index e48003a..5e3768f 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_ARNDALE=y
CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_CMD_SOUND=y
CONFIG_SOUND=y
CONFIG_I2S=y
diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig
index 6807aee..e44d61f 100644
--- a/configs/astro_mcf5373l_defconfig
+++ b/configs/astro_mcf5373l_defconfig
@@ -1,2 +1,3 @@
CONFIG_M68K=y
CONFIG_TARGET_ASTRO_MCF5373L=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/at91rm9200ek_defconfig b/configs/at91rm9200ek_defconfig
index e1fd2ec..d19fcca 100644
--- a/configs/at91rm9200ek_defconfig
+++ b/configs/at91rm9200ek_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91RM9200EK=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/at91rm9200ek_ram_defconfig b/configs/at91rm9200ek_ram_defconfig
index 3573d39..7062b2b 100644
--- a/configs/at91rm9200ek_ram_defconfig
+++ b/configs/at91rm9200ek_ram_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91RM9200EK=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig
index 052f8af..de3392a 100644
--- a/configs/at91sam9260ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs0_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS0"
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig
index f654294..be43a8e 100644
--- a/configs/at91sam9260ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs1_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS1"
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig
index 1b2d232..9e8d946 100644
--- a/configs/at91sam9260ek_nandflash_defconfig
+++ b/configs/at91sam9260ek_nandflash_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
index d8299da..bf51c98 100644
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9261EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS0"
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig
index 1eb0e78..a55167b 100644
--- a/configs/at91sam9261ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9261EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS3"
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig
index d14e5a9..3cc3b1d 100644
--- a/configs/at91sam9261ek_nandflash_defconfig
+++ b/configs/at91sam9261ek_nandflash_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9261EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig
index b272745..783dec7 100644
--- a/configs/at91sam9263ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9263EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig
index b272745..783dec7 100644
--- a/configs/at91sam9263ek_dataflash_defconfig
+++ b/configs/at91sam9263ek_dataflash_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9263EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig
index 05e6e8c..b809f55 100644
--- a/configs/at91sam9263ek_nandflash_defconfig
+++ b/configs/at91sam9263ek_nandflash_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9263EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig
index 3318ad7..48b108e 100644
--- a/configs/at91sam9263ek_norflash_boot_defconfig
+++ b/configs/at91sam9263ek_norflash_boot_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9263EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_BOOT_NORFLASH"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig
index 04efa1b..d20bf91 100644
--- a/configs/at91sam9263ek_norflash_defconfig
+++ b/configs/at91sam9263ek_norflash_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9263EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NORFLASH"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig
index bdd4e1f..e04023e 100644
--- a/configs/at91sam9g10ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9261EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS0"
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig
index 809d803..7a8e060 100644
--- a/configs/at91sam9g10ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9261EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS3"
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig
index 9c0b4f5..14c2a8b 100644
--- a/configs/at91sam9g10ek_nandflash_defconfig
+++ b/configs/at91sam9g10ek_nandflash_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9261EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig
index 4441e09..c87b71b 100644
--- a/configs/at91sam9g20ek_2mmc_defconfig
+++ b/configs/at91sam9g20ek_2mmc_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_MMC"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
index 49be950..5242860 100644
--- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig
+++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig
index 0b259ed..ad18071 100644
--- a/configs/at91sam9g20ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS0"
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig
index 974138c..8444185 100644
--- a/configs/at91sam9g20ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS1"
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig
index 9cac5f4..f9c56f6 100644
--- a/configs/at91sam9g20ek_nandflash_defconfig
+++ b/configs/at91sam9g20ek_nandflash_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig
index 201d0c4..0b4c8f1 100644
--- a/configs/at91sam9m10g45ek_mmc_defconfig
+++ b/configs/at91sam9m10g45ek_mmc_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9M10G45EK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC"
+CONFIG_ENV_IS_IN_FAT=y
diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig
index 844acd4..affbd83 100644
--- a/configs/at91sam9m10g45ek_nandflash_defconfig
+++ b/configs/at91sam9m10g45ek_nandflash_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9M10G45EK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig
index d9cf7d1..d919a10 100644
--- a/configs/at91sam9n12ek_mmc_defconfig
+++ b/configs/at91sam9n12ek_mmc_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9N12EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_MMC"
+CONFIG_ENV_IS_IN_FAT=y
diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig
index 9f0ceb9..07a8ee3 100644
--- a/configs/at91sam9n12ek_nandflash_defconfig
+++ b/configs/at91sam9n12ek_nandflash_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9N12EK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig
index 81650c5..e730339 100644
--- a/configs/at91sam9n12ek_spiflash_defconfig
+++ b/configs/at91sam9n12ek_spiflash_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9N12EK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig
index 967d28a..f068ad3 100644
--- a/configs/at91sam9rlek_dataflash_defconfig
+++ b/configs/at91sam9rlek_dataflash_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9RLEK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_DATAFLASH"
+CONFIG_ENV_IS_IN_DATAFLASH=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig
index 95a71df..a593a62 100644
--- a/configs/at91sam9rlek_mmc_defconfig
+++ b/configs/at91sam9rlek_mmc_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9RLEK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_MMC"
+CONFIG_ENV_IS_IN_FAT=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig
index 885214d..e04b813 100644
--- a/configs/at91sam9rlek_nandflash_defconfig
+++ b/configs/at91sam9rlek_nandflash_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9RLEK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig
index 91bfd99..20bf18b 100644
--- a/configs/at91sam9x5ek_dataflash_defconfig
+++ b/configs/at91sam9x5ek_dataflash_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9X5EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_DATAFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig
index d915382..14ddfc0 100644
--- a/configs/at91sam9x5ek_mmc_defconfig
+++ b/configs/at91sam9x5ek_mmc_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9X5EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_MMC"
+CONFIG_ENV_IS_IN_FAT=y
diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig
index 5d0c13f..cff1058 100644
--- a/configs/at91sam9x5ek_nandflash_defconfig
+++ b/configs/at91sam9x5ek_nandflash_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9X5EK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig
index c2d7fd4..a4e0eba 100644
--- a/configs/at91sam9x5ek_spiflash_defconfig
+++ b/configs/at91sam9x5ek_spiflash_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9X5EK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig
index e7ee6c6..fd90d3a 100644
--- a/configs/at91sam9xeek_dataflash_cs0_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs0_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS0"
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig
index 0512f06..b86c6c0 100644
--- a/configs/at91sam9xeek_dataflash_cs1_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs1_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS1"
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig
index 2e3c132..d7f7de5 100644
--- a/configs/at91sam9xeek_nandflash_defconfig
+++ b/configs/at91sam9xeek_nandflash_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index cd79990..3f435b8 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -1,2 +1,3 @@
CONFIG_AVR32=y
CONFIG_TARGET_ATNGW100=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/atngw100mkii_defconfig b/configs/atngw100mkii_defconfig
index 88b1de2..e3bc7e5 100644
--- a/configs/atngw100mkii_defconfig
+++ b/configs/atngw100mkii_defconfig
@@ -1,2 +1,3 @@
CONFIG_AVR32=y
CONFIG_TARGET_ATNGW100MKII=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/atstk1002_defconfig b/configs/atstk1002_defconfig
index d6e9a77..77baafa 100644
--- a/configs/atstk1002_defconfig
+++ b/configs/atstk1002_defconfig
@@ -1,2 +1,3 @@
CONFIG_AVR32=y
CONFIG_TARGET_ATSTK1002=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/atstk1003_defconfig b/configs/atstk1003_defconfig
index b704532..c6b4780 100644
--- a/configs/atstk1003_defconfig
+++ b/configs/atstk1003_defconfig
@@ -1,2 +1,3 @@
CONFIG_AVR32=y
CONFIG_TARGET_ATSTK1003=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/atstk1004_defconfig b/configs/atstk1004_defconfig
index 7650254..785089e 100644
--- a/configs/atstk1004_defconfig
+++ b/configs/atstk1004_defconfig
@@ -1,2 +1,3 @@
CONFIG_AVR32=y
CONFIG_TARGET_ATSTK1004=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/atstk1006_defconfig b/configs/atstk1006_defconfig
index 54beb0b..78c9cac 100644
--- a/configs/atstk1006_defconfig
+++ b/configs/atstk1006_defconfig
@@ -1,2 +1,3 @@
CONFIG_AVR32=y
CONFIG_TARGET_ATSTK1006=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/axm_defconfig b/configs/axm_defconfig
index a1d9f1d..80d0f9e 100644
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_TAURUS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2068,BOARD_AXM"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig
index d33cc00..37ab61c 100644
--- a/configs/axs101_defconfig
+++ b/configs/axs101_defconfig
@@ -6,4 +6,5 @@ CONFIG_SYS_CLK_FREQ=750000000
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_TEXT_BASE=0x81000000
+CONFIG_ENV_IS_IN_EEPROM=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig
index d30088e..b0d6d7b 100644
--- a/configs/axs103_defconfig
+++ b/configs/axs103_defconfig
@@ -5,4 +5,5 @@ CONFIG_SYS_CLK_FREQ=50000000
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_TEXT_BASE=0x81000000
+CONFIG_ENV_IS_IN_EEPROM=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig
index f2ab415..e7251fb 100644
--- a/configs/ba10_tv_box_defconfig
+++ b/configs/ba10_tv_box_defconfig
@@ -7,3 +7,4 @@ CONFIG_USB2_VBUS_PIN="PH12"
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-ba10-tvbox"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/balloon3_defconfig b/configs/balloon3_defconfig
index a1f4adb..4e23ee7 100644
--- a/configs/balloon3_defconfig
+++ b/configs/balloon3_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_BALLOON3=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/bamboo_defconfig b/configs/bamboo_defconfig
index df4adb6..954d6e9 100644
--- a/configs/bamboo_defconfig
+++ b/configs/bamboo_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_BAMBOO=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/bct-brettl2_defconfig b/configs/bct-brettl2_defconfig
index 26b145d..fe5c88d 100644
--- a/configs/bct-brettl2_defconfig
+++ b/configs/bct-brettl2_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BCT_BRETTL2=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/beagle_x15_defconfig b/configs/beagle_x15_defconfig
index 7199468..faf4e82 100644
--- a/configs/beagle_x15_defconfig
+++ b/configs/beagle_x15_defconfig
@@ -3,3 +3,4 @@ CONFIG_OMAP54XX=y
CONFIG_TARGET_BEAGLE_X15=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3"
+CONFIG_ENV_IS_IN_FAT=y
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 097bf22..020af1d 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA30=y
CONFIG_TARGET_BEAVER=y
CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/bf506f-ezkit_defconfig b/configs/bf506f-ezkit_defconfig
index f164e06..7afcfd5 100644
--- a/configs/bf506f-ezkit_defconfig
+++ b/configs/bf506f-ezkit_defconfig
@@ -1,5 +1,6 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF506F_EZKIT=y
+CONFIG_ENV_IS_IN_NAND=y
# CONFIG_CMD_BOOTM is not set
# CONFIG_CMD_EXPORTENV is not set
# CONFIG_CMD_IMPORTENV is not set
diff --git a/configs/bf525-ucr2_defconfig b/configs/bf525-ucr2_defconfig
index 692e006..8466ae6 100644
--- a/configs/bf525-ucr2_defconfig
+++ b/configs/bf525-ucr2_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF525_UCR2=y
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/bf526-ezbrd_defconfig b/configs/bf526-ezbrd_defconfig
index da06d3a..bd5ead8 100644
--- a/configs/bf526-ezbrd_defconfig
+++ b/configs/bf526-ezbrd_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF526_EZBRD=y
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf527-ezkit-v2_defconfig b/configs/bf527-ezkit-v2_defconfig
index 3dd8013..6b8aae1 100644
--- a/configs/bf527-ezkit-v2_defconfig
+++ b/configs/bf527-ezkit-v2_defconfig
@@ -1,4 +1,5 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF527_EZKIT=y
CONFIG_SYS_EXTRA_OPTIONS="BF527_EZKIT_REV_2_1"
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf527-ezkit_defconfig b/configs/bf527-ezkit_defconfig
index 69f6ef7..28593e4 100644
--- a/configs/bf527-ezkit_defconfig
+++ b/configs/bf527-ezkit_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF527_EZKIT=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf533-ezkit_defconfig b/configs/bf533-ezkit_defconfig
index 57f8da1..4b026b9 100644
--- a/configs/bf533-ezkit_defconfig
+++ b/configs/bf533-ezkit_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF533_EZKIT=y
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf533-stamp_defconfig b/configs/bf533-stamp_defconfig
index 1bcf3d3..0e3c2ed 100644
--- a/configs/bf533-stamp_defconfig
+++ b/configs/bf533-stamp_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF533_STAMP=y
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf537-minotaur_defconfig b/configs/bf537-minotaur_defconfig
index e76118f..638a42c 100644
--- a/configs/bf537-minotaur_defconfig
+++ b/configs/bf537-minotaur_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF537_MINOTAUR=y
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/bf537-srv1_defconfig b/configs/bf537-srv1_defconfig
index 61ac0e7..905f8fe 100644
--- a/configs/bf537-srv1_defconfig
+++ b/configs/bf537-srv1_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF537_SRV1=y
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/bf537-stamp_defconfig b/configs/bf537-stamp_defconfig
index 9b9a92f..0787871 100644
--- a/configs/bf537-stamp_defconfig
+++ b/configs/bf537-stamp_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF537_STAMP=y
+CONFIG_ENV_IS_IN_EEPROM=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf538f-ezkit_defconfig b/configs/bf538f-ezkit_defconfig
index 1892151..e674433 100644
--- a/configs/bf538f-ezkit_defconfig
+++ b/configs/bf538f-ezkit_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF538F_EZKIT=y
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf548-ezkit_defconfig b/configs/bf548-ezkit_defconfig
index 5236984..1075956 100644
--- a/configs/bf548-ezkit_defconfig
+++ b/configs/bf548-ezkit_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF548_EZKIT=y
+CONFIG_ENV_IS_IN_ONENAND=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf561-acvilon_defconfig b/configs/bf561-acvilon_defconfig
index 098f31f..ea4dd08 100644
--- a/configs/bf561-acvilon_defconfig
+++ b/configs/bf561-acvilon_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF561_ACVILON=y
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf561-ezkit_defconfig b/configs/bf561-ezkit_defconfig
index 5665288..06a5ef8 100644
--- a/configs/bf561-ezkit_defconfig
+++ b/configs/bf561-ezkit_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF561_EZKIT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf609-ezkit_defconfig b/configs/bf609-ezkit_defconfig
index d947a09..60c7f7c 100644
--- a/configs/bf609-ezkit_defconfig
+++ b/configs/bf609-ezkit_defconfig
@@ -2,4 +2,5 @@ CONFIG_BLACKFIN=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_TARGET_BF609_EZKIT=y
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/blackvme_defconfig b/configs/blackvme_defconfig
index 1ec2fa9..a1cb1b3 100644
--- a/configs/blackvme_defconfig
+++ b/configs/blackvme_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BLACKVME=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/br4_defconfig b/configs/br4_defconfig
index 5655d54..7433bc3 100644
--- a/configs/br4_defconfig
+++ b/configs/br4_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BR4=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bubinga_defconfig b/configs/bubinga_defconfig
index 532448d..27b2d32 100644
--- a/configs/bubinga_defconfig
+++ b/configs/bubinga_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_BUBINGA=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/caddy2_defconfig b/configs/caddy2_defconfig
index bdce6aa..9a26ca8 100644
--- a/configs/caddy2_defconfig
+++ b/configs/caddy2_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_VME8349=y
CONFIG_SYS_EXTRA_OPTIONS="CADDY2"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig
index c9d2917..2eec149 100644
--- a/configs/cairo_defconfig
+++ b/configs/cairo_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_CAIRO=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
index 02d3912..6240965 100644
--- a/configs/calimain_defconfig
+++ b/configs/calimain_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_CALIMAIN=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/cam5200_defconfig b/configs/cam5200_defconfig
index 33db80b..dda5ae9 100644
--- a/configs/cam5200_defconfig
+++ b/configs/cam5200_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_SYS_EXTRA_OPTIONS="CAM5200,TQM5200S,TQM5200_B"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/cam5200_niosflash_defconfig b/configs/cam5200_niosflash_defconfig
index c13b9bf..94f0519 100644
--- a/configs/cam5200_niosflash_defconfig
+++ b/configs/cam5200_niosflash_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_SYS_EXTRA_OPTIONS="CAM5200,TQM5200S,TQM5200_B,CAM5200_NIOSFLASH"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/cam_enc_4xx_defconfig b/configs/cam_enc_4xx_defconfig
index 89bffa0..73060e5 100644
--- a/configs/cam_enc_4xx_defconfig
+++ b/configs/cam_enc_4xx_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_CAM_ENC_4XX=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/canmb_defconfig b/configs/canmb_defconfig
index 86ffbd2..33aea1a 100644
--- a/configs/canmb_defconfig
+++ b/configs/canmb_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_CANMB=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/canyonlands_defconfig b/configs/canyonlands_defconfig
index e936d7b..d79ccb9 100644
--- a/configs/canyonlands_defconfig
+++ b/configs/canyonlands_defconfig
@@ -3,6 +3,7 @@ CONFIG_4xx=y
CONFIG_TARGET_CANYONLANDS=y
CONFIG_CANYONLANDS=y
CONFIG_DEFAULT_DEVICE_TREE="canyonlands"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_REGEX=y
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 1a9c12e..f88b5c1 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA30=y
CONFIG_TARGET_CARDHU=y
CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/cgtqmx6qeval_defconfig b/configs/cgtqmx6qeval_defconfig
index 5a20f22..57953b1 100644
--- a/configs/cgtqmx6qeval_defconfig
+++ b/configs/cgtqmx6qeval_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_CGTQMX6EVAL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/congatec/cgtqmx6eval/imximage.cfg,MX6Q"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/charon_defconfig b/configs/charon_defconfig
index 1dd3f5d..368024f 100644
--- a/configs/charon_defconfig
+++ b/configs/charon_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_CHARON=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 3d2bdf6..16dcbe8 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -5,6 +5,7 @@ CONFIG_TARGET_CHROMEBOOK_LINK=y
CONFIG_HAVE_MRC=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_OF_CONTROL=y
CONFIG_DM_PCI=y
CONFIG_VIDEO_VESA=y
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 4bbce09..9893451 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -5,6 +5,7 @@ CONFIG_TARGET_CHROMEBOX_PANTHER=y
CONFIG_HAVE_MRC=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_OF_CONTROL=y
CONFIG_DM_PCI=y
CONFIG_VIDEO_VESA=y
diff --git a/configs/cm-bf527_defconfig b/configs/cm-bf527_defconfig
index a6830b5..ce750a2 100644
--- a/configs/cm-bf527_defconfig
+++ b/configs/cm-bf527_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_CM_BF527=y
+CONFIG_ENV_IS_IN_FAT=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm-bf533_defconfig b/configs/cm-bf533_defconfig
index b9508ae..8bc7fe4 100644
--- a/configs/cm-bf533_defconfig
+++ b/configs/cm-bf533_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_CM_BF533=y
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm-bf537e_defconfig b/configs/cm-bf537e_defconfig
index a44eab7..cfd1575 100644
--- a/configs/cm-bf537e_defconfig
+++ b/configs/cm-bf537e_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_CM_BF537E=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm-bf537u_defconfig b/configs/cm-bf537u_defconfig
index 29c33b9..94b5d03 100644
--- a/configs/cm-bf537u_defconfig
+++ b/configs/cm-bf537u_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_CM_BF537U=y
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm-bf548_defconfig b/configs/cm-bf548_defconfig
index 525f2e7..7ec8301 100644
--- a/configs/cm-bf548_defconfig
+++ b/configs/cm-bf548_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_CM_BF548=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm-bf561_defconfig b/configs/cm-bf561_defconfig
index 062bfeb..b62f94c 100644
--- a/configs/cm-bf561_defconfig
+++ b/configs/cm-bf561_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_CM_BF561=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm5200_defconfig b/configs/cm5200_defconfig
index 8f5dd3c..3e05706 100644
--- a/configs/cm5200_defconfig
+++ b/configs/cm5200_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_CM5200=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 18a7157..06ed59d 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_CM_FX6=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig
index a694bb5..11c1b59 100644
--- a/configs/cm_t335_defconfig
+++ b/configs/cm_t335_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_CM_T335=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig
index da18e5f..1d05729 100644
--- a/configs/cm_t3517_defconfig
+++ b/configs/cm_t3517_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_CM_T3517=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig
index a4e0daa..3a68c7c 100644
--- a/configs/cm_t35_defconfig
+++ b/configs/cm_t35_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_CM_T35=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig
index aa7eedb..bb60406 100644
--- a/configs/cm_t54_defconfig
+++ b/configs/cm_t54_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_OMAP54XX=y
CONFIG_TARGET_CM_T54=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/cmi_mpc5xx_defconfig b/configs/cmi_mpc5xx_defconfig
index 5c855b1..3ed0f8f 100644
--- a/configs/cmi_mpc5xx_defconfig
+++ b/configs/cmi_mpc5xx_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_5xx=y
CONFIG_TARGET_CMI_MPC5XX=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/cobra5272_defconfig b/configs/cobra5272_defconfig
index dc1552d..5e98d69 100644
--- a/configs/cobra5272_defconfig
+++ b/configs/cobra5272_defconfig
@@ -1,2 +1,3 @@
CONFIG_M68K=y
CONFIG_TARGET_COBRA5272=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig
index c8faf0b..ade5ede 100644
--- a/configs/colibri_pxa270_defconfig
+++ b/configs/colibri_pxa270_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_COLIBRI_PXA270=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index 8987567..da7b367 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA20=y
CONFIG_TARGET_COLIBRI_T20=y
CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index 4e41143..74d0717 100644
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA30=y
CONFIG_TARGET_COLIBRI_T30=y
CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
index 0df337c..3a0ef63 100644
--- a/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_COLIBRI_VF=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
index 2943298..580185d 100644
--- a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_CONTROLCENTERD=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD,DEVELOP"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/controlcenterd_36BIT_SDCARD_defconfig b/configs/controlcenterd_36BIT_SDCARD_defconfig
index 1c18315..3671b86 100644
--- a/configs/controlcenterd_36BIT_SDCARD_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_CONTROLCENTERD=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 66f94d0..4a6856a 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -1,4 +1,5 @@
CONFIG_X86=y
CONFIG_TARGET_COREBOOT=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_OF_CONTROL=y
CONFIG_DM_PCI=y
diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
index 06e5a28..8f2bfed 100644
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_CORVUS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,MACH_TYPE=2066,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/cpu9260_128M_defconfig b/configs/cpu9260_128M_defconfig
index e59356c..0dd5002 100644
--- a/configs/cpu9260_128M_defconfig
+++ b/configs/cpu9260_128M_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_CPU9260=y
CONFIG_SYS_EXTRA_OPTIONS="CPU9260,CPU9260_128M"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/cpu9260_defconfig b/configs/cpu9260_defconfig
index 8b6c543..bb23e85 100644
--- a/configs/cpu9260_defconfig
+++ b/configs/cpu9260_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_CPU9260=y
CONFIG_SYS_EXTRA_OPTIONS="CPU9260"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/cpu9260_nand_128M_defconfig b/configs/cpu9260_nand_128M_defconfig
index 47f885b..74b113e 100644
--- a/configs/cpu9260_nand_128M_defconfig
+++ b/configs/cpu9260_nand_128M_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_CPU9260=y
CONFIG_SYS_EXTRA_OPTIONS="CPU9260,CPU9260_128M,NANDBOOT"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/cpu9260_nand_defconfig b/configs/cpu9260_nand_defconfig
index c6ff773..2a8c56f 100644
--- a/configs/cpu9260_nand_defconfig
+++ b/configs/cpu9260_nand_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_CPU9260=y
CONFIG_SYS_EXTRA_OPTIONS="CPU9260,NANDBOOT"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/cpu9G20_128M_defconfig b/configs/cpu9G20_128M_defconfig
index aa6a335..f25f9ad 100644
--- a/configs/cpu9G20_128M_defconfig
+++ b/configs/cpu9G20_128M_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_CPU9260=y
CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,CPU9G20_128M"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/cpu9G20_defconfig b/configs/cpu9G20_defconfig
index b63841f..387976a 100644
--- a/configs/cpu9G20_defconfig
+++ b/configs/cpu9G20_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_CPU9260=y
CONFIG_SYS_EXTRA_OPTIONS="CPU9G20"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/cpu9G20_nand_128M_defconfig b/configs/cpu9G20_nand_128M_defconfig
index 2871f31..db6138a 100644
--- a/configs/cpu9G20_nand_128M_defconfig
+++ b/configs/cpu9G20_nand_128M_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_CPU9260=y
CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,CPU9G20_128M,NANDBOOT"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/cpu9G20_nand_defconfig b/configs/cpu9G20_nand_defconfig
index b0ef7d4..0127fbc 100644
--- a/configs/cpu9G20_nand_defconfig
+++ b/configs/cpu9G20_nand_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_CPU9260=y
CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,NANDBOOT"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/cpuat91_defconfig b/configs/cpuat91_defconfig
index 5a1ef3a..a2329f4 100644
--- a/configs/cpuat91_defconfig
+++ b/configs/cpuat91_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_CPUAT91=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/cpuat91_ram_defconfig b/configs/cpuat91_ram_defconfig
index 408ef62..e5c4c70 100644
--- a/configs/cpuat91_ram_defconfig
+++ b/configs/cpuat91_ram_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_CPUAT91=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index 9804ea7..c1a3e57 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -3,4 +3,5 @@ CONFIG_VENDOR_INTEL=y
CONFIG_DEFAULT_DEVICE_TREE="crownbay"
CONFIG_TARGET_CROWNBAY=y
CONFIG_GENERATE_PIRQ_TABLE=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_OF_CONTROL=y
diff --git a/configs/csb272_defconfig b/configs/csb272_defconfig
index 8ccd645..e77dab2 100644
--- a/configs/csb272_defconfig
+++ b/configs/csb272_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_CSB272=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/csb472_defconfig b/configs/csb472_defconfig
index 81a0cf1..b344c17 100644
--- a/configs/csb472_defconfig
+++ b/configs/csb472_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_CSB472=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index e54dcf4..cb7b0ec 100644
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NET2BIG_V2=y
CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/da830evm_defconfig b/configs/da830evm_defconfig
index d27cdb0..09e27eb 100644
--- a/configs/da830evm_defconfig
+++ b/configs/da830evm_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DA830EVM=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig
index 092696e..1e4078d 100644
--- a/configs/da850_am18xxevm_defconfig
+++ b/configs/da850_am18xxevm_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DA850EVM=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig
index f3e3e9a..14b4e2c 100644
--- a/configs/da850evm_defconfig
+++ b/configs/da850evm_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DA850EVM=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig
index 24148da..77ea678 100644
--- a/configs/da850evm_direct_nor_defconfig
+++ b/configs/da850evm_direct_nor_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DA850EVM=y
CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index 1beff84..c08d8d1 100644
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA114=y
CONFIG_TARGET_DALMORE=y
CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/davinci_dm355evm_defconfig b/configs/davinci_dm355evm_defconfig
index d3a03b2..79d71fe 100644
--- a/configs/davinci_dm355evm_defconfig
+++ b/configs/davinci_dm355evm_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM355EVM=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/davinci_dm355leopard_defconfig b/configs/davinci_dm355leopard_defconfig
index 875c0b5..0888e97 100644
--- a/configs/davinci_dm355leopard_defconfig
+++ b/configs/davinci_dm355leopard_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM355LEOPARD=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/davinci_dm365evm_defconfig b/configs/davinci_dm365evm_defconfig
index f841fd9..7479089 100644
--- a/configs/davinci_dm365evm_defconfig
+++ b/configs/davinci_dm365evm_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM365EVM=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/davinci_dm6467Tevm_defconfig b/configs/davinci_dm6467Tevm_defconfig
index 5671c38..fec92db 100644
--- a/configs/davinci_dm6467Tevm_defconfig
+++ b/configs/davinci_dm6467Tevm_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM6467EVM=y
CONFIG_SYS_EXTRA_OPTIONS="DAVINCI_DM6467TEVM,REFCLK_FREQ=33000000"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/davinci_dm6467evm_defconfig b/configs/davinci_dm6467evm_defconfig
index f9741a1..4e69f65 100644
--- a/configs/davinci_dm6467evm_defconfig
+++ b/configs/davinci_dm6467evm_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM6467EVM=y
CONFIG_SYS_EXTRA_OPTIONS="REFCLK_FREQ=27000000"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/davinci_dvevm_defconfig b/configs/davinci_dvevm_defconfig
index 74e55b9..1c70d56 100644
--- a/configs/davinci_dvevm_defconfig
+++ b/configs/davinci_dvevm_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DVEVM=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/davinci_schmoogie_defconfig b/configs/davinci_schmoogie_defconfig
index 64ed2c1..8e56147 100644
--- a/configs/davinci_schmoogie_defconfig
+++ b/configs/davinci_schmoogie_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_SCHMOOGIE=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/davinci_sffsdr_defconfig b/configs/davinci_sffsdr_defconfig
index 9eb0f07..8fc2153 100644
--- a/configs/davinci_sffsdr_defconfig
+++ b/configs/davinci_sffsdr_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_SFFSDR=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/davinci_sonata_defconfig b/configs/davinci_sonata_defconfig
index d8f0f77..0c201ce 100644
--- a/configs/davinci_sonata_defconfig
+++ b/configs/davinci_sonata_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_SONATA=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig
index 0d6f0de..5af5ee5 100644
--- a/configs/db-88f6820-gp_defconfig
+++ b/configs/db-88f6820-gp_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_DB_88F6820_GP=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig
index 07b9183..c404387 100644
--- a/configs/db-mv784mp-gp_defconfig
+++ b/configs/db-mv784mp-gp_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_DB_MV784MP_GP=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/devconcenter_defconfig b/configs/devconcenter_defconfig
index ecf766e..793481a 100644
--- a/configs/devconcenter_defconfig
+++ b/configs/devconcenter_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_INTIP=y
CONFIG_SYS_EXTRA_OPTIONS="DEVCONCENTER"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
index 9f3bc18..afa6a05 100644
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_DEVKIT8000=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/dig297_defconfig b/configs/dig297_defconfig
index 95bc353..1b4a3b1 100644
--- a/configs/dig297_defconfig
+++ b/configs/dig297_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_DIG297=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/digsy_mtc_RAMBOOT_defconfig b/configs/digsy_mtc_RAMBOOT_defconfig
index fa7fd06..86a25b0 100644
--- a/configs/digsy_mtc_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_RAMBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/digsy_mtc_defconfig b/configs/digsy_mtc_defconfig
index 666c5c8..cad7a40 100644
--- a/configs/digsy_mtc_defconfig
+++ b/configs/digsy_mtc_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/digsy_mtc_rev5_RAMBOOT_defconfig b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
index be297fe..70c8d48 100644
--- a/configs/digsy_mtc_rev5_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000,DIGSY_REV5"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/digsy_mtc_rev5_defconfig b/configs/digsy_mtc_rev5_defconfig
index 12f82da..8edcfdf 100644
--- a/configs/digsy_mtc_rev5_defconfig
+++ b/configs/digsy_mtc_rev5_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y
CONFIG_SYS_EXTRA_OPTIONS="DIGSY_REV5"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/dlvision-10g_defconfig b/configs/dlvision-10g_defconfig
index 2f508c3..4b8972e 100644
--- a/configs/dlvision-10g_defconfig
+++ b/configs/dlvision-10g_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_DLVISION_10G=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/dlvision_defconfig b/configs/dlvision_defconfig
index 3149cb1..f2209d7 100644
--- a/configs/dlvision_defconfig
+++ b/configs/dlvision_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_DLVISION=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/dnp5370_defconfig b/configs/dnp5370_defconfig
index 0c00087..f2f07e1 100644
--- a/configs/dnp5370_defconfig
+++ b/configs/dnp5370_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_DNP5370=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
index cc4a03b..62294b9 100644
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_DNS325=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
index b773cde..44911fd 100644
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_DOCKSTAR=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
index 520f35f..635791e 100644
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -3,3 +3,4 @@ CONFIG_OMAP54XX=y
CONFIG_TARGET_DRA7XX_EVM=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig
index 04e0532..a3fd3e3 100644
--- a/configs/dra7xx_evm_qspiboot_defconfig
+++ b/configs/dra7xx_evm_qspiboot_defconfig
@@ -3,3 +3,4 @@ CONFIG_OMAP54XX=y
CONFIG_TARGET_DRA7XX_EVM=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,QSPI_BOOT"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig
index 32830fb..a57b7c5 100644
--- a/configs/dra7xx_evm_uart3_defconfig
+++ b/configs/dra7xx_evm_uart3_defconfig
@@ -3,3 +3,4 @@ CONFIG_OMAP54XX=y
CONFIG_TARGET_DRA7XX_EVM=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3,SPL_YMODEM_SUPPORT"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index ebd6b08..3218089 100644
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_DRACO=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig
index 45113c8..4b938ab 100644
--- a/configs/dreamplug_defconfig
+++ b/configs/dreamplug_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_DREAMPLUG=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/dxr2_defconfig b/configs/dxr2_defconfig
index c6530ed..de83fe0 100644
--- a/configs/dxr2_defconfig
+++ b/configs/dxr2_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_DXR2=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index 93676cd..bb3def5 100644
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_EA20=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig
index 7c7f188..423e97b 100644
--- a/configs/eb_cpu5282_defconfig
+++ b/configs/eb_cpu5282_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_EB_CPU5282=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFF000000,SYS_MONITOR_BASE=0xFF000400"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig
index 095d554..c57dcf6 100644
--- a/configs/eb_cpu5282_internal_defconfig
+++ b/configs/eb_cpu5282_internal_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_EB_CPU5282=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF0000000,SYS_MONITOR_BASE=0xF0000418"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/eb_cpux9k2_defconfig b/configs/eb_cpux9k2_defconfig
index 257fee5..c5b3f76 100644
--- a/configs/eb_cpux9k2_defconfig
+++ b/configs/eb_cpux9k2_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_EB_CPUX9K2=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/eb_cpux9k2_ram_defconfig b/configs/eb_cpux9k2_ram_defconfig
index 93acc13..9a17e68 100644
--- a/configs/eb_cpux9k2_ram_defconfig
+++ b/configs/eb_cpux9k2_ram_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_EB_CPUX9K2=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ebony_defconfig b/configs/ebony_defconfig
index bf2dab6..5e9a92f 100644
--- a/configs/ebony_defconfig
+++ b/configs/ebony_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_EBONY=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig
index 230bd87..375d210 100644
--- a/configs/eco5pk_defconfig
+++ b/configs/eco5pk_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_ECO5PK=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/ecovec_defconfig b/configs/ecovec_defconfig
index 57771e4..d218a34 100644
--- a/configs/ecovec_defconfig
+++ b/configs/ecovec_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_ECOVEC=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/edb9315a_defconfig b/configs/edb9315a_defconfig
index 0d4bb2d..219b434 100644
--- a/configs/edb9315a_defconfig
+++ b/configs/edb9315a_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_EDB93XX=y
CONFIG_SYS_EXTRA_OPTIONS="MK_edb9315a"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index 1476d4d..f59c1db 100644
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ORION5X=y
CONFIG_TARGET_EDMINIV2=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/enbw_cmc_defconfig b/configs/enbw_cmc_defconfig
index 92c4926..e446cad 100644
--- a/configs/enbw_cmc_defconfig
+++ b/configs/enbw_cmc_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_ENBW_CMC=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/espt_defconfig b/configs/espt_defconfig
index a50781d..e0ba870 100644
--- a/configs/espt_defconfig
+++ b/configs/espt_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_ESPT=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index 5fc79ca..bb6a835 100644
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_ETHERNUT5=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/favr-32-ezkit_defconfig b/configs/favr-32-ezkit_defconfig
index 941e028..74922d6 100644
--- a/configs/favr-32-ezkit_defconfig
+++ b/configs/favr-32-ezkit_defconfig
@@ -1,2 +1,3 @@
CONFIG_AVR32=y
CONFIG_TARGET_FAVR_32_EZKIT=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/flea3_defconfig b/configs/flea3_defconfig
index ac112cd..b8b38cb 100644
--- a/configs/flea3_defconfig
+++ b/configs/flea3_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_FLEA3=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/fo300_defconfig b/configs/fo300_defconfig
index 05068d4..2d1bf93 100644
--- a/configs/fo300_defconfig
+++ b/configs/fo300_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_TQM5200=y
CONFIG_SYS_EXTRA_OPTIONS="FO300"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/forfun_q88db_defconfig b/configs/forfun_q88db_defconfig
index fc7ce6a..06778ab 100644
--- a/configs/forfun_q88db_defconfig
+++ b/configs/forfun_q88db_defconfig
@@ -13,3 +13,4 @@ CONFIG_USB_MUSB_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-forfun-q88db"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/fx12mm_defconfig b/configs/fx12mm_defconfig
index a84dc65..f9d78cf 100644
--- a/configs/fx12mm_defconfig
+++ b/configs/fx12mm_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_FX12MM=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,INIT_TLB=board/xilinx/ppc405-generic/init.o"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/fx12mm_flash_defconfig b/configs/fx12mm_flash_defconfig
index cd28f33..77cf3c2 100644
--- a/configs/fx12mm_flash_defconfig
+++ b/configs/fx12mm_flash_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_FX12MM=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC,INIT_TLB=board/xilinx/ppc405-generic/init.o"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index 7de7749..94beb45 100644
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -4,5 +4,6 @@ CONFIG_NETDEVICES=y
CONFIG_VENDOR_INTEL=y
CONFIG_DEFAULT_DEVICE_TREE="galileo"
CONFIG_TARGET_GALILEO=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_OF_CONTROL=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/gdppc440etx_defconfig b/configs/gdppc440etx_defconfig
index 5aa579a..c0be4d8 100644
--- a/configs/gdppc440etx_defconfig
+++ b/configs/gdppc440etx_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_GDPPC440ETX=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/glacier_defconfig b/configs/glacier_defconfig
index d318f82..893be85 100644
--- a/configs/glacier_defconfig
+++ b/configs/glacier_defconfig
@@ -3,5 +3,6 @@ CONFIG_4xx=y
CONFIG_TARGET_CANYONLANDS=y
CONFIG_GLACIER=y
CONFIG_DEFAULT_DEVICE_TREE="glacier"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
diff --git a/configs/glacier_ramboot_defconfig b/configs/glacier_ramboot_defconfig
index 98bcaf4..63ac7c6 100644
--- a/configs/glacier_ramboot_defconfig
+++ b/configs/glacier_ramboot_defconfig
@@ -4,5 +4,6 @@ CONFIG_TARGET_CANYONLANDS=y
CONFIG_GLACIER=y
CONFIG_DEFAULT_DEVICE_TREE="glacier"
CONFIG_SYS_EXTRA_OPTIONS="SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/canyonlands/u-boot-ram.lds"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index 276489b..9eec07d 100644
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_GOFLEXHOME=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/gose_defconfig b/configs/gose_defconfig
index b6054f7..32d8933 100644
--- a/configs/gose_defconfig
+++ b/configs/gose_defconfig
@@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_TARGET_GOSE=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SH_SDHI=y
diff --git a/configs/gplugd_defconfig b/configs/gplugd_defconfig
index ec8f45c..2f602f1 100644
--- a/configs/gplugd_defconfig
+++ b/configs/gplugd_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_GPLUGD=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/gr_cpci_ax2000_defconfig b/configs/gr_cpci_ax2000_defconfig
index 73ac213..4e50c8b 100644
--- a/configs/gr_cpci_ax2000_defconfig
+++ b/configs/gr_cpci_ax2000_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPARC=y
CONFIG_TARGET_GR_CPCI_AX2000=y
CONFIG_SYS_TEXT_BASE=0x00000000
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/gr_ep2s60_defconfig b/configs/gr_ep2s60_defconfig
index a59f0ad..406557b 100644
--- a/configs/gr_ep2s60_defconfig
+++ b/configs/gr_ep2s60_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPARC=y
CONFIG_TARGET_GR_EP2S60=y
CONFIG_SYS_TEXT_BASE=0x00000000
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/gr_xc3s_1500_defconfig b/configs/gr_xc3s_1500_defconfig
index 257759f..8d331dd 100644
--- a/configs/gr_xc3s_1500_defconfig
+++ b/configs/gr_xc3s_1500_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPARC=y
CONFIG_TARGET_GR_XC3S_1500=y
CONFIG_SYS_TEXT_BASE=0x00000000
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/grasshopper_defconfig b/configs/grasshopper_defconfig
index 72013e7..f87ba97 100644
--- a/configs/grasshopper_defconfig
+++ b/configs/grasshopper_defconfig
@@ -1,2 +1,3 @@
CONFIG_AVR32=y
CONFIG_TARGET_GRASSHOPPER=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig
index 912a089..656316a 100644
--- a/configs/guruplug_defconfig
+++ b/configs/guruplug_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_GURUPLUG=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
index c7882ac..6858c6c 100644
--- a/configs/gwventana_defconfig
+++ b/configs/gwventana_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_GW_VENTANA=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/haleakala_defconfig b/configs/haleakala_defconfig
index 81e3398..9845b0a 100644
--- a/configs/haleakala_defconfig
+++ b/configs/haleakala_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_KILAUEA=y
CONFIG_SYS_EXTRA_OPTIONS="HALEAKALA"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/hammerhead_defconfig b/configs/hammerhead_defconfig
index 0d69cc6..8b38c83 100644
--- a/configs/hammerhead_defconfig
+++ b/configs/hammerhead_defconfig
@@ -1,2 +1,3 @@
CONFIG_AVR32=y
CONFIG_TARGET_HAMMERHEAD=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index b2c0afc..d3c6397 100644
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA20=y
CONFIG_TARGET_HARMONY=y
CONFIG_DEFAULT_DEVICE_TREE="tegra20-harmony"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig
index 88efbdf..5fb6d35 100644
--- a/configs/highbank_defconfig
+++ b/configs/highbank_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_ARCH_HIGHBANK=y
+CONFIG_ENV_IS_IN_NVRAM=y
diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig
index 69c65ba..735651f 100644
--- a/configs/hrcon_defconfig
+++ b/configs/hrcon_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_HRCON=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/hummingboard_solo_defconfig b/configs/hummingboard_solo_defconfig
index 2a256b4..c367bd8 100644
--- a/configs/hummingboard_solo_defconfig
+++ b/configs/hummingboard_solo_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_HUMMINGBOARD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/solidrun/hummingboard/solo.cfg,MX6S,DDR_MB=512"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
index c8ccf45..8192928 100644
--- a/configs/i12-tvbox_defconfig
+++ b/configs/i12-tvbox_defconfig
@@ -5,4 +5,5 @@ CONFIG_DRAM_CLK=384
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-i12-tvbox"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/iNet_3F_defconfig b/configs/iNet_3F_defconfig
index e807aeb..1de0b2c 100644
--- a/configs/iNet_3F_defconfig
+++ b/configs/iNet_3F_defconfig
@@ -15,3 +15,4 @@ CONFIG_USB_MUSB_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3f"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/iNet_3W_defconfig b/configs/iNet_3W_defconfig
index eaf7c5a..4151a86 100644
--- a/configs/iNet_3W_defconfig
+++ b/configs/iNet_3W_defconfig
@@ -15,3 +15,4 @@ CONFIG_USB_MUSB_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3w"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/iNet_86VS_defconfig b/configs/iNet_86VS_defconfig
index 017a87a..559e964 100644
--- a/configs/iNet_86VS_defconfig
+++ b/configs/iNet_86VS_defconfig
@@ -13,3 +13,4 @@ CONFIG_USB_MUSB_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-inet-86vs"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
index b6780c5..4f5a1db 100644
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_IB62X0=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/ibf-dsp561_defconfig b/configs/ibf-dsp561_defconfig
index 41a5c65..d077559 100644
--- a/configs/ibf-dsp561_defconfig
+++ b/configs/ibf-dsp561_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_IBF_DSP561=y
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/icon_defconfig b/configs/icon_defconfig
index caf7c23..67125b4 100644
--- a/configs/icon_defconfig
+++ b/configs/icon_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_ICON=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
index 7ff8d67..4f13862 100644
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_ICONNECT=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index 36db73a..c7d7a02 100644
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_IDS8313=y
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFF00000"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig
index 950bac5..e698e97 100644
--- a/configs/igep0020_defconfig
+++ b/configs/igep0020_defconfig
@@ -3,3 +3,4 @@ CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_IGEP00X0=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND"
+CONFIG_ENV_IS_IN_ONENAND=y
diff --git a/configs/igep0020_nand_defconfig b/configs/igep0020_nand_defconfig
index 4686a88..dff4e29 100644
--- a/configs/igep0020_nand_defconfig
+++ b/configs/igep0020_nand_defconfig
@@ -3,3 +3,4 @@ CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_IGEP00X0=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig
index 5e1d43d..21212cd 100644
--- a/configs/igep0030_defconfig
+++ b/configs/igep0030_defconfig
@@ -3,3 +3,4 @@ CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_IGEP00X0=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND"
+CONFIG_ENV_IS_IN_ONENAND=y
diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig
index d92dd44..2b91554 100644
--- a/configs/igep0030_nand_defconfig
+++ b/configs/igep0030_nand_defconfig
@@ -3,3 +3,4 @@ CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_IGEP00X0=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index cf120cd..0d413cd 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -3,3 +3,4 @@ CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_IGEP00X0=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND"
+CONFIG_ENV_IS_IN_ONENAND=y
diff --git a/configs/ima3-mx53_defconfig b/configs/ima3-mx53_defconfig
index 0ada8a1..f660dfb 100644
--- a/configs/ima3-mx53_defconfig
+++ b/configs/ima3-mx53_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_IMA3_MX53=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/esg/ima3-mx53/imximage.cfg"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/imx27lite_defconfig b/configs/imx27lite_defconfig
index 03803c6..0497d4b 100644
--- a/configs/imx27lite_defconfig
+++ b/configs/imx27lite_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_IMX27LITE=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/imx31_litekit_defconfig b/configs/imx31_litekit_defconfig
index cd41c0e..492664b 100644
--- a/configs/imx31_litekit_defconfig
+++ b/configs/imx31_litekit_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_IMX31_LITEKIT=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/imx31_phycore_defconfig b/configs/imx31_phycore_defconfig
index 563de57..a00924a 100644
--- a/configs/imx31_phycore_defconfig
+++ b/configs/imx31_phycore_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_IMX31_PHYCORE=y
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/imx31_phycore_eet_defconfig b/configs/imx31_phycore_eet_defconfig
index eca9cdb..b29557d 100644
--- a/configs/imx31_phycore_eet_defconfig
+++ b/configs/imx31_phycore_eet_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_IMX31_PHYCORE=y
CONFIG_SYS_EXTRA_OPTIONS="IMX31_PHYCORE_EET"
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index a8c254d..3d260c5 100644
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NETSPACE_V2=y
CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/inka4x0_defconfig b/configs/inka4x0_defconfig
index 6581b0a..6e566c7 100644
--- a/configs/inka4x0_defconfig
+++ b/configs/inka4x0_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_INKA4X0=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig
index f039470..13aa9a1 100644
--- a/configs/integratorcp_cm1136_defconfig
+++ b/configs/integratorcp_cm1136_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_CP=y
CONFIG_CM1136=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig
index cb364a1..2b40491 100644
--- a/configs/integratorcp_cm920t_defconfig
+++ b/configs/integratorcp_cm920t_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_CP=y
CONFIG_CM920T=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig
index 32ea7b9..7496d81 100644
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_CP=y
CONFIG_CM926EJ_S=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig
index e7fc706..dc7a814 100644
--- a/configs/integratorcp_cm946es_defconfig
+++ b/configs/integratorcp_cm946es_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_CP=y
CONFIG_CM946ES=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/intip_defconfig b/configs/intip_defconfig
index 3aa372f..663948f 100644
--- a/configs/intip_defconfig
+++ b/configs/intip_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_INTIP=y
CONFIG_SYS_EXTRA_OPTIONS="INTIB"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/io64_defconfig b/configs/io64_defconfig
index 9c0566e..c2a7238 100644
--- a/configs/io64_defconfig
+++ b/configs/io64_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_IO64=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/io_defconfig b/configs/io_defconfig
index 5037ff3..98d9529 100644
--- a/configs/io_defconfig
+++ b/configs/io_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_IO=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/iocon_defconfig b/configs/iocon_defconfig
index 72956d4..799ebd7 100644
--- a/configs/iocon_defconfig
+++ b/configs/iocon_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_IOCON=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig
index ca17d1b..bcf0be7 100644
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_IPAM390=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/ipek01_defconfig b/configs/ipek01_defconfig
index 83cf557..aeef880 100644
--- a/configs/ipek01_defconfig
+++ b/configs/ipek01_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_IPEK01=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/jesurun_q5_defconfig b/configs/jesurun_q5_defconfig
index da41bff..5104a39 100644
--- a/configs/jesurun_q5_defconfig
+++ b/configs/jesurun_q5_defconfig
@@ -5,3 +5,4 @@ CONFIG_DRAM_CLK=312
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-jesurun-q5"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI,MACPWR=SUNXI_GPH(19)"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 168b919..4223859 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA124=y
CONFIG_TARGET_JETSON_TK1=y
CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/jornada_defconfig b/configs/jornada_defconfig
index ad1c338..0dc5269 100644
--- a/configs/jornada_defconfig
+++ b/configs/jornada_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_JORNADA=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/jupiter_defconfig b/configs/jupiter_defconfig
index dac4f1a..2caa05b 100644
--- a/configs/jupiter_defconfig
+++ b/configs/jupiter_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_JUPITER=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig
index f9edee5..fba321b 100644
--- a/configs/k2e_evm_defconfig
+++ b/configs/k2e_evm_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_KEYSTONE=y
CONFIG_TARGET_K2E_EVM=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig
index fd959f4..1308beb 100644
--- a/configs/k2hk_evm_defconfig
+++ b/configs/k2hk_evm_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_KEYSTONE=y
CONFIG_TARGET_K2HK_EVM=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig
index 7ab19d5..679e3a8 100644
--- a/configs/k2l_evm_defconfig
+++ b/configs/k2l_evm_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_KEYSTONE=y
CONFIG_TARGET_K2L_EVM=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/katmai_defconfig b/configs/katmai_defconfig
index 02cff2f..554369a 100644
--- a/configs/katmai_defconfig
+++ b/configs/katmai_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_KATMAI=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/kilauea_defconfig b/configs/kilauea_defconfig
index 99c78a9..b0d086d 100644
--- a/configs/kilauea_defconfig
+++ b/configs/kilauea_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_KILAUEA=y
CONFIG_SYS_EXTRA_OPTIONS="KILAUEA"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index 6b69c6d..b0277e7 100644
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16"
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index b7ac8ae..2c1fa1b 100644
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD"
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index 825ad69..70b5d58 100644
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI"
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig
index 4947d1a..a63cf3d 100644
--- a/configs/kmcoge4_defconfig
+++ b/configs/kmcoge4_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_KMP204X=y
CONFIG_SYS_EXTRA_OPTIONS="KMCOGE4"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index a8b5275..b949b1c 100644
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_KM8360=y
CONFIG_SYS_EXTRA_OPTIONS="KMCOGE5NE"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index 3d734d8..51f4020 100644
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig
index 3374ab0..9699d49 100644
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_KM8360=y
CONFIG_SYS_EXTRA_OPTIONS="KMETER1"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig
index fb2c639..cd1b32d 100644
--- a/configs/kmlion1_defconfig
+++ b/configs/kmlion1_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_KMP204X=y
CONFIG_SYS_EXTRA_OPTIONS="KMLION1"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index 97e5f32..09060de 100644
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig
index 11c53b5..b90aae6 100644
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_TUXX1=y
CONFIG_SYS_EXTRA_OPTIONS="KMOPTI2"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig
index 181eff1..510a5a5 100644
--- a/configs/kmsugp1_defconfig
+++ b/configs/kmsugp1_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_SUGP1"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig
index fd4bb9a..ff3c5ff 100644
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_TUXX1=y
CONFIG_SYS_EXTRA_OPTIONS="KMSUPX5"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig
index bb1bee3..ab01012 100644
--- a/configs/kmsuv31_defconfig
+++ b/configs/kmsuv31_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_SUV31"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig
index 512d12c..34b9bc3 100644
--- a/configs/kmvect1_defconfig
+++ b/configs/kmvect1_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_SUVD3=y
CONFIG_SYS_EXTRA_OPTIONS="KMVECT1"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig
index 7ab2bfd..64ee02b 100644
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_TARGET_KOELSCH=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SH_SDHI=y
diff --git a/configs/kwb_defconfig b/configs/kwb_defconfig
index cd2e5e6..8082f0d 100644
--- a/configs/kwb_defconfig
+++ b/configs/kwb_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
CONFIG_TARGET_KWB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
+CONFIG_ENV_IS_IN_MMC=y
# CONFIG_CMD_CRC32 is not set
diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig
index 20656dd..c7a4266 100644
--- a/configs/kzm9g_defconfig
+++ b/configs/kzm9g_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_TARGET_KZM9G=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/lager_defconfig b/configs/lager_defconfig
index 08adfe3..faa4325 100644
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_TARGET_LAGER=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SH_SDHI=y
diff --git a/configs/lcd4_lwmon5_defconfig b/configs/lcd4_lwmon5_defconfig
index 241457a..284a4e8 100644
--- a/configs/lcd4_lwmon5_defconfig
+++ b/configs/lcd4_lwmon5_defconfig
@@ -3,3 +3,4 @@ CONFIG_4xx=y
CONFIG_TARGET_LWMON5=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="LCD4_LWMON5"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/lp8x4x_defconfig b/configs/lp8x4x_defconfig
index 2fc2cbc..6383f44 100644
--- a/configs/lp8x4x_defconfig
+++ b/configs/lp8x4x_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_LP8X4X=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ls1021aqds_ddr4_nor_defconfig b/configs/ls1021aqds_ddr4_nor_defconfig
index caf1ae2..de1c5c6 100644
--- a/configs/ls1021aqds_ddr4_nor_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_LS1021AQDS=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
index ac9a4d5..a2b63bb 100644
--- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_LS1021AQDS=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,LPUART"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ls1021aqds_nand_defconfig b/configs/ls1021aqds_nand_defconfig
index 6f7227d..f3839f7 100644
--- a/configs/ls1021aqds_nand_defconfig
+++ b/configs/ls1021aqds_nand_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_LS1021AQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND_BOOT"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig
index 9e42d61..2b690e4 100644
--- a/configs/ls1021aqds_nor_defconfig
+++ b/configs/ls1021aqds_nor_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_LS1021AQDS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig
index db81c4c..02deb59 100644
--- a/configs/ls1021aqds_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_nor_lpuart_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_LS1021AQDS=y
CONFIG_SYS_EXTRA_OPTIONS="LPUART"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig
index ee3f5ca..f60623a 100644
--- a/configs/ls1021aqds_qspi_defconfig
+++ b/configs/ls1021aqds_qspi_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_LS1021AQDS=y
CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/ls1021aqds_sdcard_defconfig b/configs/ls1021aqds_sdcard_defconfig
index 61cbc12..96d39f2 100644
--- a/configs/ls1021aqds_sdcard_defconfig
+++ b/configs/ls1021aqds_sdcard_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_LS1021AQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
index cd6bc80..03bb4ec 100644
--- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_LS1021ATWR=y
CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig
index 5f465d3..0741a55 100644
--- a/configs/ls1021atwr_nor_defconfig
+++ b/configs/ls1021atwr_nor_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_LS1021ATWR=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ls1021atwr_nor_lpuart_defconfig b/configs/ls1021atwr_nor_lpuart_defconfig
index 1351949..0b3848d 100644
--- a/configs/ls1021atwr_nor_lpuart_defconfig
+++ b/configs/ls1021atwr_nor_lpuart_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_LS1021ATWR=y
CONFIG_SYS_EXTRA_OPTIONS="LPUART"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig
index 57e180d..0d6f804 100644
--- a/configs/ls1021atwr_qspi_defconfig
+++ b/configs/ls1021atwr_qspi_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_LS1021ATWR=y
CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/ls1021atwr_sdcard_defconfig b/configs/ls1021atwr_sdcard_defconfig
index b9217dd..b41bf04 100644
--- a/configs/ls1021atwr_sdcard_defconfig
+++ b/configs/ls1021atwr_sdcard_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_LS1021ATWR=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/ls2085aqds_defconfig b/configs/ls2085aqds_defconfig
index d58b783..e2d8559 100644
--- a/configs/ls2085aqds_defconfig
+++ b/configs/ls2085aqds_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_LS2085AQDS=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ls2085aqds_nand_defconfig b/configs/ls2085aqds_nand_defconfig
index c4ee1ea..51c9e79 100644
--- a/configs/ls2085aqds_nand_defconfig
+++ b/configs/ls2085aqds_nand_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_LS2085AQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/ls2085ardb_defconfig b/configs/ls2085ardb_defconfig
index edf89bf..1302a98 100644
--- a/configs/ls2085ardb_defconfig
+++ b/configs/ls2085ardb_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_LS2085ARDB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ls2085ardb_nand_defconfig b/configs/ls2085ardb_nand_defconfig
index c4f2147..8d0a02f 100644
--- a/configs/ls2085ardb_nand_defconfig
+++ b/configs/ls2085ardb_nand_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_LS2085ARDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
index efd8fca..61d8c5b 100644
--- a/configs/lschlv2_defconfig
+++ b/configs/lschlv2_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_LSXL=y
CONFIG_SYS_EXTRA_OPTIONS="LSCHLV2"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig
index bb3a80e..832b18e 100644
--- a/configs/lsxhl_defconfig
+++ b/configs/lsxhl_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_LSXL=y
CONFIG_SYS_EXTRA_OPTIONS="LSXHL"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/luan_defconfig b/configs/luan_defconfig
index 3ca5ad1..e6031dd 100644
--- a/configs/luan_defconfig
+++ b/configs/luan_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_LUAN=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/lwmon5_defconfig b/configs/lwmon5_defconfig
index 1ae2109..cd73831 100644
--- a/configs/lwmon5_defconfig
+++ b/configs/lwmon5_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_LWMON5=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig
index 9b5e593..5c98214 100644
--- a/configs/m28evk_defconfig
+++ b/configs/m28evk_defconfig
@@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_TARGET_M28EVK=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_REGEX=y
diff --git a/configs/m53evk_defconfig b/configs/m53evk_defconfig
index c918532..a6a497b 100644
--- a/configs/m53evk_defconfig
+++ b/configs/m53evk_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
CONFIG_TARGET_M53EVK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/denx/m53evk/imximage.cfg"
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_REGEX=y
diff --git a/configs/magnesium_defconfig b/configs/magnesium_defconfig
index d45cfd7..9a60a64 100644
--- a/configs/magnesium_defconfig
+++ b/configs/magnesium_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_MAGNESIUM=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/makalu_defconfig b/configs/makalu_defconfig
index 18c7a20..6ac3cee 100644
--- a/configs/makalu_defconfig
+++ b/configs/makalu_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_MAKALU=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/malta_defconfig b/configs/malta_defconfig
index 1035bd6..677d124 100644
--- a/configs/malta_defconfig
+++ b/configs/malta_defconfig
@@ -1,2 +1,3 @@
CONFIG_MIPS=y
CONFIG_TARGET_MALTA=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/maltael_defconfig b/configs/maltael_defconfig
index 011525f..08310e2 100644
--- a/configs/maltael_defconfig
+++ b/configs/maltael_defconfig
@@ -1,3 +1,4 @@
CONFIG_MIPS=y
CONFIG_TARGET_MALTA=y
CONFIG_SYS_LITTLE_ENDIAN=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig
index f54fdd0..1136909 100644
--- a/configs/marsboard_defconfig
+++ b/configs/marsboard_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_EMBESTMX6BOARDS=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,ENV_IS_IN_SPI_FLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig
index 96ff2b9..3bd3d1e 100644
--- a/configs/maxbcm_defconfig
+++ b/configs/maxbcm_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MAXBCM=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig
index be3d50b..dca4f20 100644
--- a/configs/mcx_defconfig
+++ b/configs/mcx_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_MCX=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/mecp5123_defconfig b/configs/mecp5123_defconfig
index 3b0a0a0..9b497fb 100644
--- a/configs/mecp5123_defconfig
+++ b/configs/mecp5123_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC512X=y
CONFIG_TARGET_MECP5123=y
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
index 1be16d8..c212fb5 100644
--- a/configs/medcom-wide_defconfig
+++ b/configs/medcom-wide_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA20=y
CONFIG_TARGET_MEDCOM_WIDE=y
CONFIG_DEFAULT_DEVICE_TREE="tegra20-medcom-wide"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/meesc_dataflash_defconfig b/configs/meesc_dataflash_defconfig
index de1d055..b9dc24c 100644
--- a/configs/meesc_dataflash_defconfig
+++ b/configs/meesc_dataflash_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_MEESC=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/meesc_defconfig b/configs/meesc_defconfig
index e725837..e18461a 100644
--- a/configs/meesc_defconfig
+++ b/configs/meesc_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_MEESC=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/mgcoge3ne_defconfig b/configs/mgcoge3ne_defconfig
index 7b795f5..2237ffd 100644
--- a/configs/mgcoge3ne_defconfig
+++ b/configs/mgcoge3ne_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC8260=y
CONFIG_TARGET_KM82XX=y
CONFIG_SYS_EXTRA_OPTIONS="MGCOGE3NE"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig
index 1f2e436..447d085 100644
--- a/configs/mgcoge3un_defconfig
+++ b/configs/mgcoge3un_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN"
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/mgcoge_defconfig b/configs/mgcoge_defconfig
index 1fb8dfd..8d060d6 100644
--- a/configs/mgcoge_defconfig
+++ b/configs/mgcoge_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC8260=y
CONFIG_TARGET_KM82XX=y
CONFIG_SYS_EXTRA_OPTIONS="MGCOGE"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 77e07da..0d5ac16 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -2,5 +2,6 @@ CONFIG_MICROBLAZE=y
CONFIG_TARGET_MICROBLAZE_GENERIC=y
CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic"
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
diff --git a/configs/mimc200_defconfig b/configs/mimc200_defconfig
index f6edbc7..dc500d9 100644
--- a/configs/mimc200_defconfig
+++ b/configs/mimc200_defconfig
@@ -1,2 +1,3 @@
CONFIG_AVR32=y
CONFIG_TARGET_MIMC200=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/mixtile_loftq_defconfig b/configs/mixtile_loftq_defconfig
index 5c60634..3e86418 100644
--- a/configs/mixtile_loftq_defconfig
+++ b/configs/mixtile_loftq_defconfig
@@ -8,5 +8,6 @@ CONFIG_USB2_VBUS_PIN=""
CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-mixtile-loftq"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP221_ALDO1_VOLT=3300
diff --git a/configs/mk802_a10s_defconfig b/configs/mk802_a10s_defconfig
index 4994936..d173705 100644
--- a/configs/mk802_a10s_defconfig
+++ b/configs/mk802_a10s_defconfig
@@ -7,3 +7,4 @@ CONFIG_USB1_VBUS_PIN="PB10"
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-mk802"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mk802_defconfig b/configs/mk802_defconfig
index 1a9a361..e788ff3 100644
--- a/configs/mk802_defconfig
+++ b/configs/mk802_defconfig
@@ -5,3 +5,4 @@ CONFIG_USB2_VBUS_PIN="PH12"
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mk802"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mk802ii_defconfig b/configs/mk802ii_defconfig
index 3850fba..e389008 100644
--- a/configs/mk802ii_defconfig
+++ b/configs/mk802ii_defconfig
@@ -4,3 +4,4 @@ CONFIG_MACH_SUN4I=y
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mk802ii"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/ml507_defconfig b/configs/ml507_defconfig
index cbd37b3..79d3020 100644
--- a/configs/ml507_defconfig
+++ b/configs/ml507_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_ML507=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1,INIT_TLB=board/xilinx/ppc440-generic/init.o"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ml507_flash_defconfig b/configs/ml507_flash_defconfig
index fba47ef..20b8b31 100644
--- a/configs/ml507_flash_defconfig
+++ b/configs/ml507_flash_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_ML507=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC,INIT_TLB=board/xilinx/ppc440-generic/init.o"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/motionpro_defconfig b/configs/motionpro_defconfig
index 535cb84..9a5eb53 100644
--- a/configs/motionpro_defconfig
+++ b/configs/motionpro_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_MOTIONPRO=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/mpc5121ads_defconfig b/configs/mpc5121ads_defconfig
index 4d76470..4501b38 100644
--- a/configs/mpc5121ads_defconfig
+++ b/configs/mpc5121ads_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC512X=y
CONFIG_TARGET_MPC5121ADS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/mpc5121ads_rev2_defconfig b/configs/mpc5121ads_rev2_defconfig
index bda0863..6fbe1b1 100644
--- a/configs/mpc5121ads_rev2_defconfig
+++ b/configs/mpc5121ads_rev2_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC512X=y
CONFIG_TARGET_MPC5121ADS=y
CONFIG_SYS_EXTRA_OPTIONS="MPC5121ADS_REV2"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/mpc8308_p1m_defconfig b/configs/mpc8308_p1m_defconfig
index 2b8fc4e..f6f78b9 100644
--- a/configs/mpc8308_p1m_defconfig
+++ b/configs/mpc8308_p1m_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8308_P1M=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ms7720se_defconfig b/configs/ms7720se_defconfig
index 0e3f834..1cd3439 100644
--- a/configs/ms7720se_defconfig
+++ b/configs/ms7720se_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_MS7720SE=y
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/ms7722se_defconfig b/configs/ms7722se_defconfig
index 4acb509..4178e3d 100644
--- a/configs/ms7722se_defconfig
+++ b/configs/ms7722se_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_MS7722SE=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/ms7750se_defconfig b/configs/ms7750se_defconfig
index c23e4c9..31230f7 100644
--- a/configs/ms7750se_defconfig
+++ b/configs/ms7750se_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_MS7750SE=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
index 7092f76..1cea25c 100644
--- a/configs/mt_ventoux_defconfig
+++ b/configs/mt_ventoux_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_MT_VENTOUX=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/munices_defconfig b/configs/munices_defconfig
index cc9f75e..9ac3eb5 100644
--- a/configs/munices_defconfig
+++ b/configs/munices_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_MUNICES=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/mv88f6281gtw_ge_defconfig b/configs/mv88f6281gtw_ge_defconfig
index 0650032..9fd495c 100644
--- a/configs/mv88f6281gtw_ge_defconfig
+++ b/configs/mv88f6281gtw_ge_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_MV88F6281GTW_GE=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/mx23_olinuxino_defconfig b/configs/mx23_olinuxino_defconfig
index 491e5ad..4263330 100644
--- a/configs/mx23_olinuxino_defconfig
+++ b/configs/mx23_olinuxino_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX23_OLINUXINO=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx23evk_defconfig b/configs/mx23evk_defconfig
index c386bba..ccfa66c 100644
--- a/configs/mx23evk_defconfig
+++ b/configs/mx23evk_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX23EVK=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx25pdk_defconfig b/configs/mx25pdk_defconfig
index 99af9df..c8a08ea 100644
--- a/configs/mx25pdk_defconfig
+++ b/configs/mx25pdk_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX25PDK=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx25pdk/imximage.cfg"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig
index 353f827..848e301 100644
--- a/configs/mx28evk_auart_console_defconfig
+++ b/configs/mx28evk_auart_console_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_MX28EVK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE,ENV_IS_IN_MMC"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig
index 8399cbd..11dc0e5 100644
--- a/configs/mx28evk_defconfig
+++ b/configs/mx28evk_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_MX28EVK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig
index 20e2bd4..2d9a42c 100644
--- a/configs/mx28evk_nand_defconfig
+++ b/configs/mx28evk_nand_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_MX28EVK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig
index 5411e47..403a3d8 100644
--- a/configs/mx28evk_spi_defconfig
+++ b/configs/mx28evk_spi_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_MX28EVK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_SPI_FLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/mx31ads_defconfig b/configs/mx31ads_defconfig
index 5105a9a..5552266 100644
--- a/configs/mx31ads_defconfig
+++ b/configs/mx31ads_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_MX31ADS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/mx31pdk_defconfig b/configs/mx31pdk_defconfig
index 3c961b4..730cd22 100644
--- a/configs/mx31pdk_defconfig
+++ b/configs/mx31pdk_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX31PDK=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/mx35pdk_defconfig b/configs/mx35pdk_defconfig
index 3d79fe1..2b54d32 100644
--- a/configs/mx35pdk_defconfig
+++ b/configs/mx35pdk_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_MX35PDK=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/mx51_efikamx_defconfig b/configs/mx51_efikamx_defconfig
index 89b2527..fea3f99 100644
--- a/configs/mx51_efikamx_defconfig
+++ b/configs/mx51_efikamx_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX51_EFIKAMX=y
CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_mx.cfg"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/mx51_efikasb_defconfig b/configs/mx51_efikasb_defconfig
index b7faacf..c4a98d7 100644
--- a/configs/mx51_efikasb_defconfig
+++ b/configs/mx51_efikasb_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX51_EFIKAMX=y
CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_sb.cfg"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig
index b3ac9f6..f6d3f44 100644
--- a/configs/mx51evk_defconfig
+++ b/configs/mx51evk_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX51EVK=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx51evk/imximage.cfg"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx53ard_defconfig b/configs/mx53ard_defconfig
index 988a7fd..fde7ad8 100644
--- a/configs/mx53ard_defconfig
+++ b/configs/mx53ard_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX53ARD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53ard/imximage_dd3.cfg"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx53evk_defconfig b/configs/mx53evk_defconfig
index 73e6095..837d16a 100644
--- a/configs/mx53evk_defconfig
+++ b/configs/mx53evk_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX53EVK=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53evk/imximage.cfg"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig
index 8bb225b..bcb2fed 100644
--- a/configs/mx53loco_defconfig
+++ b/configs/mx53loco_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX53LOCO=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53loco/imximage.cfg"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx53smd_defconfig b/configs/mx53smd_defconfig
index bb8b8eb..d86041e 100644
--- a/configs/mx53smd_defconfig
+++ b/configs/mx53smd_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX53SMD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53smd/imximage.cfg"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig
index 68eec29..3792b2f 100644
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@ -2,5 +2,6 @@ CONFIG_ARM=y
CONFIG_TARGET_MX6CUBOXI=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_DM=y
CONFIG_DM_THERMAL=y
diff --git a/configs/mx6dlarm2_defconfig b/configs/mx6dlarm2_defconfig
index e2711ec..4157d22 100644
--- a/configs/mx6dlarm2_defconfig
+++ b/configs/mx6dlarm2_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX6QARM2=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,DDR_MB=2048"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx6dlarm2_lpddr2_defconfig b/configs/mx6dlarm2_lpddr2_defconfig
index f8af528..dea3ab3 100644
--- a/configs/mx6dlarm2_lpddr2_defconfig
+++ b/configs/mx6dlarm2_lpddr2_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX6QARM2=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,MX6DL_LPDDR2,DDR_MB=512"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
index 1f19dc3..3c07681 100644
--- a/configs/mx6dlsabreauto_defconfig
+++ b/configs/mx6dlsabreauto_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX6QSABREAUTO=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig
index 5ca0e26..50f7a8e 100644
--- a/configs/mx6dlsabresd_defconfig
+++ b/configs/mx6dlsabresd_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX6SABRESD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg,MX6DL"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx6qarm2_defconfig b/configs/mx6qarm2_defconfig
index f229702..3444823 100644
--- a/configs/mx6qarm2_defconfig
+++ b/configs/mx6qarm2_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX6QARM2=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,DDR_MB=2048"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx6qarm2_lpddr2_defconfig b/configs/mx6qarm2_lpddr2_defconfig
index 477a692..e8bbb10 100644
--- a/configs/mx6qarm2_lpddr2_defconfig
+++ b/configs/mx6qarm2_lpddr2_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX6QARM2=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,MX6DQ_LPDDR2,DDR_MB=512"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
index 595177c..637c658 100644
--- a/configs/mx6qsabreauto_defconfig
+++ b/configs/mx6qsabreauto_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX6QSABREAUTO=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index 012ab6b2..89a1849 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_NITROGEN6X=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_DM=y
CONFIG_DM_THERMAL=y
diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig
index 821c251..b6d4092 100644
--- a/configs/mx6qsabresd_defconfig
+++ b/configs/mx6qsabresd_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX6SABRESD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig
index 0589c48..36e4564 100644
--- a/configs/mx6sabresd_spl_defconfig
+++ b/configs/mx6sabresd_spl_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_MX6SABRESD=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig
index ed9f836..2077849 100644
--- a/configs/mx6slevk_defconfig
+++ b/configs/mx6slevk_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_MX6SLEVK=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_DM=y
CONFIG_DM_THERMAL=y
diff --git a/configs/mx6slevk_spinor_defconfig b/configs/mx6slevk_spinor_defconfig
index d0c993a..8dd7d0e 100644
--- a/configs/mx6slevk_spinor_defconfig
+++ b/configs/mx6slevk_spinor_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_MX6SLEVK=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL,SYS_BOOT_SPINOR"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_DM=y
CONFIG_DM_THERMAL=y
diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig
index 65590bb..07fa9a3 100644
--- a/configs/mx6sxsabresd_defconfig
+++ b/configs/mx6sxsabresd_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_MX6SXSABRESD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,MX6SX"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig
index 3bafa12..c49a1e0 100644
--- a/configs/mx6sxsabresd_spl_defconfig
+++ b/configs/mx6sxsabresd_spl_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_MX6SXSABRESD=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SX"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index 5a79c51..a7a671b 100644
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NAS220=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/neo_defconfig b/configs/neo_defconfig
index bc28353..2c48c08 100644
--- a/configs/neo_defconfig
+++ b/configs/neo_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_NEO=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index d27182b..307047b 100644
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NET2BIG_V2=y
CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index 02c82c5..03dcbaa 100644
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NETSPACE_V2=y
CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index bdabbf5..7d075ca 100644
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NETSPACE_V2=y
CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index a372ddc..73a74b6 100644
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NETSPACE_V2=y
CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index c83d398..bf602da 100644
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NETSPACE_V2=y
CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/nhk8815_defconfig b/configs/nhk8815_defconfig
index f661226..efc2596 100644
--- a/configs/nhk8815_defconfig
+++ b/configs/nhk8815_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_NOMADIK=y
CONFIG_NOMADIK_NHK8815=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/nhk8815_onenand_defconfig b/configs/nhk8815_onenand_defconfig
index c334e61..faff997 100644
--- a/configs/nhk8815_onenand_defconfig
+++ b/configs/nhk8815_onenand_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_NOMADIK=y
CONFIG_NOMADIK_NHK8815=y
CONFIG_SYS_EXTRA_OPTIONS="BOOT_ONENAND"
+CONFIG_ENV_IS_IN_ONENAND=y
diff --git a/configs/nios2-generic_defconfig b/configs/nios2-generic_defconfig
index f6da884..f987bf3 100644
--- a/configs/nios2-generic_defconfig
+++ b/configs/nios2-generic_defconfig
@@ -1,2 +1,3 @@
CONFIG_NIOS2=y
CONFIG_TARGET_NIOS2_GENERIC=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index 04439cd..0f55978 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_NITROGEN6X=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index d0f3d08..8e2872a 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_NITROGEN6X=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index b8bf23f..2a5bfd2 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_NITROGEN6X=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index 525794c..899475e 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_NITROGEN6X=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index 4d59075..dc691da 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_NITROGEN6X=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index efeab49..2a5533c 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_NITROGEN6X=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index 0baa16d..c295c4d 100644
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
CONFIG_TARGET_KOSAGI_NOVENA=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_REGEX=y
diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index 0d2ed51..b7fdbd5 100644
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA124=y
CONFIG_TARGET_NYAN_BIG=y
CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/ocotea_defconfig b/configs/ocotea_defconfig
index c0fa6ce..f68aaf9 100644
--- a/configs/ocotea_defconfig
+++ b/configs/ocotea_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_OCOTEA=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
index 3f4c2cb..6aee461 100644
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_ODROID_XU3=y
CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index a63fe96..59eee47 100644
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_ODROID=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_OF_CONTROL=y
CONFIG_DM_I2C=y
CONFIG_DM_I2C_COMPAT=y
diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
index 07cb186..186228c 100644
--- a/configs/omap3_beagle_defconfig
+++ b/configs/omap3_beagle_defconfig
@@ -3,3 +3,4 @@ CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_BEAGLE=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig
index a48a1e0..fb4f371 100644
--- a/configs/omap3_ha_defconfig
+++ b/configs/omap3_ha_defconfig
@@ -3,3 +3,4 @@ CONFIG_OMAP34XX=y
CONFIG_TARGET_TAO3530=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_BOARD_OMAP3_HA"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index 5f2c063..f1b9bb1 100644
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_LOGIC=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig
index eb431ec..6b0b357 100644
--- a/configs/omap3_overo_defconfig
+++ b/configs/omap3_overo_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_OVERO=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig
index bf28537..083a1a8 100644
--- a/configs/omap3_pandora_defconfig
+++ b/configs/omap3_pandora_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_PANDORA=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/omap3_sdp3430_defconfig b/configs/omap3_sdp3430_defconfig
index 1172c2a..821ed82 100644
--- a/configs/omap3_sdp3430_defconfig
+++ b/configs/omap3_sdp3430_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_SDP3430=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig
index e2d0a8c..5533f2e 100644
--- a/configs/omap3_zoom1_defconfig
+++ b/configs/omap3_zoom1_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_ZOOM1=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig
index c8e278b..e932fab 100644
--- a/configs/omap4_panda_defconfig
+++ b/configs/omap4_panda_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_OMAP44XX=y
CONFIG_TARGET_OMAP4_PANDA=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_FAT=y
diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig
index 0598136..fdd52a8 100644
--- a/configs/omap4_sdp4430_defconfig
+++ b/configs/omap4_sdp4430_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_OMAP44XX=y
CONFIG_TARGET_OMAP4_SDP4430=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig
index 88411ce..bc655a9 100644
--- a/configs/omap5_uevm_defconfig
+++ b/configs/omap5_uevm_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_OMAP54XX=y
CONFIG_TARGET_OMAP5_UEVM=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig
index 148e06a..6641917 100644
--- a/configs/omapl138_lcdk_defconfig
+++ b/configs/omapl138_lcdk_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_OMAPL138_LCDK=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig
index d7c2aee..9e1c0fb 100644
--- a/configs/openrd_base_defconfig
+++ b/configs/openrd_base_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_OPENRD=y
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_BASE"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig
index 2c03cf2..03444d0 100644
--- a/configs/openrd_client_defconfig
+++ b/configs/openrd_client_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_OPENRD=y
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_CLIENT"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig
index 4f37a94..70963b1 100644
--- a/configs/openrd_ultimate_defconfig
+++ b/configs/openrd_ultimate_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_OPENRD=y
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_ULTIMATE"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/origen_defconfig b/configs/origen_defconfig
index 53257d6..29420f8 100644
--- a/configs/origen_defconfig
+++ b/configs/origen_defconfig
@@ -3,4 +3,5 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_ORIGEN=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen"
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_OF_CONTROL=y
diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig
index fae11ea..c4c204b 100644
--- a/configs/ot1200_defconfig
+++ b/configs/ot1200_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_OT1200=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx6q_4x_mt41j128.cfg,MX6Q"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig
index 2d23923..37f88ca 100644
--- a/configs/ot1200_spl_defconfig
+++ b/configs/ot1200_spl_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_OT1200=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/otc570_dataflash_defconfig b/configs/otc570_dataflash_defconfig
index 1c04762..5c8928f 100644
--- a/configs/otc570_dataflash_defconfig
+++ b/configs/otc570_dataflash_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_OTC570=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/otc570_defconfig b/configs/otc570_defconfig
index f0358bb..2481603 100644
--- a/configs/otc570_defconfig
+++ b/configs/otc570_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_OTC570=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/p3p440_defconfig b/configs/p3p440_defconfig
index 0511b14..344e421 100644
--- a/configs/p3p440_defconfig
+++ b/configs/p3p440_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_P3P440=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/palmld_defconfig b/configs/palmld_defconfig
index 599acc3..8f1581e 100644
--- a/configs/palmld_defconfig
+++ b/configs/palmld_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_PALMLD=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/palmtc_defconfig b/configs/palmtc_defconfig
index 91cb76d..2b6c12a 100644
--- a/configs/palmtc_defconfig
+++ b/configs/palmtc_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_PALMTC=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index e18017b..f1cea9e 100644
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA20=y
CONFIG_TARGET_PAZ00=y
CONFIG_DEFAULT_DEVICE_TREE="tegra20-paz00"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/pcm030_LOWBOOT_defconfig b/configs/pcm030_LOWBOOT_defconfig
index 601de5f..9477919 100644
--- a/configs/pcm030_LOWBOOT_defconfig
+++ b/configs/pcm030_LOWBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_PCM030=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFF000000"
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/pcm030_defconfig b/configs/pcm030_defconfig
index 3283517..5fbd1d3 100644
--- a/configs/pcm030_defconfig
+++ b/configs/pcm030_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_PCM030=y
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/pcs440ep_defconfig b/configs/pcs440ep_defconfig
index 299bf8a..a845eed 100644
--- a/configs/pcs440ep_defconfig
+++ b/configs/pcs440ep_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_PCS440EP=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/pdm360ng_defconfig b/configs/pdm360ng_defconfig
index 4e3d704..6575133 100644
--- a/configs/pdm360ng_defconfig
+++ b/configs/pdm360ng_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC512X=y
CONFIG_TARGET_PDM360NG=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
index 865f52c..4c576a8 100644
--- a/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_PEACH_PI=y
CONFIG_DEFAULT_DEVICE_TREE="exynos5800-peach-pi"
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_CROS_EC=y
CONFIG_CROS_EC=y
CONFIG_CROS_EC_SPI=y
diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index b850092..9995568 100644
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_PEACH_PIT=y
CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit"
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_CROS_EC=y
CONFIG_CROS_EC=y
CONFIG_CROS_EC_SPI=y
diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig
index 502c4f0..ec3e7bd 100644
--- a/configs/pengwyn_defconfig
+++ b/configs/pengwyn_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_PENGWYN=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig
index c80c3cb..f607574 100644
--- a/configs/platinum_picon_defconfig
+++ b/configs/platinum_picon_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_PLATINUM_PICON=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig
index 303de5c..6561aed 100644
--- a/configs/platinum_titanium_defconfig
+++ b/configs/platinum_titanium_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_PLATINUM_TITANIUM=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
index d5f6a1f..248ca54 100644
--- a/configs/plutux_defconfig
+++ b/configs/plutux_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA20=y
CONFIG_TARGET_PLUTUX=y
CONFIG_DEFAULT_DEVICE_TREE="tegra20-plutux"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig
index c557e97..9b3333f 100644
--- a/configs/pm9261_defconfig
+++ b/configs/pm9261_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_PM9261=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig
index f14f0a7..5a03dcd 100644
--- a/configs/pm9263_defconfig
+++ b/configs/pm9263_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_PM9263=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/pm9g45_defconfig b/configs/pm9g45_defconfig
index f188cd5..4de4341 100644
--- a/configs/pm9g45_defconfig
+++ b/configs/pm9g45_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_PM9G45=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G45"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
index 97effef..aa62db7 100644
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_POGO_E02=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/polaris_defconfig b/configs/polaris_defconfig
index 284a63e..2d6f699 100644
--- a/configs/polaris_defconfig
+++ b/configs/polaris_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_TRIZEPSIV=y
CONFIG_SYS_EXTRA_OPTIONS="POLARIS"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/porter_defconfig b/configs/porter_defconfig
index a7b044e..4d200f4 100644
--- a/configs/porter_defconfig
+++ b/configs/porter_defconfig
@@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_TARGET_PORTER=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SH_SDHI=y
diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig
index 52867ff..51c2588 100644
--- a/configs/portl2_defconfig
+++ b/configs/portl2_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_PORTL2"
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/portuxg20_defconfig b/configs/portuxg20_defconfig
index 29184e6..f2c2233 100644
--- a/configs/portuxg20_defconfig
+++ b/configs/portuxg20_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_STAMP9G20=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,PORTUXG20"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/pxa255_idp_defconfig b/configs/pxa255_idp_defconfig
index 251d6c4..887c1e0 100644
--- a/configs/pxa255_idp_defconfig
+++ b/configs/pxa255_idp_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_PXA255_IDP=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index db2b03a..585f1f75 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_PXM2=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/qemu_mips64_defconfig b/configs/qemu_mips64_defconfig
index 691c505..36da677 100644
--- a/configs/qemu_mips64_defconfig
+++ b/configs/qemu_mips64_defconfig
@@ -1,3 +1,4 @@
CONFIG_MIPS=y
CONFIG_TARGET_QEMU_MIPS=y
CONFIG_CPU_MIPS64_R1=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/qemu_mips64el_defconfig b/configs/qemu_mips64el_defconfig
index a9ebd7b..ccbb4cf 100644
--- a/configs/qemu_mips64el_defconfig
+++ b/configs/qemu_mips64el_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
CONFIG_TARGET_QEMU_MIPS=y
CONFIG_SYS_LITTLE_ENDIAN=y
CONFIG_CPU_MIPS64_R1=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/qemu_mips_defconfig b/configs/qemu_mips_defconfig
index 2f767d6..774e27a 100644
--- a/configs/qemu_mips_defconfig
+++ b/configs/qemu_mips_defconfig
@@ -1,2 +1,3 @@
CONFIG_MIPS=y
CONFIG_TARGET_QEMU_MIPS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/qemu_mipsel_defconfig b/configs/qemu_mipsel_defconfig
index d0acb28..f6eb7a2 100644
--- a/configs/qemu_mipsel_defconfig
+++ b/configs/qemu_mipsel_defconfig
@@ -1,3 +1,4 @@
CONFIG_MIPS=y
CONFIG_TARGET_QEMU_MIPS=y
CONFIG_SYS_LITTLE_ENDIAN=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/qong_defconfig b/configs/qong_defconfig
index fddd836..4be1378 100644
--- a/configs/qong_defconfig
+++ b/configs/qong_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_QONG=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/r0p7734_defconfig b/configs/r0p7734_defconfig
index 2b2d2cd..721619d 100644
--- a/configs/r0p7734_defconfig
+++ b/configs/r0p7734_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_R0P7734=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig
index 87de323..b4a070a 100644
--- a/configs/r2dplus_defconfig
+++ b/configs/r2dplus_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_R2DPLUS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig
index bc1657d..121a6c4 100644
--- a/configs/r7-tv-dongle_defconfig
+++ b/configs/r7-tv-dongle_defconfig
@@ -6,3 +6,4 @@ CONFIG_USB1_VBUS_PIN="PG13"
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-r7-tv-dongle"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/r7780mp_defconfig b/configs/r7780mp_defconfig
index 7e201f5..8db59ce 100644
--- a/configs/r7780mp_defconfig
+++ b/configs/r7780mp_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_R7780MP=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/rainier_defconfig b/configs/rainier_defconfig
index 1713592..2d74709 100644
--- a/configs/rainier_defconfig
+++ b/configs/rainier_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_SEQUOIA=y
CONFIG_SYS_EXTRA_OPTIONS="RAINIER"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/rd6281a_defconfig b/configs/rd6281a_defconfig
index ed083bf..537d5db 100644
--- a/configs/rd6281a_defconfig
+++ b/configs/rd6281a_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_RD6281A=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/redwood_defconfig b/configs/redwood_defconfig
index 36840dd..f55e154 100644
--- a/configs/redwood_defconfig
+++ b/configs/redwood_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_REDWOOD=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index c0b689b..e611ea9 100644
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_EMBESTMX6BOARDS=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024,ENV_IS_IN_MMC"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index 965fcae..ae4130d 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_BCM283X=y
CONFIG_TARGET_RPI_2=y
+CONFIG_ENV_IS_IN_FAT=y
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index 8de1d9f..3c7b2eb 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_BCM283X=y
CONFIG_TARGET_RPI=y
+CONFIG_ENV_IS_IN_FAT=y
diff --git a/configs/rsk7203_defconfig b/configs/rsk7203_defconfig
index 44c0bc8..65d733c 100644
--- a/configs/rsk7203_defconfig
+++ b/configs/rsk7203_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_RSK7203=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/rsk7264_defconfig b/configs/rsk7264_defconfig
index aedc333..fe55b19 100644
--- a/configs/rsk7264_defconfig
+++ b/configs/rsk7264_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_RSK7264=y
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/rsk7269_defconfig b/configs/rsk7269_defconfig
index 25fdf80..73b66c9 100644
--- a/configs/rsk7269_defconfig
+++ b/configs/rsk7269_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_RSK7269=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index fd90d2d..5b678bf 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_RUT=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig
index 618e590..7a2f08c 100644
--- a/configs/s5p_goni_defconfig
+++ b/configs/s5p_goni_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_S5PC1XX=y
CONFIG_TARGET_S5P_GONI=y
CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
index 03a28ba..2956857 100644
--- a/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_S5PC210_UNIVERSAL=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_OF_CONTROL=y
diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig
index 9bcac2c..cfef85b 100644
--- a/configs/sama5d3_xplained_mmc_defconfig
+++ b/configs/sama5d3_xplained_mmc_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_SAMA5D3_XPLAINED=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC"
+CONFIG_ENV_IS_IN_FAT=y
diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig
index 39cc95d..a829fa5 100644
--- a/configs/sama5d3_xplained_nandflash_defconfig
+++ b/configs/sama5d3_xplained_nandflash_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_SAMA5D3_XPLAINED=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig
index 1aad37e..fef864f 100644
--- a/configs/sama5d3xek_mmc_defconfig
+++ b/configs/sama5d3xek_mmc_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_SAMA5D3XEK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC"
+CONFIG_ENV_IS_IN_FAT=y
diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig
index ada612c..3fd7cc7 100644
--- a/configs/sama5d3xek_nandflash_defconfig
+++ b/configs/sama5d3xek_nandflash_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_SAMA5D3XEK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig
index 675189d..70c1b58 100644
--- a/configs/sama5d3xek_spiflash_defconfig
+++ b/configs/sama5d3xek_spiflash_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_SAMA5D3XEK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_SERIALFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig
index 1ea23f7..5dc809b 100644
--- a/configs/sama5d4_xplained_mmc_defconfig
+++ b/configs/sama5d4_xplained_mmc_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_SAMA5D4_XPLAINED=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
+CONFIG_ENV_IS_IN_FAT=y
diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig
index a358eb0..5d57bf5 100644
--- a/configs/sama5d4_xplained_nandflash_defconfig
+++ b/configs/sama5d4_xplained_nandflash_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_SAMA5D4_XPLAINED=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig
index 06457e7..6d47d7d 100644
--- a/configs/sama5d4_xplained_spiflash_defconfig
+++ b/configs/sama5d4_xplained_spiflash_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_SAMA5D4_XPLAINED=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig
index e5dbe92..150efb7 100644
--- a/configs/sama5d4ek_mmc_defconfig
+++ b/configs/sama5d4ek_mmc_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_SAMA5D4EK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
+CONFIG_ENV_IS_IN_FAT=y
diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig
index fa6f58b..a6b110b 100644
--- a/configs/sama5d4ek_nandflash_defconfig
+++ b/configs/sama5d4ek_nandflash_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_SAMA5D4EK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig
index 8b03ea8..fc4c643 100644
--- a/configs/sama5d4ek_spiflash_defconfig
+++ b/configs/sama5d4ek_spiflash_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_SAMA5D4EK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/sbc35_a9g20_eeprom_defconfig b/configs/sbc35_a9g20_eeprom_defconfig
index 6e7589c..5947c88 100644
--- a/configs/sbc35_a9g20_eeprom_defconfig
+++ b/configs/sbc35_a9g20_eeprom_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_SBC35_A9G20=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_EEPROM"
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/sbc35_a9g20_nandflash_defconfig b/configs/sbc35_a9g20_nandflash_defconfig
index 3092ea3..d26aade 100644
--- a/configs/sbc35_a9g20_nandflash_defconfig
+++ b/configs/sbc35_a9g20_nandflash_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_SBC35_A9G20=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/sbc405_defconfig b/configs/sbc405_defconfig
index b34cbb7..22f3756 100644
--- a/configs/sbc405_defconfig
+++ b/configs/sbc405_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_SBC405=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/sbc8349_PCI_33_defconfig b/configs/sbc8349_PCI_33_defconfig
index 84ae579..83de81c 100644
--- a/configs/sbc8349_PCI_33_defconfig
+++ b/configs/sbc8349_PCI_33_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_SBC8349=y
CONFIG_SYS_EXTRA_OPTIONS="PCI,PCI_33M"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/sbc8349_PCI_66_defconfig b/configs/sbc8349_PCI_66_defconfig
index f8bdfb6..1e08ec3 100644
--- a/configs/sbc8349_PCI_66_defconfig
+++ b/configs/sbc8349_PCI_66_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_SBC8349=y
CONFIG_SYS_EXTRA_OPTIONS="PCI,PCI_66M"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/sbc8349_defconfig b/configs/sbc8349_defconfig
index f1808e8..27e292d 100644
--- a/configs/sbc8349_defconfig
+++ b/configs/sbc8349_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_SBC8349=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/sbc8548_PCI_33_PCIE_defconfig b/configs/sbc8548_PCI_33_PCIE_defconfig
index fa4f0c1..3f54977 100644
--- a/configs/sbc8548_PCI_33_PCIE_defconfig
+++ b/configs/sbc8548_PCI_33_PCIE_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_SBC8548=y
CONFIG_SYS_EXTRA_OPTIONS="PCI,33,PCIE"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/sbc8548_PCI_33_defconfig b/configs/sbc8548_PCI_33_defconfig
index 23da2b6..2f20233 100644
--- a/configs/sbc8548_PCI_33_defconfig
+++ b/configs/sbc8548_PCI_33_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_SBC8548=y
CONFIG_SYS_EXTRA_OPTIONS="PCI,33"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/sbc8548_PCI_66_PCIE_defconfig b/configs/sbc8548_PCI_66_PCIE_defconfig
index a9d8fb5..7ea9971 100644
--- a/configs/sbc8548_PCI_66_PCIE_defconfig
+++ b/configs/sbc8548_PCI_66_PCIE_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_SBC8548=y
CONFIG_SYS_EXTRA_OPTIONS="PCI,66,PCIE"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/sbc8548_PCI_66_defconfig b/configs/sbc8548_PCI_66_defconfig
index 8f2cc37..c72fb11 100644
--- a/configs/sbc8548_PCI_66_defconfig
+++ b/configs/sbc8548_PCI_66_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_SBC8548=y
CONFIG_SYS_EXTRA_OPTIONS="PCI,66"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/sbc8548_defconfig b/configs/sbc8548_defconfig
index b74f7bc..8a48e41 100644
--- a/configs/sbc8548_defconfig
+++ b/configs/sbc8548_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_SBC8548=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/sbc8641d_defconfig b/configs/sbc8641d_defconfig
index 6b89473..1192bfc 100644
--- a/configs/sbc8641d_defconfig
+++ b/configs/sbc8641d_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC86xx=y
CONFIG_TARGET_SBC8641D=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/sc_sps_1_defconfig b/configs/sc_sps_1_defconfig
index 7148bb7..f14509d 100644
--- a/configs/sc_sps_1_defconfig
+++ b/configs/sc_sps_1_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_SC_SPS_1=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/scb9328_defconfig b/configs/scb9328_defconfig
index 048caeb..bc312fa 100644
--- a/configs/scb9328_defconfig
+++ b/configs/scb9328_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_SCB9328=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 327a670..2238634 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA20=y
CONFIG_TARGET_SEABOARD=y
CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/secomx6quq7_defconfig b/configs/secomx6quq7_defconfig
index aa5b3bb..f584029 100644
--- a/configs/secomx6quq7_defconfig
+++ b/configs/secomx6quq7_defconfig
@@ -5,3 +5,4 @@ CONFIG_SECOMX6_UQ7=y
CONFIG_SECOMX6Q=y
CONFIG_SECOMX6_2GB=y
CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/sequoia_defconfig b/configs/sequoia_defconfig
index 3164728..7b2691e 100644
--- a/configs/sequoia_defconfig
+++ b/configs/sequoia_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_SEQUOIA=y
CONFIG_SYS_EXTRA_OPTIONS="SEQUOIA"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/sh7752evb_defconfig b/configs/sh7752evb_defconfig
index 1f7c6d0..eb53a31 100644
--- a/configs/sh7752evb_defconfig
+++ b/configs/sh7752evb_defconfig
@@ -1,3 +1,4 @@
CONFIG_SH=y
CONFIG_SH_32BIT=y
CONFIG_TARGET_SH7752EVB=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/sh7753evb_defconfig b/configs/sh7753evb_defconfig
index 9ff4121..4889e5c 100644
--- a/configs/sh7753evb_defconfig
+++ b/configs/sh7753evb_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_SH7753EVB=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig
index ffcf961..97c4db1 100644
--- a/configs/sh7757lcr_defconfig
+++ b/configs/sh7757lcr_defconfig
@@ -1,3 +1,4 @@
CONFIG_SH=y
CONFIG_SH_32BIT=y
CONFIG_TARGET_SH7757LCR=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/sh7763rdp_defconfig b/configs/sh7763rdp_defconfig
index 8857e8a..2653e44 100644
--- a/configs/sh7763rdp_defconfig
+++ b/configs/sh7763rdp_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_SH7763RDP=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/sh7785lcr_32bit_defconfig b/configs/sh7785lcr_32bit_defconfig
index 31b84ff..ef6023d 100644
--- a/configs/sh7785lcr_32bit_defconfig
+++ b/configs/sh7785lcr_32bit_defconfig
@@ -1,3 +1,4 @@
CONFIG_SH=y
CONFIG_SH_32BIT=y
CONFIG_TARGET_SH7785LCR=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/sh7785lcr_defconfig b/configs/sh7785lcr_defconfig
index 31d2c38..e4fc138 100644
--- a/configs/sh7785lcr_defconfig
+++ b/configs/sh7785lcr_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_SH7785LCR=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index d22b006..b9ff68d 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_SHEEVAPLUG=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/shmin_defconfig b/configs/shmin_defconfig
index 74c3550..4864240 100644
--- a/configs/shmin_defconfig
+++ b/configs/shmin_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_SHMIN=y
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/silk_defconfig b/configs/silk_defconfig
index 3c6f16e..fc18b9e 100644
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_TARGET_SILK=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SH_SDHI=y
diff --git a/configs/smdk2410_defconfig b/configs/smdk2410_defconfig
index fec4ba6..86eb7fd 100644
--- a/configs/smdk2410_defconfig
+++ b/configs/smdk2410_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_SMDK2410=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index fb872de..a8fcd21 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_SMDK5250=y
CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_SOUND=y
CONFIG_SOUND=y
CONFIG_I2S=y
diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index b9949d3..ca34924 100644
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_SMDK5420=y
CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420"
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig
index ac9bd25..0451417 100644
--- a/configs/smdkc100_defconfig
+++ b/configs/smdkc100_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_S5PC1XX=y
CONFIG_TARGET_SMDKC100=y
CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100"
+CONFIG_ENV_IS_IN_ONENAND=y
diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig
index 833906e..15d2f61 100644
--- a/configs/smdkv310_defconfig
+++ b/configs/smdkv310_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_SMDKV310=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4210-smdkv310"
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig
index 5d239c9..7a3e112 100644
--- a/configs/snapper9260_defconfig
+++ b/configs/snapper9260_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_SNAPPER9260=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig
index 382b2ab..13e4aa7 100644
--- a/configs/snapper9g20_defconfig
+++ b/configs/snapper9g20_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_SNAPPER9260=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 0ae2b9b..0c0daa9 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_SNOW=y
CONFIG_DEFAULT_DEVICE_TREE="exynos5250-snow"
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_SOUND=y
CONFIG_CMD_CROS_EC=y
CONFIG_CROS_EC=y
diff --git a/configs/snowball_defconfig b/configs/snowball_defconfig
index 19100c2..893730d 100644
--- a/configs/snowball_defconfig
+++ b/configs/snowball_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_SNOWBALL=y
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index d7ed82b..5d2c06e 100644
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_SOCRATES=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/spear300_defconfig b/configs/spear300_defconfig
index 52dd4da..92d6198 100644
--- a/configs/spear300_defconfig
+++ b/configs/spear300_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR300=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear300"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear300_nand_defconfig b/configs/spear300_nand_defconfig
index 2910c07..0e9151a 100644
--- a/configs/spear300_nand_defconfig
+++ b/configs/spear300_nand_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR300=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear300,nand"
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear300_usbtty_defconfig b/configs/spear300_usbtty_defconfig
index 12d197e..35d14f5 100644
--- a/configs/spear300_usbtty_defconfig
+++ b/configs/spear300_usbtty_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR300=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear300,usbtty"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear300_usbtty_nand_defconfig b/configs/spear300_usbtty_nand_defconfig
index e303cad..ee1ebcc 100644
--- a/configs/spear300_usbtty_nand_defconfig
+++ b/configs/spear300_usbtty_nand_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR300=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear300,usbtty,nand"
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_defconfig b/configs/spear310_defconfig
index 5e0beb6..e570d50 100644
--- a/configs/spear310_defconfig
+++ b/configs/spear310_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR310=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear310"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_nand_defconfig b/configs/spear310_nand_defconfig
index 3772d40..25b2417 100644
--- a/configs/spear310_nand_defconfig
+++ b/configs/spear310_nand_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR310=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear310,nand"
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_pnor_defconfig b/configs/spear310_pnor_defconfig
index 137161e..19f3b73 100644
--- a/configs/spear310_pnor_defconfig
+++ b/configs/spear310_pnor_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR310=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear310,FLASH_PNOR"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_usbtty_defconfig b/configs/spear310_usbtty_defconfig
index df8bb52..4046182 100644
--- a/configs/spear310_usbtty_defconfig
+++ b/configs/spear310_usbtty_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR310=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear310,usbtty"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_usbtty_nand_defconfig b/configs/spear310_usbtty_nand_defconfig
index 71cabff..d70f06e 100644
--- a/configs/spear310_usbtty_nand_defconfig
+++ b/configs/spear310_usbtty_nand_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR310=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear310,usbtty,nand"
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_usbtty_pnor_defconfig b/configs/spear310_usbtty_pnor_defconfig
index b5418e5..f56e6e2 100644
--- a/configs/spear310_usbtty_pnor_defconfig
+++ b/configs/spear310_usbtty_pnor_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR310=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear310,usbtty,FLASH_PNOR"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_defconfig b/configs/spear320_defconfig
index 0172c15..6e99c5a 100644
--- a/configs/spear320_defconfig
+++ b/configs/spear320_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR320=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear320"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_nand_defconfig b/configs/spear320_nand_defconfig
index 347b3de..a93cec7 100644
--- a/configs/spear320_nand_defconfig
+++ b/configs/spear320_nand_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR320=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear320,nand"
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_pnor_defconfig b/configs/spear320_pnor_defconfig
index 7b1b8e1..8131002 100644
--- a/configs/spear320_pnor_defconfig
+++ b/configs/spear320_pnor_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR320=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear320,FLASH_PNOR"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_usbtty_defconfig b/configs/spear320_usbtty_defconfig
index 907ba89..d086ff8 100644
--- a/configs/spear320_usbtty_defconfig
+++ b/configs/spear320_usbtty_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR320=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear320,usbtty"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_usbtty_nand_defconfig b/configs/spear320_usbtty_nand_defconfig
index 1350134..4de67ad 100644
--- a/configs/spear320_usbtty_nand_defconfig
+++ b/configs/spear320_usbtty_nand_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR320=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear320,usbtty,nand"
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_usbtty_pnor_defconfig b/configs/spear320_usbtty_pnor_defconfig
index 0b31b9a..981a111 100644
--- a/configs/spear320_usbtty_pnor_defconfig
+++ b/configs/spear320_usbtty_pnor_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR320=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear320,usbtty,FLASH_PNOR"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear600_defconfig b/configs/spear600_defconfig
index e573ecc..4d91c27 100644
--- a/configs/spear600_defconfig
+++ b/configs/spear600_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR600=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear600"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear600_nand_defconfig b/configs/spear600_nand_defconfig
index a1e9c02..9ae6b9a 100644
--- a/configs/spear600_nand_defconfig
+++ b/configs/spear600_nand_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR600=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear600,nand"
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear600_usbtty_defconfig b/configs/spear600_usbtty_defconfig
index 7673960..b88a698 100644
--- a/configs/spear600_usbtty_defconfig
+++ b/configs/spear600_usbtty_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR600=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear600,usbtty"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear600_usbtty_nand_defconfig b/configs/spear600_usbtty_nand_defconfig
index 1cdb780..8bd8cfd 100644
--- a/configs/spear600_usbtty_nand_defconfig
+++ b/configs/spear600_usbtty_nand_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_SPEAR600=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear600,usbtty,nand"
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/stamp9g20_defconfig b/configs/stamp9g20_defconfig
index e765329..36c3ac5 100644
--- a/configs/stamp9g20_defconfig
+++ b/configs/stamp9g20_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_STAMP9G20=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig
index 6d74d73..1f34e49 100644
--- a/configs/stm32f429-discovery_defconfig
+++ b/configs/stm32f429-discovery_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_STM32F429_DISCOVERY=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig
index 2be3f82..a2d7c60 100644
--- a/configs/stv0991_defconfig
+++ b/configs/stv0991_defconfig
@@ -5,4 +5,5 @@ CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_DEFAULT_DEVICE_TREE="stv0991"
CONFIG_SYS_EXTRA_OPTIONS="stv0991"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/stxgp3_defconfig b/configs/stxgp3_defconfig
index b7537df..45f67c9 100644
--- a/configs/stxgp3_defconfig
+++ b/configs/stxgp3_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_STXGP3=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/stxssa_4M_defconfig b/configs/stxssa_4M_defconfig
index e6df158..1e81266 100644
--- a/configs/stxssa_4M_defconfig
+++ b/configs/stxssa_4M_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_STXSSA=y
CONFIG_SYS_EXTRA_OPTIONS="STXSSA_4M"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/stxssa_defconfig b/configs/stxssa_defconfig
index f1701f2..b7b0f45 100644
--- a/configs/stxssa_defconfig
+++ b/configs/stxssa_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_STXSSA=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/sunxi_Gemei_G9_defconfig b/configs/sunxi_Gemei_G9_defconfig
index 35aa847..9c192c6 100644
--- a/configs/sunxi_Gemei_G9_defconfig
+++ b/configs/sunxi_Gemei_G9_defconfig
@@ -11,3 +11,4 @@ CONFIG_VIDEO_LCD_PANEL_LVDS=y
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-gemei-g9"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig
index e477b0e..d36f7da 100644
--- a/configs/suvd3_defconfig
+++ b/configs/suvd3_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_SUVD3=y
CONFIG_SYS_EXTRA_OPTIONS="SUVD3"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/sycamore_defconfig b/configs/sycamore_defconfig
index 844e67f..d433062 100644
--- a/configs/sycamore_defconfig
+++ b/configs/sycamore_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_WALNUT=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/t3corp_defconfig b/configs/t3corp_defconfig
index beac623..5c39e5f 100644
--- a/configs/t3corp_defconfig
+++ b/configs/t3corp_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_T3CORP=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/taihu_defconfig b/configs/taihu_defconfig
index 42126f5..8de2398 100644
--- a/configs/taihu_defconfig
+++ b/configs/taihu_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_TAIHU=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/taishan_defconfig b/configs/taishan_defconfig
index 81fe19d..4bad47a 100644
--- a/configs/taishan_defconfig
+++ b/configs/taishan_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_TAISHAN=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig
index ad4517d..4bfd3ca 100644
--- a/configs/tao3530_defconfig
+++ b/configs/tao3530_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_TAO3530=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index 336ca41..4ec925a 100644
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_TAURUS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2067,BOARD_TAURUS"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index cace345..e23c87b 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_TBS2910=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/tcm-bf518_defconfig b/configs/tcm-bf518_defconfig
index 0c9ae4d..9d39518 100644
--- a/configs/tcm-bf518_defconfig
+++ b/configs/tcm-bf518_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_TCM_BF518=y
+CONFIG_ENV_IS_IN_EEPROM=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/tcm-bf537_defconfig b/configs/tcm-bf537_defconfig
index 6d604b6..d585248 100644
--- a/configs/tcm-bf537_defconfig
+++ b/configs/tcm-bf537_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_TCM_BF537=y
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index 8f953bf..154f484 100644
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA30=y
CONFIG_TARGET_TEC_NG=y
CONFIG_DEFAULT_DEVICE_TREE="tegra30-tec-ng"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/tec_defconfig b/configs/tec_defconfig
index cc52fec..55f6c42 100644
--- a/configs/tec_defconfig
+++ b/configs/tec_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA20=y
CONFIG_TARGET_TEC=y
CONFIG_DEFAULT_DEVICE_TREE="tegra20-tec"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/titanium_defconfig b/configs/titanium_defconfig
index 62af244..1655ffe 100644
--- a/configs/titanium_defconfig
+++ b/configs/titanium_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_TITANIUM=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/barco/titanium/imximage.cfg"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/tk71_defconfig b/configs/tk71_defconfig
index 411e3c1..94c8993 100644
--- a/configs/tk71_defconfig
+++ b/configs/tk71_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_TK71=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/tny_a9260_eeprom_defconfig b/configs/tny_a9260_eeprom_defconfig
index bf5eaff..2f5dd85 100644
--- a/configs/tny_a9260_eeprom_defconfig
+++ b/configs/tny_a9260_eeprom_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_TNY_A9260=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_EEPROM"
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/tny_a9260_nandflash_defconfig b/configs/tny_a9260_nandflash_defconfig
index 4fad017..d576fb1 100644
--- a/configs/tny_a9260_nandflash_defconfig
+++ b/configs/tny_a9260_nandflash_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_TNY_A9260=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/tny_a9g20_eeprom_defconfig b/configs/tny_a9g20_eeprom_defconfig
index 03a0a34..1f0fbb9 100644
--- a/configs/tny_a9g20_eeprom_defconfig
+++ b/configs/tny_a9g20_eeprom_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_TNY_A9260=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_EEPROM"
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/tny_a9g20_nandflash_defconfig b/configs/tny_a9g20_nandflash_defconfig
index 82bedff..381f04a 100644
--- a/configs/tny_a9g20_nandflash_defconfig
+++ b/configs/tny_a9g20_nandflash_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_TNY_A9260=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH"
+CONFIG_ENV_IS_IN_EEPROM=y
diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig
index 627883a..8b8f8b8 100644
--- a/configs/tqma6q_mba6_mmc_defconfig
+++ b/configs/tqma6q_mba6_mmc_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_TQMA6=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_MMC_BOOT"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig
index a56a802..c035551 100644
--- a/configs/tqma6q_mba6_spi_defconfig
+++ b/configs/tqma6q_mba6_spi_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_TQMA6=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_SPI_BOOT"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig
index 51958e2..851d7f6 100644
--- a/configs/tqma6s_mba6_mmc_defconfig
+++ b/configs/tqma6s_mba6_mmc_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_TQMA6=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_MMC_BOOT"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig
index f94f704..c0c0222 100644
--- a/configs/tqma6s_mba6_spi_defconfig
+++ b/configs/tqma6s_mba6_spi_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_TQMA6=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_SPI_BOOT"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index 8326d69..336a2ed 100644
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -3,4 +3,5 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_TRATS2=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_OF_CONTROL=y
diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index b6f4ebe..0eff975 100644
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_TRATS=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats"
+CONFIG_ENV_IS_IN_MMC=y
CONFIG_OF_CONTROL=y
diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig
index a710804..1c202c7 100644
--- a/configs/tricorder_defconfig
+++ b/configs/tricorder_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_TRICORDER=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index 0ce8f81..acf42b6 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA20=y
CONFIG_TARGET_TRIMSLICE=y
CONFIG_DEFAULT_DEVICE_TREE="tegra20-trimslice"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/trizepsiv_defconfig b/configs/trizepsiv_defconfig
index 444d3bb..563157f 100644
--- a/configs/trizepsiv_defconfig
+++ b/configs/trizepsiv_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_TRIZEPSIV=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/tseries_mmc_defconfig b/configs/tseries_mmc_defconfig
index cdcdb99..8cef03f 100644
--- a/configs/tseries_mmc_defconfig
+++ b/configs/tseries_mmc_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
CONFIG_TARGET_TSERIES=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT"
+CONFIG_ENV_IS_IN_MMC=y
# CONFIG_CMD_CRC32 is not set
diff --git a/configs/tseries_nand_defconfig b/configs/tseries_nand_defconfig
index 2139f4d..968dbbe 100644
--- a/configs/tseries_nand_defconfig
+++ b/configs/tseries_nand_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
CONFIG_TARGET_TSERIES=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
+CONFIG_ENV_IS_IN_NAND=y
# CONFIG_CMD_CRC32 is not set
diff --git a/configs/tseries_spi_defconfig b/configs/tseries_spi_defconfig
index 5e01789..b77a397 100644
--- a/configs/tseries_spi_defconfig
+++ b/configs/tseries_spi_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
CONFIG_TARGET_TSERIES=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
# CONFIG_CMD_CRC32 is not set
diff --git a/configs/tt01_defconfig b/configs/tt01_defconfig
index a0e6664..0609b2b 100644
--- a/configs/tt01_defconfig
+++ b/configs/tt01_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_TT01=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index d4a422c..0b925dc 100644
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_TUXX1=y
CONFIG_SYS_EXTRA_OPTIONS="TUGE1"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig
index c8db21a..6ee66f2 100644
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_TUXX1=y
CONFIG_SYS_EXTRA_OPTIONS="TUXX1"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/twister_defconfig b/configs/twister_defconfig
index 710ab43..b07abcd 100644
--- a/configs/twister_defconfig
+++ b/configs/twister_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_TWISTER=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/tx25_defconfig b/configs/tx25_defconfig
index 8f7e303..b91a5b4 100644
--- a/configs/tx25_defconfig
+++ b/configs/tx25_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_TX25=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/u8500_href_defconfig b/configs/u8500_href_defconfig
index fef179f..c872079 100644
--- a/configs/u8500_href_defconfig
+++ b/configs/u8500_href_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_U8500_HREF=y
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/udoo_quad_defconfig b/configs/udoo_quad_defconfig
index 9687475..7dc03af 100644
--- a/configs/udoo_quad_defconfig
+++ b/configs/udoo_quad_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_UDOO=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/udoo/udoo.cfg,MX6Q,DDR_MB=1024"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig
index 7ce920a..a97fcb3 100644
--- a/configs/usb_a9263_dataflash_defconfig
+++ b/configs/usb_a9263_dataflash_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_USB_A9263=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
+CONFIG_ENV_IS_IN_DATAFLASH=y
diff --git a/configs/usbarmory_defconfig b/configs/usbarmory_defconfig
index 10bdd9e..73b20bf 100644
--- a/configs/usbarmory_defconfig
+++ b/configs/usbarmory_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_MX5=y
CONFIG_TARGET_USBARMORY=y
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/v38b_defconfig b/configs/v38b_defconfig
index 811354c..64e0b95 100644
--- a/configs/v38b_defconfig
+++ b/configs/v38b_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_V38B=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/v5fx30teval_defconfig b/configs/v5fx30teval_defconfig
index 42e0438..27af768 100644
--- a/configs/v5fx30teval_defconfig
+++ b/configs/v5fx30teval_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_V5FX30TEVAL=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1,INIT_TLB=board/xilinx/ppc440-generic/init.o"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/v5fx30teval_flash_defconfig b/configs/v5fx30teval_flash_defconfig
index 495f3b9..a24e2e6 100644
--- a/configs/v5fx30teval_flash_defconfig
+++ b/configs/v5fx30teval_flash_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_V5FX30TEVAL=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC,INIT_TLB=board/xilinx/ppc440-generic/init.o"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/vct_platinum_defconfig b/configs/vct_platinum_defconfig
index 7514857..1eb8d99 100644
--- a/configs/vct_platinum_defconfig
+++ b/configs/vct_platinum_defconfig
@@ -1,3 +1,4 @@
CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
CONFIG_VCT_PLATINUM=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig
index 7fb75f0..317b4ca 100644
--- a/configs/vct_platinum_onenand_defconfig
+++ b/configs/vct_platinum_onenand_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
CONFIG_VCT_PLATINUM=y
CONFIG_VCT_ONENAND=y
+CONFIG_ENV_IS_IN_ONENAND=y
diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig
index 4d82da9..387f1c1 100644
--- a/configs/vct_platinum_onenand_small_defconfig
+++ b/configs/vct_platinum_onenand_small_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_VCT=y
CONFIG_VCT_PLATINUM=y
CONFIG_VCT_ONENAND=y
CONFIG_VCT_SMALL_IMAGE=y
+CONFIG_ENV_IS_IN_ONENAND=y
# CONFIG_CMD_CRC32 is not set
diff --git a/configs/vct_platinum_small_defconfig b/configs/vct_platinum_small_defconfig
index 5e1f4ab..978c222 100644
--- a/configs/vct_platinum_small_defconfig
+++ b/configs/vct_platinum_small_defconfig
@@ -2,4 +2,5 @@ CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
CONFIG_VCT_PLATINUM=y
CONFIG_VCT_SMALL_IMAGE=y
+CONFIG_ENV_IS_IN_FLASH=y
# CONFIG_CMD_CRC32 is not set
diff --git a/configs/vct_platinumavc_defconfig b/configs/vct_platinumavc_defconfig
index 0a5748a..c7ab998 100644
--- a/configs/vct_platinumavc_defconfig
+++ b/configs/vct_platinumavc_defconfig
@@ -1,3 +1,4 @@
CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
CONFIG_VCT_PLATINUMAVC=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig
index 289f864..81b2507 100644
--- a/configs/vct_platinumavc_onenand_defconfig
+++ b/configs/vct_platinumavc_onenand_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
CONFIG_VCT_PLATINUMAVC=y
CONFIG_VCT_ONENAND=y
+CONFIG_ENV_IS_IN_ONENAND=y
diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig
index 1b28535..1dc275d 100644
--- a/configs/vct_platinumavc_onenand_small_defconfig
+++ b/configs/vct_platinumavc_onenand_small_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_VCT=y
CONFIG_VCT_PLATINUMAVC=y
CONFIG_VCT_ONENAND=y
CONFIG_VCT_SMALL_IMAGE=y
+CONFIG_ENV_IS_IN_ONENAND=y
# CONFIG_CMD_CRC32 is not set
diff --git a/configs/vct_platinumavc_small_defconfig b/configs/vct_platinumavc_small_defconfig
index 54813ca..f4d2ce0 100644
--- a/configs/vct_platinumavc_small_defconfig
+++ b/configs/vct_platinumavc_small_defconfig
@@ -2,4 +2,5 @@ CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
CONFIG_VCT_PLATINUMAVC=y
CONFIG_VCT_SMALL_IMAGE=y
+CONFIG_ENV_IS_IN_FLASH=y
# CONFIG_CMD_CRC32 is not set
diff --git a/configs/vct_premium_defconfig b/configs/vct_premium_defconfig
index 80c468b..d5bcbf5 100644
--- a/configs/vct_premium_defconfig
+++ b/configs/vct_premium_defconfig
@@ -1,3 +1,4 @@
CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
CONFIG_VCT_PREMIUM=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/vct_premium_onenand_defconfig b/configs/vct_premium_onenand_defconfig
index eb61ef6..5e7b95e 100644
--- a/configs/vct_premium_onenand_defconfig
+++ b/configs/vct_premium_onenand_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
CONFIG_VCT_PREMIUM=y
CONFIG_VCT_ONENAND=y
+CONFIG_ENV_IS_IN_ONENAND=y
diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig
index f592a62..97c292f 100644
--- a/configs/vct_premium_onenand_small_defconfig
+++ b/configs/vct_premium_onenand_small_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_VCT=y
CONFIG_VCT_PREMIUM=y
CONFIG_VCT_ONENAND=y
CONFIG_VCT_SMALL_IMAGE=y
+CONFIG_ENV_IS_IN_ONENAND=y
# CONFIG_CMD_CRC32 is not set
diff --git a/configs/vct_premium_small_defconfig b/configs/vct_premium_small_defconfig
index 3fb5e69..94acded 100644
--- a/configs/vct_premium_small_defconfig
+++ b/configs/vct_premium_small_defconfig
@@ -2,4 +2,5 @@ CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
CONFIG_VCT_PREMIUM=y
CONFIG_VCT_SMALL_IMAGE=y
+CONFIG_ENV_IS_IN_FLASH=y
# CONFIG_CMD_CRC32 is not set
diff --git a/configs/ve8313_defconfig b/configs/ve8313_defconfig
index 462c482..cd63d9f 100644
--- a/configs/ve8313_defconfig
+++ b/configs/ve8313_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_VE8313=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index 7375cd5..6498d3d 100644
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA124=y
CONFIG_TARGET_VENICE2=y
CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index b268ec7..5375a6f 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA20=y
CONFIG_TARGET_VENTANA=y
CONFIG_DEFAULT_DEVICE_TREE="tegra20-ventana"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/versatileab_defconfig b/configs/versatileab_defconfig
index 058f8cd..f74c71b 100644
--- a/configs/versatileab_defconfig
+++ b/configs/versatileab_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_VERSATILE=y
CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_AB"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/versatilepb_defconfig b/configs/versatilepb_defconfig
index ae8224f..65d7143 100644
--- a/configs/versatilepb_defconfig
+++ b/configs/versatilepb_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_VERSATILE=y
CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_PB"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/vexpress_ca15_tc2_defconfig b/configs/vexpress_ca15_tc2_defconfig
index ee5b351..d2c7e40 100644
--- a/configs/vexpress_ca15_tc2_defconfig
+++ b/configs/vexpress_ca15_tc2_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_VEXPRESS_CA15_TC2=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/vexpress_ca5x2_defconfig b/configs/vexpress_ca5x2_defconfig
index fafed03..277c792 100644
--- a/configs/vexpress_ca5x2_defconfig
+++ b/configs/vexpress_ca5x2_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_VEXPRESS_CA5X2=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig
index 1ff2ebf..e29eaf5 100644
--- a/configs/vexpress_ca9x4_defconfig
+++ b/configs/vexpress_ca9x4_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_VEXPRESS_CA9X4=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig
index 3a71740..d4f82f3 100644
--- a/configs/vf610twr_defconfig
+++ b/configs/vf610twr_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_VF610TWR=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_IS_IN_MMC"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig
index e22704a..cfbfa4b 100644
--- a/configs/vf610twr_nand_defconfig
+++ b/configs/vf610twr_nand_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_VF610TWR=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_IS_IN_NAND"
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/vision2_defconfig b/configs/vision2_defconfig
index ae2b487..302a40f 100644
--- a/configs/vision2_defconfig
+++ b/configs/vision2_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_VISION2=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/ttcontrol/vision2/imximage_hynix.cfg"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
diff --git a/configs/vl_ma2sc_defconfig b/configs/vl_ma2sc_defconfig
index e6478a7..ac5dd12 100644
--- a/configs/vl_ma2sc_defconfig
+++ b/configs/vl_ma2sc_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_VL_MA2SC=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/vl_ma2sc_ram_defconfig b/configs/vl_ma2sc_ram_defconfig
index c1f4947..25451dd 100644
--- a/configs/vl_ma2sc_ram_defconfig
+++ b/configs/vl_ma2sc_ram_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_VL_MA2SC=y
CONFIG_SYS_EXTRA_OPTIONS="RAMLOAD"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/vme8349_defconfig b/configs/vme8349_defconfig
index 8df2cfd..dbb2b23 100644
--- a/configs/vme8349_defconfig
+++ b/configs/vme8349_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC83xx=y
CONFIG_TARGET_VME8349=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/vpac270_nor_128_defconfig b/configs/vpac270_nor_128_defconfig
index 0f2ff7c..bb8c3d8 100644
--- a/configs/vpac270_nor_128_defconfig
+++ b/configs/vpac270_nor_128_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_VPAC270=y
CONFIG_SYS_EXTRA_OPTIONS="NOR,RAM_128M"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/vpac270_nor_256_defconfig b/configs/vpac270_nor_256_defconfig
index dfff8b4..e1c040d 100644
--- a/configs/vpac270_nor_256_defconfig
+++ b/configs/vpac270_nor_256_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_VPAC270=y
CONFIG_SYS_EXTRA_OPTIONS="NOR,RAM_256M"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/vpac270_ond_256_defconfig b/configs/vpac270_ond_256_defconfig
index ea61a76..5569c8f 100644
--- a/configs/vpac270_ond_256_defconfig
+++ b/configs/vpac270_ond_256_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_VPAC270=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="ONENAND,RAM_256M"
+CONFIG_ENV_IS_IN_ONENAND=y
diff --git a/configs/walnut_defconfig b/configs/walnut_defconfig
index c5b302e..016955a 100644
--- a/configs/walnut_defconfig
+++ b/configs/walnut_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_WALNUT=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/wandboard_dl_defconfig b/configs/wandboard_dl_defconfig
index 0136cdf..b711d3e 100644
--- a/configs/wandboard_dl_defconfig
+++ b/configs/wandboard_dl_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_WANDBOARD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/wandboard_quad_defconfig b/configs/wandboard_quad_defconfig
index 0f9bdf9..41660d3 100644
--- a/configs/wandboard_quad_defconfig
+++ b/configs/wandboard_quad_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_WANDBOARD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/wandboard_solo_defconfig b/configs/wandboard_solo_defconfig
index 57a227c..888ea12 100644
--- a/configs/wandboard_solo_defconfig
+++ b/configs/wandboard_solo_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_WANDBOARD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/warp_defconfig b/configs/warp_defconfig
index 24e1b9f..9e6fdca 100644
--- a/configs/warp_defconfig
+++ b/configs/warp_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_WARP=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig
index f235a03..356c5d4 100644
--- a/configs/whistler_defconfig
+++ b/configs/whistler_defconfig
@@ -3,3 +3,4 @@ CONFIG_TEGRA=y
CONFIG_TEGRA20=y
CONFIG_TARGET_WHISTLER=y
CONFIG_DEFAULT_DEVICE_TREE="tegra20-whistler"
+CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/wireless_space_defconfig b/configs/wireless_space_defconfig
index 580e5ce..b79db6c 100644
--- a/configs/wireless_space_defconfig
+++ b/configs/wireless_space_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_WIRELESS_SPACE=y
+CONFIG_ENV_IS_IN_NAND=y
diff --git a/configs/woodburn_defconfig b/configs/woodburn_defconfig
index 9f96bd9..5416dff 100644
--- a/configs/woodburn_defconfig
+++ b/configs/woodburn_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_WOODBURN=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/woodburn_sd_defconfig b/configs/woodburn_sd_defconfig
index 29e87f5..642c1d6 100644
--- a/configs/woodburn_sd_defconfig
+++ b/configs/woodburn_sd_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_WOODBURN_SD=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/woodburn/imximage.cfg"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig
index 09cd3ba..143c7dd 100644
--- a/configs/work_92105_defconfig
+++ b/configs/work_92105_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_WORK_92105=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_NAND=y
CONFIG_DM=y
CONFIG_DM_GPIO=y
diff --git a/configs/wtk_defconfig b/configs/wtk_defconfig
index 838190b..0ed474e 100644
--- a/configs/wtk_defconfig
+++ b/configs/wtk_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_8xx=y
CONFIG_TARGET_TQM823L=y
CONFIG_SYS_EXTRA_OPTIONS="LCD,SHARP_LQ065T9DR51U"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/x600_defconfig b/configs/x600_defconfig
index ad990df..d530eb3 100644
--- a/configs/x600_defconfig
+++ b/configs/x600_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_X600=y
CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SPL=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/xaeniax_defconfig b/configs/xaeniax_defconfig
index 52e301c..0622069 100644
--- a/configs/xaeniax_defconfig
+++ b/configs/xaeniax_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_XAENIAX=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig
index f4ed6d1..d5cb801 100644
--- a/configs/xilinx-ppc405-generic_defconfig
+++ b/configs/xilinx-ppc405-generic_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_XILINX_PPC405_GENERIC=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/xilinx-ppc405-generic_flash_defconfig b/configs/xilinx-ppc405-generic_flash_defconfig
index 1b0311c..ca0a9e0 100644
--- a/configs/xilinx-ppc405-generic_flash_defconfig
+++ b/configs/xilinx-ppc405-generic_flash_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_XILINX_PPC405_GENERIC=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig
index cac8785..395a88f 100644
--- a/configs/xilinx-ppc440-generic_defconfig
+++ b/configs/xilinx-ppc440-generic_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_XILINX_PPC440_GENERIC=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/xilinx-ppc440-generic_flash_defconfig b/configs/xilinx-ppc440-generic_flash_defconfig
index b271554..1903eb2 100644
--- a/configs/xilinx-ppc440-generic_flash_defconfig
+++ b/configs/xilinx-ppc440-generic_flash_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_XILINX_PPC440_GENERIC=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/xpedite1000_defconfig b/configs/xpedite1000_defconfig
index 635da26..5875db7 100644
--- a/configs/xpedite1000_defconfig
+++ b/configs/xpedite1000_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_XPEDITE1000=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/xpedite517x_defconfig b/configs/xpedite517x_defconfig
index b8513c1..5c50567 100644
--- a/configs/xpedite517x_defconfig
+++ b/configs/xpedite517x_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC86xx=y
CONFIG_TARGET_XPEDITE517X=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/xpedite520x_defconfig b/configs/xpedite520x_defconfig
index d5f526d..27605f0 100644
--- a/configs/xpedite520x_defconfig
+++ b/configs/xpedite520x_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_XPEDITE520X=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/xpedite537x_defconfig b/configs/xpedite537x_defconfig
index 8001dd1..8725c59 100644
--- a/configs/xpedite537x_defconfig
+++ b/configs/xpedite537x_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_XPEDITE537X=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/xpedite550x_defconfig b/configs/xpedite550x_defconfig
index dc33ca9..00c99a9 100644
--- a/configs/xpedite550x_defconfig
+++ b/configs/xpedite550x_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_XPEDITE550X=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/yellowstone_defconfig b/configs/yellowstone_defconfig
index 7b1a630..576111a 100644
--- a/configs/yellowstone_defconfig
+++ b/configs/yellowstone_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_YOSEMITE=y
CONFIG_SYS_EXTRA_OPTIONS="YELLOWSTONE"
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/yosemite_defconfig b/configs/yosemite_defconfig
index 430f25e..867f474 100644
--- a/configs/yosemite_defconfig
+++ b/configs/yosemite_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_YOSEMITE=y
CONFIG_SYS_EXTRA_OPTIONS="YOSEMITE"
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/yucca_defconfig b/configs/yucca_defconfig
index ed42523..47e538e 100644
--- a/configs/yucca_defconfig
+++ b/configs/yucca_defconfig
@@ -1,4 +1,5 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_YUCCA=y
+CONFIG_ENV_IS_IN_FLASH=y
CONFIG_REGEX=y
diff --git a/configs/zeus_defconfig b/configs/zeus_defconfig
index 546f10a..6cd1168 100644
--- a/configs/zeus_defconfig
+++ b/configs/zeus_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_ZEUS=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig
index 8d921a0..6446159 100644
--- a/configs/zipitz2_defconfig
+++ b/configs/zipitz2_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_ZIPITZ2=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/configs/zmx25_defconfig b/configs/zmx25_defconfig
index 80a66d0..014a01a 100644
--- a/configs/zmx25_defconfig
+++ b/configs/zmx25_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_TARGET_ZMX25=y
+CONFIG_ENV_IS_IN_FLASH=y
diff --git a/include/config_fsl_secboot.h b/include/config_fsl_secboot.h
index 050b157..b5cf44b 100644
--- a/include/config_fsl_secboot.h
+++ b/include/config_fsl_secboot.h
@@ -56,17 +56,12 @@
/* For secure boot flow, default environment used will be used */
#if defined(CONFIG_SYS_RAMBOOT)
#if defined(CONFIG_RAMBOOT_SPIFLASH)
-#undef CONFIG_ENV_IS_IN_SPI_FLASH
#elif defined(CONFIG_RAMBOOT_NAND)
-#undef CONFIG_ENV_IS_IN_NAND
#elif defined(CONFIG_RAMBOOT_SDCARD)
-#undef CONFIG_ENV_IS_IN_MMC
#endif
#else /*CONFIG_SYS_RAMBOOT*/
-#undef CONFIG_ENV_IS_IN_FLASH
#endif
-#define CONFIG_ENV_IS_NOWHERE
/*
* We don't want boot delay for secure boot flow
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index dca1ca5..b2108f4 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -133,7 +133,6 @@
#ifdef CONFIG_SYS_NO_FLASH
#if !defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) && !defined(CONFIG_RAMBOOT_PBL)
-#define CONFIG_ENV_IS_NOWHERE
#endif
#else
#define CONFIG_FLASH_CFI_DRIVER
@@ -143,7 +142,6 @@
#if defined(CONFIG_SPIFLASH)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -153,23 +151,19 @@
#define CONFIG_ENV_SECT_SIZE 0x10000
#elif defined(CONFIG_SDCARD)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (512 * 1097)
#elif defined(CONFIG_NAND)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE)
#elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-#define CONFIG_ENV_IS_IN_REMOTE
#define CONFIG_ENV_ADDR 0xffe20000
#define CONFIG_ENV_SIZE 0x2000
#elif defined(CONFIG_ENV_IS_NOWHERE)
#define CONFIG_ENV_SIZE 0x2000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index 047ed8b..e80a921 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -315,7 +315,6 @@ extern unsigned long get_sdram_size(void);
* Environment
*/
#if defined(CONFIG_RAMBOOT_SPIFLASH)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -324,13 +323,11 @@ extern unsigned long get_sdram_size(void);
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_SIZE 0x2000
#elif defined(CONFIG_NAND)
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_SYS_EXTRA_ENV_RELOC
#define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
#define CONFIG_ENV_OFFSET ((768 * 1024) + CONFIG_SYS_NAND_BLOCK_SIZE)
#define CONFIG_ENV_RANGE (3 * CONFIG_ENV_SIZE)
#elif defined(CONFIG_SYS_RAMBOOT)
-#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index ceee0e4..2bdbaf0 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -547,12 +547,10 @@ combinations. this should be removed later
* Environment
*/
#if defined(CONFIG_RAMBOOT_SDCARD)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_FSL_FIXED_MMC_LOCATION
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE 0x2000
#elif defined(CONFIG_RAMBOOT_SPIFLASH)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -561,16 +559,13 @@ combinations. this should be removed later
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_SIZE 0x2000
#elif defined(CONFIG_NAND) || defined(CONFIG_NAND_SECBOOT)
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
#define CONFIG_ENV_OFFSET ((768 * 1024) + CONFIG_SYS_NAND_BLOCK_SIZE)
#define CONFIG_ENV_RANGE (3 * CONFIG_ENV_SIZE)
#elif defined(CONFIG_SYS_RAMBOOT)
-#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index 7c45c36..cc99253 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -466,7 +466,6 @@
*/
#if defined(CONFIG_SYS_RAMBOOT)
#if defined(CONFIG_RAMBOOT_SPIFLASH)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -476,7 +475,6 @@
#define CONFIG_ENV_SIZE 0x2000
#endif
#elif defined(CONFIG_NAND)
-#define CONFIG_ENV_IS_IN_NAND
#ifdef CONFIG_TPL_BUILD
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_ADDR (CONFIG_SYS_INIT_L2_ADDR + (160 << 10))
@@ -486,7 +484,6 @@
#endif
#define CONFIG_ENV_OFFSET CONFIG_SYS_NAND_BLOCK_SIZE
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index 845ed81..9335677 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -186,7 +186,6 @@
#define CONFIG_SYS_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
-#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
#define CONFIG_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars */
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index ceddd7a..cb6a8c4 100644
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -249,14 +249,12 @@
/*-----------------------------------------------------------------------
* NVRAM organization
*/
-#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#define CONFIG_ENV_SIZE 0x0ff8 /* Size of Environment vars */
#define CONFIG_ENV_ADDR \
(CONFIG_SYS_NVRAM_BASE_ADDR+CONFIG_SYS_NVRAM_SIZE-(CONFIG_ENV_SIZE+8)) /* Env */
#else /* Use EEPROM for environment variables */
-#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
#define CONFIG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars*/
/* total size of a CAT24WC16 is 2048 bytes */
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 7eac03b..ae9a293 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -178,7 +178,6 @@
#define CONFIG_ENV_OFFSET 0x2000
#define CONFIG_ENV_SIZE 0x1000
#define CONFIG_ENV_SECT_SIZE 0x2000
-#define CONFIG_ENV_IS_IN_FLASH 1
#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index ce33ba4..bc39089 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -228,10 +228,8 @@
* crc error warning if there is no correct environment on the flash.
*/
#ifdef CONFIG_CF_SBF
-# define CONFIG_ENV_IS_IN_SPI_FLASH
# define CONFIG_ENV_SPI_CS 2
#else
-# define CONFIG_ENV_IS_IN_FLASH 1
#endif
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 4bba815..8de189e 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -198,7 +198,6 @@
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index 6167ea1..2be5421 100644
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -90,7 +90,6 @@
#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-#define CONFIG_ENV_IS_IN_FLASH 1
#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 5d97874..7c7bab0 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -25,11 +25,9 @@
#ifdef CONFIG_MONITOR_IS_IN_RAM
# define CONFIG_ENV_OFFSET 0x4000
# define CONFIG_ENV_SECT_SIZE 0x1000
-# define CONFIG_ENV_IS_IN_FLASH 1
#else
# define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x4000)
# define CONFIG_ENV_SECT_SIZE 0x1000
-# define CONFIG_ENV_IS_IN_FLASH 1
#endif
#define LDS_BOARD_TEXT \
diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index 64dc64d..eeb5a9e 100644
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -26,11 +26,9 @@
#ifndef CONFIG_MONITOR_IS_IN_RAM
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_SECT_SIZE 0x2000
-#define CONFIG_ENV_IS_IN_FLASH 1
#else
#define CONFIG_ENV_ADDR 0xffe04000
#define CONFIG_ENV_SECT_SIZE 0x2000
-#define CONFIG_ENV_IS_IN_FLASH 1
#endif
#define LDS_BOARD_TEXT \
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 159d2f8..9a663dd 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -34,11 +34,9 @@
#ifndef CONFIG_MONITOR_IS_IN_RAM
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_SECT_SIZE 0x2000
-#define CONFIG_ENV_IS_IN_FLASH 1
#else
#define CONFIG_ENV_ADDR 0xffe04000
#define CONFIG_ENV_SECT_SIZE 0x2000
-#define CONFIG_ENV_IS_IN_FLASH 1
#endif
#define LDS_BOARD_TEXT \
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 14ccddb..55020f9 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -35,11 +35,9 @@
#ifndef CONFIG_MONITOR_IS_IN_RAM
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_SECT_SIZE 0x2000
-#define CONFIG_ENV_IS_IN_FLASH 1
#else
#define CONFIG_ENV_ADDR 0xffe04000
#define CONFIG_ENV_SECT_SIZE 0x2000
-#define CONFIG_ENV_IS_IN_FLASH 1
#endif
#define LDS_BOARD_TEXT \
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index bc740ae..b4c563a 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -30,7 +30,6 @@
*/
#define CONFIG_ENV_ADDR 0xffe04000
#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_ENV_IS_IN_FLASH 1
#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 0829708..ea394cc 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -203,7 +203,6 @@
#define CONFIG_ENV_OFFSET (CONFIG_SYS_FLASH_BASE + 0x40000)
#define CONFIG_ENV_SIZE 0x1000
#define CONFIG_ENV_SECT_SIZE 0x8000
-#define CONFIG_ENV_IS_IN_FLASH 1
#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index a42b5f6..a8b287d 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -207,7 +207,6 @@
*/
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_SECT_SIZE 0x2000
-#define CONFIG_ENV_IS_IN_FLASH 1
#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index c142dfb..0ab2ef0 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -207,7 +207,6 @@
*/
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_SECT_SIZE 0x2000
-#define CONFIG_ENV_IS_IN_FLASH 1
#define LDS_BOARD_TEXT \
. = DEFINED(env_offset) ? env_offset : .; \
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 3a6e981..5bc49e1 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -318,7 +318,6 @@
#if defined(CONFIG_CF_SBF)
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_IN_SPI_FLASH 1
#define CONFIG_ENV_SPI_CS 1
#define CONFIG_ENV_OFFSET 0x40000
#define CONFIG_ENV_SIZE 0x2000
@@ -326,7 +325,6 @@
#endif
#if defined(CONFIG_SYS_NAND_BOOT)
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_OFFSET 0x80000
#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 1b3598a..e3ee176 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -246,13 +246,11 @@
* crc error warning if there is no correct environment on the flash.
*/
#if defined(CONFIG_SYS_STMICRO_BOOT)
-# define CONFIG_ENV_IS_IN_SPI_FLASH 1
# define CONFIG_ENV_SPI_CS 1
# define CONFIG_ENV_OFFSET 0x20000
# define CONFIG_ENV_SIZE 0x2000
# define CONFIG_ENV_SECT_SIZE 0x10000
#else
-# define CONFIG_ENV_IS_IN_FLASH 1
# define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x40000)
# define CONFIG_ENV_SIZE 0x2000
# define CONFIG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 2288bff..5ca4c1f 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -308,10 +308,8 @@
* crc error warning if there is no correct environment on the flash.
*/
#ifdef CONFIG_CF_SBF
-# define CONFIG_ENV_IS_IN_SPI_FLASH
# define CONFIG_ENV_SPI_CS 1
#else
-# define CONFIG_ENV_IS_IN_FLASH 1
#endif
#undef CONFIG_ENV_OVERWRITE
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index 91d6a1a..3e86d37 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -260,7 +260,6 @@
*/
#define CONFIG_ENV_OFFSET 0x40000
#define CONFIG_ENV_SECT_SIZE 0x10000
-#define CONFIG_ENV_IS_IN_FLASH 1
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index ce9f3b0..1ed03b5 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -245,7 +245,6 @@
*/
#define CONFIG_ENV_OFFSET 0x40000
#define CONFIG_ENV_SECT_SIZE 0x10000
-#define CONFIG_ENV_IS_IN_FLASH 1
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 147f122..e43f8ac 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -99,7 +99,6 @@
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */
-#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CONFIG_ENV_OFFSET 0x00000 /* environment starts@the beginning of the EEPROM */
#define CONFIG_ENV_SIZE 0x00800 /* 2k bytes may be used for env vars */
diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 1ab2379..faae864 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -425,7 +425,6 @@
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \
CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 9cea76a..4c5638d 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -452,7 +452,6 @@
* Environment
*/
#if defined(CONFIG_NAND)
- #define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_OFFSET (512 * 1024)
#define CONFIG_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
@@ -461,7 +460,6 @@
#define CONFIG_ENV_OFFSET_REDUND \
(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
#elif !defined(CONFIG_SYS_RAMBOOT)
- #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR \
(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */
@@ -469,7 +467,6 @@
/* Address and size of Redundant Environment Sector */
#else
- #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index fbf38c8..254613c 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -443,14 +443,12 @@
* Environment
*/
#if !defined(CONFIG_SYS_RAMBOOT)
- #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR \
(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */
#define CONFIG_ENV_SIZE 0x2000
#else
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
- #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 2dd71b7..c91c630 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -309,14 +309,12 @@
* Environment
*/
#ifndef CONFIG_SYS_RAMBOOT
- #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR \
(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_SIZE 0x2000
#else
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
- #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 14abd35..2f154aa 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -393,14 +393,12 @@
* Environment
*/
#ifndef CONFIG_SYS_RAMBOOT
- #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR \
(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_SIZE 0x2000
#else
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
- #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 17f230f..73ca1e7 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -453,7 +453,6 @@
* Environment
*/
#ifndef CONFIG_SYS_RAMBOOT
- #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR \
(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
@@ -465,7 +464,6 @@
#else
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
- #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 2457125..2a71656 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -468,7 +468,6 @@ boards, we say we have two, but don't display a message if we find only one. */
#define CONFIG_ENV_OVERWRITE
#ifndef CONFIG_SYS_RAMBOOT
- #define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR \
(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for environment */
@@ -476,7 +475,6 @@ boards, we say we have two, but don't display a message if we find only one. */
#else
#define CONFIG_SYS_NO_FLASH /* Flash is not usable now */
#undef CONFIG_FLASH_CFI_DRIVER
- #define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 521904d..2068fb1 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -463,14 +463,12 @@ extern int board_pci_host_broken(void);
* Environment
*/
#ifndef CONFIG_SYS_RAMBOOT
- #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR \
(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
#define CONFIG_ENV_SIZE 0x2000
#else
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
- #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 19e0e30..8318537 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -473,14 +473,12 @@
* Environment
*/
#ifndef CONFIG_SYS_RAMBOOT
- #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR \
(CONFIG_SYS_MONITOR_BASE+CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for env */
#define CONFIG_ENV_SIZE 0x4000
#else
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
- #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE-0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index dc09b1f..629f2f8 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -605,7 +605,6 @@
#if defined(CONFIG_SYS_RAMBOOT)
#if defined(CONFIG_RAMBOOT_SPIFLASH)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -614,17 +613,14 @@
#define CONFIG_ENV_OFFSET 0xF0000
#define CONFIG_ENV_SECT_SIZE 0x10000
#elif defined(CONFIG_RAMBOOT_SDCARD)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_FSL_FIXED_MMC_LOCATION
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_SYS_MMC_ENV_DEV 0
#else
- #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif
#else
- #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 37c2b94..7b1b3a2 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -321,13 +321,11 @@
* Environment
*/
#ifndef CONFIG_SYS_RAMBOOT
- #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000)
#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
#define CONFIG_ENV_SIZE 0x2000
#else
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
- #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index 5d229a0..84efcb3 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -346,7 +346,6 @@ extern unsigned long get_clock_freq(void);
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000)
#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index dade6d3..41ee5ec 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -358,7 +358,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#if CONFIG_SYS_MONITOR_BASE > 0xfff80000
#define CONFIG_ENV_ADDR 0xfff80000
#else
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 190c668..f3d5234 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -467,7 +467,6 @@ extern unsigned long get_clock_freq(void);
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#if CONFIG_SYS_MONITOR_BASE > 0xfff80000
#define CONFIG_ENV_ADDR 0xfff80000
#else
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index 5263ffc..d83b0fa 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -344,7 +344,6 @@ extern unsigned long get_clock_freq(void);
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000)
#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index ac78d48..26f8789 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -358,13 +358,11 @@
* Environment
*/
#ifndef CONFIG_SYS_RAMBOOT
- #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000)
#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
#define CONFIG_ENV_SIZE 0x2000
#else
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
- #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 02a5acf..fbc4ca0 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -365,7 +365,6 @@ extern unsigned long get_clock_freq(void);
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000)
#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index e624c71..526cba9 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -452,7 +452,6 @@ extern unsigned long get_clock_freq(void);
*/
#if defined(CONFIG_SYS_RAMBOOT)
#else
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 5e7bc49..7b70860 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -577,7 +577,6 @@
#if defined(CONFIG_SYS_RAMBOOT)
#else
- #define CONFIG_ENV_IS_IN_FLASH 1
#if CONFIG_SYS_MONITOR_BASE > 0xfff80000
#define CONFIG_ENV_ADDR 0xfff80000
#else
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index e6d570a..e0de268 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -443,12 +443,10 @@
* Environment
*/
#ifndef CONFIG_SYS_RAMBOOT
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 126k (one sector) for env */
#define CONFIG_ENV_SIZE 0x2000
#else
-#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 9f755e5..02c5664 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -601,12 +601,10 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
* Environment
*/
#ifndef CONFIG_SYS_RAMBOOT
- #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR \
(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */
#else
- #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#endif
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index 88df94f..0960728 100644
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -109,7 +109,6 @@
#undef CONFIG_SYS_DIRECT_FLASH_TFTP
/* ENV setting */
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
#define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index ccf3ce3..a6c840c 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -769,12 +769,10 @@ extern unsigned long get_sdram_size(void);
* Environment
*/
#if defined(CONFIG_SDCARD)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_FSL_FIXED_MMC_LOCATION
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE 0x2000
#elif defined(CONFIG_SPIFLASH)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -783,7 +781,6 @@ extern unsigned long get_sdram_size(void);
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_SIZE 0x2000
#elif defined(CONFIG_NAND)
-#define CONFIG_ENV_IS_IN_NAND
#ifdef CONFIG_TPL_BUILD
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_ADDR (CONFIG_SYS_INIT_L2_ADDR + (160 << 10))
@@ -798,11 +795,9 @@ extern unsigned long get_sdram_size(void);
#endif
#define CONFIG_ENV_OFFSET (1024 * 1024)
#elif defined(CONFIG_SYS_RAMBOOT)
-#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 795e3b5..0e5a82a 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -640,7 +640,6 @@
* Environment
*/
#ifdef CONFIG_SPIFLASH
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -649,7 +648,6 @@
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
#define CONFIG_ENV_SECT_SIZE 0x10000
#elif defined(CONFIG_SDCARD)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_FSL_FIXED_MMC_LOCATION
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_SYS_MMC_ENV_DEV 0
@@ -660,15 +658,12 @@
#else
#define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
#endif
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET (1024 * 1024)
#define CONFIG_ENV_RANGE (3 * CONFIG_ENV_SIZE)
#elif defined(CONFIG_SYS_RAMBOOT)
-#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index d65c461..8740db7 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -260,7 +260,6 @@ extern unsigned long get_clock_freq(void);
*/
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index f99da65..cdbd4dd 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -71,7 +71,6 @@
#ifdef CONFIG_SYS_NO_FLASH
#if !defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-#define CONFIG_ENV_IS_NOWHERE
#endif
#else
#define CONFIG_FLASH_CFI_DRIVER
@@ -81,7 +80,6 @@
#if defined(CONFIG_SPIFLASH)
#define CONFIG_SYS_EXTRA_ENV_RELOC
- #define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -91,24 +89,20 @@
#define CONFIG_ENV_SECT_SIZE 0x10000
#elif defined(CONFIG_SDCARD)
#define CONFIG_SYS_EXTRA_ENV_RELOC
- #define CONFIG_ENV_IS_IN_MMC
#define CONFIG_FSL_FIXED_MMC_LOCATION
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (512 * 1658)
#elif defined(CONFIG_NAND)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
#define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_NAND_BLOCK_SIZE)
#elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-#define CONFIG_ENV_IS_IN_REMOTE
#define CONFIG_ENV_ADDR 0xffe20000
#define CONFIG_ENV_SIZE 0x2000
#elif defined(CONFIG_ENV_IS_NOWHERE)
#define CONFIG_ENV_SIZE 0x2000
#else
- #define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE \
- CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index 3ca204e..43e5ca1 100644
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -165,13 +165,11 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 1
#define CONFIG_SYS_MAX_FLASH_SECT 128
-#define CONFIG_ENV_IS_IN_EEPROM
#ifdef CONFIG_ENV_IS_IN_EEPROM
#define CONFIG_ENV_OFFSET 0
#define CONFIG_ENV_SIZE 2048
#endif
-#undef CONFIG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SIZE 0x00002000 /* Set whole sector as env */
#define CONFIG_ENV_OFFSET ((0 - CONFIG_SYS_FLASH_BASE) - CONFIG_ENV_SIZE) /* Environment starts at this adress */
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 9a1b2ac..c263062 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -80,7 +80,6 @@
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x53
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
-#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CONFIG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
#define CONFIG_ENV_SIZE 0x800 /* 2 kBytes may be used for env vars */
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index a236e11..e790a1a 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -256,7 +256,6 @@
/*
* Environment Variable setup
*/
-#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CONFIG_ENV_OFFSET 0x100 /* reseve 0x100 bytes for strapping */
#define CONFIG_ENV_SIZE 0x700
diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h
index f7d28e3..23d61a5 100644
--- a/include/configs/PMC405DE.h
+++ b/include/configs/PMC405DE.h
@@ -192,7 +192,6 @@
/*
* Environment in EEPROM setup
*/
-#define CONFIG_ENV_IS_IN_EEPROM 1
#define CONFIG_ENV_OFFSET 0x100
#define CONFIG_ENV_SIZE 0x700
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index c29429d..24fbd32 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -98,7 +98,6 @@
/*-----------------------------------------------------------------------
* Environment
*----------------------------------------------------------------------*/
-#define CONFIG_ENV_IS_IN_EEPROM 1 /* use FLASH for environment vars */
/*-----------------------------------------------------------------------
* RTC
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 2927043..d476231 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -169,7 +169,6 @@
#if defined(CONFIG_SPIFLASH)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -179,23 +178,19 @@
#define CONFIG_ENV_SECT_SIZE 0x10000
#elif defined(CONFIG_SDCARD)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (512 * 0x800)
#elif defined(CONFIG_NAND)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE)
#elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-#define CONFIG_ENV_IS_IN_REMOTE
#define CONFIG_ENV_ADDR 0xffe20000
#define CONFIG_ENV_SIZE 0x2000
#elif defined(CONFIG_ENV_IS_NOWHERE)
#define CONFIG_ENV_SIZE 0x2000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index deff617..117c592 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -182,7 +182,6 @@
#if defined(CONFIG_SPIFLASH)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -196,13 +195,11 @@
#endif
#elif defined(CONFIG_SDCARD)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (512 * 0x800)
#elif defined(CONFIG_NAND)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE 0x2000
#if defined(CONFIG_T1024RDB)
#define CONFIG_ENV_OFFSET (2 * CONFIG_SYS_NAND_BLOCK_SIZE)
@@ -210,13 +207,11 @@
#define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE)
#endif
#elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-#define CONFIG_ENV_IS_IN_REMOTE
#define CONFIG_ENV_ADDR 0xffe20000
#define CONFIG_ENV_SIZE 0x2000
#elif defined(CONFIG_ENV_IS_NOWHERE)
#define CONFIG_ENV_SIZE 0x2000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index faf8c9d..7f3dc2b 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -79,7 +79,6 @@
#define CONFIG_ENV_OVERWRITE
#ifdef CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_NOWHERE
#else
#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_CFI
@@ -89,7 +88,6 @@
#ifndef CONFIG_SYS_NO_FLASH
#if defined(CONFIG_SPIFLASH)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -99,17 +97,14 @@
#define CONFIG_ENV_SECT_SIZE 0x10000
#elif defined(CONFIG_SDCARD)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (512 * 1658)
#elif defined(CONFIG_NAND)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
#define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_NAND_BLOCK_SIZE)
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 6cc95ef..01f9f7b 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -143,23 +143,19 @@
#if defined(CONFIG_SPIFLASH)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
#define CONFIG_ENV_SECT_SIZE 0x10000
#elif defined(CONFIG_SDCARD)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (512 * 0x800)
#elif defined(CONFIG_NAND)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (3 * CONFIG_SYS_NAND_BLOCK_SIZE)
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index bad3613..ad5168a 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -159,7 +159,6 @@
#if defined(CONFIG_SPIFLASH)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -169,23 +168,19 @@
#define CONFIG_ENV_SECT_SIZE 0x10000
#elif defined(CONFIG_SDCARD)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (512 * 0x800)
#elif defined(CONFIG_NAND)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE)
#elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-#define CONFIG_ENV_IS_IN_REMOTE
#define CONFIG_ENV_ADDR 0xffe20000
#define CONFIG_ENV_SIZE 0x2000
#elif defined(CONFIG_ENV_IS_NOWHERE)
#define CONFIG_ENV_SIZE 0x2000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 107efdc..e91ca69 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -153,7 +153,6 @@
#if defined(CONFIG_SPIFLASH)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -163,23 +162,19 @@
#define CONFIG_ENV_SECT_SIZE 0x10000
#elif defined(CONFIG_SDCARD)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (512 * 0x800)
#elif defined(CONFIG_NAND)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (2 * CONFIG_SYS_NAND_BLOCK_SIZE)
#elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-#define CONFIG_ENV_IS_IN_REMOTE
#define CONFIG_ENV_ADDR 0xffe20000
#define CONFIG_ENV_SIZE 0x2000
#elif defined(CONFIG_ENV_IS_NOWHERE)
#define CONFIG_ENV_SIZE 0x2000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h
index cfe6557..753e0d9 100644
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@@ -94,7 +94,6 @@
#ifdef CONFIG_SYS_NO_FLASH
#if !defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) && !defined(CONFIG_RAMBOOT_PBL)
-#define CONFIG_ENV_IS_NOWHERE
#endif
#else
#define CONFIG_FLASH_CFI_DRIVER
@@ -104,7 +103,6 @@
#if defined(CONFIG_SPIFLASH)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -114,23 +112,19 @@
#define CONFIG_ENV_SECT_SIZE 0x10000
#elif defined(CONFIG_SDCARD)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (512 * 0x800)
#elif defined(CONFIG_NAND)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE)
#elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-#define CONFIG_ENV_IS_IN_REMOTE
#define CONFIG_ENV_ADDR 0xffe20000
#define CONFIG_ENV_SIZE 0x2000
#elif defined(CONFIG_ENV_IS_NOWHERE)
#define CONFIG_ENV_SIZE 0x2000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 2a22249..080327f 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -383,7 +383,6 @@
#ifdef CONFIG_SYS_NO_FLASH
#ifndef CONFIG_RAMBOOT_PBL
-#define CONFIG_ENV_IS_NOWHERE
#endif
#else
#define CONFIG_FLASH_CFI_DRIVER
@@ -393,7 +392,6 @@
#if defined(CONFIG_SPIFLASH)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -403,19 +401,16 @@
#define CONFIG_ENV_SECT_SIZE 0x10000
#elif defined(CONFIG_SDCARD)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (512 * 0x800)
#elif defined(CONFIG_NAND)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
#define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_NAND_BLOCK_SIZE)
#elif defined(CONFIG_ENV_IS_NOWHERE)
#define CONFIG_ENV_SIZE 0x2000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index cdccbef..19f8c4c 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -468,7 +468,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SIZE 0x4000 /* 16 k - keep small for fast booting */
#if defined(CONFIG_TQM5200_B) || defined (CONFIG_CAM5200)
#define CONFIG_ENV_SECT_SIZE 0x40000
diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index 0d5a2b9..434f141 100644
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -196,7 +196,6 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of memory banks */
#define CONFIG_SYS_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */
#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index e765a03..859b0a6 100644
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -191,7 +191,6 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define CONFIG_SYS_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */
#define CONFIG_ENV_SIZE 0x08000 /* Total Size of Environment */
#define CONFIG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 7b496c8..dcdbad2 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -266,7 +266,6 @@
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR \
(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) for env */
diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index bbdc3f8..2ba77c8 100644
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -180,7 +180,6 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of memory banks */
#define CONFIG_SYS_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */
#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index 5fc87f2..b5bfc0f 100644
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -181,7 +181,6 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define CONFIG_SYS_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */
#define CONFIG_ENV_SIZE 0x08000 /* Total Size of Environment */
#define CONFIG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index 589d168..c0be327 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -184,7 +184,6 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of memory banks */
#define CONFIG_SYS_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */
#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 60acb56..d3e5376 100644
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -214,7 +214,6 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define CONFIG_SYS_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */
#define CONFIG_ENV_SIZE 0x08000 /* Total Size of Environment */
#define CONFIG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index ebc5571..01ae761 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -183,7 +183,6 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of memory banks */
#define CONFIG_SYS_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */
#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index f4ce07f..24bcfb3 100644
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -183,7 +183,6 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define CONFIG_SYS_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */
#define CONFIG_ENV_SIZE 0x08000 /* Total Size of Environment Sector */
#define CONFIG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index 97db519..97c9168 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -187,7 +187,6 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of memory banks */
#define CONFIG_SYS_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */
#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index 25d60a7..9c48302 100644
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -187,7 +187,6 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define CONFIG_SYS_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */
#define CONFIG_ENV_SIZE 0x08000 /* Total Size of Environment */
#define CONFIG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index 928b879..5827cf1 100644
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -226,7 +226,6 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define CONFIG_SYS_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */
#define CONFIG_ENV_SIZE 0x08000 /* Total Size of Environment Sector */
#define CONFIG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index 598020c..1e2e967 100644
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -228,7 +228,6 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define CONFIG_SYS_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */
#define CONFIG_ENV_SIZE 0x08000 /* Total Size of Environment */
#define CONFIG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 57e0c6c..753734b 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -435,7 +435,6 @@
*/
#ifdef CONFIG_ENV_FIT_UCBOOT
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x20000)
#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
@@ -449,7 +448,6 @@
#ifdef CONFIG_RAMBOOT_SPIFLASH
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SIZE 0x3000 /* 12KB */
#define CONFIG_ENV_OFFSET 0x2000 /* 8KB */
#define CONFIG_ENV_SECT_SIZE 0x1000
@@ -461,18 +459,15 @@
#endif
#elif defined(CONFIG_RAMBOOT_SDCARD)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_FSL_FIXED_MMC_LOCATION
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_SYS_MMC_ENV_DEV 0
#elif defined(CONFIG_SYS_RAMBOOT)
-#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_BASE (CONFIG_SYS_FLASH_BASE)
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 6aee6db..a464143 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -83,7 +83,6 @@
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
/* use EEPROM for environment vars */
-#define CONFIG_ENV_IS_IN_EEPROM 1
/* environment starts at offset 0 */
#define CONFIG_ENV_OFFSET 0x000
/* 2KB should be more than enough */
diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h
index e229256..66c69b3 100644
--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@@ -176,7 +176,6 @@
/*
* Environment Variable setup
*/
-#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CONFIG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */
#define CONFIG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/
/* total size of a CAT24WC16 is 2048 bytes */
diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h
index d23d2c4..02e9da2 100644
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -134,7 +134,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SIZE 0x10000
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h
index 3c67655..fa2de21 100644
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -217,7 +217,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SIZE 0x10000
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h
index 54b7028..ca1e33d 100644
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@@ -381,7 +381,6 @@
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
/* This has to be a multiple of the flash sector size */
#define CONFIG_ENV_ADDR 0xFFF40000
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/acadia.h b/include/configs/acadia.h
index 4dd5720..fdec174 100644
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h
@@ -82,7 +82,6 @@
/*-----------------------------------------------------------------------
* Environment
*----------------------------------------------------------------------*/
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
/*-----------------------------------------------------------------------
* FLASH related
diff --git a/include/configs/adp-ag101.h b/include/configs/adp-ag101.h
index e318c75..f4ae914 100644
--- a/include/configs/adp-ag101.h
+++ b/include/configs/adp-ag101.h
@@ -379,7 +379,6 @@
#define CONFIG_SYS_MAX_FLASH_SECT 128
/* environments */
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000)
#define CONFIG_ENV_SIZE 8192
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index 24904b0..c3dc2a9 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -355,7 +355,6 @@
#define CONFIG_SYS_MAX_FLASH_SECT 128
/* environments */
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x140000)
#define CONFIG_ENV_SIZE 8192
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/adp-ag102.h b/include/configs/adp-ag102.h
index 39f7a3c..179e33f 100644
--- a/include/configs/adp-ag102.h
+++ b/include/configs/adp-ag102.h
@@ -334,7 +334,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_SIZE 4096
#endif /* __CONFIG_H */
diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
index 932a309..2d4c19a 100644
--- a/include/configs/afeb9260.h
+++ b/include/configs/afeb9260.h
@@ -129,7 +129,6 @@
GENERATED_GBL_DATA_SIZE)
/* bootstrap + u-boot + env + linux in dataflash on CS1 */
-#define CONFIG_ENV_IS_IN_DATAFLASH
#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
#define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET)
diff --git a/include/configs/alpr.h b/include/configs/alpr.h
index 2782e55..5882d6d 100644
--- a/include/configs/alpr.h
+++ b/include/configs/alpr.h
@@ -81,7 +81,6 @@
#define CONFIG_SYS_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CONFIG_SYS_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#define CONFIG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE-CONFIG_ENV_SECT_SIZE)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 8da3325..7501f0e 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -250,8 +250,6 @@
"8m(NAND.kernel)," \
"-(NAND.rootfs)"
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000
-#undef CONFIG_ENV_IS_NOWHERE
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x001c0000
#define CONFIG_ENV_OFFSET_REDUND 0x001e0000
#define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
@@ -329,8 +327,6 @@
#undef CONFIG_SPL_YMODEM_SUPPORT
#undef CONFIG_SPL_NAND_SUPPORT
#undef CONFIG_SPL_MMC_SUPPORT
-#define CONFIG_ENV_IS_NOWHERE
-#undef CONFIG_ENV_IS_IN_NAND
/* disable host part of MUSB in SPL */
#undef CONFIG_MUSB_HOST
/* disable EFI partitions and partition UUID support */
@@ -405,7 +401,6 @@
#define CONFIG_SPL_SPI_LOAD
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
#define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */
@@ -417,8 +412,6 @@
"128k(u-boot-env2),3464k(kernel)," \
"-(rootfs)"
#elif defined(CONFIG_EMMC_BOOT)
-#undef CONFIG_ENV_IS_NOWHERE
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SPL_ENV_SUPPORT
#define CONFIG_SYS_MMC_ENV_DEV 1
#define CONFIG_SYS_MMC_ENV_PART 2
@@ -466,7 +459,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
/* Reduce SPL size by removing unlikey targets */
#ifdef CONFIG_NOR_BOOT
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_ENV_OFFSET (512 << 10) /* 512 KiB */
#define CONFIG_ENV_OFFSET_REDUND (768 << 10) /* 768 KiB */
diff --git a/include/configs/am335x_igep0033.h b/include/configs/am335x_igep0033.h
index a14310a..dd529bb 100644
--- a/include/configs/am335x_igep0033.h
+++ b/include/configs/am335x_igep0033.h
@@ -104,7 +104,6 @@
#define CONFIG_SYS_NAND_ONFI_DETECTION 1
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x180000 /* environment starts here */
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_OFFSET + CONFIG_SYS_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index c3c9169..fa867fa 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -266,7 +266,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_ENV_IS_IN_NAND 1
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB sector */
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 31e758d..3052e41 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -275,7 +275,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_ENV_IS_IN_NAND 1
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 331fdac..2ae66b1 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -86,7 +86,6 @@
/* NS16550 Configuration */
#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
-#define CONFIG_ENV_IS_IN_FAT
#define FAT_ENV_INTERFACE "mmc"
#define FAT_ENV_DEVICE_AND_PART "0:1"
#define FAT_ENV_FILE "uboot.env"
@@ -166,8 +165,6 @@
#ifdef CONFIG_QSPI_BOOT
#define CONFIG_SYS_TEXT_BASE 0x30000000
-#undef CONFIG_ENV_IS_IN_FAT
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
#define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64 KB sectors */
diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index 5a06311..bcbd361 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -92,7 +92,6 @@
#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024)
#define CONFIG_SYS_BOOTPARAMS_LEN (64 * 1024)
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + \
CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SIZE 0x1000
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 462b2e2..9f969f6 100644
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -141,7 +141,6 @@
#undef CONFIG_SYS_DIRECT_FLASH_TFTP
/* ENV setting */
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
#define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h
index 4282d70..cd70c09 100644
--- a/include/configs/ap_sh4a_4a.h
+++ b/include/configs/ap_sh4a_4a.h
@@ -137,7 +137,6 @@
#define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
/* ENV setting */
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
#define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 6d38853..3179f09 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -33,7 +33,6 @@
#define CONFIG_CMD_MMC
/* Environment in eMMC,@the end of 2nd "boot sector" */
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index 403692d..ded388c 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -115,7 +115,6 @@
*/
#define ACFG_MONITOR_OFFSET 0x00000000
#define CONFIG_SYS_MONITOR_LEN 0x00100000 /* 1MiB */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_OFFSET 0x00100000 /* NAND offset */
#define CONFIG_ENV_SIZE 0x00020000 /* 128kB */
diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
index d1f18bc..42f572a 100644
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -49,7 +49,6 @@
/* Environment */
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_ENV_IS_IN_NAND
/* Environment is in MMC */
#if defined(CONFIG_CMD_MMC) && defined(CONFIG_ENV_IS_IN_MMC)
diff --git a/include/configs/arcangel4.h b/include/configs/arcangel4.h
index 5e4097f..40dbb72 100644
--- a/include/configs/arcangel4.h
+++ b/include/configs/arcangel4.h
@@ -53,7 +53,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_SIZE 0x00200 /* 512 bytes */
#define CONFIG_ENV_OFFSET 0
diff --git a/include/configs/aria.h b/include/configs/aria.h
index 2f9677c..e3f0c47 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -392,7 +392,6 @@
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
/* This has to be a multiple of the flash sector size */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \
CONFIG_SYS_MONITOR_LEN)
diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index cc26790..8c43700 100644
--- a/include/configs/aristainetos.h
+++ b/include/configs/aristainetos.h
@@ -243,7 +243,6 @@
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ENV_SIZE (12 * 1024)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 72469f3..4f3e2c2 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -111,7 +111,6 @@
#define CONFIG_SYS_FLASH_UNLOCK_TOUT 3000
/* ENV setting */
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
#define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + \
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 3ad4a9b..bd0e285 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -41,7 +41,6 @@
#define CONFIG_IDENT_STRING " for ARNDALE"
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (CONFIG_BL2_OFFSET + CONFIG_BL2_SIZE)
#define CONFIG_IRAM_STACK 0x02050000
diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h
index 47760ef..9f28c5f 100644
--- a/include/configs/aspenite.h
+++ b/include/configs/aspenite.h
@@ -54,7 +54,6 @@
/*
* Environment variables configurations
*/
-#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */
#define CONFIG_ENV_SIZE 0x20000 /* 64k */
#endif /* __CONFIG_ASPENITE_H */
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 7b9ff8f..d8b63a8 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -144,7 +144,6 @@
#ifndef CONFIG_MONITOR_IS_IN_RAM
#define CONFIG_ENV_OFFSET 0x1FF8000
#define CONFIG_ENV_SECT_SIZE 0x8000
-#define CONFIG_ENV_IS_IN_FLASH 1
#else
/*
* environment in RAM - This is used to use a single PC-based application
@@ -154,7 +153,6 @@
*/
#define CONFIG_ENV_ADDR 0x40060000
#define CONFIG_ENV_SECT_SIZE 0x8000
-#define CONFIG_ENV_IS_IN_FLASH 1
#endif
/* here we put our FPGA configuration... */
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index 735c82a..51e9a09 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -169,7 +169,6 @@
/*
* Environment Settings
*/
-#define CONFIG_ENV_IS_IN_FLASH
/*
* after u-boot.bin
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index c4b2e16..35c0807 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -204,7 +204,6 @@
#ifdef CONFIG_SYS_USE_DATAFLASH_CS0
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
#define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
@@ -218,7 +217,6 @@
#elif CONFIG_SYS_USE_DATAFLASH_CS1
/* bootstrap + u-boot + env + linux in dataflash on CS1 */
-#define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
#define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET)
@@ -232,7 +230,6 @@
#elif defined(CONFIG_SYS_USE_NANDFLASH)
/* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_OFFSET 0xc0000
#define CONFIG_ENV_OFFSET_REDUND 0x100000
#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
@@ -246,7 +243,6 @@
#else /* CONFIG_SYS_USE_MMC */
/* bootstrap + u-boot + env + linux in mmc */
-#define CONFIG_ENV_IS_IN_MMC
/* For FAT system, most cases it should be in the reserved sector */
#define CONFIG_ENV_OFFSET 0x2000
#define CONFIG_ENV_SIZE 0x1000
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 407a53e..7fd055d 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -168,7 +168,6 @@
#ifdef CONFIG_SYS_USE_DATAFLASH_CS0
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CONFIG_ENV_IS_IN_DATAFLASH
#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
#define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
@@ -182,7 +181,6 @@
#elif CONFIG_SYS_USE_DATAFLASH_CS3
/* bootstrap + u-boot + env + linux in dataflash on CS3 */
-#define CONFIG_ENV_IS_IN_DATAFLASH
#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + 0x8400)
#define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + CONFIG_ENV_OFFSET)
@@ -196,7 +194,6 @@
#else /* CONFIG_SYS_USE_NANDFLASH */
/* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0xc0000
#define CONFIG_ENV_OFFSET_REDUND 0x100000
#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index fa19e8b..dc292d6 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -149,7 +149,6 @@
#define CONFIG_SYS_MONITOR_SEC 1:0-3
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_MONITOR_LEN (256 << 10)
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x007E0000)
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SIZE)
@@ -311,7 +310,6 @@
#ifdef CONFIG_SYS_USE_DATAFLASH
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
#define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
@@ -325,7 +323,6 @@
#elif CONFIG_SYS_USE_NANDFLASH
/* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_OFFSET 0xc0000
#define CONFIG_ENV_OFFSET_REDUND 0x100000
#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index e4c49f4..383d0f1 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -150,7 +150,6 @@
#ifdef CONFIG_SYS_USE_NANDFLASH
/* bootstrap + u-boot + env in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0xc0000
#define CONFIG_ENV_OFFSET_REDUND 0x100000
#define CONFIG_ENV_SIZE 0x20000
@@ -174,7 +173,6 @@
*/
#define FAT_ENV_DEVICE_AND_PART "0"
#define FAT_ENV_FILE "uboot.env"
-#define CONFIG_ENV_IS_IN_FAT
#define CONFIG_FAT_WRITE
#define CONFIG_ENV_SIZE 0x4000
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index c44da1c..fbeca81 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -176,7 +176,6 @@
#ifdef CONFIG_SYS_USE_SPIFLASH
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x5000
#define CONFIG_ENV_SIZE 0x3000
#define CONFIG_ENV_SECT_SIZE 0x1000
@@ -188,7 +187,6 @@
#elif defined(CONFIG_SYS_USE_NANDFLASH)
/* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0xc0000
#define CONFIG_ENV_OFFSET_REDUND 0x100000
#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
@@ -209,7 +207,6 @@
#define CONFIG_SYS_MMC_ENV_DEV 0
#else
/* Use file in FAT file to save environment */
-#define CONFIG_ENV_IS_IN_FAT
#define CONFIG_FAT_WRITE
#define FAT_ENV_INTERFACE "mmc"
#define FAT_ENV_FILE "uboot.env"
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 6c1bd30..4fefe0e 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -147,7 +147,6 @@
#ifdef CONFIG_SYS_USE_DATAFLASH
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
#define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
@@ -161,7 +160,6 @@
#elif CONFIG_SYS_USE_NANDFLASH
/* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_OFFSET 0xc0000
#define CONFIG_ENV_OFFSET_REDUND 0x100000
#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
@@ -178,7 +176,6 @@
#else /* CONFIG_SYS_USE_MMC */
/* bootstrap + u-boot + env + linux in mmc */
-#define CONFIG_ENV_IS_IN_FAT
#define CONFIG_FAT_WRITE
#define FAT_ENV_INTERFACE "mmc"
#define FAT_ENV_FILE "uboot.env"
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 1a481b3..ca0845c 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -174,7 +174,6 @@
#ifdef CONFIG_SYS_USE_NANDFLASH
/* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0xc0000
#define CONFIG_ENV_OFFSET_REDUND 0x100000
#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
@@ -183,7 +182,6 @@
"bootm 0x22000000"
#elif defined(CONFIG_SYS_USE_SPIFLASH)
/* bootstrap + u-boot + env + linux in spi flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x5000
#define CONFIG_ENV_SIZE 0x3000
#define CONFIG_ENV_SECT_SIZE 0x1000
@@ -193,7 +191,6 @@
"bootm 0x22000000"
#elif defined(CONFIG_SYS_USE_DATAFLASH)
/* bootstrap + u-boot + env + linux in data flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_SIZE 0x4200
#define CONFIG_ENV_SECT_SIZE 0x210
@@ -203,7 +200,6 @@
"bootm 0x22000000"
#else /* CONFIG_SYS_USE_MMC */
/* bootstrap + u-boot + env + linux in mmc */
-#define CONFIG_ENV_IS_IN_FAT
#define CONFIG_FAT_WRITE
#define FAT_ENV_INTERFACE "mmc"
#define FAT_ENV_FILE "uboot.env"
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index 540e86a..f11c155 100644
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -136,7 +136,6 @@
#define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE
#define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SIZE 65536
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
index eaed7ea..926bedc 100644
--- a/include/configs/atngw100mkii.h
+++ b/include/configs/atngw100mkii.h
@@ -161,7 +161,6 @@
#define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE
#define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SIZE 65536
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index a9c064a..c645f80 100644
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -155,7 +155,6 @@
#define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE
#define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SIZE 65536
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h
index 63704b1..0c1a7c2 100644
--- a/include/configs/atstk1003.h
+++ b/include/configs/atstk1003.h
@@ -135,7 +135,6 @@
#define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE
#define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SIZE 65536
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h
index 331a60d..80f1e95 100644
--- a/include/configs/atstk1004.h
+++ b/include/configs/atstk1004.h
@@ -135,7 +135,6 @@
#define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE
#define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SIZE 65536
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h
index 25090a6..7e34e97 100644
--- a/include/configs/atstk1006.h
+++ b/include/configs/atstk1006.h
@@ -152,7 +152,6 @@
#define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE
#define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SIZE 65536
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
diff --git a/include/configs/axs101.h b/include/configs/axs101.h
index 389f75b..77c0b2f 100644
--- a/include/configs/axs101.h
+++ b/include/configs/axs101.h
@@ -142,7 +142,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_IN_EEPROM
#define CONFIG_ENV_SIZE 0x00200 /* 512 bytes */
#define CONFIG_ENV_OFFSET 0
diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h
index 848a158..bf3f94c 100644
--- a/include/configs/balloon3.h
+++ b/include/configs/balloon3.h
@@ -131,10 +131,8 @@
#define CONFIG_SYS_FLASH_LOCK_TOUT 240000
#define CONFIG_SYS_FLASH_UNLOCK_TOUT 240000
#define CONFIG_SYS_FLASH_PROTECTION
-#define CONFIG_ENV_IS_IN_FLASH
#else
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_NOWHERE
#endif
#define CONFIG_SYS_MONITOR_BASE 0x000000
diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h
index 6ba4aaf..cb0f2ca 100644
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -86,7 +86,6 @@
/*-----------------------------------------------------------------------
* Environment
*----------------------------------------------------------------------*/
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
/*-----------------------------------------------------------------------
* FLASH related
diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index 490c53e..3932bea 100644
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -18,7 +18,6 @@
#define __CONFIG_BAV335X_H
#include <configs/ti_am335x_common.h>
-#define CONFIG_ENV_IS_NOWHERE
#ifndef CONFIG_SPL_BUILD
# define CONFIG_FIT
@@ -407,8 +406,6 @@ DEFAULT_LINUX_BOOT_ENV \
"8m(NAND.kernel)," \
"-(NAND.rootfs)"
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000
-#undef CONFIG_ENV_IS_NOWHERE
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x001c0000
#define CONFIG_ENV_OFFSET_REDUND 0x001e0000
#define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
@@ -555,7 +552,6 @@ DEFAULT_LINUX_BOOT_ENV \
#define CONFIG_SPL_SPI_LOAD
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
#define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */
@@ -567,8 +563,6 @@ DEFAULT_LINUX_BOOT_ENV \
"128k(u-boot-env2),3464k(kernel)," \
"-(rootfs)"
#elif defined(CONFIG_EMMC_BOOT)
-#undef CONFIG_ENV_IS_NOWHERE
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SPL_ENV_SUPPORT
#define CONFIG_SYS_MMC_ENV_DEV 1
#define CONFIG_SYS_MMC_ENV_PART 2
@@ -616,7 +610,6 @@ DEFAULT_LINUX_BOOT_ENV \
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
/* Reduce SPL size by removing unlikey targets */
#ifdef CONFIG_NOR_BOOT
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_ENV_OFFSET (512 << 10) /* 512 KiB */
#define CONFIG_ENV_OFFSET_REDUND (768 << 10) /* 768 KiB */
diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h
index 1045779..9855db4 100644
--- a/include/configs/bcm28155_ap.h
+++ b/include/configs/bcm28155_ap.h
@@ -92,7 +92,6 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_ENV_SIZE 0x10000
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_SYS_NO_FLASH /* Not using NAND/NOR unmanaged flash */
diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h
index fb85c72..bdab94a 100644
--- a/include/configs/bcm_ep_board.h
+++ b/include/configs/bcm_ep_board.h
@@ -55,7 +55,6 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_SYS_NO_FLASH /* Not using NAND/NOR unmanaged flash */
diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h
index 2e0e922..6e72aeb 100644
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -94,7 +94,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x12000
diff --git a/include/configs/beagle_x15.h b/include/configs/beagle_x15.h
index 4aa8550..d56f092 100644
--- a/include/configs/beagle_x15.h
+++ b/include/configs/beagle_x15.h
@@ -17,7 +17,6 @@
#define CONFIG_NR_DRAM_BANKS 2
#define CONFIG_ENV_SIZE (64 << 10)
-#define CONFIG_ENV_IS_IN_FAT
#define FAT_ENV_INTERFACE "mmc"
#define FAT_ENV_DEVICE_AND_PART "0:1"
#define FAT_ENV_FILE "uboot.env"
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 58013c6..bffee15 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -47,7 +47,6 @@
#define CONFIG_CMD_MMC
/* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h
index 0b66cdb..6a6f964 100644
--- a/include/configs/bf506f-ezkit.h
+++ b/include/configs/bf506f-ezkit.h
@@ -83,7 +83,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_SIZE 0x400
diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h
index 50e85ca..04349fd 100644
--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@@ -117,12 +117,10 @@
* Env Storage Settings
*/
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x10000
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x10000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/bf525-ucr2.h b/include/configs/bf525-ucr2.h
index 008f4b5..e68bccb 100644
--- a/include/configs/bf525-ucr2.h
+++ b/include/configs/bf525-ucr2.h
@@ -72,7 +72,6 @@
#define CONFIG_SF_DEFAULT_HZ 30000000
#define CONFIG_SPI_FLASH_EON
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_MAX_HZ 30000000
#define CONFIG_ENV_OFFSET 0x10000
#define CONFIG_ENV_SIZE 0x10000
diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h
index 7fc882a..7d55db9 100644
--- a/include/configs/bf526-ezbrd.h
+++ b/include/configs/bf526-ezbrd.h
@@ -114,12 +114,10 @@
* Env Storage Settings
*/
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x2000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h
index c2958e8..591408e 100644
--- a/include/configs/bf527-ad7160-eval.h
+++ b/include/configs/bf527-ad7160-eval.h
@@ -97,17 +97,14 @@
* Env Storage Settings
*/
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x10000
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
#elif (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND)
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x40000
#define CONFIG_ENV_SIZE 0x20000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h
index 79e440a..72fbc84 100644
--- a/include/configs/bf527-ezkit.h
+++ b/include/configs/bf527-ezkit.h
@@ -112,17 +112,14 @@
* Env Storage Settings
*/
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x10000
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
#elif (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND)
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x40000
#define CONFIG_ENV_SIZE 0x20000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/bf527-sdp.h b/include/configs/bf527-sdp.h
index b374ab5..f9450ef 100644
--- a/include/configs/bf527-sdp.h
+++ b/include/configs/bf527-sdp.h
@@ -85,13 +85,11 @@
* Env Storage Settings
*/
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x10000
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h
index 0fda967..497381b 100644
--- a/include/configs/bf533-ezkit.h
+++ b/include/configs/bf533-ezkit.h
@@ -85,7 +85,6 @@
#define CONFIG_SYS_FLASH_BASE 0x20000000
#define CONFIG_SYS_MAX_FLASH_BANKS 3
#define CONFIG_SYS_MAX_FLASH_SECT 40
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR 0x20030000
#define CONFIG_ENV_SECT_SIZE 0x10000
#define FLASH_TOT_SECT 40
diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index ae4d83a..ebacf51 100644
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -108,12 +108,10 @@
* Env Storage Settings
*/
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x10000
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x10000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index 6df89af..b80877b 100644
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -111,7 +111,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x10000
#define CONFIG_ENV_SIZE 0x10000
#define CONFIG_ENV_SECT_SIZE 0x10000
diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h
index 4f2b2cb..323ff1b 100644
--- a/include/configs/bf537-pnav.h
+++ b/include/configs/bf537-pnav.h
@@ -94,11 +94,9 @@
*/
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x4000
#else
#define ENV_IS_EMBEDDED
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR 0x20004000
#define CONFIG_ENV_OFFSET 0x4000
#endif
diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index d01d88f..c6c5814 100644
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -110,7 +110,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x10000
#define CONFIG_ENV_SIZE 0x10000
#define CONFIG_ENV_SECT_SIZE 0x10000
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 7b5a5a7..621384f 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -95,12 +95,10 @@
* Env Storage Settings
*/
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x10000
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x10000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h
index e60558e..158a4d7 100644
--- a/include/configs/bf538f-ezkit.h
+++ b/include/configs/bf538f-ezkit.h
@@ -93,12 +93,10 @@
* Env Storage Settings
*/
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x2000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index e71e6d3..bc74562 100644
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -102,18 +102,15 @@
* Env Storage Settings
*/
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x10000
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
#elif (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND)
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x60000
#define CONFIG_ENV_SIZE 0x20000
#else
/* The BF548-EZKIT uses a top boot flash */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_OFFSET (0x1000000 - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h
index 6871d8c..5c029d5 100644
--- a/include/configs/bf561-acvilon.h
+++ b/include/configs/bf561-acvilon.h
@@ -125,7 +125,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_IN_SPI_FLASH
/* #define CONFIG_CMD_SAVEENV */
#define CONFIG_ENV_SECT_SIZE (1056 * 8)
#define CONFIG_ENV_OFFSET ((16 + 256) * 1056)
diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index fb6f948..be0933f 100644
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -78,7 +78,6 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 1
#define CONFIG_SYS_MAX_FLASH_SECT 135
/* The BF561-EZKIT uses a top boot flash */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET (0x800000 - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h
index 7507d57..d0dd90f 100644
--- a/include/configs/bf609-ezkit.h
+++ b/include/configs/bf609-ezkit.h
@@ -110,17 +110,14 @@
* Env Storage Settings
*/
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x10000
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
#elif (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND)
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x60000
#define CONFIG_ENV_SIZE 0x20000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_OFFSET 0x8000
#define CONFIG_ENV_SIZE 0x8000
diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h
index 507d972..6467239 100644
--- a/include/configs/bg0900.h
+++ b/include/configs/bg0900.h
@@ -39,7 +39,6 @@
/* Environment */
#define CONFIG_ENV_SIZE (16 * 1024)
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_ENV_IS_NOWHERE
/* FEC Ethernet on SoC */
#ifdef CONFIG_CMD_NET
diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h
index 7de4253..2585cb3 100644
--- a/include/configs/blackstamp.h
+++ b/include/configs/blackstamp.h
@@ -81,7 +81,6 @@
/* #define CONFIG_ETHADDR 02:80:ad:20:31:b8 */
#endif
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x40000
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x40000
diff --git a/include/configs/blackvme.h b/include/configs/blackvme.h
index 6e5774c..798f69d 100644
--- a/include/configs/blackvme.h
+++ b/include/configs/blackvme.h
@@ -138,7 +138,6 @@
* For the M25P64 SCK should be kept < 15 MHz
*/
#define CONFIG_BFIN_SPI
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x40000
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x40000
diff --git a/include/configs/br4.h b/include/configs/br4.h
index 48cf184..86fd9d2 100644
--- a/include/configs/br4.h
+++ b/include/configs/br4.h
@@ -92,7 +92,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x10000
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x10000
diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h
index ea7b104..22faed1 100644
--- a/include/configs/bubinga.h
+++ b/include/configs/bubinga.h
@@ -66,9 +66,7 @@
* supported for backward compatibility.
*/
#if 1
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#else
-#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#endif
/*
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 44c947f..e9a8098 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -160,7 +160,6 @@
#define CONFIG_CONS_INDEX 1 /* use UART0 for console */
#define CONFIG_BAUDRATE 115200 /* Default baud rate */
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_CFI
#define CONFIG_SYS_FLASH_PROTECTION
diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index f8785db..a502c90 100644
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -146,11 +146,9 @@
#ifdef CONFIG_NAND_DAVINCI
#define CONFIG_ENV_SIZE (16 << 10)
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x180000
#define CONFIG_ENV_RANGE 0x040000
#define CONFIG_ENV_OFFSET_REDUND 0x1c0000
-#undef CONFIG_ENV_IS_IN_FLASH
#endif
#if defined(CONFIG_MMC) && !defined(CONFIG_ENV_IS_IN_NAND)
@@ -158,8 +156,6 @@
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */
#define CONFIG_ENV_OFFSET (51 << 9) /* Sector 51 */
-#define CONFIG_ENV_IS_IN_MMC
-#undef CONFIG_ENV_IS_IN_FLASH
#endif
#define CONFIG_BOOTDELAY 3
diff --git a/include/configs/canmb.h b/include/configs/canmb.h
index c901793..36df13b 100644
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -124,7 +124,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET (2*128*1024)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE (128*1024)
diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index ed790cc..dc996ad 100644
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@@ -127,7 +127,6 @@
/*
* Define here the location of the environment variables (FLASH).
*/
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#define CONFIG_SYS_NOR_CS 0 /* NOR chip connected to CSx */
#define CONFIG_SYS_NAND_CS 3 /* NAND chip connected to CSx */
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 55de464..9e73962 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -50,7 +50,6 @@
#define CONFIG_CMD_MMC
/* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index b189bf1..ddf27b1 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -165,7 +165,6 @@
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_SYS_MMC_ENV_DEV 0
diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h
index 643c837..a917196 100644
--- a/include/configs/cm-bf527.h
+++ b/include/configs/cm-bf527.h
@@ -102,7 +102,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR 0x20008000
#define CONFIG_ENV_OFFSET 0x8000
#define CONFIG_ENV_SIZE 0x8000
diff --git a/include/configs/cm-bf533.h b/include/configs/cm-bf533.h
index 485f01a..7969814 100644
--- a/include/configs/cm-bf533.h
+++ b/include/configs/cm-bf533.h
@@ -84,7 +84,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x20000
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_SIZE 0x10000
diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index e059568..b1273eb 100644
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -97,7 +97,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x8000
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h
index 1f26457..1d9af1e 100644
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@@ -95,7 +95,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x8000
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h
index 72eafc5..748e412 100644
--- a/include/configs/cm-bf548.h
+++ b/include/configs/cm-bf548.h
@@ -94,7 +94,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR 0x20008000
#define CONFIG_ENV_OFFSET 0x8000
#define CONFIG_ENV_SIZE 0x8000
diff --git a/include/configs/cm-bf561.h b/include/configs/cm-bf561.h
index 96910a7..1e088fc 100644
--- a/include/configs/cm-bf561.h
+++ b/include/configs/cm-bf561.h
@@ -85,7 +85,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x20000
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_SIZE 0x10000
diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index 9393864..84cbf47 100644
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -258,7 +258,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SIZE 0x10000
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN)
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index d6e5a2b..043910c 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -86,7 +86,6 @@
/* Environment */
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index 767ef3a..46a5151 100644
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -147,7 +147,6 @@
"1m(u-boot),1m(u-boot-env)," \
"1m(dtb),4m(splash)," \
"6m(kernel),-(rootfs)"
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x300000 /* environment starts here */
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_SYS_NAND_ONFI_DETECTION
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 3eb7886..99f1c58 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -267,7 +267,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
-#define CONFIG_ENV_IS_IN_NAND
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index 8c63138..3ce2b8e 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -268,7 +268,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
-#define CONFIG_ENV_IS_IN_NAND
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h
index 0cd4aec..377cf46 100644
--- a/include/configs/cm_t54.h
+++ b/include/configs/cm_t54.h
@@ -50,7 +50,6 @@
#undef CONFIG_ENV_OFFSET
#undef CONFIG_ENV_SIZE
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */
#define CONFIG_SYS_MMC_ENV_PART 0
#define CONFIG_ENV_OFFSET 0xc0000 /* (in bytes) 768 KB */
diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h
index 32cecbd..c2f7666 100644
--- a/include/configs/cmi_mpc5xx.h
+++ b/include/configs/cmi_mpc5xx.h
@@ -152,7 +152,6 @@
#define CONFIG_SYS_FLASH_WRITE_TOUT 600 /* Timeout for Flash Write (in ms) */
#define CONFIG_SYS_FLASH_PROTECTION 1 /* Physically section protection on */
-#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OFFSET 0x00020000 /* Environment starts at this adress */
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 38fcc40..2c497e6 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -97,11 +97,9 @@
#ifndef CONFIG_MONITOR_IS_IN_RAM
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_SECT_SIZE 0x2000
-#define CONFIG_ENV_IS_IN_FLASH 1
#else
#define CONFIG_ENV_ADDR 0xffe04000
#define CONFIG_ENV_SECT_SIZE 0x2000
-#define CONFIG_ENV_IS_IN_FLASH 1
#endif
#define LDS_BOARD_TEXT \
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 7fc364e..3b31363 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -142,11 +142,9 @@
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1
#define CONFIG_SYS_FLASH_PROTECTION 1
-#define CONFIG_ENV_IS_IN_FLASH 1
#else /* No flash */
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_NOWHERE
#endif
#define CONFIG_SYS_MONITOR_BASE 0x0
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index c17f245..a6a285f 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -50,7 +50,6 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1
/* Environment in NAND, 64K is a bit excessive but erase block is 512K anyway */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET (SZ_2M)
#undef CONFIG_ENV_SIZE /* undef size from tegra20-common.h */
#define CONFIG_ENV_SIZE (SZ_64K)
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index ee6fa1c..353c0cf 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -33,7 +33,6 @@
#define CONFIG_CMD_MMC
/* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index bfcfa0c..eece98b 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -351,11 +351,9 @@
* Environment
*/
#if defined(CONFIG_TRAILBLAZER)
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
#undef CONFIG_CMD_SAVEENV
#elif defined(CONFIG_RAMBOOT_SPIFLASH)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -364,7 +362,6 @@
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
#define CONFIG_ENV_SECT_SIZE 0x10000
#elif defined(CONFIG_RAMBOOT_SDCARD)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_FSL_FIXED_MMC_LOCATION
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_SYS_MMC_ENV_DEV 0
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 8e27ae4..a2eab2d 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -70,7 +70,6 @@
#ifdef CONFIG_SYS_NO_FLASH
#if !defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) && !defined(CONFIG_RAMBOOT_PBL)
-#define CONFIG_ENV_IS_NOWHERE
#endif
#else
#define CONFIG_FLASH_CFI_DRIVER
@@ -80,7 +79,6 @@
#if defined(CONFIG_SPIFLASH)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -90,24 +88,20 @@
#define CONFIG_ENV_SECT_SIZE 0x10000
#elif defined(CONFIG_SDCARD)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_FSL_FIXED_MMC_LOCATION
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (512 * 1658)
#elif defined(CONFIG_NAND)
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
#define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_NAND_BLOCK_SIZE)
#elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
-#define CONFIG_ENV_IS_IN_REMOTE
#define CONFIG_ENV_ADDR 0xffe20000
#define CONFIG_ENV_SIZE 0x2000
#elif defined(CONFIG_ENV_IS_NOWHERE)
#define CONFIG_ENV_SIZE 0x2000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index f5b8f9b..33e3821 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -123,7 +123,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x72000000 /* load address */
/* bootstrap + u-boot + env in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x100000
#define CONFIG_ENV_OFFSET_REDUND 0x180000
#define CONFIG_ENV_SIZE 0x20000
diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h
index 1feaefd..f543c7b 100644
--- a/include/configs/cpu9260.h
+++ b/include/configs/cpu9260.h
@@ -380,7 +380,6 @@
#endif
#if defined(CONFIG_SYS_USE_FLASH)
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OFFSET 0x40000
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_SIZE 0x20000
@@ -422,7 +421,6 @@
"0x10220000 $(filesize)\0" \
""
#elif defined(CONFIG_NANDBOOT)
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x60000
#define CONFIG_ENV_OFFSET_REDUND 0x80000
#define CONFIG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h
index 8c7d97a..2654ff8 100644
--- a/include/configs/cpuat91.h
+++ b/include/configs/cpuat91.h
@@ -170,7 +170,6 @@
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15
#endif
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 128 * 1024)
#define CONFIG_ENV_SIZE (128 * 1024)
#define CONFIG_ENV_SECT_SIZE (128 * 1024)
diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index a5c6f84..17a0102 100644
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -216,9 +216,6 @@
* Environment configuration
*
*/
-#define CONFIG_ENV_IS_IN_FLASH 1 /* environment is in FLASH */
-#undef CONFIG_ENV_IS_IN_NVRAM
-#undef CONFIG_ENV_IS_IN_EEPROM
/*
* General Memory organization
diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index 6aa98ef..3396689 100644
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -216,9 +216,6 @@
* Environment configuration
*
*/
-#define CONFIG_ENV_IS_IN_FLASH 1 /* environment is in FLASH */
-#undef CONFIG_ENV_IS_IN_NVRAM
-#undef CONFIG_ENV_IS_IN_EEPROM
/*
* General Memory organization
diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index 0bdcef7..537cd66 100644
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -82,10 +82,8 @@
* Flash & Environment
*/
#ifdef CONFIG_USE_NAND
-#undef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#define CONFIG_ENV_OFFSET (512 << 10)
#define CONFIG_ENV_SIZE (10 << 10) /* 10KB */
#define CONFIG_SYS_NAND_USE_FLASH_BBT
@@ -100,7 +98,6 @@
#endif
#ifdef CONFIG_USE_NOR
-#define CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_SYS_NO_FLASH
#define CONFIG_SYS_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_CFI
@@ -115,9 +112,6 @@
#endif
#ifdef CONFIG_USE_SPIFLASH
-#undef CONFIG_ENV_IS_IN_FLASH
-#undef CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SIZE (16 << 10)
#define CONFIG_ENV_OFFSET (256 << 10)
#define CONFIG_ENV_SECT_SIZE 4096
@@ -236,7 +230,6 @@
#if !defined(CONFIG_USE_NAND) && \
!defined(CONFIG_USE_NOR) && \
!defined(CONFIG_USE_SPIFLASH)
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ENV_SIZE (16 << 10)
#undef CONFIG_CMD_IMLS
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index e5a612c..07f4145 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -173,10 +173,8 @@
* Flash & Environment
*/
#ifdef CONFIG_USE_NAND
-#undef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
#define CONFIG_ENV_SIZE (128 << 10)
#define CONFIG_SYS_NAND_USE_FLASH_BBT
@@ -231,7 +229,6 @@
#endif
#ifdef CONFIG_USE_NOR
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_CFI
#define CONFIG_SYS_FLASH_PROTECTION
@@ -247,9 +244,6 @@
#endif
#ifdef CONFIG_USE_SPIFLASH
-#undef CONFIG_ENV_IS_IN_FLASH
-#undef CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SIZE (64 << 10)
#define CONFIG_ENV_OFFSET (512 << 10)
#define CONFIG_ENV_SECT_SIZE (64 << 10)
@@ -339,7 +333,6 @@
#if !defined(CONFIG_USE_NAND) && \
!defined(CONFIG_USE_NOR) && \
!defined(CONFIG_USE_SPIFLASH)
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ENV_SIZE (16 << 10)
#undef CONFIG_CMD_IMLS
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 5f5eb3b..97ae3ba 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -43,7 +43,6 @@
#define CONFIG_CMD_MMC
/* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h
index 16b901b..4bf21ca 100644
--- a/include/configs/davinci_dm355evm.h
+++ b/include/configs/davinci_dm355evm.h
@@ -127,17 +127,13 @@
#ifdef CONFIG_NAND_DAVINCI
#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x3C0000
-#undef CONFIG_ENV_IS_IN_FLASH
#endif
#if defined(CONFIG_MMC) && !defined(CONFIG_ENV_IS_IN_NAND)
#define CONFIG_CMD_ENV
#define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */
#define CONFIG_ENV_OFFSET (51 << 9) /* Sector 51 */
-#define CONFIG_ENV_IS_IN_MMC
-#undef CONFIG_ENV_IS_IN_FLASH
#endif
#define CONFIG_BOOTDELAY 5
diff --git a/include/configs/davinci_dm355leopard.h b/include/configs/davinci_dm355leopard.h
index 4eed722..34cee0a 100644
--- a/include/configs/davinci_dm355leopard.h
+++ b/include/configs/davinci_dm355leopard.h
@@ -95,9 +95,7 @@
#ifdef CONFIG_NAND_DAVINCI
#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x3C0000
-#undef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE
#endif
diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h
index c50c059..565082e 100644
--- a/include/configs/davinci_dm365evm.h
+++ b/include/configs/davinci_dm365evm.h
@@ -160,17 +160,13 @@
#ifdef CONFIG_NAND_DAVINCI
#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x3C0000
-#undef CONFIG_ENV_IS_IN_FLASH
#endif
#if defined(CONFIG_MMC) && !defined(CONFIG_ENV_IS_IN_NAND)
#define CONFIG_CMD_ENV
#define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */
#define CONFIG_ENV_OFFSET (51 << 9) /* Sector 51 */
-#define CONFIG_ENV_IS_IN_MMC
-#undef CONFIG_ENV_IS_IN_FLASH
#endif
#define CONFIG_BOOTDELAY 3
diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h
index 2c5a837..b4d1b90 100644
--- a/include/configs/davinci_dm6467evm.h
+++ b/include/configs/davinci_dm6467evm.h
@@ -80,15 +80,12 @@ extern unsigned int davinci_arm_clk_get(void);
#define CONFIG_SYS_NAND_MASK_CLE 0x80000
#define CONFIG_SYS_NAND_MASK_ALE 0x40000
#define CONFIG_SYS_NAND_CS 2
-#undef CONFIG_ENV_IS_IN_FLASH
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */
#define CONFIG_SYS_NAND_BASE_LIST {0x42000000, }
#define CONFIG_SYS_NAND_HW_ECC
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_ENV_OFFSET 0
#else
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_SIZE (4 << 10) /* 4 KiB */
#endif
diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index 2467f70..504aa6f 100644
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -95,9 +95,7 @@
#ifdef CONFIG_SYS_USE_NAND
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NAND_CS 2
-#undef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#ifdef CONFIG_SYS_NAND_SMALLPAGE
#define CONFIG_ENV_SECT_SIZE 512 /* Env sector Size */
#define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */
@@ -124,7 +122,6 @@
#else
#undef CONFIG_SKIP_LOWLEVEL_INIT
#endif
-#define CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_SYS_NO_FLASH
#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_CFI
diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index 2505465..3848ce9 100644
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -62,11 +62,9 @@
/*=====================*/
/* Flash & Environment */
/*=====================*/
-#undef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_SYS_NO_FLASH
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NAND_CS 2
-#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#define CONFIG_ENV_SECT_SIZE 2048 /* Env sector Size */
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index e773835..b489446 100644
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -54,11 +54,9 @@
#define CONFIG_NET_RETRY_COUNT 10
#define CONFIG_OVERWRITE_ETHADDR_ONCE
/* Flash & Environment */
-#undef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_SYS_NO_FLASH
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NAND_CS 2
-#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#define CONFIG_ENV_SECT_SIZE 2048 /* Env sector Size */
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index dae37cd..ee5ad4c 100644
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -96,10 +96,8 @@
#ifdef CONFIG_SYS_USE_NAND
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NAND_CS 2
-#undef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ENV_OVERWRITE /* instead if obsoleted forceenv() */
-#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#define CONFIG_ENV_SECT_SIZE 512 /* Env sector Size */
#define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
@@ -113,7 +111,6 @@
#else
#undef CONFIG_SKIP_LOWLEVEL_INIT
#endif
-#define CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_SYS_NO_FLASH
#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_CFI
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index 12a24ce..ec65be4 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -50,7 +50,6 @@
#define CONFIG_SPI_FLASH_STMICRO
/* Environment in SPI NOR flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */
#define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */
#define CONFIG_ENV_SECT_SIZE (256 << 10) /* 256KiB sectors */
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index 77d3408..8230188 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -47,7 +47,6 @@
#define CONFIG_SPI_FLASH_STMICRO
/* Environment in SPI NOR flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */
#define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */
#define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 56317ef..9b0906d 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -180,7 +180,6 @@
#define CONFIG_SYS_FLASH_ERASE_TOUT (2 * CONFIG_SYS_HZ) /* Timeout for Flash Erase */
#define CONFIG_SYS_FLASH_WRITE_TOUT (2 * CONFIG_SYS_HZ) /* Timeout for Flash Write */
-#define CONFIG_ENV_IS_NOWHERE 1
/* Address and size of Primary Environment Sector */
#define CONFIG_ENV_ADDR 0xB0030000
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index bd96a7d..fae8084 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -72,7 +72,6 @@
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DOS_PARTITION
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_SIZE SZ_128K
/*
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 84b047e..94cd7ae 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -199,7 +199,6 @@
0x01000000) /* 16MB */
/* NAND and environment organization */
-#define CONFIG_ENV_IS_IN_NAND 1
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index 9326401..e029580 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -261,7 +261,6 @@
/* Monitor at start of flash */
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
-#define CONFIG_ENV_IS_IN_NAND
#define SMNAND_ENV_OFFSET 0x0E0000 /* environment starts here */
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index 76ec168..54d20a4 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -313,7 +313,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#if defined(CONFIG_LOWBOOT)
#define CONFIG_ENV_ADDR 0xFF060000
#else /* CONFIG_LOWBOOT */
diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h
index d9bd564..d02b064 100644
--- a/include/configs/dlvision-10g.h
+++ b/include/configs/dlvision-10g.h
@@ -43,7 +43,6 @@
#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
#define CONFIG_FIT_DISABLE_SHA256
-#define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environment vars */
/*
* Default environment variables
diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h
index a9cfc10..15ffe88 100644
--- a/include/configs/dlvision.h
+++ b/include/configs/dlvision.h
@@ -37,7 +37,6 @@
#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
#define CONFIG_FIT_DISABLE_SHA256
-#define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environment vars */
/*
* Default environment variables
diff --git a/include/configs/dnp5370.h b/include/configs/dnp5370.h
index 3f1f9f3..3c4ee47 100644
--- a/include/configs/dnp5370.h
+++ b/include/configs/dnp5370.h
@@ -79,7 +79,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR 0x20004000
#define CONFIG_ENV_SIZE 0x00002000
#define CONFIG_ENV_SECT_SIZE 0x00002000 /* Total Size of Environment Sector */
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 379e6c7..81d1192 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -106,10 +106,8 @@
* Environment variables configurations
*/
#ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128KB */
#else
-#define CONFIG_ENV_IS_NOWHERE
#endif
#define CONFIG_ENV_SIZE 0x20000 /* 128KB */
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index ec7f721..cba4e1b 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -51,10 +51,8 @@
* Environment variables configurations
*/
#ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */
#else
-#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */
#endif
/*
* max 4k env size is enough, but in case of nand
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index d79612b..15f04fb 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -17,7 +17,6 @@
#ifndef CONFIG_QSPI_BOOT
/* MMC ENV related defines */
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */
#define CONFIG_ENV_SIZE (128 << 10)
#define CONFIG_ENV_OFFSET 0xE0000
@@ -152,7 +151,6 @@
#define CONFIG_SPL_MAX_SIZE (64 << 10) /* 64 KiB */
#endif
#define CONFIG_SPL_ENV_SUPPORT
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
#define CONFIG_ENV_SIZE (64 << 10)
@@ -282,7 +280,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
/* Reduce SPL size by removing unlikey targets */
#ifdef CONFIG_NOR_BOOT
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SECT_SIZE (128 * 1024) /* 128 KiB */
#define MTDIDS_DEFAULT "nor0=physmap-flash.0"
#define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:" \
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index ea6e5c0..7576925 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -66,10 +66,8 @@
* Environment variables configurations
*/
#ifdef CONFIG_SPI_FLASH
-#define CONFIG_ENV_IS_IN_SPI_FLASH 1
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64k */
#else
-#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */
#endif
#ifdef CONFIG_CMD_SF
diff --git a/include/configs/duovero.h b/include/configs/duovero.h
index e68f415..8c9a19a 100644
--- a/include/configs/duovero.h
+++ b/include/configs/duovero.h
@@ -55,7 +55,6 @@
#define CONFIG_CMD_GPIO
/* ENV related config options */
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index ae89368..31ec1f1 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -95,9 +95,6 @@
#endif
#ifdef CONFIG_USE_SPIFLASH
-#undef CONFIG_ENV_IS_IN_FLASH
-#undef CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SIZE (8 << 10)
#define CONFIG_ENV_OFFSET 0x80000
#define CONFIG_ENV_SECT_SIZE (64 << 10)
@@ -208,7 +205,6 @@
#if !defined(CONFIG_SYS_USE_NAND) && \
!defined(CONFIG_USE_NOR) && \
!defined(CONFIG_USE_SPIFLASH)
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ENV_SIZE (16 << 10)
#undef CONFIG_CMD_IMLS
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index e2b9326..41f0085 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -50,7 +50,6 @@
#define CONFIG_ENV_ADDR 0xFF040000
#define CONFIG_ENV_SECT_SIZE 0x00020000
-#define CONFIG_ENV_IS_IN_FLASH 1
/*
* BOOTP options
diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index f7e70aa..01f9ae6 100644
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -324,7 +324,6 @@
#define CONFIG_BOOTDELAY 5
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x80000)
#define CONFIG_ENV_SIZE 0x20000 /* sectors are 128K here */
diff --git a/include/configs/ebony.h b/include/configs/ebony.h
index 3f0ad69..da5f9d0 100644
--- a/include/configs/ebony.h
+++ b/include/configs/ebony.h
@@ -34,9 +34,7 @@
* supported for backward compatibility.
*/
#if 1
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#else
-#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#endif
/*-----------------------------------------------------------------------
diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index e26591c..4ace46f 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -161,7 +161,6 @@
#define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
/* ENV setting */
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
#define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index a82e8bc..53e2320 100644
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -245,7 +245,6 @@
#define CONFIG_SYS_MONITOR_LEN (256 * 1024)
#define CONFIG_ENV_OVERWRITE /* Vendor params unprotected */
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR 0x60040000
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index bd08740..741c672 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -216,7 +216,6 @@
/*
* Environment variables configurations
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SECT_SIZE 0x2000 /* 16K */
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET 0x4000 /* env starts here */
diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h
index cdea4a8..a058827 100644
--- a/include/configs/enbw_cmc.h
+++ b/include/configs/enbw_cmc.h
@@ -154,7 +154,6 @@
#define CONFIG_CMD_FLASH
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_SYS_MONITOR_LEN 0x80000
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + \
CONFIG_SYS_MONITOR_LEN)
@@ -163,7 +162,6 @@
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + \
CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
-#undef CONFIG_ENV_IS_IN_NAND
#define CONFIG_DEFAULT_SETTINGS_ADDR (CONFIG_ENV_ADDR_REDUND + \
CONFIG_ENV_SECT_SIZE)
@@ -284,7 +282,6 @@
#if !defined(CONFIG_USE_NAND) && \
!defined(CONFIG_USE_NOR) && \
!defined(CONFIG_USE_SPIFLASH)
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ENV_SIZE (16 << 10)
#undef CONFIG_CMD_IMLS
diff --git a/include/configs/espt.h b/include/configs/espt.h
index de16be7..f2345ad 100644
--- a/include/configs/espt.h
+++ b/include/configs/espt.h
@@ -84,7 +84,6 @@
/* Use hardware flash sectors protection instead of U-Boot software protection */
#undef CONFIG_SYS_FLASH_PROTECTION
#undef CONFIG_SYS_DIRECT_FLASH_TFTP
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + (1 * CONFIG_ENV_SECT_SIZE))
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index b79000e..5feec17 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -67,7 +67,6 @@
#define DATAFLASH_TCSS (0x1a << 16)
#define DATAFLASH_TCHS (0x1 << 24)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x3DE000
#define CONFIG_ENV_SECT_SIZE (132 << 10)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h
index 75bff4c..5981d88 100644
--- a/include/configs/favr-32-ezkit.h
+++ b/include/configs/favr-32-ezkit.h
@@ -155,7 +155,6 @@
#define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE
#define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SIZE 65536
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index 5f7cad8..a8c7b42 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -179,7 +179,6 @@
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \
CONFIG_SYS_MONITOR_LEN)
-#define CONFIG_ENV_IS_IN_FLASH
/*
* CFI FLASH driver setup
diff --git a/include/configs/fx12mm.h b/include/configs/fx12mm.h
index d0083fd..79106a2 100644
--- a/include/configs/fx12mm.h
+++ b/include/configs/fx12mm.h
@@ -30,7 +30,6 @@
#define CONFIG_SYS_SDRAM_SIZE_MB 64
/* environment */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SIZE 0x10000
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_SYS_ENV_OFFSET 0xA0000
diff --git a/include/configs/gdppc440etx.h b/include/configs/gdppc440etx.h
index 12fd75d..6a160d8 100644
--- a/include/configs/gdppc440etx.h
+++ b/include/configs/gdppc440etx.h
@@ -80,7 +80,6 @@
* Define here the location of the environment variables (FLASH or EEPROM).
* Note: DENX encourages to use redundant environment in FLASH.
*/
-#define CONFIG_ENV_IS_IN_FLASH 1 /* FLASH for env. vars*/
/*
* FLASH related
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index 836515d..0551883 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -78,10 +78,8 @@
* Environment variables configurations
*/
#ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */
#else
-#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */
#endif
/*
* max 4k env size is enough, but in case of nand
diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
index 0ac198d..03b5b44 100644
--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -116,7 +116,6 @@
/*
* Environment variables configurations
*/
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SECT_SIZE 0x4000
#define CONFIG_ENV_SIZE 0x4000
#define CONFIG_ENV_OFFSET 0x07C000
diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index 854807d..13da05c 100644
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -200,8 +200,6 @@
/*
* Environment settings
*/
-/*#define CONFIG_ENV_IS_NOWHERE 1*/
-#define CONFIG_ENV_IS_IN_FLASH 1
/* CONFIG_ENV_ADDR need to be at sector boundary */
#define CONFIG_ENV_SIZE 0x8000
#define CONFIG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index ed2dd2a..29a27ef 100644
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -188,8 +188,6 @@
/*
* Environment settings
*/
-/*#define CONFIG_ENV_IS_NOWHERE 1*/
-#define CONFIG_ENV_IS_IN_FLASH 1
/* CONFIG_ENV_ADDR need to be at sector boundary */
#define CONFIG_ENV_SIZE 0x8000
#define CONFIG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index e3cbb6f..22b4dda 100644
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -164,8 +164,6 @@
/*
* Environment settings
*/
-/*#define CONFIG_ENV_IS_NOWHERE 1*/
-#define CONFIG_ENV_IS_IN_FLASH 1
/* CONFIG_ENV_ADDR need to be at sector boundary */
#define CONFIG_ENV_SIZE 0x8000
#define CONFIG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h
index 54eb977..4c8f903 100644
--- a/include/configs/grasshopper.h
+++ b/include/configs/grasshopper.h
@@ -146,7 +146,6 @@
#define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE
#define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH
/* place u-boot env in flash sector after u-boot */
#define CONFIG_ENV_SIZE 0x10000
#define CONFIG_ENV_ADDR 0x20000
diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index 1e089a9..b0d79ce 100644
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -189,8 +189,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_NOWHERE 1
-/*#define CONFIG_ENV_IS_IN_FLASH*/
/*#define CONFIG_ENV_SIZE 0x8000*/
#define CONFIG_ENV_SECT_SIZE 0x40000
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index 66194a8..02a9e0b 100644
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -186,8 +186,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_NOWHERE 1
-/*#define CONFIG_ENV_IS_IN_FLASH*/
/*#define CONFIG_ENV_SIZE 0x8000*/
#define CONFIG_ENV_SECT_SIZE 0x40000
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index 8e53af8..5395a22 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -67,10 +67,8 @@
* Environment variables configurations
*/
#ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */
#else
-#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */
#endif
/*
* max 4k env size is enough, but in case of nand
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index fcfc1b3..aead45b 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -293,9 +293,7 @@
/* Persistent Environment Config */
#define CONFIG_ENV_OVERWRITE /* allow to overwrite serial and ethaddr */
#ifdef CONFIG_SPI_FLASH
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#else
-#define CONFIG_ENV_IS_IN_NAND
#endif
#if defined(CONFIG_ENV_IS_IN_MMC)
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index 109cee9..1406bbd 100644
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -30,7 +30,6 @@
#define CONFIG_ENV_SIZE 0x00040000
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_LOAD_ADDR 0xa3000000 /* default load address */
diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h
index 0bc42f1..8c550a0 100644
--- a/include/configs/hammerhead.h
+++ b/include/configs/hammerhead.h
@@ -129,7 +129,6 @@
#define CONFIG_SYS_SDRAM_BASE 0x10000000
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SIZE 65536
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index ad3dcdb..ef5bdc3 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -39,7 +39,6 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1
/* Environment in NAND (which is 512M), aligned to start of last sector */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sector size */
/* USB Host support */
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index da1c837..184da97 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -90,7 +90,6 @@
/* Environment data setup
*/
-#define CONFIG_ENV_IS_IN_NVRAM
#define CONFIG_SYS_NVRAM_BASE_ADDR 0xfff88000 /* NVRAM base address */
#define CONFIG_SYS_NVRAM_SIZE 0x8000 /* NVRAM size */
#define CONFIG_ENV_SIZE 0x2000 /* Size of Environ */
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index e7df9ad..e8d16c6 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -453,7 +453,6 @@ int fpga_gpio_get(unsigned int bus, int pin);
* Environment
*/
#if 1
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \
CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */
@@ -461,7 +460,6 @@ int fpga_gpio_get(unsigned int bus, int pin);
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#else
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
#endif
diff --git a/include/configs/hummingboard.h b/include/configs/hummingboard.h
index 973f2c5..4979e88 100644
--- a/include/configs/hummingboard.h
+++ b/include/configs/hummingboard.h
@@ -210,7 +210,6 @@
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_SYS_MMC_ENV_DEV 0
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index f1ddf21..b71b4ea 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -67,10 +67,8 @@
* Environment variables configuration
*/
#ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SECT_SIZE 0x20000
#else
-#define CONFIG_ENV_IS_NOWHERE
#endif
#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_ENV_OFFSET 0xe0000
diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h
index 2a937c6..7d59a43 100644
--- a/include/configs/ibf-dsp561.h
+++ b/include/configs/ibf-dsp561.h
@@ -78,7 +78,6 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define CONFIG_SYS_MAX_FLASH_SECT 135 /* max number of sectors on one chip */
/* The BF561-EZKIT uses a top boot flash */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x4000
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/icon.h b/include/configs/icon.h
index bbe9b59..aa460fe 100644
--- a/include/configs/icon.h
+++ b/include/configs/icon.h
@@ -147,7 +147,6 @@
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment uses flash */
/*
* Default environment variables
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index 2baf50c..0310927 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -60,10 +60,8 @@
* Environment variables configuration
*/
#ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SECT_SIZE 0x20000
#else
-#define CONFIG_ENV_IS_NOWHERE
#endif
#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_ENV_OFFSET 0x80000
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index c1ca56c..50be7fb 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -456,7 +456,6 @@
/*
* Environment Configuration
*/
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE \
+ CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SIZE 0x20000
diff --git a/include/configs/ima3-mx53.h b/include/configs/ima3-mx53.h
index ad1614a..20bb4f0 100644
--- a/include/configs/ima3-mx53.h
+++ b/include/configs/ima3-mx53.h
@@ -147,7 +147,6 @@
#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \
CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index 386dbd8..7ba4c11 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -93,7 +93,6 @@
/*
* Flash & Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_CFI
/* Use buffered writes (~10x faster) */
diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index 0f22032..48d1457 100644
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -141,7 +141,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE /* Monitor at beginning of flash */
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x001f0000)
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SIZE (64 * 1024)
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index db197f3..39cc034 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -149,7 +149,6 @@
/* Monitor at beginning of flash */
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
-#define CONFIG_ENV_IS_IN_EEPROM
#define CONFIG_ENV_OFFSET 0x00 /* env. starts here */
#define CONFIG_ENV_SIZE 4096
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x52
diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index f321975..d1d96e8 100644
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -165,7 +165,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x4000)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x2000
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index 8439db7..d4818ab 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -57,7 +57,6 @@
/* Flash settings */
#define CONFIG_SYS_FLASH_SIZE 0x02000000 /* 32 MiB */
#define CONFIG_SYS_MAX_FLASH_SECT 128
-#define CONFIG_ENV_IS_NOWHERE 1
#define CONFIG_ENV_SIZE 32768
/*-----------------------------------------------------------------------
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 7518b60..5e23857 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -56,7 +56,6 @@
#define PHYS_FLASH_SIZE 0x01000000 /* 16MB */
#define CONFIG_SYS_MAX_FLASH_SECT 64
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_SYS_MONITOR_LEN 0x00100000
/*
diff --git a/include/configs/intip.h b/include/configs/intip.h
index 928eb5b..65d9e1b 100644
--- a/include/configs/intip.h
+++ b/include/configs/intip.h
@@ -113,7 +113,6 @@
/*
* Define here the location of the environment variables (FLASH).
*/
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#define CONFIG_SYS_NOR_CS 0 /* NOR chip connected to CSx */
/*
diff --git a/include/configs/io.h b/include/configs/io.h
index d4ae0ad..4b600e2 100644
--- a/include/configs/io.h
+++ b/include/configs/io.h
@@ -43,7 +43,6 @@
#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
#define CONFIG_FIT_DISABLE_SHA256
-#define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environment vars */
/*
* Default environment variables
diff --git a/include/configs/io64.h b/include/configs/io64.h
index 2a9ff37..798edee 100644
--- a/include/configs/io64.h
+++ b/include/configs/io64.h
@@ -128,7 +128,6 @@
/*-----------------------------------------------------------------------
* Environment
*----------------------------------------------------------------------*/
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
/*-----------------------------------------------------------------------
* FLASH related
diff --git a/include/configs/iocon.h b/include/configs/iocon.h
index 38d473d..bba8db9 100644
--- a/include/configs/iocon.h
+++ b/include/configs/iocon.h
@@ -42,7 +42,6 @@
#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
#define CONFIG_FIT_DISABLE_SHA256
-#define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environment vars */
/*
* Default environment variables
diff --git a/include/configs/ip04.h b/include/configs/ip04.h
index 2ee215f..274afd0 100644
--- a/include/configs/ip04.h
+++ b/include/configs/ip04.h
@@ -100,7 +100,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_PREBOOT "echo starting from spi flash"
#define CONFIG_ENV_OFFSET 0x30000
#define CONFIG_ENV_SIZE 0x10000
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index 664a2b2..8b1f2fe 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -147,7 +147,6 @@
*/
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
#define CONFIG_ENV_SIZE (128 << 10)
#define CONFIG_SYS_NAND_USE_FLASH_BBT
diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index 41ced15..c819723 100644
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -219,7 +219,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SIZE 0x10000
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 8c016b7..8037d01 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -35,7 +35,6 @@
#define CONFIG_CMD_MMC
/* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/include/configs/jornada.h b/include/configs/jornada.h
index 7e18d8e..4718fca 100644
--- a/include/configs/jornada.h
+++ b/include/configs/jornada.h
@@ -92,7 +92,6 @@
#define CONFIG_FLASH_SHOW_PROGRESS 1
/* Environment */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR 0x00040000
#define CONFIG_ENV_OFFSET 0x00040000
#define CONFIG_ENV_SIZE 0x00040000
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index 7dfaa22..56f4102 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -189,7 +189,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index fa72eb0..10cf3a9 100644
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -154,7 +154,6 @@
/*-----------------------------------------------------------------------
* Environment
*----------------------------------------------------------------------*/
-#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment uses flash */
/*
* Default environment variables
diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h
index 1990b2d..0421e78 100644
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -118,7 +118,6 @@
/*-----------------------------------------------------------------------
* Environment
*----------------------------------------------------------------------*/
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
/*-----------------------------------------------------------------------
* FLASH related
diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h
index 940000e..52c8935 100644
--- a/include/configs/km/km83xx-common.h
+++ b/include/configs/km/km83xx-common.h
@@ -184,7 +184,6 @@
*/
#ifndef CONFIG_SYS_RAMBOOT
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \
CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
@@ -197,7 +196,6 @@
#else /* CFG_SYS_RAMBOOT */
#define CONFIG_SYS_NO_FLASH /* Flash is not usable now */
-#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif /* CFG_SYS_RAMBOOT */
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 2ed0855..b14f2f9 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -232,7 +232,6 @@ int get_scl(void);
* Environment variables configurations
*/
#if defined CONFIG_KM_ENV_IS_IN_SPI_NOR
-#define CONFIG_ENV_IS_IN_SPI_FLASH /* use SPI-Flash for environment vars */
#define CONFIG_ENV_OFFSET 0xc0000 /* no bracets! */
#define CONFIG_ENV_SIZE 0x02000 /* Size of Environment */
#define CONFIG_ENV_SECT_SIZE 0x10000
@@ -240,7 +239,6 @@ int get_scl(void);
CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_TOTAL_SIZE 0x20000 /* no bracets! */
#else
-#define CONFIG_ENV_IS_IN_EEPROM /* use EEPROM for environment vars */
#define CONFIG_SYS_DEF_EEPROM_ADDR 0x50
#define CONFIG_ENV_EEPROM_IS_ON_I2C
#define CONFIG_SYS_EEPROM_WREN
diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index b70b5b1..f62a4b6 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -57,7 +57,6 @@
/* Environment in SPI Flash */
#define CONFIG_SYS_EXTRA_ENV_RELOC
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 20000000
diff --git a/include/configs/km82xx.h b/include/configs/km82xx.h
index 12f9d42..9a16e58 100644
--- a/include/configs/km82xx.h
+++ b/include/configs/km82xx.h
@@ -212,7 +212,6 @@
#define CONFIG_SYS_MONITOR_LEN (768 << 10)
-#define CONFIG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h
index 42280ca..ecebd1f 100644
--- a/include/configs/ks2_evm.h
+++ b/include/configs/ks2_evm.h
@@ -184,7 +184,6 @@
#define CONFIG_SYS_NAND_MAX_CHIPS 1
#define CONFIG_SYS_NAND_NO_SUBPAGE_WRITE
#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x100000
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
diff --git a/include/configs/kwb.h b/include/configs/kwb.h
index d1c745e..6afe6f6 100644
--- a/include/configs/kwb.h
+++ b/include/configs/kwb.h
@@ -131,8 +131,6 @@ BUR_COMMON_ENV \
#define CONFIG_USB_STORAGE
#endif /* CONFIG_MUSB_HOST */
-#undef CONFIG_ENV_IS_NOWHERE
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
#define CONFIG_ENV_OFFSET 0x40000 /* TODO: Adresse definieren */
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index ac74ae7..b4a4873 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -114,7 +114,6 @@
#undef CONFIG_SYS_FLASH_PROTECTION
#undef CONFIG_SYS_DIRECT_FLASH_TFTP
-#define CONFIG_ENV_IS_IN_FLASH
/* GPIO / PFC */
#define CONFIG_SH_GPIO_PFC
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 9ac5d33..87c23fb 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -181,7 +181,6 @@
/*
* Environment variables configurations
*/
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64KB */
#define CONFIG_ENV_SIZE 0x1000 /* 4KB */
#define CONFIG_ENV_ADDR 0x70000
diff --git a/include/configs/lp8x4x.h b/include/configs/lp8x4x.h
index a269372..962a409 100644
--- a/include/configs/lp8x4x.h
+++ b/include/configs/lp8x4x.h
@@ -158,7 +158,6 @@
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1
#define CONFIG_SYS_FLASH_PROTECTION 1
-#define CONFIG_ENV_IS_IN_FLASH 1
/*
* GPIO settings
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 9a8fd50..9816505 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -625,20 +625,16 @@ unsigned long get_board_ddr_clk(void);
#if defined(CONFIG_SD_BOOT)
#define CONFIG_ENV_OFFSET 0x100000
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE 0x2000
#elif defined(CONFIG_QSPI_BOOT)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
#define CONFIG_ENV_SECT_SIZE 0x10000
#elif defined(CONFIG_NAND_BOOT)
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE)
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 729205f..3d77b91 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -417,16 +417,13 @@
#if defined(CONFIG_SD_BOOT)
#define CONFIG_ENV_OFFSET 0x100000
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE 0x20000
#elif defined(CONFIG_QSPI_BOOT)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET 0x100000
#define CONFIG_ENV_SECT_SIZE 0x10000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/ls2085a_emu.h b/include/configs/ls2085a_emu.h
index 2d68e1b..5a97d51 100644
--- a/include/configs/ls2085a_emu.h
+++ b/include/configs/ls2085a_emu.h
@@ -83,7 +83,6 @@
#define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 200000
/* Store environment at top of flash */
-#define CONFIG_ENV_IS_NOWHERE 1
#define CONFIG_ENV_SIZE 0x1000
#endif /* __LS2_EMU_H */
diff --git a/include/configs/ls2085a_simu.h b/include/configs/ls2085a_simu.h
index d0d2eed..d361909 100644
--- a/include/configs/ls2085a_simu.h
+++ b/include/configs/ls2085a_simu.h
@@ -144,7 +144,6 @@
#define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 200000
/* Store environment at top of flash */
-#define CONFIG_ENV_IS_NOWHERE 1
#define CONFIG_ENV_SIZE 0x1000
#endif /* __LS2_SIMU_H */
diff --git a/include/configs/ls2085aqds.h b/include/configs/ls2085aqds.h
index 711d529..c847b02 100644
--- a/include/configs/ls2085aqds.h
+++ b/include/configs/ls2085aqds.h
@@ -207,7 +207,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_SYS_CS0_FTIM2 CONFIG_SYS_NAND_FTIM2
#define CONFIG_SYS_CS0_FTIM3 CONFIG_SYS_NAND_FTIM3
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET (896 * 1024)
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_SIZE 0x2000
@@ -243,7 +242,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_SYS_CS2_FTIM2 CONFIG_SYS_NAND_FTIM2
#define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_NAND_FTIM3
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x200000)
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/ls2085ardb.h b/include/configs/ls2085ardb.h
index d1c2548..afa69d6 100644
--- a/include/configs/ls2085ardb.h
+++ b/include/configs/ls2085ardb.h
@@ -190,7 +190,6 @@ unsigned long get_board_sys_clk(void);
#define CONFIG_SYS_CS0_FTIM2 CONFIG_SYS_NAND_FTIM2
#define CONFIG_SYS_CS0_FTIM3 CONFIG_SYS_NAND_FTIM3
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET (2048 * 1024)
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_SIZE 0x2000
@@ -216,7 +215,6 @@ unsigned long get_board_sys_clk(void);
#define CONFIG_SYS_CS2_FTIM2 CONFIG_SYS_NAND_FTIM2
#define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_NAND_FTIM3
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x200000)
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index c354c29..4a260d1 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -100,10 +100,8 @@
#ifdef CONFIG_SPI_FLASH
#define CONFIG_SYS_MAX_FLASH_BANKS 1
#define CONFIG_SYS_MAX_FLASH_SECT 8
-#define CONFIG_ENV_IS_IN_SPI_FLASH 1
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K */
#else
-#define CONFIG_ENV_IS_NOWHERE
#endif
#define CONFIG_ENV_SIZE 0x10000 /* 64k */
diff --git a/include/configs/luan.h b/include/configs/luan.h
index 15e4a7e..5c18743 100644
--- a/include/configs/luan.h
+++ b/include/configs/luan.h
@@ -80,7 +80,6 @@
* Define here the location of the environment variables (FLASH or EEPROM).
* Note: DENX encourages to use redundant environment in FLASH.
*/
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
/*-----------------------------------------------------------------------
* FLASH related
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index d43db52..9745acc 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -128,7 +128,6 @@
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environment vars */
/*
* FLASH related
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index dbc00ce..ea2740c 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -58,7 +58,6 @@
/* Environment */
#define CONFIG_ENV_SIZE (16 * 1024)
-#define CONFIG_ENV_IS_IN_NAND
/* Environment is in NAND */
#if defined(CONFIG_CMD_NAND) && defined(CONFIG_ENV_IS_IN_NAND)
@@ -86,7 +85,6 @@
"238m(data)," \
"- at 4096k(UBI)"
#else
-#define CONFIG_ENV_IS_NOWHERE
#endif
/* FEC Ethernet on SoC */
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 0cc1282..496a425 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -126,7 +126,6 @@
#define CONFIG_SYS_NAND_USE_FLASH_BBT
/* Environment is in NAND */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_RANGE (4 * CONFIG_ENV_SECT_SIZE)
@@ -151,7 +150,6 @@
"240m(data)," \
"- at 2048k(UBI)"
#else
-#define CONFIG_ENV_IS_NOWHERE
#endif
/*
diff --git a/include/configs/makalu.h b/include/configs/makalu.h
index fd4c26e..e9033ef 100644
--- a/include/configs/makalu.h
+++ b/include/configs/makalu.h
@@ -100,7 +100,6 @@
/*-----------------------------------------------------------------------
* Environment
*----------------------------------------------------------------------*/
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
/*-----------------------------------------------------------------------
* FLASH related
diff --git a/include/configs/malta.h b/include/configs/malta.h
index 9445c9b..b4116bd 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -100,7 +100,6 @@
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
#define CONFIG_ENV_ADDR \
diff --git a/include/configs/manroland/mpc5200-common.h b/include/configs/manroland/mpc5200-common.h
index 60e8716..acbba2c 100644
--- a/include/configs/manroland/mpc5200-common.h
+++ b/include/configs/manroland/mpc5200-common.h
@@ -85,7 +85,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SIZE 0x4000
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h
index d8811a4..ec3f300 100644
--- a/include/configs/maxbcm.h
+++ b/include/configs/maxbcm.h
@@ -47,7 +47,6 @@
#define CONFIG_SPI_FLASH_BAR
/* Environment in SPI NOR flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */
#define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */
#define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index de7792a..c8bd6c4 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -319,7 +319,6 @@
/* **** PISMO SUPPORT *** */
#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_ENV_IS_IN_NAND
#define SMNAND_ENV_OFFSET 0x180000 /* environment starts here */
/* Redundant Environment */
diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h
index 0b9cbae..d4b2df0 100644
--- a/include/configs/mecp5123.h
+++ b/include/configs/mecp5123.h
@@ -289,7 +289,6 @@
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_EEPROM /* Store env in I2C EEPROM */
#define CONFIG_ENV_SIZE 0x1000
#define CONFIG_ENV_OFFSET 0x0000 /* environment starts here */
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index f721a4d..ad5ed06 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -32,7 +32,6 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1
/* Environment in NAND, aligned to start of last sector */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */
/* USB host support */
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index 955d0e2..247dcb8 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -172,7 +172,6 @@
#ifdef CONFIG_SYS_USE_DATAFLASH
/* bootstrap + u-boot + env in dataflash on CS0 */
-# define CONFIG_ENV_IS_IN_DATAFLASH
# define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + \
0x8400)
# define CONFIG_ENV_OFFSET 0x4200
@@ -183,7 +182,6 @@
#elif CONFIG_SYS_USE_NANDFLASH
/* bootstrap + u-boot + env + linux in nandflash */
-# define CONFIG_ENV_IS_IN_NAND 1
# define CONFIG_ENV_OFFSET 0xC0000
# define CONFIG_ENV_SIZE 0x20000
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 166ab4f..e91831d 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -157,12 +157,10 @@
/* use buffered writes (20x faster) */
# define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1
# ifdef RAMENV
-# define CONFIG_ENV_IS_NOWHERE 1
# define CONFIG_ENV_SIZE 0x1000
# define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE)
# else /* FLASH && !RAMENV */
-# define CONFIG_ENV_IS_IN_FLASH 1
/* 128K(one sector) for env */
# define CONFIG_ENV_SECT_SIZE 0x20000
# define CONFIG_ENV_ADDR \
@@ -183,12 +181,10 @@
# define CONFIG_SF_DEFAULT_CS XILINX_SPI_FLASH_CS
# ifdef RAMENV
-# define CONFIG_ENV_IS_NOWHERE 1
# define CONFIG_ENV_SIZE 0x1000
# define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE)
# else /* SPIFLASH && !RAMENV */
-# define CONFIG_ENV_IS_IN_SPI_FLASH 1
# define CONFIG_ENV_SPI_MODE SPI_MODE_3
# define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
# define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
@@ -202,7 +198,6 @@
/* ENV in RAM */
# define CONFIG_SYS_NO_FLASH 1
-# define CONFIG_ENV_IS_NOWHERE 1
# define CONFIG_ENV_SIZE 0x1000
# define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE)
#endif /* !SPIFLASH */
diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h
index 2fd3add..ef93217 100644
--- a/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@@ -150,7 +150,6 @@
#define CONFIG_SYS_FRAM_BASE 0x08000000
#define CONFIG_SYS_FRAM_SIZE 0x20000
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SIZE 65536
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index 2a1915d..e88d20e 100644
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -70,7 +70,5 @@
#define CONFIG_SYS_CACHELINE_SIZE 16
/* Environment in SPI flash is unsupported for now */
-#undef CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_ENV_IS_NOWHERE
#endif /* __CONFIG_H */
diff --git a/include/configs/ml507.h b/include/configs/ml507.h
index b9ecb09..f8064e8 100644
--- a/include/configs/ml507.h
+++ b/include/configs/ml507.h
@@ -17,7 +17,6 @@
#define CONFIG_SYS_SDRAM_SIZE_MB 256
/*Env*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_OFFSET 0x340000
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index e8b0593..0521559 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -334,7 +334,6 @@ extern void __led_set(led_id_t id, int state);
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
/* This has to be a multiple of the Flash sector size */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SIZE 0x1000
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index 41ae0a5..420012d 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -398,7 +398,6 @@
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
/* This has to be a multiple of the Flash sector size */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index d2ef1af..0a44561 100644
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -376,7 +376,6 @@
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \
CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index 8ae497c..bae633f 100644
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -55,7 +55,6 @@
#define CONFIG_SYS_MAX_FLASH_SECT 256
#define CONFIG_SYS_MAX_FLASH_BANKS 1
#define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE }
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index 585d68f..912ba9c 100644
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -73,7 +73,6 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 1
#define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE }
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 1c8ada6..a030dd1 100644
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -97,7 +97,6 @@
#undef CONFIG_SYS_DIRECT_FLASH_TFTP
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
#define CONFIG_ENV_SECT_SIZE (8 * 1024)
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index 4cf8efe..afab051 100644
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -70,7 +70,6 @@
#define CONFIG_SYS_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
diff --git a/include/configs/munices.h b/include/configs/munices.h
index e65a14a..b9091e6 100644
--- a/include/configs/munices.h
+++ b/include/configs/munices.h
@@ -137,7 +137,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x40000
#define CONFIG_ENV_ADDR (CONFIG_SYS_TEXT_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/mv88f6281gtw_ge.h b/include/configs/mv88f6281gtw_ge.h
index 311fc0c..6be2d9d 100644
--- a/include/configs/mv88f6281gtw_ge.h
+++ b/include/configs/mv88f6281gtw_ge.h
@@ -53,10 +53,8 @@
* Environment variables configurations
*/
#ifdef CONFIG_SPI_FLASH
-#define CONFIG_ENV_IS_IN_SPI_FLASH 1
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K */
#else
-#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */
#endif
#define CONFIG_ENV_SIZE 0x1000 /* 4k */
#define CONFIG_ENV_ADDR 0x30000
diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h
index e377fea..3bcc59c 100644
--- a/include/configs/mx23_olinuxino.h
+++ b/include/configs/mx23_olinuxino.h
@@ -33,7 +33,6 @@
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
/* Environment */
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OVERWRITE
/* Environment is in MMC */
diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h
index b496892..c61dc9e 100644
--- a/include/configs/mx23evk.h
+++ b/include/configs/mx23evk.h
@@ -39,7 +39,6 @@
/* Environment */
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_ENV_IS_IN_MMC
/* 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 bfbfc68..936942d 100644
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -66,7 +66,6 @@
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
/* U-Boot general configuration */
diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index bed071f..69c811d 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -162,7 +162,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE /* Monitor at beginning of flash */
#define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256KiB */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 1282a6e..e939775 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -157,7 +157,6 @@
/* No NOR flash present */
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x40000
#define CONFIG_ENV_OFFSET_REDUND 0x60000
#define CONFIG_ENV_SIZE (128 * 1024)
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 244a9ab..5ce0c52 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -197,10 +197,8 @@
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \
CONFIG_SYS_MONITOR_LEN)
-#define CONFIG_ENV_IS_IN_FLASH
#if defined(CONFIG_FSL_ENV_IN_NAND)
- #define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET (1024 * 1024)
#endif
diff --git a/include/configs/mx51_efikamx.h b/include/configs/mx51_efikamx.h
index fce7ead..cd14ed6 100644
--- a/include/configs/mx51_efikamx.h
+++ b/include/configs/mx51_efikamx.h
@@ -105,11 +105,9 @@
#define CONFIG_ENV_SPI_MAX_HZ 25000000
#define CONFIG_ENV_SPI_MODE (SPI_MODE_0)
#define CONFIG_FSL_ENV_IN_SF
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_SYS_NO_FLASH
#else
-#define CONFIG_ENV_IS_NOWHERE
#endif
/* SPI PMIC */
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index b0c9717..8a541d2 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -261,7 +261,6 @@
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#endif
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index 7c3dc20..63502cd 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -224,7 +224,6 @@
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_OF_LIBFDT
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index 22a9fc4..a9b8589 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -171,7 +171,6 @@
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#endif /* __CONFIG_H */
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index a56e72e..a23b9a5 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -215,7 +215,6 @@
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_OF_LIBFDT
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index 0785491..e31752e 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -159,7 +159,6 @@
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_OF_LIBFDT
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index b569f34..aa02ea7 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -209,7 +209,6 @@
/* Environment organization */
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (8 * 64 * 1024)
#define CONFIG_OF_LIBFDT
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 5412dd3..38edb3b 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -181,7 +181,6 @@
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 1
#define CONFIG_OF_LIBFDT
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index b72522b..628704a 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -247,7 +247,6 @@
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
#if defined(CONFIG_ENV_IS_IN_MMC)
#define CONFIG_ENV_OFFSET (8 * 64 * 1024)
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index cd023de..61e2900 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -201,7 +201,6 @@
#define CONFIG_ENV_SIZE SZ_8K
#if defined CONFIG_SYS_BOOT_SPINOR
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET (768 * 1024)
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
@@ -210,7 +209,6 @@
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
#else
#define CONFIG_ENV_OFFSET (8 * SZ_64K)
-#define CONFIG_ENV_IS_IN_MMC
#endif
#define CONFIG_OF_LIBFDT
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 248303c..f054e58 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -258,7 +258,6 @@
#define CONFIG_ENV_OFFSET (8 * SZ_64K)
#define CONFIG_ENV_SIZE SZ_8K
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_OF_LIBFDT
#define CONFIG_CMD_BOOTZ
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index cfb85bf..1ae7f14 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -74,10 +74,8 @@
* Environment variables configurations
*/
#ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SECT_SIZE 0x10000
#else
-#define CONFIG_ENV_IS_NOWHERE
#endif
#define CONFIG_ENV_SIZE 0x10000
diff --git a/include/configs/neo.h b/include/configs/neo.h
index 09300ca..39851ca 100644
--- a/include/configs/neo.h
+++ b/include/configs/neo.h
@@ -40,7 +40,6 @@
#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */
#define CONFIG_FIT_DISABLE_SHA256
-#define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environment vars */
/*
* Default environment variables
diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
index 52cde41..05e043c 100644
--- a/include/configs/nhk8815.h
+++ b/include/configs/nhk8815.h
@@ -148,7 +148,6 @@
# define CONFIG_JFFS2_DEV "onenand0"
# define CONFIG_JFFS2_PART_SIZE 0x01600000
# define CONFIG_JFFS2_PART_OFFSET 0x00680000
-# define CONFIG_ENV_IS_IN_ONENAND
# define CONFIG_ENV_SIZE 0x20000 /* 128 Kb - one sector */
# define CONFIG_ENV_ADDR (0x00280000 - CONFIG_ENV_SIZE)
@@ -165,7 +164,6 @@
# define CONFIG_JFFS2_NAND 1 /* For the jffs2 support*/
# define CONFIG_JFFS2_PART_SIZE 0x01600000
# define CONFIG_JFFS2_PART_OFFSET 0x00580000
-# define CONFIG_ENV_IS_IN_NAND
# define CONFIG_ENV_SIZE 0x20000 /* 128 Kb - one sector */
# define CONFIG_ENV_OFFSET (0x00280000 - CONFIG_ENV_SIZE)
diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h
index 6247bf1..41bcaa9 100644
--- a/include/configs/nios2-generic.h
+++ b/include/configs/nios2-generic.h
@@ -100,7 +100,6 @@
* of flash. NOTE: the monitor length must be multiple of sector size
* (which is common practice).
*/
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SIZE 0x20000 /* 128k, 1 sector */
#define CONFIG_ENV_OVERWRITE /* Serial change Ok */
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index eaa2c2c..e20c246 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -359,9 +359,7 @@
#define CONFIG_ENV_SIZE (8 * 1024)
#if defined(CONFIG_SABRELITE)
-#define CONFIG_ENV_IS_IN_MMC
#else
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#endif
#if defined(CONFIG_ENV_IS_IN_MMC)
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 152a6e5..a6a3cf0 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -447,7 +447,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
* FLASH and environment organization
*/
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 425db8a..3a20529 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -75,14 +75,12 @@
* http://homepage.ntlworld.com./jonathan.deboynepollard/FGA/disc-partition-alignment.html
*/
#ifdef CONFIG_CMD_MMC
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_OFFSET (512 * 1024)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#define CONFIG_ENV_OFFSET_REDUND \
(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
#else
-#define CONFIG_ENV_IS_NOWHERE
#endif
/* Booting Linux */
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index 5397599..eccc791 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -32,7 +32,6 @@
#define CONFIG_CMD_MMC
/* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h
index 18388d1..26a7241 100644
--- a/include/configs/o2dnt-common.h
+++ b/include/configs/o2dnt-common.h
@@ -251,7 +251,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h
index 4ff2f05..2635f6c 100644
--- a/include/configs/ocotea.h
+++ b/include/configs/ocotea.h
@@ -75,9 +75,7 @@
* supported for backward compatibility.
*/
#if 1
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#else
-#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#endif
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 5ee0abe..f01f6d1 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -61,7 +61,6 @@
#define CONFIG_SYS_MONITOR_BASE 0x00000000
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV
#define CONFIG_ENV_SIZE 4096
#define CONFIG_ENV_OFFSET (SZ_1K * 1280) /* 1.25 MiB offset */
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index c395020..3bcc058 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -31,7 +31,6 @@
#define CONFIG_SYS_MEM_TOP_HIDE (22UL << 20UL)
#define CONFIG_TZSW_RESERVED_DRAM_SIZE CONFIG_SYS_MEM_TOP_HIDE
-#define CONFIG_ENV_IS_IN_MMC
#undef CONFIG_ENV_SIZE
#undef CONFIG_ENV_OFFSET
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index f25a940..efb3a9a 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -281,7 +281,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
-#define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
index 3030054..c6d116f 100644
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -195,7 +195,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
-#define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
index 370f21e..298bd04 100644
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@@ -216,9 +216,7 @@
#if !defined(CONFIG_ENV_IS_NOWHERE)
#if defined(CONFIG_CMD_NAND)
-#define CONFIG_ENV_IS_IN_NAND
#elif defined(CONFIG_CMD_ONENAND)
-#define CONFIG_ENV_IS_IN_ONENAND
#define CONFIG_ENV_OFFSET ONENAND_ENV_OFFSET
#endif
#endif /* CONFIG_ENV_IS_NOWHERE */
diff --git a/include/configs/omap3_evm_quick_mmc.h b/include/configs/omap3_evm_quick_mmc.h
index a7acc1b..d5bc034 100644
--- a/include/configs/omap3_evm_quick_mmc.h
+++ b/include/configs/omap3_evm_quick_mmc.h
@@ -35,7 +35,6 @@
* ----------------------------------------------------------------------------
*/
#define CONFIG_SILENT_CONSOLE
-#define CONFIG_ENV_IS_NOWHERE
/* ----------------------------------------------------------------------------
* Supported hardware
diff --git a/include/configs/omap3_evm_quick_nand.h b/include/configs/omap3_evm_quick_nand.h
index c6cad93..62fa1ef 100644
--- a/include/configs/omap3_evm_quick_nand.h
+++ b/include/configs/omap3_evm_quick_nand.h
@@ -34,7 +34,6 @@
* ----------------------------------------------------------------------------
*/
#define CONFIG_SILENT_CONSOLE
-#define CONFIG_ENV_IS_NOWHERE
/* -----------------------------------------------------------------------------
* Include common board configuration
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index a5e7d8f..d515740 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -81,7 +81,6 @@
#define CONFIG_CMD_PING
#define CONFIG_CMD_NFS /* NFS support */
-/*#undef CONFIG_ENV_IS_NOWHERE*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"usbtty=cdc_acm\0" \
@@ -161,14 +160,12 @@
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
-#define CONFIG_ENV_IS_IN_ONENAND 1
#define CONFIG_ENV_SIZE (512 << 10) /* Total Size Environment */
#define CONFIG_ENV_ADDR ONENAND_ENV_OFFSET
#endif
#ifdef CONFIG_NAND
#define CONFIG_ENV_OFFSET 0x260000 /* environment starts here */
-#define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_SIZE (512 << 10) /* Total Size Environment */
#define CONFIG_ENV_ADDR NAND_ENV_OFFSET
#endif
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 13cd35b..7ab44ba 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -295,7 +295,6 @@
#if defined(CONFIG_CMD_NAND)
#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
#endif
diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
index b61297f..aebbd22 100644
--- a/include/configs/omap3_mvblx.h
+++ b/include/configs/omap3_mvblx.h
@@ -246,7 +246,6 @@
#define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0
#define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1
-#define CONFIG_ENV_IS_NOWHERE 1
/*----------------------------------------------------------------------------
* Network Subsystem (SMSC9211 Ethernet from SMSC9118 family)
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index e1db29a..ebea0dd 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -209,7 +209,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
-#define CONFIG_ENV_IS_IN_NAND
#define ONENAND_ENV_OFFSET 0x240000 /* environment starts here */
#define SMNAND_ENV_OFFSET 0x240000 /* environment starts here */
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 8d3531c..56bf57d 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -127,7 +127,6 @@
/* Monitor at start of flash */
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
-#define CONFIG_ENV_IS_IN_NAND 1
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h
index 1ca79d4..4bc8d0b 100644
--- a/include/configs/omap3_sdp3430.h
+++ b/include/configs/omap3_sdp3430.h
@@ -142,7 +142,6 @@
/* OMITTED: single 2 Gbit KFM2G16 OneNAND flash */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_SYS_ENV_SECT_SIZE (256 << 10)
#define CONFIG_ENV_OFFSET CONFIG_SYS_ENV_SECT_SIZE
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_ENV_SECT_SIZE)
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index 611cd5e..51288c8 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -178,7 +178,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
-#define CONFIG_ENV_IS_IN_NAND 1
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h
index e97c5e3..efeede2 100644
--- a/include/configs/omap4_panda.h
+++ b/include/configs/omap4_panda.h
@@ -45,7 +45,6 @@
/* ENV related config options */
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-#define CONFIG_ENV_IS_IN_FAT
#define FAT_ENV_INTERFACE "mmc"
#define FAT_ENV_DEVICE_AND_PART "0:1"
#define FAT_ENV_FILE "uboot.env"
diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h
index a837974..868b4f3 100644
--- a/include/configs/omap4_sdp4430.h
+++ b/include/configs/omap4_sdp4430.h
@@ -27,7 +27,6 @@
#endif
/* ENV related config options */
-#define CONFIG_ENV_IS_IN_MMC 1
#define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */
#define CONFIG_ENV_OFFSET 0xE0000
#define CONFIG_CMD_SAVEENV
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index 0ca4e82..97416cf 100644
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -25,7 +25,6 @@
#define CONFIG_MISC_INIT_R
/* MMC ENV related defines */
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */
#define CONFIG_ENV_SIZE (128 << 10)
#define CONFIG_ENV_OFFSET 0xE0000
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 68b4010..9bbfbc1 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -133,10 +133,8 @@
* Flash & Environment
*/
#ifdef CONFIG_USE_NAND
-#undef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
#define CONFIG_ENV_SIZE (128 << 9)
#define CONFIG_SYS_NAND_USE_FLASH_BBT
@@ -153,7 +151,6 @@
#endif
#ifdef CONFIG_SYS_USE_NOR
-#define CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_SYS_NO_FLASH
#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_CFI
@@ -170,9 +167,6 @@
#endif
#ifdef CONFIG_USE_SPIFLASH
-#undef CONFIG_ENV_IS_IN_FLASH
-#undef CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SIZE (64 << 10)
#define CONFIG_ENV_OFFSET (256 << 10)
#define CONFIG_ENV_SECT_SIZE (64 << 10)
@@ -276,7 +270,6 @@
#if !defined(CONFIG_USE_NAND) && \
!defined(CONFIG_SYS_USE_NOR) && \
!defined(CONFIG_USE_SPIFLASH)
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ENV_SIZE (16 << 10)
#undef CONFIG_CMD_IMLS
@@ -293,7 +286,6 @@
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT
#define CONFIG_CMD_MMC
-#undef CONFIG_ENV_IS_IN_MMC
#endif
#ifdef CONFIG_ENV_IS_IN_MMC
@@ -301,9 +293,6 @@
#undef CONFIG_ENV_OFFSET
#define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */
#define CONFIG_ENV_OFFSET (51 << 9) /* Sector 51 */
-#undef CONFIG_ENV_IS_IN_FLASH
-#undef CONFIG_ENV_IS_IN_NAND
-#undef CONFIG_ENV_IS_IN_SPI_FLASH
#endif
#ifndef CONFIG_DIRECT_NOR_BOOT
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index b6f80af..415ef77 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -64,10 +64,8 @@
* Environment variables configurations
*/
#ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */
#else
-#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */
#endif
/*
* max 4k env size is enough, but in case of nand
diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h
index d4de3c3..ae3a4f9 100644
--- a/include/configs/openrisc-generic.h
+++ b/include/configs/openrisc-generic.h
@@ -79,7 +79,6 @@
CONFIG_SYS_SDRAM_SIZE - \
CONFIG_SYS_MONITOR_LEN)
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment, 128KB */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE)
diff --git a/include/configs/origen.h b/include/configs/origen.h
index 8f1e256..a5861a4 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -105,7 +105,6 @@
/* MIU (Memory Interleaving Unit) */
#define CONFIG_MIU_2BIT_21_7_INTERLEAVED
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE (16 << 10) /* 16 KB */
#define RESERVE_BLOCK_SIZE (512)
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 200f40a..92e2ea3 100644
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -193,7 +193,6 @@
/* FLASH and environment organization */
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SIZE (64 * 1024) /* 64 kb */
#define CONFIG_ENV_OFFSET (1024 * 1024)
/* M25P16 has an erase size of 64 KiB */
diff --git a/include/configs/otc570.h b/include/configs/otc570.h
index 2390beb..64e61e3 100644
--- a/include/configs/otc570.h
+++ b/include/configs/otc570.h
@@ -224,7 +224,6 @@
#ifdef CONFIG_SYS_USE_DATAFLASH
/* bootstrap + u-boot + env in dataflash on CS0 */
-# define CONFIG_ENV_IS_IN_DATAFLASH
# define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + \
0x8400)
# define CONFIG_ENV_OFFSET 0x4200
@@ -235,7 +234,6 @@
#elif CONFIG_SYS_USE_NANDFLASH
/* bootstrap + u-boot + env + linux in nandflash */
-# define CONFIG_ENV_IS_IN_NAND 1
# define CONFIG_ENV_OFFSET 0xC0000
# define CONFIG_ENV_SIZE 0x20000
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index a5f9717..d7b60a0 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -858,7 +858,6 @@
* Environment
*/
#ifdef CONFIG_SPIFLASH
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS 0
#define CONFIG_ENV_SPI_CS 0
#define CONFIG_ENV_SPI_MAX_HZ 10000000
@@ -867,7 +866,6 @@
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
#define CONFIG_ENV_SECT_SIZE 0x10000
#elif defined(CONFIG_SDCARD)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_FSL_FIXED_MMC_LOCATION
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_SYS_MMC_ENV_DEV 0
@@ -878,15 +876,12 @@
#else
#define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
#endif
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET (1024 * 1024)
#define CONFIG_ENV_RANGE (3 * CONFIG_ENV_SIZE)
#elif defined(CONFIG_SYS_RAMBOOT)
-#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index 9864c15..0894b88 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -407,16 +407,13 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
*/
#ifdef CONFIG_SYS_RAMBOOT
#ifdef CONFIG_RAMBOOT_SDCARD
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_SYS_MMC_ENV_DEV 0
#else
-#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h
index 225567b..14943d3 100644
--- a/include/configs/p3p440.h
+++ b/include/configs/p3p440.h
@@ -283,7 +283,6 @@
#define CONFIG_SYS_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CONFIG_SYS_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#define CONFIG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE-CONFIG_ENV_SECT_SIZE)
diff --git a/include/configs/palmld.h b/include/configs/palmld.h
index 7dbc9ae..452fa59 100644
--- a/include/configs/palmld.h
+++ b/include/configs/palmld.h
@@ -162,11 +162,9 @@
#define CONFIG_SYS_FLASH_UNLOCK_TOUT 240000
#define CONFIG_SYS_FLASH_PROTECTION
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SECT_SIZE 0x10000
#else
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_NOWHERE
#endif
#define CONFIG_ENV_ADDR 0x40000
diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h
index 75506b2..7be365a 100644
--- a/include/configs/palmtc.h
+++ b/include/configs/palmtc.h
@@ -159,11 +159,9 @@
#define CONFIG_SYS_FLASH_UNLOCK_TOUT 240000
#define CONFIG_SYS_FLASH_PROTECTION
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SECT_SIZE 0x40000
#else
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_NOWHERE
#endif
#define CONFIG_SYS_MONITOR_BASE 0x0
diff --git a/include/configs/palmtreo680.h b/include/configs/palmtreo680.h
index bd0f44b..40edce3 100644
--- a/include/configs/palmtreo680.h
+++ b/include/configs/palmtreo680.h
@@ -250,7 +250,6 @@
/*
* environment
*/
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_BUILD_ENVCRC
#define CONFIG_ENV_SIZE 0x200
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 284419f..42332d3 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -37,7 +37,6 @@
#define CONFIG_CMD_MMC
/* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index a1926bb..71b164f 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -96,7 +96,6 @@
#define CONFIG_SYS_FLASH_ERASE_TOUT (2 * CONFIG_SYS_HZ) /* Timeout for Flash Erase */
#define CONFIG_SYS_FLASH_WRITE_TOUT (2 * CONFIG_SYS_HZ) /* Timeout for Flash Write */
-#define CONFIG_ENV_IS_NOWHERE 1
/* Address and size of Primary Environment Sector */
#define CONFIG_ENV_ADDR 0xB0030000
diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h
index 31a93c8..998be2c 100644
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -190,7 +190,6 @@ RTC configuration
---------------------------------------------------------------------------*/
/* pcm030 ships with environment is EEPROM by default */
-#define CONFIG_ENV_IS_IN_EEPROM 1
#define CONFIG_ENV_OFFSET 0x00 /* environment starts at the */
/*beginning of the EEPROM */
#define CONFIG_ENV_SIZE CONFIG_SYS_EEPROM_SIZE
diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index c0bb227..4e0b637 100644
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -122,7 +122,6 @@
4800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, 115200 }
/* CPU */
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_SPL_YMODEM_SUPPORT
#define CONFIG_SPL_NET_SUPPORT
diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h
index e6e06f2..8ab5f57 100644
--- a/include/configs/pcs440ep.h
+++ b/include/configs/pcs440ep.h
@@ -78,7 +78,6 @@
/*-----------------------------------------------------------------------
* Environment
*----------------------------------------------------------------------*/
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
/*-----------------------------------------------------------------------
* FLASH related
diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h
index 17d7bca..9b531fa 100644
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@@ -367,7 +367,6 @@
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
/* This has to be a multiple of the Flash sector size */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \
CONFIG_SYS_MONITOR_LEN)
diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h
index e3cb09e..392140a 100644
--- a/include/configs/peach-pi.h
+++ b/include/configs/peach-pi.h
@@ -9,7 +9,6 @@
#ifndef __CONFIG_PEACH_PI_H
#define __CONFIG_PEACH_PI_H
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_SPI_FLASH
#define CONFIG_ENV_SPI_BASE 0x12D30000
#define FLASH_SIZE (0x4 << 20)
diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
index 3ee42ef..78c7e41 100644
--- a/include/configs/peach-pit.h
+++ b/include/configs/peach-pit.h
@@ -9,7 +9,6 @@
#ifndef __CONFIG_PEACH_PIT_H
#define __CONFIG_PEACH_PIT_H
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_SPI_FLASH
#define CONFIG_ENV_SPI_BASE 0x12D30000
#define FLASH_SIZE (0x4 << 20)
diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h
index 4684ad6..7b3f887 100644
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -156,7 +156,6 @@
"128k(SPL.backup3),1792k(u-boot)," \
"128k(u-boot-spl-os)," \
"128k(u-boot-env),5m(kernel),-(rootfs)"
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x260000 /* environment starts here */
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
/* NAND: SPL falcon mode configs */
diff --git a/include/configs/pepper.h b/include/configs/pepper.h
index cc153ab..9f4341b 100644
--- a/include/configs/pepper.h
+++ b/include/configs/pepper.h
@@ -25,7 +25,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_PEPPER
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
-#define CONFIG_ENV_IS_NOWHERE
/* Display cpuinfo */
#define CONFIG_DISPLAY_CPUINFO
diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index 91ffc7c..ca7d649 100644
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -132,7 +132,6 @@
#define CONFIG_MXC_OCOTP
/* Environment in NAND */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET (16 << 20)
#define CONFIG_ENV_SECT_SIZE (128 << 10)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
@@ -143,7 +142,6 @@
/* Environment in MMC */
#define CONFIG_ENV_SIZE (8 << 10)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_SYS_MMC_ENV_DEV 0
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 6878ed7..47e1bc0 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -32,7 +32,6 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1
/* Environment in NAND, aligned to start of last sector */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */
/* USB host support */
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index 10415d3..ed3e71a 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -263,7 +263,6 @@
#ifdef CONFIG_SYS_USE_DATAFLASH_CS0
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CONFIG_SYS_MONITOR_BASE \
(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
#define CONFIG_ENV_OFFSET 0x4200
@@ -279,7 +278,6 @@
#elif defined(CONFIG_SYS_USE_NANDFLASH) /* CONFIG_SYS_USE_NANDFLASH */
/* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_OFFSET 0x60000
#define CONFIG_ENV_OFFSET_REDUND 0x80000
#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
@@ -293,7 +291,6 @@
#elif defined (CONFIG_SYS_USE_FLASH)
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x40000
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_SIZE 0x10000
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index f6aebf4..00f95d3 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -292,7 +292,6 @@
#ifdef CONFIG_SYS_USE_DATAFLASH
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CONFIG_ENV_IS_IN_DATAFLASH
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
#define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
@@ -306,7 +305,6 @@
#elif defined(CONFIG_SYS_USE_NANDFLASH) /* CFG_USE_NANDFLASH */
/* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x60000
#define CONFIG_ENV_OFFSET_REDUND 0x80000
#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
@@ -324,7 +322,6 @@
#elif defined(CONFIG_SYS_USE_FLASH) /* CFG_USE_FLASH */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x40000
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_SIZE 0x10000
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index a8dc0f0..9636fe3 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -139,7 +139,6 @@
#define CONFIG_SYS_MEMTEST_END CONFIG_AT91SAM9G45_LCD_BASE
/* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_OFFSET 0x60000
#define CONFIG_ENV_OFFSET_REDUND 0x80000
#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index 89560ad..8e6d9b5 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -56,10 +56,8 @@
* Environment variables configurations
*/
#ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */
#else
-#define CONFIG_ENV_IS_NOWHERE
#endif
#define CONFIG_ENV_SIZE 0x20000 /* 128k */
diff --git a/include/configs/pr1.h b/include/configs/pr1.h
index 13fb675..71c334d 100644
--- a/include/configs/pr1.h
+++ b/include/configs/pr1.h
@@ -92,7 +92,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x10000
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_SECT_SIZE 0x10000
diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
index af7c076..ab703e1 100644
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -327,7 +327,6 @@
#define CONFIG_SYS_FLASH_WRITE_TOUT (25*CONFIG_SYS_HZ) /* Timeout for Flash Write */
/* put cfg@end of flash for now */
-#define CONFIG_ENV_IS_IN_FLASH 1
/* Addr of Environment Sector */
#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SIZE - 0x40000)
#define CONFIG_ENV_SIZE PHYS_FLASH_SECT_SIZE /* Total Size of Environment Sector */
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index 75da8a1..eaca954 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -134,7 +134,6 @@
#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN)
/* Address and size of Primary Environment Sector */
diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index b07ca4e..847d80b 100644
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -136,7 +136,6 @@
#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN)
/* Address and size of Primary Environment Sector */
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 7071849..d2ca043 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -83,7 +83,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_HWCONFIG
diff --git a/include/configs/qong.h b/include/configs/qong.h
index d383fe8..847c688 100644
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -234,7 +234,6 @@ extern int qong_nand_rdy(void *chip);
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_MONITOR_LEN 0x40000 /* Reserve 256KiB */
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x80000)
diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h
index a71709b..12b6498 100644
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -143,7 +143,6 @@
#define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
/* ENV setting */
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
#define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 24d0c34..d49c989 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -65,7 +65,6 @@
#define CONFIG_SYS_MAX_FLASH_SECT 256
#define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE }
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SECT_SIZE 0x40000
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 8156724..86644d3 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -90,7 +90,6 @@
/* print 'E' for empty sector on flinfo */
#define CONFIG_SYS_FLASH_EMPTY_INFO
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SECT_SIZE (256 * 1024)
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index c33f1cb..2c889aa 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -86,7 +86,6 @@
#define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
/* ENV setting */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_ADDR 0xC0000
/* Common ENV setting */
diff --git a/include/configs/rd6281a.h b/include/configs/rd6281a.h
index e80949e..6c0c0f7 100644
--- a/include/configs/rd6281a.h
+++ b/include/configs/rd6281a.h
@@ -45,10 +45,8 @@
* Environment variables configurations
*/
#ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */
#else
-#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */
#endif
/*
* max 4k env size is enough, but in case of nand
diff --git a/include/configs/redwood.h b/include/configs/redwood.h
index 622b7c7..238c564 100644
--- a/include/configs/redwood.h
+++ b/include/configs/redwood.h
@@ -106,9 +106,6 @@
/*-----------------------------------------------------------------------
* Environment
*----------------------------------------------------------------------*/
-#undef CONFIG_ENV_IS_IN_NVRAM /* ... not in NVRAM */
-#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment uses flash */
-#undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
#define CONFIG_PREBOOT "echo;" \
"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h
index 3121ac9..d98503c 100644
--- a/include/configs/rpi-common.h
+++ b/include/configs/rpi-common.h
@@ -98,7 +98,6 @@
/* Environment */
#define CONFIG_ENV_SIZE SZ_16K
-#define CONFIG_ENV_IS_IN_FAT
#define FAT_ENV_INTERFACE "mmc"
#define FAT_ENV_DEVICE_AND_PART "0:1"
#define FAT_ENV_FILE "uboot.env"
diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index e7f7387..ab64bb3 100644
--- a/include/configs/rsk7203.h
+++ b/include/configs/rsk7203.h
@@ -72,7 +72,6 @@
#define CONFIG_SYS_MAX_FLASH_SECT 64
#define CONFIG_SYS_MAX_FLASH_BANKS 1
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h
index 2ecf785..0c43f45 100644
--- a/include/configs/rsk7264.h
+++ b/include/configs/rsk7264.h
@@ -53,7 +53,6 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 1
#define CONFIG_SYS_MAX_FLASH_SECT 512
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET (128 * 1024)
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SECT_SIZE (128 * 1024)
diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h
index 14c1da7..cf3ed6b 100644
--- a/include/configs/rsk7269.h
+++ b/include/configs/rsk7269.h
@@ -52,7 +52,6 @@
#define CONFIG_SYS_MAX_FLASH_BANKS 1
#define CONFIG_SYS_MAX_FLASH_SECT 512
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET (128 * 1024)
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 8fadc68..e28101b 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -231,7 +231,6 @@
/* FLASH and environment organization */
#define CONFIG_MMC_DEFAULT_DEV 0
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV
#define CONFIG_ENV_SIZE 4096
#define CONFIG_ENV_OFFSET ((32 - 4) << 10) /* 32KiB - 4KiB */
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index e7bace4..10d2978 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -83,7 +83,6 @@
#define CONFIG_BOOTBLOCK "10"
#define CONFIG_UBIBLOCK "9"
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV
#define CONFIG_ENV_SIZE 4096
#define CONFIG_ENV_OFFSET ((32 - 4) << 10) /* 32KiB - 4KiB */
diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index bfd8aa7..d0cfd4c 100644
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -117,7 +117,6 @@
#if CONFIG_SYS_USE_NANDFLASH
/* bootstrap + u-boot + env in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0xc0000
#define CONFIG_ENV_OFFSET_REDUND 0x100000
#define CONFIG_ENV_SIZE 0x20000
@@ -126,7 +125,6 @@
"bootz 0x22000000 - 0x21000000"
#elif CONFIG_SYS_USE_MMC
/* bootstrap + u-boot + env in sd card */
-#define CONFIG_ENV_IS_IN_FAT
#define FAT_ENV_INTERFACE "mmc"
#define FAT_ENV_FILE "uboot.env"
#define FAT_ENV_DEVICE_AND_PART "0"
@@ -135,7 +133,6 @@
"fatload mmc 0:1 0x22000000 zImage; " \
"bootz 0x22000000 - 0x21000000"
#else
-#define CONFIG_ENV_IS_NOWHERE
#endif
/* SPL */
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index d933a9e..531e492 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -156,7 +156,6 @@
#ifdef CONFIG_SYS_USE_SERIALFLASH
/* bootstrap + u-boot + env + linux in serial flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x5000
#define CONFIG_ENV_SIZE 0x3000
#define CONFIG_ENV_SECT_SIZE 0x1000
@@ -165,7 +164,6 @@
"bootm 0x22000000"
#elif CONFIG_SYS_USE_NANDFLASH
/* bootstrap + u-boot + env in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0xc0000
#define CONFIG_ENV_OFFSET_REDUND 0x100000
#define CONFIG_ENV_SIZE 0x20000
@@ -174,7 +172,6 @@
"bootm 0x22000000 - 0x21000000"
#elif CONFIG_SYS_USE_MMC
/* bootstrap + u-boot + env in sd card */
-#define CONFIG_ENV_IS_IN_FAT
#define FAT_ENV_INTERFACE "mmc"
#define FAT_ENV_FILE "uboot.env"
#define FAT_ENV_DEVICE_AND_PART "0"
@@ -183,7 +180,6 @@
"fatload mmc 0:1 0x22000000 uImage; " \
"bootm 0x22000000 - 0x21000000"
#else
-#define CONFIG_ENV_IS_NOWHERE
#endif
/* SPL */
diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h
index 5fb621e..359bdd8 100644
--- a/include/configs/sama5d4_xplained.h
+++ b/include/configs/sama5d4_xplained.h
@@ -119,7 +119,6 @@
#ifdef CONFIG_SYS_USE_SERIALFLASH
/* bootstrap + u-boot + env + linux in serial flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
#define CONFIG_ENV_OFFSET 0x10000
@@ -131,7 +130,6 @@
"bootz 0x22000000 - 0x21000000"
#elif CONFIG_SYS_USE_NANDFLASH
/* bootstrap + u-boot + env in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0xc0000
#define CONFIG_ENV_OFFSET_REDUND 0x100000
#define CONFIG_ENV_SIZE 0x20000
@@ -140,7 +138,6 @@
"bootz 0x22000000 - 0x21000000"
#elif CONFIG_SYS_USE_MMC
/* bootstrap + u-boot + env in sd card */
-#define CONFIG_ENV_IS_IN_FAT
#define CONFIG_FAT_WRITE
#define FAT_ENV_INTERFACE "mmc"
/*
diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h
index 546d7a3..a179676 100644
--- a/include/configs/sama5d4ek.h
+++ b/include/configs/sama5d4ek.h
@@ -117,7 +117,6 @@
#ifdef CONFIG_SYS_USE_SERIALFLASH
/* bootstrap + u-boot + env + linux in serial flash */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
#define CONFIG_ENV_OFFSET 0x10000
@@ -129,7 +128,6 @@
"bootz 0x22000000 - 0x21000000"
#elif CONFIG_SYS_USE_NANDFLASH
/* bootstrap + u-boot + env in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0xc0000
#define CONFIG_ENV_OFFSET_REDUND 0x100000
#define CONFIG_ENV_SIZE 0x20000
@@ -138,7 +136,6 @@
"bootz 0x22000000 - 0x21000000"
#elif CONFIG_SYS_USE_MMC
/* bootstrap + u-boot + env in sd card */
-#define CONFIG_ENV_IS_IN_FAT
#define CONFIG_FAT_WRITE
#define FAT_ENV_INTERFACE "mmc"
/*
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index f5361d1..73651a7 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -75,7 +75,6 @@
#define CONFIG_AUTO_COMPLETE
#define CONFIG_ENV_SIZE 8192
-#define CONFIG_ENV_IS_NOWHERE
/* SPI - enable all SPI flash types for testing purposes */
#define CONFIG_CMD_SF
diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h
index 8cce34a..f8d2d46 100644
--- a/include/configs/sansa_fuze_plus.h
+++ b/include/configs/sansa_fuze_plus.h
@@ -33,7 +33,6 @@
/* Environment */
#define CONFIG_ENV_SIZE (16 * 1024)
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_OVERWRITE
/* Booting Linux */
diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h
index e7c35ec..8f05133 100644
--- a/include/configs/sbc35_a9g20.h
+++ b/include/configs/sbc35_a9g20.h
@@ -15,9 +15,7 @@
#include <linux/sizes.h>
#if defined(CONFIG_SYS_USE_NANDFLASH)
-#define CONFIG_ENV_IS_IN_NAND
#else
-#define CONFIG_ENV_IS_IN_EEPROM
#endif
#define MACH_TYPE_SBC35_A9G20 1848
diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h
index 69dc210..b2b94ed 100644
--- a/include/configs/sbc405.h
+++ b/include/configs/sbc405.h
@@ -215,7 +215,6 @@
* Environment Variable setup
*/
#define CONFIG_ENV_ADDR CONFIG_SYS_FLASH_BASE /* starting right at the beginning */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0 /* starting right at the beginning */
#define CONFIG_ENV_SECT_SIZE 0x40000 /* see README - env sector total size */
#define CONFIG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 2d264d2..5f44153 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -385,7 +385,6 @@
* Environment
*/
#ifndef CONFIG_SYS_RAMBOOT
- #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000)
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
#define CONFIG_ENV_SIZE 0x2000
@@ -396,7 +395,6 @@
#else
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
- #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index aee0d9e..8b6ce37 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -509,7 +509,6 @@
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SIZE 0x2000
#if CONFIG_SYS_TEXT_BASE == 0xfff00000 /* Boot from 64MB SODIMM */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x80000)
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 8eb7276..e3fce0b 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -471,7 +471,6 @@
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000)
#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h
index 16d2e2d..2ff72f3 100644
--- a/include/configs/sc_sps_1.h
+++ b/include/configs/sc_sps_1.h
@@ -41,14 +41,12 @@
/* Environment */
#define CONFIG_ENV_SIZE (16 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
/* Environment is in MMC */
#if defined(CONFIG_CMD_MMC) && defined(CONFIG_ENV_IS_IN_MMC)
#define CONFIG_ENV_OFFSET (256 * 1024)
#define CONFIG_SYS_MMC_ENV_DEV 0
#else
-#define CONFIG_ENV_IS_NOWHERE
#endif
/* FEC Ethernet on SoC */
diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h
index f4a40bb..f058226 100644
--- a/include/configs/scb9328.h
+++ b/include/configs/scb9328.h
@@ -177,7 +177,6 @@
#define CONFIG_SYS_MONITOR_BASE 0x10000000
#define CONFIG_SYS_MONITOR_LEN 0x20000 /* 128b ( 1 flash sector ) */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR 0x10020000 /* absolute address for now */
#define CONFIG_ENV_SIZE 0x20000
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index 78ff651..6d7b810 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -40,7 +40,6 @@
#define CONFIG_CMD_MMC
/* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index b6a5e6a..f0d233e 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -98,7 +98,6 @@
* Environment
*/
#if defined(CONFIG_SYS_RAMBOOT)
-#define CONFIG_ENV_IS_NOWHERE /* Store env in memory only */
#define CONFIG_ENV_SIZE (8 << 10)
/*
* In RAM-booting version, we have no environment storage. So we need to
@@ -110,7 +109,6 @@
#define CONFIG_ETHADDR 4a:56:49:22:3e:43
#define CONFIG_ETH1ADDR 02:93:53:d5:06:98
#else
-#define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environ vars */
#endif
#if defined(CONFIG_CMD_FLASH)
diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index 2d509a9..5046c21 100644
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -116,7 +116,6 @@
/* ENV setting */
#define CONFIG_ENV_IS_EMBEDDED
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_ADDR (0x00080000)
#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR)
diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index c31dd7a..69b82b8 100644
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -116,7 +116,6 @@
/* ENV setting */
#define CONFIG_ENV_IS_EMBEDDED
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_ADDR (0x00080000)
#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR)
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index 36afd5f..6888487 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -124,7 +124,6 @@
/* ENV setting */
#define CONFIG_ENV_IS_EMBEDDED
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_ADDR (0x00080000)
#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR)
diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 2438318..dfe6f73 100644
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -84,7 +84,6 @@
/* Use hardware flash sectors protection instead of U-Boot software protection */
#undef CONFIG_SYS_FLASH_PROTECTION
#undef CONFIG_SYS_DIRECT_FLASH_TFTP
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + (1 * CONFIG_ENV_SECT_SIZE))
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 2723eaf..c64856b 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -158,7 +158,6 @@
#define CONFIG_RTL8169
/* ENV setting */
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
#define CONFIG_ENV_SECT_SIZE (256 * 1024)
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 84029cb..9456af7 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -67,10 +67,8 @@
* Environment variables configurations
*/
#ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */
#else
-#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */
#endif
/*
* max 4k env size is enough, but in case of nand
diff --git a/include/configs/shmin.h b/include/configs/shmin.h
index 4d38f6c..7f46443 100644
--- a/include/configs/shmin.h
+++ b/include/configs/shmin.h
@@ -80,7 +80,6 @@
#define CONFIG_SYS_ATMEL_SECT {1, 2, 1, 7}
#define CONFIG_SYS_ATMEL_SECTSZ {0x4000, 0x2000, 0x8000, 0x10000}
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index c7affd6..b24706a 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -54,7 +54,6 @@
#endif
#define CONFIG_ENV_OVERWRITE 1
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
@@ -280,8 +279,6 @@
* 0x442000 - 0x800000 : Userland
*/
#if defined(CONFIG_SPI_BOOT)
-# undef CONFIG_ENV_IS_NOWHERE
-# define CONFIG_ENV_IS_IN_SPI_FLASH
# define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
# define CONFIG_ENV_OFFSET (892 << 10) /* 892 KiB in */
# define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */
@@ -466,8 +463,6 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND
devices */
#if !defined(CONFIG_SPI_BOOT)
-#undef CONFIG_ENV_IS_NOWHERE
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x260000 /* environment starts here */
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#endif
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 71eb81c..98b8ef6 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -154,7 +154,6 @@
#define CONFIG_SYS_MAX_FLASH_SECT (19)
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x070000)
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SIZE 0x10000
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index 08381e3..0b52d2d 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -9,7 +9,6 @@
#ifndef __CONFIG_SMDK_H
#define __CONFIG_SMDK_H
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_SPI_FLASH
#define CONFIG_ENV_SPI_BASE 0x12D30000
#define FLASH_SIZE (0x4 << 20)
diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index 61f582f..7194c58 100644
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -9,7 +9,6 @@
#ifndef __CONFIG_SMDK5420_H
#define __CONFIG_SMDK5420_H
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_SPI_FLASH
#define CONFIG_ENV_SPI_BASE 0x12D30000
#define FLASH_SIZE (0x4 << 20)
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 080fc3a..ac69f26 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -195,7 +195,6 @@
/*-----------------------------------------------------------------------
* Boot configuration
*/
-#define CONFIG_ENV_IS_IN_ONENAND 1
#define CONFIG_ENV_SIZE (128 << 10) /* 128KiB, 0x20000 */
#define CONFIG_ENV_ADDR (256 << 10) /* 256KiB, 0x40000 */
#define CONFIG_ENV_OFFSET (256 << 10) /* 256KiB, 0x40000 */
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 655025c..b0259a3 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -83,7 +83,6 @@
/* MIU (Memory Interleaving Unit) */
#define CONFIG_MIU_2BIT_INTERLEAVED
-#define CONFIG_ENV_IS_IN_MMC 1
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SIZE (16 << 10) /* 16 KB */
#define RESERVE_BLOCK_SIZE (512)
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 6c68596..132e874 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -129,7 +129,6 @@
#define CONFIG_BOOTP_HOSTNAME
/* Environment settings */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET (512 << 10)
#define CONFIG_ENV_SIZE (256 << 10)
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/snow.h b/include/configs/snow.h
index a2fb3f9..fa8a600 100644
--- a/include/configs/snow.h
+++ b/include/configs/snow.h
@@ -9,7 +9,6 @@
#ifndef __CONFIG_SNOW_H
#define __CONFIG_SNOW_H
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_SPI_FLASH
#define CONFIG_ENV_SPI_BASE 0x12D30000
#define FLASH_SIZE (0x4 << 20)
diff --git a/include/configs/snowball.h b/include/configs/snowball.h
index 126201c..722e8dc 100644
--- a/include/configs/snowball.h
+++ b/include/configs/snowball.h
@@ -41,7 +41,6 @@
#define CONFIG_ENV_SIZE (8*1024)
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 256*1024)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_CMD_ENV
#define CONFIG_CMD_SAVEENV
#define CONFIG_ENV_OFFSET 0x0118000
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index e742acf..746d219 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -270,7 +270,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_SYS_CONSOLE_ENV_OVERWRITE
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_SIZE 4096
/*
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index c654a0e..6c3d326 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -289,7 +289,6 @@
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x4000
diff --git a/include/configs/spear3xx_evb.h b/include/configs/spear3xx_evb.h
index 8090bc8..6975e54 100644
--- a/include/configs/spear3xx_evb.h
+++ b/include/configs/spear3xx_evb.h
@@ -28,9 +28,7 @@
#endif
#if defined(CONFIG_nand)
-#define CONFIG_ENV_IS_IN_NAND
#else
-#define CONFIG_ENV_IS_IN_FLASH
#endif
#include <configs/spear-common.h>
diff --git a/include/configs/spear6xx_evb.h b/include/configs/spear6xx_evb.h
index 28dddcc..60dcd12 100644
--- a/include/configs/spear6xx_evb.h
+++ b/include/configs/spear6xx_evb.h
@@ -19,9 +19,7 @@
#endif
#if defined(CONFIG_nand)
-#define CONFIG_ENV_IS_IN_NAND
#else
-#define CONFIG_ENV_IS_IN_FLASH
#endif
#include <configs/spear-common.h>
diff --git a/include/configs/stamp9g20.h b/include/configs/stamp9g20.h
index 01085dc..cca56af 100644
--- a/include/configs/stamp9g20.h
+++ b/include/configs/stamp9g20.h
@@ -204,7 +204,6 @@
* 0x0100000-0x06fffff -> 6M, kernel
* 0x0700000-0x8000000 -> 121M, RootFS
*/
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET ((128 + 256) << 10)
#define CONFIG_ENV_OFFSET_REDUND ((128 + 256 + 128) << 10)
#define CONFIG_ENV_SIZE (128 << 10)
diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index 84cc19d..14adea1 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -39,7 +39,6 @@
#define CONFIG_SYS_MAX_FLASH_SECT 12
#define CONFIG_SYS_MAX_FLASH_BANKS 2
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OFFSET (256 << 10)
#define CONFIG_ENV_SECT_SIZE (128 << 10)
#define CONFIG_ENV_SIZE (8 << 10)
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index e75e661..788ae9d 100644
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -23,7 +23,6 @@
#define PHYS_SDRAM_1_SIZE 0x00198000
#define CONFIG_ENV_SIZE 0x10000
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR \
(PHYS_SDRAM_1_SIZE - CONFIG_ENV_SIZE)
#define CONFIG_SYS_MAXARGS 16
diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index 5fb40eb..d062428 100644
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -262,13 +262,11 @@
/* We use the top boot sector flash, so we have some 16K sectors for env
*/
#ifndef CONFIG_SYS_RAMBOOT
- #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x60000)
#define CONFIG_ENV_SECT_SIZE 0x4000 /* 16K (one top sector) for env */
#define CONFIG_ENV_SIZE 0x2000
#else
#define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
- #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index 914d821..913e6b4 100644
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -288,11 +288,9 @@
/* Environment - default config is in flash, see below */
#if 0 /* in EEPROM */
-# define CONFIG_ENV_IS_IN_EEPROM 1
# define CONFIG_ENV_OFFSET 0
# define CONFIG_ENV_SIZE 2048
#else /* in flash */
-# define CONFIG_ENV_IS_IN_FLASH 1
# ifdef CONFIG_STXSSA_4M
# define CONFIG_ENV_SECT_SIZE 0x20000
# else /* default configuration - 64 MiB flash */
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index c8ebb54..908bc64 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -106,7 +106,6 @@
#define CONFIG_CMD_MMC
#define CONFIG_MMC_SUNXI
#define CONFIG_MMC_SUNXI_SLOT 0
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0 /* first detected MMC controller */
#endif
@@ -321,7 +320,6 @@ extern int soft_i2c_gpio_scl;
!defined CONFIG_ENV_IS_IN_NAND && \
!defined CONFIG_ENV_IS_IN_FAT && \
!defined CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_ENV_IS_NOWHERE
#endif
#define CONFIG_MISC_INIT_R
diff --git a/include/configs/t3corp.h b/include/configs/t3corp.h
index 502e795..8952560 100644
--- a/include/configs/t3corp.h
+++ b/include/configs/t3corp.h
@@ -99,7 +99,6 @@
/*
* Define here the location of the environment variables (flash).
*/
-#define CONFIG_ENV_IS_IN_FLASH /* use flash for environment vars */
/*
* Flash related
diff --git a/include/configs/taihu.h b/include/configs/taihu.h
index 5c0ce7a..322f105 100644
--- a/include/configs/taihu.h
+++ b/include/configs/taihu.h
@@ -59,7 +59,6 @@
#endif
/*----------------------------------------------------------------------------*/
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
/*
* Default environment variables
diff --git a/include/configs/taishan.h b/include/configs/taishan.h
index 3d5c351..5a57e90 100644
--- a/include/configs/taishan.h
+++ b/include/configs/taishan.h
@@ -68,7 +68,6 @@
/*-----------------------------------------------------------------------
* Environment
*----------------------------------------------------------------------*/
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
/*-----------------------------------------------------------------------
* FLASH related
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 2d12e86..53839f7 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -187,7 +187,6 @@
/* **** PISMO SUPPORT *** */
#define CONFIG_NAND
#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_ENV_IS_IN_NAND
#define SMNAND_ENV_OFFSET 0x180000 /* environment starts here */
/* Redundant Environment */
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 49ed79f..a1f47e1 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -263,7 +263,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
-#define CONFIG_ENV_IS_IN_NAND 1
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 2cf4558..7b5d617 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -162,7 +162,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x22000000
/* bootstrap in spi flash , u-boot + env + linux in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x100000
#define CONFIG_ENV_OFFSET_REDUND 0x180000
#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index b2b4b10..8114fcf 100644
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -82,7 +82,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_SIZE SZ_2K
#define CONFIG_ENV_OFFSET 0
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 3a88f22..cecb29f 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -217,7 +217,6 @@
/* Flash and environment organization */
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 2
#define CONFIG_SYS_MMC_ENV_PART 1
#define CONFIG_ENV_SIZE (8 * 1024)
diff --git a/include/configs/tcm-bf518.h b/include/configs/tcm-bf518.h
index e96a742..dc8089e 100644
--- a/include/configs/tcm-bf518.h
+++ b/include/configs/tcm-bf518.h
@@ -92,7 +92,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OFFSET 0x8000
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SIZE 0x2000
diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index 42129fb..f0a3ea2 100644
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -97,7 +97,6 @@
/*
* Env Storage Settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x8000
#define CONFIG_ENV_SIZE 0x8000
#define CONFIG_ENV_SECT_SIZE 0x8000
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index cfa7fb1..883689a 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -30,7 +30,6 @@
#define CONFIG_CMD_MMC
/* Environment in eMMC,@the end of 2nd "boot sector" */
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/include/configs/tec.h b/include/configs/tec.h
index 13c24c9..1c3aae6 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -32,7 +32,6 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1
/* Environment in NAND, aligned to start of last sector */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */
/* USB host support */
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index dcc2bdc..a52d74f 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -165,7 +165,6 @@
#define CONFIG_CONS_INDEX 1
#define CONFIG_SYS_CONSOLE_INFO_QUIET
-#define CONFIG_ENV_IS_NOWHERE
/* Defines for SPL */
#define CONFIG_SPL_FRAMEWORK
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 27a3dd1..2b358f2 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -129,7 +129,6 @@
#define CONFIG_CONS_INDEX 1
#define CONFIG_SYS_CONSOLE_INFO_QUIET
-#define CONFIG_ENV_IS_NOWHERE
/* SPL */
/* Defines for SPL */
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 320d76c..860e95d 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -234,7 +234,6 @@
#define CONFIG_APBH_DMA_BURST8
/* Environment in NAND */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET (16 << 20)
#define CONFIG_ENV_SECT_SIZE (128 << 10)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
@@ -245,7 +244,6 @@
/* Environment in MMC */
#define CONFIG_ENV_SIZE (8 << 10)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_SYS_MMC_ENV_DEV 0
diff --git a/include/configs/tk71.h b/include/configs/tk71.h
index a9c6d2e..a933697 100644
--- a/include/configs/tk71.h
+++ b/include/configs/tk71.h
@@ -81,10 +81,8 @@
* Environment variables configurations
*/
#ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SECT_SIZE 0x20000
#else
-#define CONFIG_ENV_IS_NOWHERE
#endif
#define CONFIG_ENV_SIZE 0x20000
diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h
index 79c7fc5..a20ddba 100644
--- a/include/configs/tny_a9260.h
+++ b/include/configs/tny_a9260.h
@@ -21,9 +21,7 @@
#include <asm/hardware.h>
#if defined(CONFIG_TNY_A9260_NANDFLASH) || defined(CONFIG_TNY_A9G20_NANDFLASH)
-#define CONFIG_ENV_IS_IN_NAND
#else
-#define CONFIG_ENV_IS_IN_EEPROM
#endif
/* Define actual evaluation board type from used processor type */
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 012fa1c..9443401 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -170,7 +170,6 @@
#if defined(CONFIG_TQMA6X_MMC_BOOT)
-#define CONFIG_ENV_IS_IN_MMC
#define TQMA6_UBOOT_OFFSET SZ_1K
#define TQMA6_UBOOT_SECTOR_START 0x2
#define TQMA6_UBOOT_SECTOR_COUNT 0x7fe
@@ -245,7 +244,6 @@
#define TQMA6_UBOOT_SIZE (TQMA6_UBOOT_SECTOR_SIZE * \
TQMA6_UBOOT_SECTOR_COUNT)
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
#define CONFIG_ENV_OFFSET (TQMA6_UBOOT_SIZE)
#define CONFIG_ENV_SECT_SIZE TQMA6_SPI_FLASH_SECTOR_SIZE
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 6808e78..7718188 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -67,7 +67,6 @@
#define CONFIG_BOOTBLOCK "10"
#define CONFIG_ENV_COMMON_BOOT "${console} ${meminfo}"
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV
#define CONFIG_ENV_SIZE 4096
#define CONFIG_ENV_OFFSET ((32 - 4) << 10) /* 32KiB - 4KiB */
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 94c31fb..d9f4a15 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -57,7 +57,6 @@
#define CONFIG_SYS_MONITOR_BASE 0x00000000
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV
#define CONFIG_ENV_SIZE 4096
#define CONFIG_ENV_OFFSET ((32 - 4) << 10) /* 32KiB - 4KiB */
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 7426bde..323da27 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -218,7 +218,6 @@
*/
#ifdef CONFIG_FLASHCARD
-#define CONFIG_ENV_IS_NOWHERE
/* the rdaddr is 16 MiB before the loadaddr */
#define CONFIG_ENV_RDADDR "rdaddr=0x81000000\0"
@@ -240,7 +239,6 @@
#define CONFIG_ENV_OVERWRITE /* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_COMMON_ENV_SETTINGS \
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 81be8a2..a6d4fa4 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -41,7 +41,6 @@
#define CONFIG_CMD_MMC
/* Environment in SPI */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_MAX_HZ 48000000
#define CONFIG_ENV_SPI_MODE SPI_MODE_0
#define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index b7804d2..45d63f9 100644
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -299,7 +299,6 @@
#define CONFIG_SYS_FLASH_PROTECTION 1
/* Flash environment locations */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + CONFIG_SYS_MONITOR_LEN) /* Addr of Environment Sector */
#define CONFIG_ENV_SIZE 0x40000 /* Total Size of Environment */
#define CONFIG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */
diff --git a/include/configs/tseries.h b/include/configs/tseries.h
index 9218533..47ab6d6 100644
--- a/include/configs/tseries.h
+++ b/include/configs/tseries.h
@@ -274,8 +274,6 @@ MMCARGS
#define CONFIG_SPL_SPI_FLASH_SUPPORT
#define CONFIG_SPL_SPI_LOAD
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
-#undef CONFIG_ENV_IS_NOWHERE
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
#define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */
@@ -283,8 +281,6 @@ MMCARGS
#define CONFIG_ENV_OFFSET_REDUND (896 << 10) /* 896 KiB in */
#elif defined(CONFIG_EMMC_BOOT)
-#undef CONFIG_ENV_IS_NOWHERE
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
#define CONFIG_ENV_OFFSET 0x40000 /* TODO: Adresse definieren */
@@ -294,9 +290,7 @@ MMCARGS
#elif defined(CONFIG_NAND)
/* No NAND env support in SPL */
#ifdef CONFIG_SPL_BUILD
-#define CONFIG_ENV_IS_NOWHERE
#else
-#define CONFIG_ENV_IS_IN_NAND
#endif
#define CONFIG_ENV_OFFSET 0x60000
#define CONFIG_SYS_ENV_SECT_SIZE CONFIG_ENV_SIZE
diff --git a/include/configs/tt01.h b/include/configs/tt01.h
index cf169a4..e92a98e 100644
--- a/include/configs/tt01.h
+++ b/include/configs/tt01.h
@@ -107,7 +107,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_MONITOR_LEN (1024 * 1024)
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_SIZE (128 * 1024)
diff --git a/include/configs/tx25.h b/include/configs/tx25.h
index 118f5ba..36f0156 100644
--- a/include/configs/tx25.h
+++ b/include/configs/tx25.h
@@ -96,7 +96,6 @@
*/
/* No NOR flash present */
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET CONFIG_SYS_MONITOR_LEN
#define CONFIG_ENV_SIZE (128 * 1024) /* 128 kB NAND block size */
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
diff --git a/include/configs/u8500_href.h b/include/configs/u8500_href.h
index 5302b1f..acd21a6 100644
--- a/include/configs/u8500_href.h
+++ b/include/configs/u8500_href.h
@@ -192,7 +192,6 @@
#define CONFIG_CMD_ENV
#define CONFIG_CMD_SAVEENV /* CMD_ENV is obsolete but used in env_emmc.c */
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET 0x13F80000
#define CONFIG_SYS_MMC_ENV_DEV 0 /* SLOT2: eMMC */
diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index b4a6245..8a4a9ec 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -221,7 +221,6 @@
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_SYS_MMC_ENV_DEV 0
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index d4688c5..0e1adea 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -156,8 +156,6 @@
* For NAND booting the environment is embedded in the U-Boot image. Please take
* look at the file board/amcc/canyonlands/u-boot-nand.lds for details.
*/
-/* #define CONFIG_ENV_IS_IN_NAND */
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_OFFSET 0x0
/* #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) */
diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index 84571f6..7c0e90e 100644
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -135,7 +135,6 @@
#define CONFIG_SYS_MEMTEST_END 0x23e00000
/* bootstrap + u-boot + env in dataflash on CS0 */
-#define CONFIG_ENV_IS_IN_DATAFLASH
#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x4000)
#define CONFIG_ENV_OFFSET 0x2000
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + \
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index f29ab2d..dde134e 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -33,7 +33,6 @@
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
/* U-Boot general configurations */
diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index 7f6b0c7..9fe65da 100644
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -197,7 +197,6 @@
/*
* Environment settings
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x00040000)
#define CONFIG_ENV_SIZE 0x10000
#define CONFIG_ENV_SECT_SIZE 0x10000
diff --git a/include/configs/v5fx30teval.h b/include/configs/v5fx30teval.h
index f30a090..82e0fbd 100644
--- a/include/configs/v5fx30teval.h
+++ b/include/configs/v5fx30teval.h
@@ -17,7 +17,6 @@
#define CONFIG_SYS_SDRAM_SIZE_MB 64
/*Env*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_OFFSET 0x1A0000
diff --git a/include/configs/vct.h b/include/configs/vct.h
index 88e58ec..b94e2da 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -168,7 +168,6 @@
* FLASH and environment organization
*/
#if defined(CONFIG_VCT_NOR)
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_FLASH_NOT_MEM_MAPPED
/*
@@ -215,7 +214,6 @@
#if defined(CONFIG_VCT_ONENAND)
#define CONFIG_USE_ONENAND_BOARD_INIT
-#define CONFIG_ENV_IS_IN_ONENAND
#define CONFIG_SYS_ONENAND_BASE 0x00000000 /* this is not real address */
#define CONFIG_SYS_FLASH_BASE 0x00000000
#define CONFIG_ENV_ADDR (128 << 10) /* after compr. U-Boot image */
diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 107f01a..3eab8d0 100644
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -307,7 +307,6 @@
/*
* Environment
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR \
(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 4594002..c8e5106 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -32,7 +32,6 @@
#define CONFIG_CMD_MMC
/* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index 62bec99..f254a6e 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -28,7 +28,6 @@
#define CONFIG_CMD_MMC
/* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index 900b89c..ec26518 100644
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -151,7 +151,6 @@
#ifdef CONFIG_ARCH_VERSATILE_QEMU
#define CONFIG_SYS_TEXT_BASE 0x10000
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_SYS_MONITOR_LEN 0x80000
#else
#define CONFIG_SYS_TEXT_BASE 0x01000000
@@ -160,7 +159,6 @@
*/
#define CONFIG_SYS_FLASH_CFI
#define CONFIG_FLASH_CFI_DRIVER
-#define CONFIG_ENV_IS_IN_FLASH 1
/*
* System control register
*/
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 032010b..3a05632 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -242,7 +242,6 @@
#endif
/* Do not preserve environment */
-#define CONFIG_ENV_IS_NOWHERE 1
#define CONFIG_ENV_SIZE 0x1000
/* Monitor Command Prompt */
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 989e755..b9c1a8f 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -275,7 +275,6 @@
#define CONFIG_ENV_OVERWRITE 1
/* Store environment@top of flash */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET (PHYS_FLASH_SIZE - \
(2 * CONFIG_ENV_SECT_SIZE))
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE1 + \
diff --git a/include/configs/vision2.h b/include/configs/vision2.h
index 3f35076..ed4f083 100644
--- a/include/configs/vision2.h
+++ b/include/configs/vision2.h
@@ -71,7 +71,6 @@
#define CONFIG_ENV_SIZE (4 * 1024)
#define CONFIG_FSL_ENV_IN_SF
-#define CONFIG_ENV_IS_IN_SPI_FLASH
/* PMIC Controller */
#define CONFIG_POWER
diff --git a/include/configs/vl_ma2sc.h b/include/configs/vl_ma2sc.h
index bef821f..5222b1c 100644
--- a/include/configs/vl_ma2sc.h
+++ b/include/configs/vl_ma2sc.h
@@ -293,7 +293,6 @@
#define CONFIG_SYS_MAX_FLASH_SECT 256
#define CONFIG_SYS_MAX_FLASH_BANKS 1
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x00060000)
/* setup SMC0, CS0 (NOR Flash) - 16-bit, 15 WS */
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index c7730fc..e77e902 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -327,7 +327,6 @@
* Environment
*/
#ifndef CONFIG_SYS_RAMBOOT
- #define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0xc0000)
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
#define CONFIG_ENV_SIZE 0x2000
@@ -338,7 +337,6 @@
#else
#define CONFIG_SYS_NO_FLASH /* Flash is not usable now */
- #define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
#define CONFIG_ENV_SIZE 0x2000
#endif
diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index 887433b..ea605ef 100644
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -211,17 +211,14 @@
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1
#define CONFIG_SYS_FLASH_PROTECTION 1
-#define CONFIG_ENV_IS_IN_FLASH 1
#elif defined(CONFIG_CMD_ONENAND) /* OneNAND */
#define CONFIG_SYS_NO_FLASH
#define CONFIG_SYS_ONENAND_BASE 0x00000000
-#define CONFIG_ENV_IS_IN_ONENAND 1
#else /* No flash */
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_NOWHERE
#endif
/*
diff --git a/include/configs/walnut.h b/include/configs/walnut.h
index 8b803a2..d45ce29 100644
--- a/include/configs/walnut.h
+++ b/include/configs/walnut.h
@@ -122,9 +122,7 @@
* supported for backward compatibility.
*/
#if 1
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#else
-#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#endif
/*-----------------------------------------------------------------------
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index b2c3614..a3f6f95 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -275,7 +275,6 @@
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_SYS_MMC_ENV_DEV 0
diff --git a/include/configs/warp.h b/include/configs/warp.h
index 2eb429e..c328f71 100644
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -109,7 +109,6 @@
#define CONFIG_ENV_OFFSET (6 * SZ_64K)
#define CONFIG_ENV_SIZE SZ_8K
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
/* VDD voltage 1.65 - 1.95 */
diff --git a/include/configs/whistler.h b/include/configs/whistler.h
index 94f151e..605d578 100644
--- a/include/configs/whistler.h
+++ b/include/configs/whistler.h
@@ -38,7 +38,6 @@
* they didn't, the boot sector layout may be different. However, use of that
* particular card is standard practice as far as I know.
*/
-#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/include/configs/wireless_space.h b/include/configs/wireless_space.h
index 036c1e4..bda9eb9 100644
--- a/include/configs/wireless_space.h
+++ b/include/configs/wireless_space.h
@@ -140,7 +140,6 @@
* Environment variables configurations
*/
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128KB */
#define CONFIG_ENV_SIZE 0x20000 /* 128KB */
#define CONFIG_ENV_OFFSET 0x80000 /* env starts here */
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index d0895cf..2ffee20 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -208,7 +208,6 @@
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \
CONFIG_SYS_MONITOR_LEN)
-#define CONFIG_ENV_IS_IN_FLASH
/*
* CFI FLASH driver setup
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index dc8e99f..41b178a 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -170,7 +170,6 @@
* Environment
*/
-#define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_SIZE 0x00020000
#define CONFIG_ENV_OFFSET 0x00100000
#define CONFIG_ENV_OFFSET_REDUND 0x00120000
diff --git a/include/configs/x600.h b/include/configs/x600.h
index 27a66a5..f4cdace 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -33,7 +33,6 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_MONITOR_LEN 0x60000
-#define CONFIG_ENV_IS_IN_FLASH
/* Serial Configuration (PL011) */
#define CONFIG_SYS_SERIAL0 0xD0000000
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index b6a76fe..daec247 100644
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -54,11 +54,9 @@
#define CONFIG_CMD_CROS_EC
#define CONFIG_ARCH_EARLY_INIT_R
-#undef CONFIG_ENV_IS_NOWHERE
#undef CONFIG_ENV_SIZE
#define CONFIG_ENV_SIZE 0x1000
#define CONFIG_ENV_SECT_SIZE 0x1000
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_OFFSET 0x003f8000
#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,vga,serial\0" \
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 3e21e09..1d870aa 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -208,7 +208,6 @@
/*-----------------------------------------------------------------------
* Environment configuration
*/
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SIZE 0x01000
/*-----------------------------------------------------------------------
diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index 2999d1b..082dc5f 100644
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -155,7 +155,6 @@
#define CONFIG_SYS_FLASH_WRITE_TOUT (25*CONFIG_SYS_HZ) /* Timeout for Flash Write */
/* FIXME */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x40000)/* Addr of Environment Sector */
#define CONFIG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */
diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h
index 8e6b365..b0a1e91 100644
--- a/include/configs/xfi3.h
+++ b/include/configs/xfi3.h
@@ -32,7 +32,6 @@
/* Environment */
#define CONFIG_ENV_SIZE (16 * 1024)
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_OVERWRITE
/* Booting Linux */
diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h
index 0ccd73a..8b504ef 100644
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -100,7 +100,6 @@
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#else
-#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_SYS_NO_FLASH
#endif
diff --git a/include/configs/xilinx-ppc405-generic.h b/include/configs/xilinx-ppc405-generic.h
index 75b119f..8916f61 100644
--- a/include/configs/xilinx-ppc405-generic.h
+++ b/include/configs/xilinx-ppc405-generic.h
@@ -18,7 +18,6 @@
#define CONFIG_SYS_SDRAM_SIZE_MB 256
/* environment */
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SIZE 0x10000
#define CONFIG_ENV_SECT_SIZE 0x10000
#define CONFIG_SYS_ENV_OFFSET 0x3F0000
diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h
index 8e68415..c98b90f 100644
--- a/include/configs/xilinx-ppc440-generic.h
+++ b/include/configs/xilinx-ppc440-generic.h
@@ -17,7 +17,6 @@
#define CONFIG_SYS_SDRAM_SIZE_MB 256
/*Env*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_OFFSET 0x340000
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 880d29c..9d2940a 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -114,7 +114,6 @@
#define CONFIG_BOARD_LATE_INIT
/* Do not preserve environment */
-#define CONFIG_ENV_IS_NOWHERE 1
#define CONFIG_ENV_SIZE 0x1000
/* Monitor Command Prompt */
diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h
index 15c9176..88b6cdf 100644
--- a/include/configs/xpedite1000.h
+++ b/include/configs/xpedite1000.h
@@ -233,7 +233,6 @@ extern void out32(unsigned int, unsigned long);
/*
* Environment Configuration
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128k (one sector) for env */
#define CONFIG_ENV_SIZE 0x8000
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - (256 * 1024))
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 3414230..7aab4d3 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -581,7 +581,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
/*
* Environment Configuration
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128k (one sector) for env */
#define CONFIG_ENV_SIZE 0x8000
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index f966a8a..c7bf59f 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -364,7 +364,6 @@
/*
* Environment Configuration
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128k (one sector) for env */
#define CONFIG_ENV_SIZE 0x8000
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - (256 * 1024))
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 988a2e8..0996a70 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -436,7 +436,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
/*
* Environment Configuration
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128k (one sector) for env */
#define CONFIG_ENV_SIZE 0x8000
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - (256 * 1024))
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index ac3f4f1..44c4c89 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -421,7 +421,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
/*
* Environment Configuration
*/
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128k (one sector) for env */
#define CONFIG_ENV_SIZE 0x8000
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - (256 * 1024))
diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h
index 8508a80..921721e 100644
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -78,9 +78,7 @@
* Note: DENX encourages to use redundant environment in FLASH.
*/
#if 1
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#else
-#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#endif
/*-----------------------------------------------------------------------
diff --git a/include/configs/yucca.h b/include/configs/yucca.h
index 76717e4..b1a831e 100644
--- a/include/configs/yucca.h
+++ b/include/configs/yucca.h
@@ -121,9 +121,6 @@
*----------------------------------------------------------------------*/
/* #define CONFIG_SYS_NVRAM_SIZE (0x2000 - 8) */ /* NVRAM size(8k)- RTC regs */
-#undef CONFIG_ENV_IS_IN_NVRAM /* ... not in NVRAM */
-#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment uses flash */
-#undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
#define CONFIG_ENV_OVERWRITE 1
/*
diff --git a/include/configs/zeus.h b/include/configs/zeus.h
index 4d7a7fc..2e7ca00 100644
--- a/include/configs/zeus.h
+++ b/include/configs/zeus.h
@@ -27,7 +27,6 @@
#define PLLMR0_DEFAULT PLLMR0_333_111_55_111
#define PLLMR1_DEFAULT PLLMR1_333_111_55_111
-#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#define CONFIG_OVERWRITE_ETHADDR_ONCE 1
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 1dbbc15..05f3529 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -24,7 +24,6 @@
* Environment settings
*/
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_ADDR 0x40000
#define CONFIG_ENV_SIZE 0x20000
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 342fa2c..28b4e19 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -124,7 +124,6 @@
#define CONFIG_SYS_MAX_FLASH_SECT 256
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x00040000)
-#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_SIZE (128 * 1024)
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 926b381..a9c7cc7 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -193,9 +193,7 @@
/* Environment */
#ifndef CONFIG_ENV_IS_NOWHERE
# ifndef CONFIG_SYS_NO_FLASH
-# define CONFIG_ENV_IS_IN_FLASH
# elif defined(CONFIG_SYS_NO_FLASH)
-# define CONFIG_ENV_IS_NOWHERE
# endif
# define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
--
1.7.11.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [RFC PATCH 3/8] Add RBTREE to Kconfig
2015-05-14 4:29 [U-Boot] [RFC PATCH 0/8] Complex config moves Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 1/8] Add env persist location to Kconfig Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 2/8] Move env location selection from include to defconfig Joe Hershberger
@ 2015-05-14 4:29 ` Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 4/8] Add CMD_UBI " Joe Hershberger
` (4 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Joe Hershberger @ 2015-05-14 4:29 UTC (permalink / raw)
To: u-boot
This will allow this required feature to be automatically selected by
the CMD_UBI feature (which requires this).
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
lib/Kconfig | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/lib/Kconfig b/lib/Kconfig
index 0454a86..b4a02b4 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -36,6 +36,12 @@ config SYS_VSNPRINTF
Thumb-2, about 420 bytes). Enable this option for safety when
using sprintf() with data you do not control.
+config RBTREE
+ bool "Red-Black Tree support"
+ help
+ This is support needed by UBI, but it could be used for
+ something else.
+
config REGEX
bool "Enable regular expression support"
help
--
1.7.11.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [RFC PATCH 4/8] Add CMD_UBI to Kconfig
2015-05-14 4:29 [U-Boot] [RFC PATCH 0/8] Complex config moves Joe Hershberger
` (2 preceding siblings ...)
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 3/8] Add RBTREE to Kconfig Joe Hershberger
@ 2015-05-14 4:29 ` Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 5/8] Add decompression " Joe Hershberger
` (3 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Joe Hershberger @ 2015-05-14 4:29 UTC (permalink / raw)
To: u-boot
This command benefits from Kconfig auto-selecting-other-configs
capability.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
common/Kconfig | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/common/Kconfig b/common/Kconfig
index 4397e69..619fc9d 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -319,6 +319,24 @@ config CMD_FPGA
endmenu
+menu "Storage commands"
+
+config CMD_UBI
+ bool "ubi"
+ select RBTREE
+ help
+ Adds commands for interacting with MTD partitions formatted
+ with the UBI flash translation layer
+
+config UBI_SILENCE_MSG
+ bool "Silence UBI messages"
+ default y if ENV_IS_IN_UBI
+ depends on CMD_UBI
+ help
+ Make the verbose messages from UBI stop printing. This leaves
+ warnings and errors enabled.
+
+endmenu
menu "Shell scripting commands"
--
1.7.11.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [RFC PATCH 5/8] Add decompression to Kconfig
2015-05-14 4:29 [U-Boot] [RFC PATCH 0/8] Complex config moves Joe Hershberger
` (3 preceding siblings ...)
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 4/8] Add CMD_UBI " Joe Hershberger
@ 2015-05-14 4:29 ` Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 6/8] Add CMD_UBIFS " Joe Hershberger
` (2 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Joe Hershberger @ 2015-05-14 4:29 UTC (permalink / raw)
To: u-boot
Also add a new menu for all of the decompression options.
The CMD_UBIFS config needs to select the LZO config.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
lib/Kconfig | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/lib/Kconfig b/lib/Kconfig
index b4a02b4..ead7fc0 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -50,6 +50,35 @@ config REGEX
regex support to some commands, for example "env grep" and
"setexpr".
+menu "Decompression Support"
+
+config GZIP
+ bool "gzip decompression support"
+ default y
+ help
+ If this option is set, support for gzip compressed images is
+ included.
+
+config BZIP2
+ bool "bzip2 decompression support"
+ help
+ If this option is set, support for bzip2 compressed images is
+ included.
+
+config LZMA
+ bool "LZMA decompression support"
+ help
+ If this option is set, support for lzma compressed images is
+ included.
+
+config LZO
+ bool "LZO decompression support"
+ help
+ If this option is set, support for LZO compressed images is
+ included.
+
+endmenu
+
source lib/rsa/Kconfig
menu "Hashing Support"
--
1.7.11.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [RFC PATCH 6/8] Add CMD_UBIFS to Kconfig
2015-05-14 4:29 [U-Boot] [RFC PATCH 0/8] Complex config moves Joe Hershberger
` (4 preceding siblings ...)
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 5/8] Add decompression " Joe Hershberger
@ 2015-05-14 4:29 ` Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 7/8] Move compression and UBI from include to defconfig Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 8/8] Move setexpr to Kconfig Joe Hershberger
7 siblings, 0 replies; 10+ messages in thread
From: Joe Hershberger @ 2015-05-14 4:29 UTC (permalink / raw)
To: u-boot
This command benefits from Kconfig auto-selecting-other-configs
capability.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
common/Kconfig | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/common/Kconfig b/common/Kconfig
index 619fc9d..cd24370 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -336,6 +336,21 @@ config UBI_SILENCE_MSG
Make the verbose messages from UBI stop printing. This leaves
warnings and errors enabled.
+config CMD_UBIFS
+ bool "ubifs"
+ select LZO
+ help
+ Adds commands for interacting with UBI volumes formatted as
+ UBIFS. UBIFS is read-only in u-boot.
+
+config UBIFS_SILENCE_MSG
+ bool "Silence UBIFS messages"
+ default y if ENV_IS_IN_UBI
+ depends on CMD_UBIFS
+ help
+ Make the verbose messages from UBIFS stop printing. This
+ leaves warnings and errors enabled.
+
endmenu
menu "Shell scripting commands"
--
1.7.11.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [RFC PATCH 7/8] Move compression and UBI from include to defconfig
2015-05-14 4:29 [U-Boot] [RFC PATCH 0/8] Complex config moves Joe Hershberger
` (5 preceding siblings ...)
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 6/8] Add CMD_UBIFS " Joe Hershberger
@ 2015-05-14 4:29 ` Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 8/8] Move setexpr to Kconfig Joe Hershberger
7 siblings, 0 replies; 10+ messages in thread
From: Joe Hershberger @ 2015-05-14 4:29 UTC (permalink / raw)
To: u-boot
Update the boards based on tools/moveconfig.py using these settings:
RBTREE bool n y
GZIP bool y y
BZIP2 bool n y
LZMA bool n y
LZO bool n y
CMD_UBI bool n y
UBI_SILENCE_MSG bool y y
CMD_UBIFS bool n y
UBIFS_SILENCE_MSG bool y y
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
configs/MIP405T_defconfig | 1 +
configs/MIP405_defconfig | 1 +
configs/O2D_defconfig | 1 +
configs/PIP405_defconfig | 1 +
configs/PLU405_defconfig | 2 ++
configs/VCMA9_defconfig | 4 ++++
configs/a3m071_defconfig | 2 ++
configs/a4m2k_defconfig | 2 ++
configs/am335x_boneblack_defconfig | 1 +
configs/am335x_boneblack_vboot_defconfig | 1 +
configs/am335x_evm_defconfig | 1 +
configs/am335x_evm_nor_defconfig | 1 +
configs/am335x_evm_norboot_defconfig | 1 +
configs/am335x_evm_spiboot_defconfig | 1 +
configs/am335x_evm_usbspl_defconfig | 1 +
configs/am335x_igep0033_defconfig | 2 ++
configs/apf27_defconfig | 2 ++
configs/apx4devkit_defconfig | 2 ++
configs/aristainetos_defconfig | 2 ++
configs/at91sam9x5ek_dataflash_defconfig | 2 ++
configs/at91sam9x5ek_mmc_defconfig | 2 ++
configs/at91sam9x5ek_nandflash_defconfig | 2 ++
configs/at91sam9x5ek_spiflash_defconfig | 2 ++
configs/balloon3_defconfig | 1 +
configs/bf527-ezkit_defconfig | 1 +
configs/bf548-ezkit_defconfig | 1 +
configs/bf561-acvilon_defconfig | 1 +
configs/birdland_bav335a_defconfig | 1 +
configs/birdland_bav335b_defconfig | 1 +
configs/cam_enc_4xx_defconfig | 2 ++
configs/chromebook_link_defconfig | 2 ++
configs/chromebox_panther_defconfig | 2 ++
configs/cm-bf537e_defconfig | 1 +
configs/cm-bf548_defconfig | 2 ++
configs/colibri_pxa270_defconfig | 1 +
configs/colibri_vf_defconfig | 2 ++
configs/coreboot-x86_defconfig | 2 ++
configs/crownbay_defconfig | 2 ++
configs/davinci_dm355evm_defconfig | 1 +
configs/davinci_dm355leopard_defconfig | 1 +
configs/davinci_dm365evm_defconfig | 1 +
configs/dig297_defconfig | 2 ++
configs/digsy_mtc_RAMBOOT_defconfig | 1 +
configs/digsy_mtc_defconfig | 1 +
configs/digsy_mtc_rev5_RAMBOOT_defconfig | 1 +
configs/digsy_mtc_rev5_defconfig | 1 +
configs/dns325_defconfig | 2 ++
configs/dockstar_defconfig | 2 ++
configs/ea20_defconfig | 2 ++
configs/eb_cpux9k2_defconfig | 2 ++
configs/eb_cpux9k2_ram_defconfig | 2 ++
configs/eco5pk_defconfig | 2 ++
configs/enbw_cmc_defconfig | 2 ++
configs/ethernut5_defconfig | 2 ++
configs/galileo_defconfig | 2 ++
configs/goflexhome_defconfig | 2 ++
configs/guruplug_defconfig | 4 ++++
configs/gwventana_defconfig | 2 ++
configs/ib62x0_defconfig | 4 ++++
configs/iconnect_defconfig | 4 ++++
configs/ids8313_defconfig | 2 ++
configs/ipam390_defconfig | 2 ++
configs/k2e_evm_defconfig | 2 ++
configs/k2hk_evm_defconfig | 2 ++
configs/k2l_evm_defconfig | 2 ++
configs/km_kirkwood_128m16_defconfig | 1 +
configs/km_kirkwood_defconfig | 1 +
configs/km_kirkwood_pci_defconfig | 1 +
configs/kmcoge4_defconfig | 1 +
configs/kmcoge5ne_defconfig | 1 +
configs/kmcoge5un_defconfig | 1 +
configs/kmeter1_defconfig | 1 +
configs/kmlion1_defconfig | 1 +
configs/kmnusa_defconfig | 1 +
configs/kmopti2_defconfig | 1 +
configs/kmsugp1_defconfig | 1 +
configs/kmsupx5_defconfig | 1 +
configs/kmsuv31_defconfig | 1 +
configs/kmvect1_defconfig | 1 +
configs/lp8x4x_defconfig | 1 +
configs/m28evk_defconfig | 2 ++
configs/m53evk_defconfig | 2 ++
configs/mcx_defconfig | 2 ++
configs/mgcoge3ne_defconfig | 1 +
configs/mgcoge3un_defconfig | 1 +
configs/mgcoge_defconfig | 1 +
configs/microblaze-generic_defconfig | 1 +
configs/minnowmax_defconfig | 2 ++
configs/mt_ventoux_defconfig | 2 ++
configs/mx28evk_auart_console_defconfig | 2 ++
configs/mx28evk_defconfig | 2 ++
configs/mx28evk_nand_defconfig | 2 ++
configs/mx28evk_spi_defconfig | 2 ++
configs/nas220_defconfig | 2 ++
configs/omap3_overo_defconfig | 2 ++
configs/omap3_pandora_defconfig | 2 ++
configs/omapl138_lcdk_defconfig | 2 ++
configs/openrd_base_defconfig | 2 ++
configs/openrd_client_defconfig | 2 ++
configs/openrd_ultimate_defconfig | 2 ++
configs/palmld_defconfig | 1 +
configs/palmtc_defconfig | 1 +
configs/palmtreo680_defconfig | 1 +
configs/platinum_picon_defconfig | 2 ++
configs/platinum_titanium_defconfig | 2 ++
configs/pogo_e02_defconfig | 2 ++
configs/portl2_defconfig | 1 +
configs/pxm2_defconfig | 2 ++
configs/qemu_mips64_defconfig | 1 +
configs/qemu_mips64el_defconfig | 1 +
configs/qemu_mips_defconfig | 1 +
configs/qemu_mipsel_defconfig | 1 +
configs/qong_defconfig | 2 ++
configs/rut_defconfig | 2 ++
configs/sama5d3_xplained_mmc_defconfig | 2 ++
configs/sama5d3_xplained_nandflash_defconfig | 2 ++
configs/sandbox_defconfig | 3 +++
configs/sheevaplug_defconfig | 4 ++++
configs/smdk2410_defconfig | 4 ++++
configs/suvd3_defconfig | 1 +
configs/titanium_defconfig | 2 ++
configs/tricorder_defconfig | 2 ++
configs/tricorder_flash_defconfig | 2 ++
configs/tuge1_defconfig | 1 +
configs/tuxx1_defconfig | 1 +
configs/twister_defconfig | 2 ++
configs/vct_platinum_onenand_defconfig | 1 +
configs/vct_platinum_onenand_small_defconfig | 1 +
configs/vct_platinumavc_onenand_defconfig | 1 +
configs/vct_platinumavc_onenand_small_defconfig | 1 +
configs/vct_premium_onenand_defconfig | 1 +
configs/vct_premium_onenand_small_defconfig | 1 +
configs/vf610twr_defconfig | 2 ++
configs/vf610twr_nand_defconfig | 2 ++
configs/vpac270_nor_128_defconfig | 1 +
configs/vpac270_nor_256_defconfig | 1 +
configs/vpac270_ond_256_defconfig | 1 +
configs/x600_defconfig | 2 ++
configs/zipitz2_defconfig | 1 +
configs/zmx25_defconfig | 1 +
include/config_cmd_all.h | 2 --
include/config_defaults.h | 1 -
include/configs/M54418TWR.h | 2 --
include/configs/MIP405.h | 1 -
include/configs/PIP405.h | 1 -
include/configs/PLU405.h | 3 ---
include/configs/VCMA9.h | 7 -------
include/configs/a3m071.h | 4 ----
include/configs/am335x_evm.h | 1 -
include/configs/am335x_igep0033.h | 4 ----
include/configs/apf27.h | 4 ----
include/configs/apx4devkit.h | 4 ----
include/configs/aristainetos.h | 4 ----
include/configs/at91sam9x5ek.h | 4 ----
include/configs/balloon3.h | 1 -
include/configs/bav335x.h | 1 -
include/configs/bct-brettl2.h | 1 -
include/configs/bf506f-ezkit.h | 1 -
include/configs/bfin_adi_common.h | 1 -
include/configs/cam_enc_4xx.h | 4 ----
include/configs/colibri_pxa270.h | 1 -
include/configs/colibri_vf.h | 4 ----
include/configs/da850evm.h | 4 ----
include/configs/davinci_dm355evm.h | 2 --
include/configs/davinci_dm355leopard.h | 2 --
include/configs/davinci_dm365evm.h | 2 --
include/configs/dig297.h | 4 ----
include/configs/digsy_mtc.h | 1 -
include/configs/dockstar.h | 4 ----
include/configs/ea20.h | 4 ----
include/configs/eb_cpux9k2.h | 4 ----
include/configs/enbw_cmc.h | 4 ----
include/configs/ethernut5.h | 4 ----
include/configs/guruplug.h | 6 ------
include/configs/gw_ventana.h | 4 ----
include/configs/ib62x0.h | 6 ------
include/configs/iconnect.h | 6 ------
include/configs/ids8313.h | 4 ----
include/configs/ipam390.h | 4 ----
include/configs/km/keymile-common.h | 2 --
include/configs/ks2_evm.h | 4 ----
include/configs/lacie_kw.h | 1 -
include/configs/lp8x4x.h | 1 -
include/configs/m28evk.h | 4 ----
include/configs/m53evk.h | 4 ----
include/configs/mcx.h | 4 ----
include/configs/microblaze-generic.h | 7 -------
include/configs/mv-common.h | 4 ----
include/configs/mv88f6281gtw_ge.h | 3 ---
include/configs/mx28evk.h | 4 ----
include/configs/nas220.h | 4 ----
include/configs/nokia_rx51.h | 4 ----
include/configs/omap3_overo.h | 4 ----
include/configs/omap3_pandora.h | 4 ----
include/configs/omapl138_lcdk.h | 4 ----
include/configs/palmld.h | 1 -
include/configs/palmtc.h | 1 -
include/configs/palmtreo680.h | 1 -
include/configs/platinum.h | 4 ----
include/configs/pogo_e02.h | 4 ----
include/configs/pxm2.h | 4 ----
include/configs/qemu-mips.h | 1 -
include/configs/qemu-mips64.h | 1 -
include/configs/qong.h | 4 ----
include/configs/rut.h | 4 ----
include/configs/sama5d3_xplained.h | 4 ----
include/configs/sandbox.h | 3 ---
include/configs/sheevaplug.h | 6 ------
include/configs/smdk2410.h | 6 ------
include/configs/tam3517-common.h | 4 ----
include/configs/titanium.h | 4 ----
include/configs/tricorder.h | 4 ----
include/configs/vct.h | 2 --
include/configs/vf610twr.h | 4 ----
include/configs/vpac270.h | 1 -
include/configs/wireless_space.h | 1 -
include/configs/x600.h | 4 ----
include/configs/x86-common.h | 2 --
include/configs/zipitz2.h | 1 -
include/configs/zmx25.h | 1 -
220 files changed, 226 insertions(+), 251 deletions(-)
diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig
index 8777200..80359ef 100644
--- a/configs/MIP405T_defconfig
+++ b/configs/MIP405T_defconfig
@@ -3,3 +3,4 @@ CONFIG_4xx=y
CONFIG_TARGET_MIP405=y
CONFIG_SYS_EXTRA_OPTIONS="MIP405T"
CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_BZIP2=y
diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig
index c8d1494..7fccedf 100644
--- a/configs/MIP405_defconfig
+++ b/configs/MIP405_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_MIP405=y
CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_BZIP2=y
diff --git a/configs/O2D_defconfig b/configs/O2D_defconfig
index af665a4..c07cc0e 100644
--- a/configs/O2D_defconfig
+++ b/configs/O2D_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2D=y
CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_BZIP2=y
diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig
index 1a62e08..e22e9bd 100644
--- a/configs/PIP405_defconfig
+++ b/configs/PIP405_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_PIP405=y
CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_BZIP2=y
diff --git a/configs/PLU405_defconfig b/configs/PLU405_defconfig
index 129475d..3dda1fb 100644
--- a/configs/PLU405_defconfig
+++ b/configs/PLU405_defconfig
@@ -2,3 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_PLU405=y
CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_CMD_UBI=y
+CONFIG_LZO=y
diff --git a/configs/VCMA9_defconfig b/configs/VCMA9_defconfig
index a6bbb38..dc4ed94 100644
--- a/configs/VCMA9_defconfig
+++ b/configs/VCMA9_defconfig
@@ -1,3 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_VCMA9=y
CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_BZIP2=y
+CONFIG_LZMA=y
diff --git a/configs/a3m071_defconfig b/configs/a3m071_defconfig
index 6797017..e5d3a5f 100644
--- a/configs/a3m071_defconfig
+++ b/configs/a3m071_defconfig
@@ -3,3 +3,5 @@ CONFIG_MPC5xxx=y
CONFIG_TARGET_A3M071=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/a4m2k_defconfig b/configs/a4m2k_defconfig
index e71d755..a11951f 100644
--- a/configs/a4m2k_defconfig
+++ b/configs/a4m2k_defconfig
@@ -4,3 +4,5 @@ CONFIG_TARGET_A3M071=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="A4M2K"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
index a514075..f6c465f 100644
--- a/configs/am335x_boneblack_defconfig
+++ b/configs/am335x_boneblack_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_LZO=y
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index 31b7753..aaf94ce 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -10,3 +10,4 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT,ENABLE_VBOOT"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_OF_CONTROL=y
+CONFIG_LZO=y
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index 144e993..f0554f8 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_SYS_EXTRA_OPTIONS="NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_LZO=y
diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
index b94d3e1..1f91eb4 100644
--- a/configs/am335x_evm_nor_defconfig
+++ b/configs/am335x_evm_nor_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_SYS_EXTRA_OPTIONS="NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_LZO=y
diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
index 6ba8bf3..c9dbe99 100644
--- a/configs/am335x_evm_norboot_defconfig
+++ b/configs/am335x_evm_norboot_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_AM335X_EVM=y
CONFIG_NOR=y
CONFIG_NOR_BOOT=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZO=y
diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
index 7dbbead..f357896 100644
--- a/configs/am335x_evm_spiboot_defconfig
+++ b/configs/am335x_evm_spiboot_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_SYS_EXTRA_OPTIONS="SPI_BOOT"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_LZO=y
diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
index 790b43f..b1e3c32 100644
--- a/configs/am335x_evm_usbspl_defconfig
+++ b/configs/am335x_evm_usbspl_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_SYS_EXTRA_OPTIONS="NAND,SPL_USBETH_SUPPORT"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_LZO=y
diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig
index 62a62b4..12823a7 100644
--- a/configs/am335x_igep0033_defconfig
+++ b/configs/am335x_igep0033_defconfig
@@ -4,3 +4,5 @@ CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_RBTREE=y
+CONFIG_LZO=y
diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
index ea9b4a6..5f74558 100644
--- a/configs/apf27_defconfig
+++ b/configs/apf27_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_TARGET_APF27=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/apx4devkit_defconfig b/configs/apx4devkit_defconfig
index 0585b11..43977de 100644
--- a/configs/apx4devkit_defconfig
+++ b/configs/apx4devkit_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_TARGET_APX4DEVKIT=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
index 16df93e..71bc3bc 100644
--- a/configs/aristainetos_defconfig
+++ b/configs/aristainetos_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_TARGET_ARISTAINETOS=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig
index 20bf18b..4e42f01 100644
--- a/configs/at91sam9x5ek_dataflash_defconfig
+++ b/configs/at91sam9x5ek_dataflash_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9X5EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_DATAFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig
index 14ddfc0..9d165ab 100644
--- a/configs/at91sam9x5ek_mmc_defconfig
+++ b/configs/at91sam9x5ek_mmc_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9X5EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_MMC"
CONFIG_ENV_IS_IN_FAT=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig
index cff1058..b4a5ab9 100644
--- a/configs/at91sam9x5ek_nandflash_defconfig
+++ b/configs/at91sam9x5ek_nandflash_defconfig
@@ -4,3 +4,5 @@ CONFIG_TARGET_AT91SAM9X5EK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig
index a4e0eba..dbcb86d 100644
--- a/configs/at91sam9x5ek_spiflash_defconfig
+++ b/configs/at91sam9x5ek_spiflash_defconfig
@@ -4,3 +4,5 @@ CONFIG_TARGET_AT91SAM9X5EK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/balloon3_defconfig b/configs/balloon3_defconfig
index 4e23ee7..9b37994 100644
--- a/configs/balloon3_defconfig
+++ b/configs/balloon3_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_BALLOON3=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/bf527-ezkit_defconfig b/configs/bf527-ezkit_defconfig
index 28593e4..20212e6 100644
--- a/configs/bf527-ezkit_defconfig
+++ b/configs/bf527-ezkit_defconfig
@@ -2,3 +2,4 @@ CONFIG_BLACKFIN=y
CONFIG_TARGET_BF527_EZKIT=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
+CONFIG_LZMA=y
diff --git a/configs/bf548-ezkit_defconfig b/configs/bf548-ezkit_defconfig
index 1075956..eb6199a 100644
--- a/configs/bf548-ezkit_defconfig
+++ b/configs/bf548-ezkit_defconfig
@@ -1,4 +1,5 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF548_EZKIT=y
CONFIG_ENV_IS_IN_ONENAND=y
+CONFIG_CMD_UBI=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf561-acvilon_defconfig b/configs/bf561-acvilon_defconfig
index ea4dd08..93a9046 100644
--- a/configs/bf561-acvilon_defconfig
+++ b/configs/bf561-acvilon_defconfig
@@ -2,3 +2,4 @@ CONFIG_BLACKFIN=y
CONFIG_TARGET_BF561_ACVILON=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
+CONFIG_LZO=y
diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig
index 43a4206..2eb026e 100644
--- a/configs/birdland_bav335a_defconfig
+++ b/configs/birdland_bav335a_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_BAV335X=y
CONFIG_BAV_VERSION=1
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
+CONFIG_LZO=y
diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig
index 7206e8e..be7a6ba 100644
--- a/configs/birdland_bav335b_defconfig
+++ b/configs/birdland_bav335b_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_BAV335X=y
CONFIG_BAV_VERSION=2
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
+CONFIG_LZO=y
diff --git a/configs/cam_enc_4xx_defconfig b/configs/cam_enc_4xx_defconfig
index 73060e5..23d6a38 100644
--- a/configs/cam_enc_4xx_defconfig
+++ b/configs/cam_enc_4xx_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_CAM_ENC_4XX=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 16dcbe8..2c04d06 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -9,3 +9,5 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_OF_CONTROL=y
CONFIG_DM_PCI=y
CONFIG_VIDEO_VESA=y
+# CONFIG_GZIP is not set
+CONFIG_LZO=y
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 9893451..d34286b 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -9,3 +9,5 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_OF_CONTROL=y
CONFIG_DM_PCI=y
CONFIG_VIDEO_VESA=y
+# CONFIG_GZIP is not set
+CONFIG_LZO=y
diff --git a/configs/cm-bf537e_defconfig b/configs/cm-bf537e_defconfig
index cfd1575..5d04223 100644
--- a/configs/cm-bf537e_defconfig
+++ b/configs/cm-bf537e_defconfig
@@ -1,4 +1,5 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_CM_BF537E=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm-bf548_defconfig b/configs/cm-bf548_defconfig
index 7ec8301..ef8b387 100644
--- a/configs/cm-bf548_defconfig
+++ b/configs/cm-bf548_defconfig
@@ -1,4 +1,6 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_CM_BF548=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig
index ade5ede..3627a1b 100644
--- a/configs/colibri_pxa270_defconfig
+++ b/configs/colibri_pxa270_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_COLIBRI_PXA270=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
index 3a0ef63..c3ea628 100644
--- a/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_TARGET_COLIBRI_VF=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 4a6856a..1aa5726 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -3,3 +3,5 @@ CONFIG_TARGET_COREBOOT=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_OF_CONTROL=y
CONFIG_DM_PCI=y
+# CONFIG_GZIP is not set
+CONFIG_LZO=y
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index c1a3e57..c694c80 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -5,3 +5,5 @@ CONFIG_TARGET_CROWNBAY=y
CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_OF_CONTROL=y
+# CONFIG_GZIP is not set
+CONFIG_LZO=y
diff --git a/configs/davinci_dm355evm_defconfig b/configs/davinci_dm355evm_defconfig
index 79d71fe..b1537fd 100644
--- a/configs/davinci_dm355evm_defconfig
+++ b/configs/davinci_dm355evm_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM355EVM=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
diff --git a/configs/davinci_dm355leopard_defconfig b/configs/davinci_dm355leopard_defconfig
index 0888e97..6e7182a 100644
--- a/configs/davinci_dm355leopard_defconfig
+++ b/configs/davinci_dm355leopard_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM355LEOPARD=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
diff --git a/configs/davinci_dm365evm_defconfig b/configs/davinci_dm365evm_defconfig
index 7479089..88e55d8 100644
--- a/configs/davinci_dm365evm_defconfig
+++ b/configs/davinci_dm365evm_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM365EVM=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
diff --git a/configs/dig297_defconfig b/configs/dig297_defconfig
index 1b4a3b1..2f6c6a8 100644
--- a/configs/dig297_defconfig
+++ b/configs/dig297_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_DIG297=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/digsy_mtc_RAMBOOT_defconfig b/configs/digsy_mtc_RAMBOOT_defconfig
index 86a25b0..7ebd30b 100644
--- a/configs/digsy_mtc_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_RAMBOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_BZIP2=y
diff --git a/configs/digsy_mtc_defconfig b/configs/digsy_mtc_defconfig
index cad7a40..964bf36 100644
--- a/configs/digsy_mtc_defconfig
+++ b/configs/digsy_mtc_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_BZIP2=y
diff --git a/configs/digsy_mtc_rev5_RAMBOOT_defconfig b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
index 70c8d48..4e02885 100644
--- a/configs/digsy_mtc_rev5_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000,DIGSY_REV5"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_BZIP2=y
diff --git a/configs/digsy_mtc_rev5_defconfig b/configs/digsy_mtc_rev5_defconfig
index 8edcfdf..44f91c9 100644
--- a/configs/digsy_mtc_rev5_defconfig
+++ b/configs/digsy_mtc_rev5_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y
CONFIG_SYS_EXTRA_OPTIONS="DIGSY_REV5"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_BZIP2=y
diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
index 62294b9..462af29 100644
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_DNS325=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
index 44911fd..8ea05f4 100644
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_DOCKSTAR=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index bb3def5..4c0f21d 100644
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_EA20=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/eb_cpux9k2_defconfig b/configs/eb_cpux9k2_defconfig
index c5b3f76..43b6e19 100644
--- a/configs/eb_cpux9k2_defconfig
+++ b/configs/eb_cpux9k2_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_EB_CPUX9K2=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/eb_cpux9k2_ram_defconfig b/configs/eb_cpux9k2_ram_defconfig
index 9a17e68..cbfdce3 100644
--- a/configs/eb_cpux9k2_ram_defconfig
+++ b/configs/eb_cpux9k2_ram_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_EB_CPUX9K2=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig
index 375d210..f1b4a06 100644
--- a/configs/eco5pk_defconfig
+++ b/configs/eco5pk_defconfig
@@ -3,3 +3,5 @@ CONFIG_OMAP34XX=y
CONFIG_TARGET_ECO5PK=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/enbw_cmc_defconfig b/configs/enbw_cmc_defconfig
index e446cad..d9559fb 100644
--- a/configs/enbw_cmc_defconfig
+++ b/configs/enbw_cmc_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_ENBW_CMC=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index bb6a835..9c1b5fb 100644
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_ETHERNUT5=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index 94beb45..1fdebef 100644
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -7,3 +7,5 @@ CONFIG_TARGET_GALILEO=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_OF_CONTROL=y
CONFIG_ETH_DESIGNWARE=y
+# CONFIG_GZIP is not set
+CONFIG_LZO=y
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index 9eec07d..aef64a7 100644
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_GOFLEXHOME=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig
index 656316a..118248d 100644
--- a/configs/guruplug_defconfig
+++ b/configs/guruplug_defconfig
@@ -2,3 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_GURUPLUG=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_BZIP2=y
+CONFIG_LZMA=y
diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
index 6858c6c..7de8c35 100644
--- a/configs/gwventana_defconfig
+++ b/configs/gwventana_defconfig
@@ -4,3 +4,5 @@ CONFIG_SYS_MALLOC_F=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
index 4f5a1db..402b44b 100644
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -2,3 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_IB62X0=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_BZIP2=y
+CONFIG_LZMA=y
diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
index 4f13862..4b29dab 100644
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
@@ -2,3 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_ICONNECT=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_BZIP2=y
+CONFIG_LZMA=y
diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index c7d7a02..4c198cf 100644
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -5,3 +5,5 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFF00000"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig
index bcf0be7..131509c 100644
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_IPAM390=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig
index fba321b..8cb5bda 100644
--- a/configs/k2e_evm_defconfig
+++ b/configs/k2e_evm_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_KEYSTONE=y
CONFIG_TARGET_K2E_EVM=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig
index 1308beb..060ab21 100644
--- a/configs/k2hk_evm_defconfig
+++ b/configs/k2hk_evm_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_KEYSTONE=y
CONFIG_TARGET_K2HK_EVM=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig
index 679e3a8..11d2e4a 100644
--- a/configs/k2l_evm_defconfig
+++ b/configs/k2l_evm_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_KEYSTONE=y
CONFIG_TARGET_K2L_EVM=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index b0277e7..cce2b90 100644
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16"
CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_CMD_UBI=y
diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index 2c1fa1b..0693ae7 100644
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD"
CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_CMD_UBI=y
diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index 70b5d58..cc6763f 100644
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI"
CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig
index a63cf3d..f1b18e63 100644
--- a/configs/kmcoge4_defconfig
+++ b/configs/kmcoge4_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_KMP204X=y
CONFIG_SYS_EXTRA_OPTIONS="KMCOGE4"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index b949b1c..2c1e0a8 100644
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
CONFIG_TARGET_KM8360=y
CONFIG_SYS_EXTRA_OPTIONS="KMCOGE5NE"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index 51f4020..316671f 100644
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig
index 9699d49..87b9653 100644
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
CONFIG_TARGET_KM8360=y
CONFIG_SYS_EXTRA_OPTIONS="KMETER1"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig
index cd1b32d..3ec83d3 100644
--- a/configs/kmlion1_defconfig
+++ b/configs/kmlion1_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_KMP204X=y
CONFIG_SYS_EXTRA_OPTIONS="KMLION1"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index 09060de..35bfcbf 100644
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig
index b90aae6..0c9d7c0 100644
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
CONFIG_TARGET_TUXX1=y
CONFIG_SYS_EXTRA_OPTIONS="KMOPTI2"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig
index 510a5a5..3ae4d96 100644
--- a/configs/kmsugp1_defconfig
+++ b/configs/kmsugp1_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_SUGP1"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig
index ff3c5ff..f8b4df9 100644
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
CONFIG_TARGET_TUXX1=y
CONFIG_SYS_EXTRA_OPTIONS="KMSUPX5"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig
index ab01012..0fc2ce2 100644
--- a/configs/kmsuv31_defconfig
+++ b/configs/kmsuv31_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_SUV31"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig
index 34b9bc3..ecd663b 100644
--- a/configs/kmvect1_defconfig
+++ b/configs/kmvect1_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
CONFIG_TARGET_SUVD3=y
CONFIG_SYS_EXTRA_OPTIONS="KMVECT1"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/lp8x4x_defconfig b/configs/lp8x4x_defconfig
index 6383f44..c262f67 100644
--- a/configs/lp8x4x_defconfig
+++ b/configs/lp8x4x_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_LP8X4X=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig
index 5c98214..7e387ae 100644
--- a/configs/m28evk_defconfig
+++ b/configs/m28evk_defconfig
@@ -2,4 +2,6 @@ CONFIG_ARM=y
CONFIG_TARGET_M28EVK=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
CONFIG_REGEX=y
diff --git a/configs/m53evk_defconfig b/configs/m53evk_defconfig
index a6a497b..07db5a3 100644
--- a/configs/m53evk_defconfig
+++ b/configs/m53evk_defconfig
@@ -3,4 +3,6 @@ CONFIG_TARGET_M53EVK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/denx/m53evk/imximage.cfg"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
CONFIG_REGEX=y
diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig
index dca4f20..b3e0629 100644
--- a/configs/mcx_defconfig
+++ b/configs/mcx_defconfig
@@ -3,3 +3,5 @@ CONFIG_OMAP34XX=y
CONFIG_TARGET_MCX=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/mgcoge3ne_defconfig b/configs/mgcoge3ne_defconfig
index 2237ffd..86323ba 100644
--- a/configs/mgcoge3ne_defconfig
+++ b/configs/mgcoge3ne_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC8260=y
CONFIG_TARGET_KM82XX=y
CONFIG_SYS_EXTRA_OPTIONS="MGCOGE3NE"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig
index 447d085..535d01a 100644
--- a/configs/mgcoge3un_defconfig
+++ b/configs/mgcoge3un_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN"
CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_CMD_UBI=y
diff --git a/configs/mgcoge_defconfig b/configs/mgcoge_defconfig
index 8d060d6..f2e187b 100644
--- a/configs/mgcoge_defconfig
+++ b/configs/mgcoge_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC8260=y
CONFIG_TARGET_KM82XX=y
CONFIG_SYS_EXTRA_OPTIONS="MGCOGE"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 0d5ac16..55b7b1b 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -3,5 +3,6 @@ CONFIG_TARGET_MICROBLAZE_GENERIC=y
CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic"
CONFIG_SPL=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index ad794aa..61188cc 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -10,3 +10,5 @@ CONFIG_GENERATE_SFI_TABLE=y
CONFIG_CMD_CPU=y
CONFIG_OF_CONTROL=y
CONFIG_CPU=y
+# CONFIG_GZIP is not set
+CONFIG_LZO=y
diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
index 1cea25c..d897f90 100644
--- a/configs/mt_ventoux_defconfig
+++ b/configs/mt_ventoux_defconfig
@@ -3,3 +3,5 @@ CONFIG_OMAP34XX=y
CONFIG_TARGET_MT_VENTOUX=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig
index 848e301..d0bca2a 100644
--- a/configs/mx28evk_auart_console_defconfig
+++ b/configs/mx28evk_auart_console_defconfig
@@ -3,3 +3,5 @@ CONFIG_TARGET_MX28EVK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE,ENV_IS_IN_MMC"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig
index 11dc0e5..1f2e3c4 100644
--- a/configs/mx28evk_defconfig
+++ b/configs/mx28evk_defconfig
@@ -3,3 +3,5 @@ CONFIG_TARGET_MX28EVK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig
index 2d9a42c..cba3d1d 100644
--- a/configs/mx28evk_nand_defconfig
+++ b/configs/mx28evk_nand_defconfig
@@ -3,3 +3,5 @@ CONFIG_TARGET_MX28EVK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig
index 403a3d8..a22c57f 100644
--- a/configs/mx28evk_spi_defconfig
+++ b/configs/mx28evk_spi_defconfig
@@ -3,3 +3,5 @@ CONFIG_TARGET_MX28EVK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_SPI_FLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index a7a671b..4b17a82 100644
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_NAS220=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig
index 6b0b357..28443db 100644
--- a/configs/omap3_overo_defconfig
+++ b/configs/omap3_overo_defconfig
@@ -3,3 +3,5 @@ CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_OVERO=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig
index 083a1a8..3387fdd 100644
--- a/configs/omap3_pandora_defconfig
+++ b/configs/omap3_pandora_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_PANDORA=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig
index 6641917..63233b5 100644
--- a/configs/omapl138_lcdk_defconfig
+++ b/configs/omapl138_lcdk_defconfig
@@ -3,3 +3,5 @@ CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_OMAPL138_LCDK=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig
index 9e1c0fb..748563f 100644
--- a/configs/openrd_base_defconfig
+++ b/configs/openrd_base_defconfig
@@ -3,3 +3,5 @@ CONFIG_KIRKWOOD=y
CONFIG_TARGET_OPENRD=y
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_BASE"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig
index 03444d0..0f97dde 100644
--- a/configs/openrd_client_defconfig
+++ b/configs/openrd_client_defconfig
@@ -3,3 +3,5 @@ CONFIG_KIRKWOOD=y
CONFIG_TARGET_OPENRD=y
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_CLIENT"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig
index 70963b1..fea6ccc 100644
--- a/configs/openrd_ultimate_defconfig
+++ b/configs/openrd_ultimate_defconfig
@@ -3,3 +3,5 @@ CONFIG_KIRKWOOD=y
CONFIG_TARGET_OPENRD=y
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_ULTIMATE"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/palmld_defconfig b/configs/palmld_defconfig
index 8f1581e..b4b1a48 100644
--- a/configs/palmld_defconfig
+++ b/configs/palmld_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_PALMLD=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/palmtc_defconfig b/configs/palmtc_defconfig
index 2b6c12a..3777add 100644
--- a/configs/palmtc_defconfig
+++ b/configs/palmtc_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_PALMTC=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/palmtreo680_defconfig b/configs/palmtreo680_defconfig
index f30d2b7..318c4e2 100644
--- a/configs/palmtreo680_defconfig
+++ b/configs/palmtreo680_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_PALMTREO680=y
CONFIG_SPL=y
+CONFIG_LZMA=y
diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig
index f607574..256777a 100644
--- a/configs/platinum_picon_defconfig
+++ b/configs/platinum_picon_defconfig
@@ -3,3 +3,5 @@ CONFIG_TARGET_PLATINUM_PICON=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig
index 6561aed..36fca62 100644
--- a/configs/platinum_titanium_defconfig
+++ b/configs/platinum_titanium_defconfig
@@ -3,3 +3,5 @@ CONFIG_TARGET_PLATINUM_TITANIUM=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
index aa62db7..abb6f5b 100644
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_POGO_E02=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig
index 51c2588..b0305e8 100644
--- a/configs/portl2_defconfig
+++ b/configs/portl2_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_PORTL2"
CONFIG_ENV_IS_IN_EEPROM=y
+CONFIG_CMD_UBI=y
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 585f1f75..a41bfd1 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_TARGET_PXM2=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/qemu_mips64_defconfig b/configs/qemu_mips64_defconfig
index 36da677..8bae13a 100644
--- a/configs/qemu_mips64_defconfig
+++ b/configs/qemu_mips64_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
CONFIG_TARGET_QEMU_MIPS=y
CONFIG_CPU_MIPS64_R1=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/qemu_mips64el_defconfig b/configs/qemu_mips64el_defconfig
index ccbb4cf..6c54c45 100644
--- a/configs/qemu_mips64el_defconfig
+++ b/configs/qemu_mips64el_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_QEMU_MIPS=y
CONFIG_SYS_LITTLE_ENDIAN=y
CONFIG_CPU_MIPS64_R1=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/qemu_mips_defconfig b/configs/qemu_mips_defconfig
index 774e27a..7285cbb 100644
--- a/configs/qemu_mips_defconfig
+++ b/configs/qemu_mips_defconfig
@@ -1,3 +1,4 @@
CONFIG_MIPS=y
CONFIG_TARGET_QEMU_MIPS=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/qemu_mipsel_defconfig b/configs/qemu_mipsel_defconfig
index f6eb7a2..f5c9a05 100644
--- a/configs/qemu_mipsel_defconfig
+++ b/configs/qemu_mipsel_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
CONFIG_TARGET_QEMU_MIPS=y
CONFIG_SYS_LITTLE_ENDIAN=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/qong_defconfig b/configs/qong_defconfig
index 4be1378..4efcd59 100644
--- a/configs/qong_defconfig
+++ b/configs/qong_defconfig
@@ -1,3 +1,5 @@
CONFIG_ARM=y
CONFIG_TARGET_QONG=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index 5b678bf..aa48d76 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_TARGET_RUT=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig
index cfef85b..27b39b6 100644
--- a/configs/sama5d3_xplained_mmc_defconfig
+++ b/configs/sama5d3_xplained_mmc_defconfig
@@ -4,3 +4,5 @@ CONFIG_TARGET_SAMA5D3_XPLAINED=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC"
CONFIG_ENV_IS_IN_FAT=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig
index a829fa5..13edd67 100644
--- a/configs/sama5d3_xplained_nandflash_defconfig
+++ b/configs/sama5d3_xplained_nandflash_defconfig
@@ -4,3 +4,5 @@ CONFIG_TARGET_SAMA5D3_XPLAINED=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index cc309c8..0972b4f 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -27,4 +27,7 @@ CONFIG_USB=y
CONFIG_USB_EMUL=y
CONFIG_USB_STORAGE=y
CONFIG_DM_RTC=y
+CONFIG_BZIP2=y
+CONFIG_LZMA=y
+CONFIG_LZO=y
CONFIG_CMD_UT_TIME=y
diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index b9ff68d..6646bdb 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -2,3 +2,7 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_SHEEVAPLUG=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_BZIP2=y
+CONFIG_LZMA=y
diff --git a/configs/smdk2410_defconfig b/configs/smdk2410_defconfig
index 86eb7fd..71d171e 100644
--- a/configs/smdk2410_defconfig
+++ b/configs/smdk2410_defconfig
@@ -1,3 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_SMDK2410=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_BZIP2=y
+CONFIG_LZMA=y
diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig
index d36f7da..fe80714 100644
--- a/configs/suvd3_defconfig
+++ b/configs/suvd3_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
CONFIG_TARGET_SUVD3=y
CONFIG_SYS_EXTRA_OPTIONS="SUVD3"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/titanium_defconfig b/configs/titanium_defconfig
index 1655ffe..19bed54 100644
--- a/configs/titanium_defconfig
+++ b/configs/titanium_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_TARGET_TITANIUM=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/barco/titanium/imximage.cfg"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig
index 1c202c7..0c10cff 100644
--- a/configs/tricorder_defconfig
+++ b/configs/tricorder_defconfig
@@ -3,3 +3,5 @@ CONFIG_OMAP34XX=y
CONFIG_TARGET_TRICORDER=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig
index c00bffe..7f56e89 100644
--- a/configs/tricorder_flash_defconfig
+++ b/configs/tricorder_flash_defconfig
@@ -3,3 +3,5 @@ CONFIG_OMAP34XX=y
CONFIG_TARGET_TRICORDER=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="FLASHCARD"
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index 0b925dc..734581c 100644
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
CONFIG_TARGET_TUXX1=y
CONFIG_SYS_EXTRA_OPTIONS="TUGE1"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig
index 6ee66f2..2a07e51 100644
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
CONFIG_TARGET_TUXX1=y
CONFIG_SYS_EXTRA_OPTIONS="TUXX1"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
diff --git a/configs/twister_defconfig b/configs/twister_defconfig
index b07abcd..3ff0a35 100644
--- a/configs/twister_defconfig
+++ b/configs/twister_defconfig
@@ -3,3 +3,5 @@ CONFIG_OMAP34XX=y
CONFIG_TARGET_TWISTER=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig
index 317b4ca..078866f 100644
--- a/configs/vct_platinum_onenand_defconfig
+++ b/configs/vct_platinum_onenand_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VCT=y
CONFIG_VCT_PLATINUM=y
CONFIG_VCT_ONENAND=y
CONFIG_ENV_IS_IN_ONENAND=y
+CONFIG_CMD_UBI=y
diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig
index 387f1c1..75c483a 100644
--- a/configs/vct_platinum_onenand_small_defconfig
+++ b/configs/vct_platinum_onenand_small_defconfig
@@ -5,3 +5,4 @@ CONFIG_VCT_ONENAND=y
CONFIG_VCT_SMALL_IMAGE=y
CONFIG_ENV_IS_IN_ONENAND=y
# CONFIG_CMD_CRC32 is not set
+CONFIG_CMD_UBI=y
diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig
index 81b2507..fdbf13b 100644
--- a/configs/vct_platinumavc_onenand_defconfig
+++ b/configs/vct_platinumavc_onenand_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VCT=y
CONFIG_VCT_PLATINUMAVC=y
CONFIG_VCT_ONENAND=y
CONFIG_ENV_IS_IN_ONENAND=y
+CONFIG_CMD_UBI=y
diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig
index 1dc275d..8caf2a8 100644
--- a/configs/vct_platinumavc_onenand_small_defconfig
+++ b/configs/vct_platinumavc_onenand_small_defconfig
@@ -5,3 +5,4 @@ CONFIG_VCT_ONENAND=y
CONFIG_VCT_SMALL_IMAGE=y
CONFIG_ENV_IS_IN_ONENAND=y
# CONFIG_CMD_CRC32 is not set
+CONFIG_CMD_UBI=y
diff --git a/configs/vct_premium_onenand_defconfig b/configs/vct_premium_onenand_defconfig
index 5e7b95e..ed74502 100644
--- a/configs/vct_premium_onenand_defconfig
+++ b/configs/vct_premium_onenand_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VCT=y
CONFIG_VCT_PREMIUM=y
CONFIG_VCT_ONENAND=y
CONFIG_ENV_IS_IN_ONENAND=y
+CONFIG_CMD_UBI=y
diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig
index 97c292f..3e46238 100644
--- a/configs/vct_premium_onenand_small_defconfig
+++ b/configs/vct_premium_onenand_small_defconfig
@@ -5,3 +5,4 @@ CONFIG_VCT_ONENAND=y
CONFIG_VCT_SMALL_IMAGE=y
CONFIG_ENV_IS_IN_ONENAND=y
# CONFIG_CMD_CRC32 is not set
+CONFIG_CMD_UBI=y
diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig
index d4f82f3..7765b33 100644
--- a/configs/vf610twr_defconfig
+++ b/configs/vf610twr_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_TARGET_VF610TWR=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_IS_IN_MMC"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig
index cfbfa4b..c669064 100644
--- a/configs/vf610twr_nand_defconfig
+++ b/configs/vf610twr_nand_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_TARGET_VF610TWR=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_IS_IN_NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
diff --git a/configs/vpac270_nor_128_defconfig b/configs/vpac270_nor_128_defconfig
index bb8c3d8..78f7a4d 100644
--- a/configs/vpac270_nor_128_defconfig
+++ b/configs/vpac270_nor_128_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_VPAC270=y
CONFIG_SYS_EXTRA_OPTIONS="NOR,RAM_128M"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/vpac270_nor_256_defconfig b/configs/vpac270_nor_256_defconfig
index e1c040d..cfe4822 100644
--- a/configs/vpac270_nor_256_defconfig
+++ b/configs/vpac270_nor_256_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_VPAC270=y
CONFIG_SYS_EXTRA_OPTIONS="NOR,RAM_256M"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/vpac270_ond_256_defconfig b/configs/vpac270_ond_256_defconfig
index 5569c8f..5209bab 100644
--- a/configs/vpac270_ond_256_defconfig
+++ b/configs/vpac270_ond_256_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VPAC270=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="ONENAND,RAM_256M"
CONFIG_ENV_IS_IN_ONENAND=y
+CONFIG_LZMA=y
diff --git a/configs/x600_defconfig b/configs/x600_defconfig
index d530eb3..02a0905 100644
--- a/configs/x600_defconfig
+++ b/configs/x600_defconfig
@@ -4,4 +4,6 @@ CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig
index 6446159..8d4336b 100644
--- a/configs/zipitz2_defconfig
+++ b/configs/zipitz2_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_ZIPITZ2=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZMA=y
diff --git a/configs/zmx25_defconfig b/configs/zmx25_defconfig
index 014a01a..61111d0 100644
--- a/configs/zmx25_defconfig
+++ b/configs/zmx25_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_ZMX25=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_LZO=y
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index 2c2a05b..6d9f839 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -89,8 +89,6 @@
#define CONFIG_CMD_SOURCE /* "source" command support */
#define CONFIG_CMD_SPI /* SPI utility */
#define CONFIG_CMD_TERMINAL /* built-in Serial Terminal */
-#define CONFIG_CMD_UBI /* UBI Support */
-#define CONFIG_CMD_UBIFS /* UBIFS Support */
#define CONFIG_CMD_UNIVERSE /* Tundra Universe Support */
#define CONFIG_CMD_UNZIP /* unzip from memory to memory */
#define CONFIG_CMD_USB /* USB Support */
diff --git a/include/config_defaults.h b/include/config_defaults.h
index ad08c1d..ab1e593 100644
--- a/include/config_defaults.h
+++ b/include/config_defaults.h
@@ -16,7 +16,6 @@
#define CONFIG_BOOTM_RTEMS 1
#define CONFIG_BOOTM_VXWORKS 1
-#define CONFIG_GZIP 1
#define CONFIG_ZLIB 1
#define CONFIG_PARTITIONS 1
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 5bc49e1..d564f4a 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -48,7 +48,6 @@
#undef CONFIG_CMD_FLASH
#undef CONFIG_CMD_I2C
#undef CONFIG_CMD_JFFS2
-#undef CONFIG_CMD_UBI
#define CONFIG_CMD_MEMORY
#define CONFIG_CMD_MISC
#define CONFIG_CMD_MII
@@ -377,7 +376,6 @@
#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE /* needed for mtdparts command */
#define CONFIG_MTD_PARTITIONS /* mtdparts and UBI support */
-#define CONFIG_RBTREE
#define MTDIDS_DEFAULT "nand0=NAND"
#define MTDPARTS_DEFAULT "mtdparts=NAND:1m(u-boot)," \
"-(ubi)"
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index e43f8ac..666b02e 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -401,7 +401,6 @@
/************************************************************
* support BZIP2 compression
************************************************************/
-#define CONFIG_BZIP2 1
/************************************************************
* Ident
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index c263062..5595857 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -358,7 +358,6 @@
/************************************************************
* support BZIP2 compression
************************************************************/
-#define CONFIG_BZIP2 1
/************************************************************
* Ident
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index e790a1a..87052c7 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -405,11 +405,8 @@
/*
* UBI
*/
-#define CONFIG_CMD_UBI
-#define CONFIG_RBTREE
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
#endif /* __CONFIG_H */
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index a464143..f3be290 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -161,9 +161,6 @@
/* we configure PWM Timer 4 to 1ms 1000Hz */
/* support additional compression methods */
-#define CONFIG_BZIP2
-#define CONFIG_LZO
-#define CONFIG_LZMA
/* Ident */
/*#define VERSION_TAG "released"*/
@@ -213,15 +210,11 @@
/* File system */
#define CONFIG_CMD_FAT
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#define CONFIG_CMD_JFFS2
#define CONFIG_YAFFS2
-#define CONFIG_RBTREE
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_MTD_PARTITIONS
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - \
diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h
index 02e9da2..7c22c26 100644
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -81,11 +81,7 @@
"5376k(data)," \
"8M(install)"
-#define CONFIG_LZO /* needed for UBI */
-#define CONFIG_RBTREE /* needed for UBI */
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#define CONFIG_FIT
/*
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 7501f0e..a1e7714 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -23,7 +23,6 @@
# define CONFIG_FIT
#endif
# define CONFIG_TIMESTAMP
-# define CONFIG_LZO
#endif
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
diff --git a/include/configs/am335x_igep0033.h b/include/configs/am335x_igep0033.h
index dd529bb..7f9285b 100644
--- a/include/configs/am335x_igep0033.h
+++ b/include/configs/am335x_igep0033.h
@@ -28,8 +28,6 @@
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
/* Make the verbose messages from UBI stop printing */
-#define CONFIG_UBI_SILENCE_MSG
-#define CONFIG_UBIFS_SILENCE_MSG
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
@@ -110,8 +108,6 @@
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(spl),"\
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index ded388c..10f1916 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -87,8 +87,6 @@
#define CONFIG_CMD_NFS /* NFS support */
#define CONFIG_CMD_PING /* ping support */
#define CONFIG_CMD_SETEXPR /* setexpr support */
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
/*
* Memory configurations
@@ -279,8 +277,6 @@
/*
* UBIFS
*/
-#define CONFIG_RBTREE
-#define CONFIG_LZO
/*
* Ethernet (on SOC imx FEC)
diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
index 42f572a..223ae2f 100644
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -70,11 +70,7 @@
/* UBI and NAND partitioning */
#ifdef CONFIG_CMD_NAND
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define MTDIDS_DEFAULT "nand0=gpmi-nand"
diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index 8c43700..a1789c7 100644
--- a/include/configs/aristainetos.h
+++ b/include/configs/aristainetos.h
@@ -307,10 +307,6 @@
#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#define CONFIG_MTD_UBI_FASTMAP
#define CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT 1
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index ca0845c..c93665c 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -126,10 +126,6 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#endif
/* MMC */
diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h
index bf3f94c..4f56e70 100644
--- a/include/configs/balloon3.h
+++ b/include/configs/balloon3.h
@@ -33,7 +33,6 @@
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_SYS_TEXT_BASE 0x0
-#define CONFIG_LZMA /* LZMA compression support */
/*
* Serial Console Configuration
diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index 3932bea..70daaf5 100644
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -22,7 +22,6 @@
#ifndef CONFIG_SPL_BUILD
# define CONFIG_FIT
# define CONFIG_TIMESTAMP
-# define CONFIG_LZO
# ifdef CONFIG_ENABLE_VBOOT
# define CONFIG_FIT_SIGNATURE
# define CONFIG_RSA
diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h
index 6e72aeb..434eaf1 100644
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -144,7 +144,6 @@
/* disable unnecessary features */
#undef CONFIG_BOOTM_RTEMS
-#undef CONFIG_BZIP2
#undef CONFIG_KALLSYMS
#endif
diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h
index 6a6f964..6900329 100644
--- a/include/configs/bf506f-ezkit.h
+++ b/include/configs/bf506f-ezkit.h
@@ -97,7 +97,6 @@
#define CONFIG_BFIN_SERIAL
#define CONFIG_CMD_MEMORY
-#undef CONFIG_GZIP
#undef CONFIG_ZLIB
#undef CONFIG_BOOTM_RTEMS
#undef CONFIG_BOOTM_LINUX
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index 143d3dd..5edcec8 100644
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -317,7 +317,6 @@
# define CONFIG_BOARD_SIZE_LIMIT $$(( 256 * 1024 ))
#endif
#define CONFIG_BFIN_SPI_GPIO_CS /* Only matters if BFIN_SPI is enabled */
-#define CONFIG_LZMA
#define CONFIG_MONITOR_IS_IN_RAM
#ifdef CONFIG_HW_WATCHDOG
# define CONFIG_BFIN_WATCHDOG
diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index a502c90..b345247 100644
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -120,10 +120,6 @@
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
#define CONFIG_CMD_NAND
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#endif
#define CONFIG_CRC32_VERIFY
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 3b31363..0c66073 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -38,7 +38,6 @@
#define CONFIG_BOOTDELAY 2 /* Autoboot delay */
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_LZMA /* LZMA compression support */
#define CONFIG_OF_LIBFDT
/*
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 414600a..2f41371 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -82,13 +82,9 @@
#define CONFIG_CMD_EXT4
#define CONFIG_DOS_PARTITION
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#define CONFIG_CMD_FS_GENERIC
#define CONFIG_CMD_BOOTZ
-#define CONFIG_CMD_UBI
#define CONFIG_MTD_UBI_FASTMAP
-#define CONFIG_CMD_UBIFS /* increases size by almost 60 KB */
#define CONFIG_CMD_PING
#define CONFIG_CMD_DHCP
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 07f4145..1a59ce5 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -317,10 +317,6 @@
#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
-#define CONFIG_RBTREE
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#endif
#ifdef CONFIG_USE_SPIFLASH
diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h
index 4bf21ca..e16d308 100644
--- a/include/configs/davinci_dm355evm.h
+++ b/include/configs/davinci_dm355evm.h
@@ -98,8 +98,6 @@
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
#define CONFIG_CMD_NAND
-#define CONFIG_CMD_UBI
-#define CONFIG_RBTREE
#endif
#ifdef CONFIG_USB_DAVINCI
diff --git a/include/configs/davinci_dm355leopard.h b/include/configs/davinci_dm355leopard.h
index 34cee0a..488a874 100644
--- a/include/configs/davinci_dm355leopard.h
+++ b/include/configs/davinci_dm355leopard.h
@@ -76,8 +76,6 @@
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
#define CONFIG_CMD_NAND
-#define CONFIG_CMD_UBI
-#define CONFIG_RBTREE
#endif
#define CONFIG_CRC32_VERIFY
diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h
index 565082e..cb064e7 100644
--- a/include/configs/davinci_dm365evm.h
+++ b/include/configs/davinci_dm365evm.h
@@ -141,8 +141,6 @@
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
#define CONFIG_CMD_NAND
-#define CONFIG_CMD_UBI
-#define CONFIG_RBTREE
#endif
#define CONFIG_CRC32_VERIFY
diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index e029580..05d35d8 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -98,16 +98,12 @@
#define CONFIG_DOS_PARTITION
/* library portions to compile in */
-#define CONFIG_RBTREE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
/* commands to include */
#include <config_cmd_default.h>
#define CONFIG_CMD_FAT /* FAT support */
-#define CONFIG_CMD_UBI /* UBI Support */
-#define CONFIG_CMD_UBIFS /* UBIFS Support */
#define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index 54d20a4..9f49ae8 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -69,7 +69,6 @@
* Partitions
*/
#define CONFIG_DOS_PARTITION
-#define CONFIG_BZIP2
/*
* Video
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index cba4e1b..ba328c9 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -97,12 +97,8 @@
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT
#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_MTD_PARTITIONS
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
#endif /* _CONFIG_DOCKSTAR_H */
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 31ec1f1..bbf907e 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -177,10 +177,6 @@
#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
-#define CONFIG_RBTREE
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NAND_PAGE_2K
diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index 01f9ae6..eb1781f 100644
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -125,9 +125,7 @@
#define CONFIG_I2C_CMD_TREE
#define CONFIG_CMD_USB
#define CONFIG_CMD_FAT
-#define CONFIG_CMD_UBI
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_CMD_UBIFS
#define CONFIG_SYS_LONGHELP
@@ -138,8 +136,6 @@
#define CONFIG_FLASH_CFI_MTD
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#define MTDIDS_DEFAULT "nor0=physmap-flash.0,nand0=atmel_nand"
#define MTDPARTS_DEFAULT "mtdparts=" \
diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h
index a058827..a76c7ec 100644
--- a/include/configs/enbw_cmc.h
+++ b/include/configs/enbw_cmc.h
@@ -273,10 +273,6 @@
#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
-#define CONFIG_RBTREE
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#endif
#if !defined(CONFIG_USE_NAND) && \
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 5feec17..9026913 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -131,8 +131,6 @@
#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_SF
#define CONFIG_CMD_SNTP
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#define CONFIG_CMD_UNZIP
#define CONFIG_CMD_USB
#endif
@@ -237,8 +235,6 @@
defined(CONFIG_CMD_USB) || defined(CONFIG_MMC)
#define CONFIG_DOS_PARTITION
#endif
-#define CONFIG_LZO
-#define CONFIG_RBTREE
/* Boot command */
#define CONFIG_BOOTDELAY 3
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index 5395a22..ff4364e 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -28,9 +28,6 @@
/*
* Compression configuration
*/
-#define CONFIG_BZIP2
-#define CONFIG_LZMA
-#define CONFIG_LZO
/*
* Enable device tree support
@@ -130,9 +127,6 @@
#define CONFIG_CMD_EXT4
#define CONFIG_CMD_FAT
#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index aead45b..f278413 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -116,7 +116,6 @@
#define CONFIG_CMD_EXT4
#define CONFIG_CMD_EXT4_WRITE
#define CONFIG_CMD_FAT
-#define CONFIG_CMD_UBIFS
#define CONFIG_DOS_PARTITION
/*
@@ -167,9 +166,6 @@
#define CONFIG_CMD_BOOTZ
#define CONFIG_CMD_GSC
#define CONFIG_CMD_EECONFIG /* Gateworks EEPROM config cmd */
-#define CONFIG_CMD_UBI
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#define CONFIG_CMD_FUSE /* eFUSE read/write support */
#ifdef CONFIG_CMD_FUSE
#define CONFIG_MXC_OCOTP
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index b71b4ea..3a88d41 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -36,9 +36,6 @@
/*
* Compression configuration
*/
-#define CONFIG_BZIP2
-#define CONFIG_LZMA
-#define CONFIG_LZO
/*
* Commands configuration
@@ -135,9 +132,6 @@
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT
#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index 0310927..ca489d1 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -31,9 +31,6 @@
/*
* Compression configuration
*/
-#define CONFIG_BZIP2
-#define CONFIG_LZMA
-#define CONFIG_LZO
/*
* Commands configuration
@@ -104,9 +101,6 @@
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT
#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 50be7fb..d505133 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -559,10 +559,6 @@
/* UBI Support */
#define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#define CONFIG_MTD_PARTITIONS
/* bootcount support */
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index 8b1f2fe..4226ead 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -281,10 +281,6 @@
#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
-#define CONFIG_RBTREE
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#define MTDIDS_NAME_STR "davinci_nand.0"
#define MTDIDS_DEFAULT "nand0=" MTDIDS_NAME_STR
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 517f46a..ddf2f62 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -76,8 +76,6 @@
#define CONFIG_BOOTP_HOSTNAME
/* UBI Support for all Keymile boards */
-#define CONFIG_CMD_UBI
-#define CONFIG_RBTREE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_CONCAT
diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h
index ecebd1f..54fadc3 100644
--- a/include/configs/ks2_evm.h
+++ b/include/configs/ks2_evm.h
@@ -187,8 +187,6 @@
#define CONFIG_ENV_OFFSET 0x100000
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#define MTDIDS_DEFAULT "nand0=davinci_nand.0"
#define MTDPARTS_DEFAULT "mtdparts=davinci_nand.0:" \
"1024k(bootloader)ro,512k(params)ro," \
@@ -217,8 +215,6 @@
#define CONFIG_CMD_SAVES
#define CONFIG_CMD_MTDPARTS
#define CONFIG_CMD_NAND
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#define CONFIG_CMD_SF
#define CONFIG_CMD_EEPROM
#define CONFIG_CMD_USB
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 87c23fb..915aadf 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -91,7 +91,6 @@
#include "mv-common.h"
/* Remove or override few declarations from mv-common.h */
-#undef CONFIG_RBTREE
#undef CONFIG_ENV_SPI_MAX_HZ
#undef CONFIG_SYS_IDE_MAXBUS
#undef CONFIG_SYS_IDE_MAXDEVICE
diff --git a/include/configs/lp8x4x.h b/include/configs/lp8x4x.h
index 962a409..21c4b55 100644
--- a/include/configs/lp8x4x.h
+++ b/include/configs/lp8x4x.h
@@ -30,7 +30,6 @@
#define CONFIG_BOOTDELAY 2 /* Autoboot delay */
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_LZMA /* LZMA compression support */
#define CONFIG_OF_LIBFDT
/*
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index ea2740c..0dcb5a0 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -68,11 +68,7 @@
#define CONFIG_ENV_OFFSET_REDUND \
(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define MTDIDS_DEFAULT "nand0=gpmi-nand"
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 496a425..70936f4 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -133,11 +133,7 @@
#define CONFIG_ENV_OFFSET_REDUND \
(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define MTDIDS_DEFAULT "nand0=mxc_nand"
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index c8bd6c4..0b4cb28 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -128,10 +128,6 @@
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_PING
#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
#define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index e91831d..daffd5f 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -273,8 +273,6 @@
# define CONFIG_CMD_FLASH
# define CONFIG_CMD_IMLS
# define CONFIG_CMD_JFFS2
-# define CONFIG_CMD_UBI
-# undef CONFIG_CMD_UBIFS
# if !defined(RAMENV)
# define CONFIG_CMD_SAVEENV
@@ -293,8 +291,6 @@
# undef CONFIG_CMD_IMLS
# undef CONFIG_CMD_FLASH
# undef CONFIG_CMD_JFFS2
-# undef CONFIG_CMD_UBI
-# undef CONFIG_CMD_UBIFS
#endif
#endif
@@ -303,13 +299,10 @@
#endif
#if defined(CONFIG_CMD_UBIFS)
-# define CONFIG_CMD_UBI
-# define CONFIG_LZO
#endif
#if defined(CONFIG_CMD_UBI)
# define CONFIG_MTD_PARTITIONS
-# define CONFIG_RBTREE
#endif
#if defined(CONFIG_MTD_PARTITIONS)
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 51436da..e3fe6f2 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -143,13 +143,9 @@
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_FAT
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_MTD_PARTITIONS
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
#endif
#endif /* _MV_COMMON_H */
diff --git a/include/configs/mv88f6281gtw_ge.h b/include/configs/mv88f6281gtw_ge.h
index 6be2d9d..96d9399 100644
--- a/include/configs/mv88f6281gtw_ge.h
+++ b/include/configs/mv88f6281gtw_ge.h
@@ -45,9 +45,6 @@
#undef CONFIG_CMD_EXT2
#undef CONFIG_CMD_JFFS2
#undef CONFIG_CMD_FAT
-#undef CONFIG_CMD_UBI
-#undef CONFIG_CMD_UBIFS
-#undef CONFIG_RBTREE
/*
* Environment variables configurations
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 9daa0bf..956c4ef 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -85,11 +85,7 @@
/* UBI and NAND partitioning */
#ifdef CONFIG_CMD_NAND
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define MTDIDS_DEFAULT "nand0=gpmi-nand"
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 1ae7f14..01e1e58 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -126,13 +126,9 @@
#define CONFIG_CMD_JFFS2
#define CONFIG_JFFS2_NAND
#define CONFIG_JFFS2_LZO
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_MTD_PARTITIONS
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
/*
* SATA
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index a6a3cf0..bd1e6d4 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -146,8 +146,6 @@
#define CONFIG_CMD_MTDPARTS /* mtd parts support */
#ifdef UBIFS_SUPPORT
-#define CONFIG_CMD_UBI /* UBI Support */
-#define CONFIG_CMD_UBIFS /* UBIFS Support */
#endif
#endif
@@ -229,8 +227,6 @@
#define CONFIG_MTD_PARTITIONS
#ifdef UBIFS_SUPPORT
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#endif
#define MTDIDS_DEFAULT "onenand0=onenand"
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index ebea0dd..9403c1b 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -63,11 +63,7 @@
#undef CONFIG_CMD_NFS /* NFS support */
#ifdef CONFIG_NAND
-#define CONFIG_CMD_UBI /* UBI-formated MTD partition support */
-#define CONFIG_CMD_UBIFS /* Read-only UBI volume operations */
-#define CONFIG_RBTREE /* required by CONFIG_CMD_UBI */
-#define CONFIG_LZO /* required by CONFIG_CMD_UBIFS */
#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 56bf57d..f01b1ef 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -78,11 +78,7 @@
#define CONFIG_SYS_NAND_OOBSIZE 64
#ifdef CONFIG_NAND
-#define CONFIG_CMD_UBI /* UBI-formated MTD partition support */
-#define CONFIG_CMD_UBIFS /* Read-only UBI volume operations */
-#define CONFIG_RBTREE /* required by CONFIG_CMD_UBI */
-#define CONFIG_LZO /* required by CONFIG_CMD_UBIFS */
#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 9bbfbc1..8ff9ec9 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -253,10 +253,6 @@
#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
-#define CONFIG_RBTREE
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#endif
#ifdef CONFIG_USE_SPIFLASH
diff --git a/include/configs/palmld.h b/include/configs/palmld.h
index 452fa59..b64ba57 100644
--- a/include/configs/palmld.h
+++ b/include/configs/palmld.h
@@ -37,7 +37,6 @@
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_LZMA /* LZMA compression support */
/*
* Serial Console Configuration
diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h
index 7be365a..e011597 100644
--- a/include/configs/palmtc.h
+++ b/include/configs/palmtc.h
@@ -40,7 +40,6 @@
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_LZMA /* LZMA compression support */
/*
* Serial Console Configuration
diff --git a/include/configs/palmtreo680.h b/include/configs/palmtreo680.h
index 40edce3..a2840de 100644
--- a/include/configs/palmtreo680.h
+++ b/include/configs/palmtreo680.h
@@ -20,7 +20,6 @@
#define CONFIG_SYS_MALLOC_LEN (4096*1024)
-#define CONFIG_LZMA
/*
* Serial Console Configuration
diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index ca7d649..6d08c24 100644
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -42,8 +42,6 @@
#define CONFIG_CMD_NET
#define CONFIG_CMD_PING
#define CONFIG_CMD_TIME
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#define CONFIG_CMD_USB
/*
@@ -200,10 +198,8 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* MTD/UBI/UBIFS config */
-#define CONFIG_LZO
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_RBTREE
#if (CONFIG_SYS_NAND_MAX_CHIPS == 1)
#define MTDIDS_DEFAULT "nand0=gpmi-nand"
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index 8e6d9b5..193dce0 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -93,12 +93,8 @@
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT
#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_MTD_PARTITIONS
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
#endif /* _CONFIG_POGO_E02_H */
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 946b2c8..33dc7c9 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -53,10 +53,6 @@
#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#endif
/* Watchdog */
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index eaca954..6509344 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -143,7 +143,6 @@
#define MEM_SIZE 128
-#define CONFIG_LZMA
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index 847d80b..08413e7 100644
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -145,7 +145,6 @@
#define MEM_SIZE 128
-#define CONFIG_LZMA
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git a/include/configs/qong.h b/include/configs/qong.h
index 847c688..05b37ba 100644
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -258,12 +258,8 @@ extern int qong_nand_rdy(void *chip);
* Filesystem
*/
#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=physmap-flash.0," \
diff --git a/include/configs/rut.h b/include/configs/rut.h
index 0067ea4..668dd4d 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -50,10 +50,6 @@
#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#endif
/* Watchdog */
diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index d0cfd4c..78d3d8f 100644
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -65,10 +65,6 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#endif
/* Ethernet Hardware */
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 73651a7..8f0a7d7 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -202,9 +202,6 @@
MEM_LAYOUT_ENV_SETTINGS
#define CONFIG_GZIP_COMPRESSED
-#define CONFIG_BZIP2
-#define CONFIG_LZO
-#define CONFIG_LZMA
#define CONFIG_CMD_LZMADEC
#define CONFIG_CMD_USB
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 9456af7..858473a 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -28,9 +28,6 @@
/*
* Compression configuration
*/
-#define CONFIG_BZIP2
-#define CONFIG_LZMA
-#define CONFIG_LZO
/*
* Enable device tree support
@@ -139,9 +136,6 @@
#define CONFIG_CMD_EXT4
#define CONFIG_CMD_FAT
#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_MTD_PARTITIONS
#define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 98b8ef6..f42d07b 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -124,9 +124,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x30800000
/* support additional compression methods */
-#define CONFIG_BZIP2
-#define CONFIG_LZO
-#define CONFIG_LZMA
/*-----------------------------------------------------------------------
* Physical Memory Map
@@ -182,13 +179,10 @@
*/
#define CONFIG_CMD_FAT
#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_YAFFS2
-#define CONFIG_RBTREE
/* additions for new relocation code, must be added to all boards */
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 53839f7..944a2f0 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -268,10 +268,6 @@
#define CONFIG_OF_LIBFDT
#define CONFIG_FIT
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
#define CONFIG_MTD_PARTITIONS
#define CONFIG_MTD_DEVICE
#define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 860e95d..bc65b17 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -250,13 +250,9 @@
#endif /* CONFIG_CMD_NAND */
/* UBI/UBIFS config options */
-#define CONFIG_LZO
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_RBTREE
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
#define CONFIG_OF_LIBFDT
#define CONFIG_CMD_BOOTZ
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 323da27..43c7812 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -158,9 +158,6 @@
#define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */
#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */
-#define CONFIG_CMD_UBI /* UBI commands */
-#define CONFIG_CMD_UBIFS /* UBIFS commands */
-#define CONFIG_LZO /* LZO is needed for UBIFS */
#undef CONFIG_CMD_NET
#undef CONFIG_CMD_NFS
@@ -169,7 +166,6 @@
#undef CONFIG_CMD_JFFS2 /* JFFS2 Support */
/* needed for ubi */
-#define CONFIG_RBTREE
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/vct.h b/include/configs/vct.h
index b94e2da..3ed240b 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -272,8 +272,6 @@ int vct_gpio_get(int pin);
#if defined(CONFIG_VCT_ONENAND)
#define CONFIG_SYS_USE_UBI
#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_RBTREE
#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
#define CONFIG_MTD_PARTITIONS
#define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 05bc7d0..0010913 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -58,10 +58,6 @@
#define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR
/* UBI */
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
/* Dynamic MTD partition support */
#define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index ea605ef..470edfe 100644
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -53,7 +53,6 @@
#define CONFIG_BOOTDELAY 2 /* Autoboot delay */
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_LZMA /* LZMA compression support */
#define CONFIG_OF_LIBFDT
/*
diff --git a/include/configs/wireless_space.h b/include/configs/wireless_space.h
index bda9eb9..73e494c 100644
--- a/include/configs/wireless_space.h
+++ b/include/configs/wireless_space.h
@@ -60,7 +60,6 @@
#include "mv-common.h"
/* Remove or override few declarations from mv-common.h */
-#undef CONFIG_RBTREE
#undef CONFIG_SYS_IDE_MAXBUS
#undef CONFIG_SYS_IDE_MAXDEVICE
#define CONFIG_SYS_IDE_MAXBUS 1
diff --git a/include/configs/x600.h b/include/configs/x600.h
index f4cdace..96e1ad6 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -69,7 +69,6 @@
/* UBI/UBI config options */
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_RBTREE
/* Ethernet config options */
#define CONFIG_MII
@@ -117,9 +116,6 @@
#define CONFIG_CMD_PING
#define CONFIG_CMD_RUN
#define CONFIG_CMD_SAVES
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_LZO
/* This must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <config_cmd_default.h>
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 1d870aa..4e423f2 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -25,10 +25,8 @@
#define CONFIG_LMB
#define CONFIG_OF_LIBFDT
-#define CONFIG_LZO
#define CONFIG_FIT
#undef CONFIG_ZLIB
-#undef CONFIG_GZIP
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
/* SATA AHCI storage */
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 05f3529..63501db 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -47,7 +47,6 @@
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_SYS_TEXT_BASE 0x0
-#define CONFIG_LZMA /* LZMA compression support */
/*
* Serial Console Configuration
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 28b4e19..e4c268c 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -40,7 +40,6 @@
/*
* Compressions
*/
-#define CONFIG_LZO
/*
* Hardware drivers
--
1.7.11.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [RFC PATCH 8/8] Move setexpr to Kconfig
2015-05-14 4:29 [U-Boot] [RFC PATCH 0/8] Complex config moves Joe Hershberger
` (6 preceding siblings ...)
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 7/8] Move compression and UBI from include to defconfig Joe Hershberger
@ 2015-05-14 4:29 ` Joe Hershberger
7 siblings, 0 replies; 10+ messages in thread
From: Joe Hershberger @ 2015-05-14 4:29 UTC (permalink / raw)
To: u-boot
Another shell scripting command that has not been moved.
Moved using tools/moveconfig.py using these settings:
CMD_SETEXPR bool n y
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
---
common/Kconfig | 8 ++++++++
configs/A10-OLinuXino-Lime_defconfig | 1 +
configs/A10s-OLinuXino-M_defconfig | 1 +
configs/A13-OLinuXinoM_defconfig | 1 +
configs/A13-OLinuXino_defconfig | 1 +
configs/A20-OLinuXino-Lime2_defconfig | 1 +
configs/A20-OLinuXino-Lime_defconfig | 1 +
configs/A20-OLinuXino_MICRO_defconfig | 1 +
configs/Ainol_AW1_defconfig | 1 +
configs/Ampe_A76_defconfig | 1 +
configs/Astar_MID756_defconfig | 1 +
configs/Auxtek-T004_defconfig | 1 +
configs/B4420QDS_NAND_defconfig | 1 +
configs/B4420QDS_SPIFLASH_defconfig | 1 +
configs/B4420QDS_defconfig | 1 +
configs/B4860QDS_NAND_defconfig | 1 +
configs/B4860QDS_SECURE_BOOT_defconfig | 1 +
configs/B4860QDS_SPIFLASH_defconfig | 1 +
configs/B4860QDS_SRIO_PCIE_BOOT_defconfig | 1 +
configs/B4860QDS_defconfig | 1 +
configs/BSC9131RDB_NAND_SYSCLK100_defconfig | 1 +
configs/BSC9131RDB_NAND_defconfig | 1 +
configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig | 1 +
configs/BSC9131RDB_SPIFLASH_defconfig | 1 +
configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig | 1 +
configs/BSC9132QDS_NAND_DDRCLK100_defconfig | 1 +
configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig | 1 +
configs/BSC9132QDS_NAND_DDRCLK133_defconfig | 1 +
configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig | 1 +
configs/BSC9132QDS_NOR_DDRCLK100_defconfig | 1 +
configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig | 1 +
configs/BSC9132QDS_NOR_DDRCLK133_defconfig | 1 +
configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig | 1 +
configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig | 1 +
configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig | 1 +
configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig | 1 +
configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig | 1 +
configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig | 1 +
configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig | 1 +
configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig | 1 +
configs/Bananapi_defconfig | 1 +
configs/Bananapro_defconfig | 1 +
configs/C29XPCIE_NAND_defconfig | 1 +
configs/C29XPCIE_NOR_SECBOOT_defconfig | 1 +
configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig | 1 +
configs/C29XPCIE_SPIFLASH_defconfig | 1 +
configs/C29XPCIE_defconfig | 1 +
configs/CSQ_CS908_defconfig | 1 +
configs/Chuwi_V7_CW0825_defconfig | 1 +
configs/Colombus_defconfig | 1 +
configs/Cubieboard2_defconfig | 1 +
configs/Cubieboard_defconfig | 1 +
configs/Cubietruck_defconfig | 1 +
configs/Hummingbird_A31_defconfig | 1 +
configs/Hyundai_A7HD_defconfig | 1 +
configs/Ippo_q8h_v1_2_a33_1024x600_defconfig | 1 +
configs/Ippo_q8h_v1_2_defconfig | 1 +
configs/Ippo_q8h_v5_defconfig | 1 +
configs/Linksprite_pcDuino3_Nano_defconfig | 1 +
configs/Linksprite_pcDuino3_defconfig | 1 +
configs/Linksprite_pcDuino_defconfig | 1 +
configs/MK808C_defconfig | 1 +
configs/MPC8536DS_36BIT_defconfig | 1 +
configs/MPC8536DS_SDCARD_defconfig | 1 +
configs/MPC8536DS_SPIFLASH_defconfig | 1 +
configs/MPC8536DS_defconfig | 1 +
configs/MPC8540ADS_defconfig | 1 +
configs/MPC8541CDS_defconfig | 1 +
configs/MPC8541CDS_legacy_defconfig | 1 +
configs/MPC8544DS_defconfig | 1 +
configs/MPC8548CDS_36BIT_defconfig | 1 +
configs/MPC8548CDS_defconfig | 1 +
configs/MPC8548CDS_legacy_defconfig | 1 +
configs/MPC8555CDS_defconfig | 1 +
configs/MPC8555CDS_legacy_defconfig | 1 +
configs/MPC8560ADS_defconfig | 1 +
configs/MPC8568MDS_defconfig | 1 +
configs/MPC8569MDS_ATM_defconfig | 1 +
configs/MPC8569MDS_defconfig | 1 +
configs/MPC8572DS_36BIT_defconfig | 1 +
configs/MPC8572DS_defconfig | 1 +
configs/MSI_Primo73_defconfig | 1 +
configs/MSI_Primo81_defconfig | 1 +
configs/Marsboard_A10_defconfig | 1 +
configs/Mele_A1000_defconfig | 1 +
configs/Mele_I7_defconfig | 1 +
configs/Mele_M3_defconfig | 1 +
configs/Mele_M5_defconfig | 1 +
configs/Mele_M9_defconfig | 1 +
configs/Mini-X_defconfig | 1 +
configs/O2MNT_O2M112_defconfig | 1 +
configs/O2MNT_defconfig | 1 +
configs/Orangepi_defconfig | 1 +
configs/Orangepi_mini_defconfig | 1 +
configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig | 1 +
configs/P1010RDB-PA_36BIT_NAND_defconfig | 1 +
configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig | 1 +
configs/P1010RDB-PA_36BIT_NOR_defconfig | 1 +
configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 1 +
configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig | 1 +
configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 1 +
configs/P1010RDB-PA_NAND_SECBOOT_defconfig | 1 +
configs/P1010RDB-PA_NAND_defconfig | 1 +
configs/P1010RDB-PA_NOR_SECBOOT_defconfig | 1 +
configs/P1010RDB-PA_NOR_defconfig | 1 +
configs/P1010RDB-PA_SDCARD_defconfig | 1 +
configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig | 1 +
configs/P1010RDB-PA_SPIFLASH_defconfig | 1 +
configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig | 1 +
configs/P1010RDB-PB_36BIT_NAND_defconfig | 1 +
configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig | 1 +
configs/P1010RDB-PB_36BIT_NOR_defconfig | 1 +
configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 1 +
configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig | 1 +
configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 1 +
configs/P1010RDB-PB_NAND_SECBOOT_defconfig | 1 +
configs/P1010RDB-PB_NAND_defconfig | 1 +
configs/P1010RDB-PB_NOR_SECBOOT_defconfig | 1 +
configs/P1010RDB-PB_NOR_defconfig | 1 +
configs/P1010RDB-PB_SDCARD_defconfig | 1 +
configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig | 1 +
configs/P1010RDB-PB_SPIFLASH_defconfig | 1 +
configs/P1020MBG-PC_36BIT_SDCARD_defconfig | 1 +
configs/P1020MBG-PC_36BIT_defconfig | 1 +
configs/P1020MBG-PC_SDCARD_defconfig | 1 +
configs/P1020MBG-PC_defconfig | 1 +
configs/P1020RDB-PC_36BIT_NAND_defconfig | 1 +
configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 1 +
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
configs/P1020RDB-PC_36BIT_defconfig | 1 +
configs/P1020RDB-PC_NAND_defconfig | 1 +
configs/P1020RDB-PC_SDCARD_defconfig | 1 +
configs/P1020RDB-PC_SPIFLASH_defconfig | 1 +
configs/P1020RDB-PC_defconfig | 1 +
configs/P1020RDB-PD_NAND_defconfig | 1 +
configs/P1020RDB-PD_SDCARD_defconfig | 1 +
configs/P1020RDB-PD_SPIFLASH_defconfig | 1 +
configs/P1020RDB-PD_defconfig | 1 +
configs/P1020UTM-PC_36BIT_SDCARD_defconfig | 1 +
configs/P1020UTM-PC_36BIT_defconfig | 1 +
configs/P1020UTM-PC_SDCARD_defconfig | 1 +
configs/P1020UTM-PC_defconfig | 1 +
configs/P1021RDB-PC_36BIT_NAND_defconfig | 1 +
configs/P1021RDB-PC_36BIT_SDCARD_defconfig | 1 +
configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
configs/P1021RDB-PC_36BIT_defconfig | 1 +
configs/P1021RDB-PC_NAND_defconfig | 1 +
configs/P1021RDB-PC_SDCARD_defconfig | 1 +
configs/P1021RDB-PC_SPIFLASH_defconfig | 1 +
configs/P1021RDB-PC_defconfig | 1 +
configs/P1022DS_36BIT_NAND_defconfig | 1 +
configs/P1022DS_36BIT_SDCARD_defconfig | 1 +
configs/P1022DS_36BIT_SPIFLASH_defconfig | 1 +
configs/P1022DS_36BIT_defconfig | 1 +
configs/P1022DS_NAND_defconfig | 1 +
configs/P1022DS_SDCARD_defconfig | 1 +
configs/P1022DS_SPIFLASH_defconfig | 1 +
configs/P1022DS_defconfig | 1 +
configs/P1023RDB_defconfig | 1 +
configs/P1024RDB_36BIT_defconfig | 1 +
configs/P1024RDB_NAND_defconfig | 1 +
configs/P1024RDB_SDCARD_defconfig | 1 +
configs/P1024RDB_SPIFLASH_defconfig | 1 +
configs/P1024RDB_defconfig | 1 +
configs/P1025RDB_36BIT_defconfig | 1 +
configs/P1025RDB_NAND_defconfig | 1 +
configs/P1025RDB_SDCARD_defconfig | 1 +
configs/P1025RDB_SPIFLASH_defconfig | 1 +
configs/P1025RDB_defconfig | 1 +
configs/P2020RDB-PC_36BIT_NAND_defconfig | 1 +
configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 1 +
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
configs/P2020RDB-PC_36BIT_defconfig | 1 +
configs/P2020RDB-PC_NAND_defconfig | 1 +
configs/P2020RDB-PC_SDCARD_defconfig | 1 +
configs/P2020RDB-PC_SPIFLASH_defconfig | 1 +
configs/P2020RDB-PC_defconfig | 1 +
configs/P2041RDB_NAND_defconfig | 1 +
configs/P2041RDB_SDCARD_defconfig | 1 +
configs/P2041RDB_SECURE_BOOT_defconfig | 1 +
configs/P2041RDB_SPIFLASH_defconfig | 1 +
configs/P2041RDB_SRIO_PCIE_BOOT_defconfig | 1 +
configs/P2041RDB_defconfig | 1 +
configs/P3041DS_NAND_defconfig | 1 +
configs/P3041DS_SDCARD_defconfig | 1 +
configs/P3041DS_SECURE_BOOT_defconfig | 1 +
configs/P3041DS_SPIFLASH_defconfig | 1 +
configs/P3041DS_SRIO_PCIE_BOOT_defconfig | 1 +
configs/P3041DS_defconfig | 1 +
configs/P4080DS_SDCARD_defconfig | 1 +
configs/P4080DS_SECURE_BOOT_defconfig | 1 +
configs/P4080DS_SPIFLASH_defconfig | 1 +
configs/P4080DS_SRIO_PCIE_BOOT_defconfig | 1 +
configs/P4080DS_defconfig | 1 +
configs/P5020DS_NAND_defconfig | 1 +
configs/P5020DS_SDCARD_defconfig | 1 +
configs/P5020DS_SECURE_BOOT_defconfig | 1 +
configs/P5020DS_SPIFLASH_defconfig | 1 +
configs/P5020DS_SRIO_PCIE_BOOT_defconfig | 1 +
configs/P5020DS_defconfig | 1 +
configs/P5040DS_NAND_defconfig | 1 +
configs/P5040DS_SDCARD_defconfig | 1 +
configs/P5040DS_SECURE_BOOT_defconfig | 1 +
configs/P5040DS_SPIFLASH_defconfig | 1 +
configs/P5040DS_defconfig | 1 +
configs/T1023RDB_NAND_defconfig | 1 +
configs/T1023RDB_SDCARD_defconfig | 1 +
configs/T1023RDB_SECURE_BOOT_defconfig | 1 +
configs/T1023RDB_SPIFLASH_defconfig | 1 +
configs/T1023RDB_defconfig | 1 +
configs/T1024QDS_D4_SECURE_BOOT_defconfig | 1 +
configs/T1024QDS_NAND_defconfig | 1 +
configs/T1024QDS_SDCARD_defconfig | 1 +
configs/T1024QDS_SECURE_BOOT_defconfig | 1 +
configs/T1024QDS_SPIFLASH_defconfig | 1 +
configs/T1024QDS_defconfig | 1 +
configs/T1024RDB_NAND_defconfig | 1 +
configs/T1024RDB_SDCARD_defconfig | 1 +
configs/T1024RDB_SECURE_BOOT_defconfig | 1 +
configs/T1024RDB_SPIFLASH_defconfig | 1 +
configs/T1024RDB_defconfig | 1 +
configs/T1040QDS_D4_defconfig | 1 +
configs/T1040QDS_SECURE_BOOT_defconfig | 1 +
configs/T1040QDS_defconfig | 1 +
configs/T1040RDB_NAND_defconfig | 1 +
configs/T1040RDB_SDCARD_defconfig | 1 +
configs/T1040RDB_SECURE_BOOT_defconfig | 1 +
configs/T1040RDB_SPIFLASH_defconfig | 1 +
configs/T1040RDB_defconfig | 1 +
configs/T1042RDB_PI_NAND_defconfig | 1 +
configs/T1042RDB_PI_SDCARD_defconfig | 1 +
configs/T1042RDB_PI_SPIFLASH_defconfig | 1 +
configs/T1042RDB_PI_defconfig | 1 +
configs/T1042RDB_SECURE_BOOT_defconfig | 1 +
configs/T1042RDB_defconfig | 1 +
configs/T2080QDS_NAND_defconfig | 1 +
configs/T2080QDS_SDCARD_defconfig | 1 +
configs/T2080QDS_SECURE_BOOT_defconfig | 1 +
configs/T2080QDS_SPIFLASH_defconfig | 1 +
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 1 +
configs/T2080QDS_defconfig | 1 +
configs/T2080RDB_NAND_defconfig | 1 +
configs/T2080RDB_SDCARD_defconfig | 1 +
configs/T2080RDB_SECURE_BOOT_defconfig | 1 +
configs/T2080RDB_SPIFLASH_defconfig | 1 +
configs/T2080RDB_SRIO_PCIE_BOOT_defconfig | 1 +
configs/T2080RDB_defconfig | 1 +
configs/T2081QDS_NAND_defconfig | 1 +
configs/T2081QDS_SDCARD_defconfig | 1 +
configs/T2081QDS_SPIFLASH_defconfig | 1 +
configs/T2081QDS_SRIO_PCIE_BOOT_defconfig | 1 +
configs/T2081QDS_defconfig | 1 +
configs/T4160QDS_NAND_defconfig | 1 +
configs/T4160QDS_SDCARD_defconfig | 1 +
configs/T4160QDS_SECURE_BOOT_defconfig | 1 +
configs/T4160QDS_defconfig | 1 +
configs/T4160RDB_defconfig | 1 +
configs/T4240QDS_NAND_defconfig | 1 +
configs/T4240QDS_SDCARD_defconfig | 1 +
configs/T4240QDS_SECURE_BOOT_defconfig | 1 +
configs/T4240QDS_SRIO_PCIE_BOOT_defconfig | 1 +
configs/T4240QDS_defconfig | 1 +
configs/T4240RDB_SDCARD_defconfig | 1 +
configs/T4240RDB_defconfig | 1 +
configs/TWR-P1025_defconfig | 1 +
configs/TZX-Q8-713B7_defconfig | 1 +
configs/UCP1020_SPIFLASH_defconfig | 1 +
configs/UCP1020_defconfig | 1 +
configs/UTOO_P66_defconfig | 1 +
configs/Wexler_TAB7200_defconfig | 1 +
configs/Wits_Pro_A20_DKT_defconfig | 1 +
configs/Yones_Toptech_BD1078_defconfig | 1 +
configs/acadia_defconfig | 1 +
configs/apalis_t30_defconfig | 1 +
configs/apf27_defconfig | 1 +
configs/arches_defconfig | 1 +
configs/aristainetos_defconfig | 1 +
configs/ba10_tv_box_defconfig | 1 +
configs/bamboo_defconfig | 1 +
configs/bf518f-ezbrd_defconfig | 1 +
configs/bf526-ezbrd_defconfig | 1 +
configs/bf527-ad7160-eval_defconfig | 1 +
configs/bf527-sdp_defconfig | 1 +
configs/bf533-stamp_defconfig | 1 +
configs/bf538f-ezkit_defconfig | 1 +
configs/bg0900_defconfig | 1 +
configs/bubinga_defconfig | 1 +
configs/cairo_defconfig | 1 +
configs/canyonlands_defconfig | 1 +
configs/cm-bf533_defconfig | 1 +
configs/cm-bf537e_defconfig | 1 +
configs/colibri_t20_defconfig | 1 +
configs/colibri_t30_defconfig | 1 +
configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig | 1 +
configs/controlcenterd_36BIT_SDCARD_defconfig | 1 +
configs/devconcenter_defconfig | 1 +
configs/dlvision-10g_defconfig | 1 +
configs/dlvision_defconfig | 1 +
configs/dnp5370_defconfig | 1 +
configs/ebony_defconfig | 1 +
configs/ethernut5_defconfig | 1 +
configs/forfun_q88db_defconfig | 1 +
configs/gdppc440etx_defconfig | 1 +
configs/glacier_defconfig | 1 +
configs/glacier_ramboot_defconfig | 1 +
configs/gwventana_defconfig | 1 +
configs/haleakala_defconfig | 1 +
configs/hummingboard_solo_defconfig | 1 +
configs/i12-tvbox_defconfig | 1 +
configs/iNet_3F_defconfig | 1 +
configs/iNet_3W_defconfig | 1 +
configs/iNet_86VS_defconfig | 1 +
configs/icon_defconfig | 1 +
configs/intip_defconfig | 1 +
configs/io64_defconfig | 1 +
configs/io_defconfig | 1 +
configs/iocon_defconfig | 1 +
configs/ip04_defconfig | 1 +
configs/jesurun_q5_defconfig | 1 +
configs/katmai_defconfig | 1 +
configs/kilauea_defconfig | 1 +
configs/km_kirkwood_128m16_defconfig | 1 +
configs/km_kirkwood_defconfig | 1 +
configs/km_kirkwood_pci_defconfig | 1 +
configs/kmcoge4_defconfig | 1 +
configs/kmcoge5ne_defconfig | 1 +
configs/kmcoge5un_defconfig | 1 +
configs/kmeter1_defconfig | 1 +
configs/kmlion1_defconfig | 1 +
configs/kmnusa_defconfig | 1 +
configs/kmopti2_defconfig | 1 +
configs/kmsugp1_defconfig | 1 +
configs/kmsupx5_defconfig | 1 +
configs/kmsuv31_defconfig | 1 +
configs/kmvect1_defconfig | 1 +
configs/luan_defconfig | 1 +
configs/m28evk_defconfig | 1 +
configs/m53evk_defconfig | 1 +
configs/makalu_defconfig | 1 +
configs/marsboard_defconfig | 1 +
configs/mgcoge3ne_defconfig | 1 +
configs/mgcoge3un_defconfig | 1 +
configs/mgcoge_defconfig | 1 +
configs/mixtile_loftq_defconfig | 1 +
configs/mk802_a10s_defconfig | 1 +
configs/mk802_defconfig | 1 +
configs/mk802ii_defconfig | 1 +
configs/mpr2_defconfig | 1 +
configs/mx28evk_auart_console_defconfig | 1 +
configs/mx28evk_defconfig | 1 +
configs/mx28evk_nand_defconfig | 1 +
configs/mx28evk_spi_defconfig | 1 +
configs/mx53ard_defconfig | 1 +
configs/mx6cuboxi_defconfig | 1 +
configs/mx6dlsabreauto_defconfig | 1 +
configs/mx6dlsabresd_defconfig | 1 +
configs/mx6qsabreauto_defconfig | 1 +
configs/mx6qsabrelite_defconfig | 1 +
configs/mx6qsabresd_defconfig | 1 +
configs/mx6sabresd_spl_defconfig | 1 +
configs/neo_defconfig | 1 +
configs/nitrogen6dl2g_defconfig | 1 +
configs/nitrogen6dl_defconfig | 1 +
configs/nitrogen6q2g_defconfig | 1 +
configs/nitrogen6q_defconfig | 1 +
configs/nitrogen6s1g_defconfig | 1 +
configs/nitrogen6s_defconfig | 1 +
configs/novena_defconfig | 1 +
configs/ocotea_defconfig | 1 +
configs/odroid_defconfig | 1 +
configs/omap3_beagle_defconfig | 1 +
configs/omap3_logic_defconfig | 1 +
configs/origen_defconfig | 1 +
configs/ot1200_defconfig | 1 +
configs/ot1200_spl_defconfig | 1 +
configs/portl2_defconfig | 1 +
configs/pr1_defconfig | 1 +
configs/qemu-ppce500_defconfig | 1 +
configs/qong_defconfig | 1 +
configs/r7-tv-dongle_defconfig | 1 +
configs/rainier_defconfig | 1 +
configs/rainier_ramboot_defconfig | 1 +
configs/redwood_defconfig | 1 +
configs/riotboard_defconfig | 1 +
configs/s5pc210_universal_defconfig | 1 +
configs/sama5d3_xplained_mmc_defconfig | 1 +
configs/sama5d3_xplained_nandflash_defconfig | 1 +
configs/sama5d3xek_mmc_defconfig | 1 +
configs/sama5d3xek_nandflash_defconfig | 1 +
configs/sama5d3xek_spiflash_defconfig | 1 +
configs/sama5d4_xplained_mmc_defconfig | 1 +
configs/sama5d4_xplained_nandflash_defconfig | 1 +
configs/sama5d4_xplained_spiflash_defconfig | 1 +
configs/sama5d4ek_mmc_defconfig | 1 +
configs/sama5d4ek_nandflash_defconfig | 1 +
configs/sama5d4ek_spiflash_defconfig | 1 +
configs/sc_sps_1_defconfig | 1 +
configs/secomx6quq7_defconfig | 1 +
configs/sequoia_defconfig | 1 +
configs/sequoia_ramboot_defconfig | 1 +
configs/smdkv310_defconfig | 1 +
configs/socfpga_arria5_defconfig | 1 +
configs/socfpga_cyclone5_defconfig | 1 +
configs/socfpga_socrates_defconfig | 1 +
configs/sunxi_Gemei_G9_defconfig | 1 +
configs/suvd3_defconfig | 1 +
configs/sycamore_defconfig | 1 +
configs/t3corp_defconfig | 1 +
configs/taihu_defconfig | 1 +
configs/taishan_defconfig | 1 +
configs/tbs2910_defconfig | 1 +
configs/tqma6q_mba6_mmc_defconfig | 1 +
configs/tqma6q_mba6_spi_defconfig | 1 +
configs/tqma6s_mba6_mmc_defconfig | 1 +
configs/tqma6s_mba6_spi_defconfig | 1 +
configs/trats2_defconfig | 1 +
configs/trats_defconfig | 1 +
configs/tuge1_defconfig | 1 +
configs/tuxx1_defconfig | 1 +
configs/udoo_quad_defconfig | 1 +
configs/walnut_defconfig | 1 +
configs/wandboard_dl_defconfig | 1 +
configs/wandboard_quad_defconfig | 1 +
configs/wandboard_solo_defconfig | 1 +
configs/yellowstone_defconfig | 1 +
configs/yosemite_defconfig | 1 +
configs/yucca_defconfig | 1 +
include/config_cmd_all.h | 1 -
include/configs/B4860QDS.h | 1 -
include/configs/BSC9131RDB.h | 1 -
include/configs/BSC9132QDS.h | 1 -
include/configs/C29XPCIE.h | 1 -
include/configs/MPC8536DS.h | 1 -
include/configs/MPC8540ADS.h | 1 -
include/configs/MPC8541CDS.h | 1 -
include/configs/MPC8544DS.h | 1 -
include/configs/MPC8548CDS.h | 1 -
include/configs/MPC8555CDS.h | 1 -
include/configs/MPC8560ADS.h | 1 -
include/configs/MPC8568MDS.h | 1 -
include/configs/MPC8569MDS.h | 1 -
include/configs/MPC8572DS.h | 1 -
include/configs/P1010RDB.h | 1 -
include/configs/P1022DS.h | 1 -
include/configs/P1023RDB.h | 1 -
include/configs/P2041RDB.h | 1 -
include/configs/T102xQDS.h | 1 -
include/configs/T102xRDB.h | 1 -
include/configs/T1040QDS.h | 1 -
include/configs/T104xRDB.h | 1 -
include/configs/T208xQDS.h | 1 -
include/configs/T208xRDB.h | 1 -
include/configs/T4240RDB.h | 1 -
include/configs/UCP1020.h | 1 -
include/configs/amcc-common.h | 1 -
include/configs/apalis_t30.h | 1 -
include/configs/apf27.h | 1 -
include/configs/aristainetos.h | 1 -
include/configs/at91-sama5_common.h | 1 -
include/configs/bg0900.h | 1 -
include/configs/colibri_t20.h | 1 -
include/configs/colibri_t30.h | 1 -
include/configs/controlcenterd.h | 1 -
include/configs/corenet_ds.h | 1 -
include/configs/embestmx6boards.h | 1 -
include/configs/ethernut5.h | 1 -
include/configs/exynos4-common.h | 1 -
include/configs/gw_ventana.h | 1 -
include/configs/hummingboard.h | 1 -
include/configs/km/keymile-common.h | 1 -
include/configs/m28evk.h | 1 -
include/configs/m53evk.h | 1 -
include/configs/mx28evk.h | 1 -
include/configs/mx53ard.h | 1 -
include/configs/mx6cuboxi.h | 1 -
include/configs/mx6sabre_common.h | 1 -
include/configs/nitrogen6x.h | 1 -
include/configs/novena.h | 1 -
include/configs/omap3_beagle.h | 1 -
include/configs/omap3_cairo.h | 1 -
include/configs/omap3_logic.h | 1 -
include/configs/ot1200.h | 1 -
include/configs/p1_p2_rdb_pc.h | 1 -
include/configs/p1_twr.h | 1 -
include/configs/qemu-ppce500.h | 1 -
include/configs/qong.h | 1 -
include/configs/sc_sps_1.h | 1 -
include/configs/secomx6quq7.h | 1 -
include/configs/socfpga_arria5.h | 1 -
include/configs/socfpga_cyclone5.h | 1 -
include/configs/sunxi-common.h | 1 -
include/configs/t4qds.h | 1 -
include/configs/tbs2910.h | 1 -
include/configs/tqma6.h | 1 -
include/configs/udoo.h | 1 -
include/configs/wandboard.h | 1 -
496 files changed, 434 insertions(+), 69 deletions(-)
diff --git a/common/Kconfig b/common/Kconfig
index cd24370..3897c97 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -370,6 +370,14 @@ config CMD_SOURCE
help
Run script from memory
+config CMD_SETEXPR
+ bool "setexpr"
+ help
+ Evaluate boolean and math expressions and store the result in an env
+ variable.
+ Also supports loading the value at a memory location into a variable.
+ If CONFIG_REGEX is enabled, setexpr also supports a gsub function.
+
endmenu
menu "Network commands"
diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
index 1f67b19..bfe08ea 100644
--- a/configs/A10-OLinuXino-Lime_defconfig
+++ b/configs/A10-OLinuXino-Lime_defconfig
@@ -8,3 +8,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig
index 541ffe1..8a46c02 100644
--- a/configs/A10s-OLinuXino-M_defconfig
+++ b/configs/A10s-OLinuXino-M_defconfig
@@ -10,3 +10,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-olinuxino-micro"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,SUNXI_EMAC,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
index db39010..c4370d3 100644
--- a/configs/A13-OLinuXinoM_defconfig
+++ b/configs/A13-OLinuXinoM_defconfig
@@ -14,3 +14,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino-micro"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index 2e14996..12683e5 100644
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -15,3 +15,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
index 8f2a5ba..fed6de6 100644
--- a/configs/A20-OLinuXino-Lime2_defconfig
+++ b/configs/A20-OLinuXino-Lime2_defconfig
@@ -9,4 +9,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
index 55614fc..dbe4071 100644
--- a/configs/A20-OLinuXino-Lime_defconfig
+++ b/configs/A20-OLinuXino-Lime_defconfig
@@ -6,4 +6,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
index d911e61..fd97ab4 100644
--- a/configs/A20-OLinuXino_MICRO_defconfig
+++ b/configs/A20-OLinuXino_MICRO_defconfig
@@ -10,4 +10,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig
index 4a45c74..b9c7047 100644
--- a/configs/Ainol_AW1_defconfig
+++ b/configs/Ainol_AW1_defconfig
@@ -16,3 +16,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-ainol-aw1"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/Ampe_A76_defconfig b/configs/Ampe_A76_defconfig
index 10f0864..625a334 100644
--- a/configs/Ampe_A76_defconfig
+++ b/configs/Ampe_A76_defconfig
@@ -15,3 +15,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-ampe-a76"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/Astar_MID756_defconfig b/configs/Astar_MID756_defconfig
index ded3d81..84fa4a4 100644
--- a/configs/Astar_MID756_defconfig
+++ b/configs/Astar_MID756_defconfig
@@ -16,5 +16,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-astar-mid756"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_AXP221_DLDO1_VOLT=3300
CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig
index b32353b..396a732 100644
--- a/configs/Auxtek-T004_defconfig
+++ b/configs/Auxtek-T004_defconfig
@@ -7,3 +7,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-auxtek-t004"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/B4420QDS_NAND_defconfig b/configs/B4420QDS_NAND_defconfig
index 8f9f7af..13742b1 100644
--- a/configs/B4420QDS_NAND_defconfig
+++ b/configs/B4420QDS_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_B4860QDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/B4420QDS_SPIFLASH_defconfig b/configs/B4420QDS_SPIFLASH_defconfig
index 1a1d290..5f74072 100644
--- a/configs/B4420QDS_SPIFLASH_defconfig
+++ b/configs/B4420QDS_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/B4420QDS_defconfig b/configs/B4420QDS_defconfig
index dc563a7..ff6271a 100644
--- a/configs/B4420QDS_defconfig
+++ b/configs/B4420QDS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/B4860QDS_NAND_defconfig b/configs/B4860QDS_NAND_defconfig
index 222fbbc..c1eea55 100644
--- a/configs/B4860QDS_NAND_defconfig
+++ b/configs/B4860QDS_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_B4860QDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/B4860QDS_SECURE_BOOT_defconfig b/configs/B4860QDS_SECURE_BOOT_defconfig
index c2e9acc..9e1f1c4 100644
--- a/configs/B4860QDS_SECURE_BOOT_defconfig
+++ b/configs/B4860QDS_SECURE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/B4860QDS_SPIFLASH_defconfig b/configs/B4860QDS_SPIFLASH_defconfig
index 4466fec..d4ef9c8 100644
--- a/configs/B4860QDS_SPIFLASH_defconfig
+++ b/configs/B4860QDS_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig b/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
index 729b033..2b4a7f7 100644
--- a/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_REMOTE=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/B4860QDS_defconfig b/configs/B4860QDS_defconfig
index e0eafaf..52d06c8 100644
--- a/configs/B4860QDS_defconfig
+++ b/configs/B4860QDS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
index 1853b1e..2ffefc6 100644
--- a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
+++ b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9131RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND,SYS_CLK_100"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9131RDB_NAND_defconfig b/configs/BSC9131RDB_NAND_defconfig
index 145e462..3fe6c18 100644
--- a/configs/BSC9131RDB_NAND_defconfig
+++ b/configs/BSC9131RDB_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9131RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
index 4a99bcb..65f8f98 100644
--- a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
+++ b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9131RDB=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,SPIFLASH,SYS_CLK_100"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9131RDB_SPIFLASH_defconfig b/configs/BSC9131RDB_SPIFLASH_defconfig
index 4cae008..2d7bcba 100644
--- a/configs/BSC9131RDB_SPIFLASH_defconfig
+++ b/configs/BSC9131RDB_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9131RDB=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
index 4904a1d..10c19bb 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND_SECBOOT,SYS_CLK_100_DDR_100,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
index c997f3d..e9207b1 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_100"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
index 721b7f5..16da769 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND_SECBOOT,SYS_CLK_100_DDR_133,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
index ff99256..2473171 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_133"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
index 1ecca15..27b4d29 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_100,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
index f6b60df..db37838 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_100"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
index 536ae0d..516ac00 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_133,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
index ec1eeee..2a7c19c 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_133"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
index 6ee5d30..c3f400d 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_100,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
index 90d705c..b8162c9 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_100"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
index bbd515b..cae8a90 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
index d47a04a..7bb4661 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
index 610b747..d0adf12 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
index d01e740..c919a2f 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
index d7e6281..f19b7a3 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_133,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
index 6a8741e..9e97f71 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_133"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
index 9aae387..7216151 100644
--- a/configs/Bananapi_defconfig
+++ b/configs/Bananapi_defconfig
@@ -7,4 +7,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig
index ac8cef4..9291b1a 100644
--- a/configs/Bananapro_defconfig
+++ b/configs/Bananapro_defconfig
@@ -9,4 +9,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapro"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/C29XPCIE_NAND_defconfig b/configs/C29XPCIE_NAND_defconfig
index 0c1ab94..326bf3b 100644
--- a/configs/C29XPCIE_NAND_defconfig
+++ b/configs/C29XPCIE_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/C29XPCIE_NOR_SECBOOT_defconfig b/configs/C29XPCIE_NOR_SECBOOT_defconfig
index afbc3b3..e516ff6 100644
--- a/configs/C29XPCIE_NOR_SECBOOT_defconfig
+++ b/configs/C29XPCIE_NOR_SECBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_C29XPCIE=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
index 9d3e0b3..2a08524 100644
--- a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
+++ b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_C29XPCIE=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SPIFLASH,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/C29XPCIE_SPIFLASH_defconfig b/configs/C29XPCIE_SPIFLASH_defconfig
index 6562990..1071282 100644
--- a/configs/C29XPCIE_SPIFLASH_defconfig
+++ b/configs/C29XPCIE_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_C29XPCIE=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/C29XPCIE_defconfig b/configs/C29XPCIE_defconfig
index 234c1f0..f356a40d 100644
--- a/configs/C29XPCIE_defconfig
+++ b/configs/C29XPCIE_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_C29XPCIE=y
CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/CSQ_CS908_defconfig b/configs/CSQ_CS908_defconfig
index e97b01d..b92ee90 100644
--- a/configs/CSQ_CS908_defconfig
+++ b/configs/CSQ_CS908_defconfig
@@ -8,6 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-cs908"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP221_DLDO1_VOLT=3300
CONFIG_AXP221_ALDO1_VOLT=3300
diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig
index 18e89be..c431d4b 100644
--- a/configs/Chuwi_V7_CW0825_defconfig
+++ b/configs/Chuwi_V7_CW0825_defconfig
@@ -15,6 +15,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-chuwi-v7-cw0825"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_VIDEO_LCD_SPI_CS="PA0"
CONFIG_VIDEO_LCD_SPI_SCLK="PA1"
CONFIG_VIDEO_LCD_SPI_MOSI="PA2"
diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
index 68e34c5..2145ced 100644
--- a/configs/Colombus_defconfig
+++ b/configs/Colombus_defconfig
@@ -8,5 +8,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-colombus"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP221_ALDO1_VOLT=3300
diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
index bc5f2a6..e8c098d 100644
--- a/configs/Cubieboard2_defconfig
+++ b/configs/Cubieboard2_defconfig
@@ -7,4 +7,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
index b9e5dab..1f97365 100644
--- a/configs/Cubieboard_defconfig
+++ b/configs/Cubieboard_defconfig
@@ -6,3 +6,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index ba98c9a..2824fc9 100644
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -8,4 +8,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig
index 5193f75..9dad21d 100644
--- a/configs/Hummingbird_A31_defconfig
+++ b/configs/Hummingbird_A31_defconfig
@@ -10,5 +10,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-hummingbird"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP221_ALDO1_VOLT=3300
diff --git a/configs/Hyundai_A7HD_defconfig b/configs/Hyundai_A7HD_defconfig
index e0cb47d..3a8a767 100644
--- a/configs/Hyundai_A7HD_defconfig
+++ b/configs/Hyundai_A7HD_defconfig
@@ -17,3 +17,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-hyundai-a7hd"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
index 499c7e9..f7aae81 100644
--- a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
+++ b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
@@ -16,5 +16,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ippo-q8h-v1.2-lcd1024x600"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_AXP221_DLDO1_VOLT=3300
CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Ippo_q8h_v1_2_defconfig b/configs/Ippo_q8h_v1_2_defconfig
index e6eb8e6..1982daf 100644
--- a/configs/Ippo_q8h_v1_2_defconfig
+++ b/configs/Ippo_q8h_v1_2_defconfig
@@ -16,5 +16,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v1.2"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_AXP221_DLDO1_VOLT=3300
CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Ippo_q8h_v5_defconfig b/configs/Ippo_q8h_v5_defconfig
index d8c0ced..c13ecbc 100644
--- a/configs/Ippo_q8h_v5_defconfig
+++ b/configs/Ippo_q8h_v5_defconfig
@@ -16,5 +16,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v5"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_AXP221_DLDO1_VOLT=3300
CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig
index 1a5f854..06af4ac 100644
--- a/configs/Linksprite_pcDuino3_Nano_defconfig
+++ b/configs/Linksprite_pcDuino3_Nano_defconfig
@@ -9,4 +9,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3-nano"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
index 95038b3..08cf6c4 100644
--- a/configs/Linksprite_pcDuino3_defconfig
+++ b/configs/Linksprite_pcDuino3_defconfig
@@ -7,4 +7,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Linksprite_pcDuino_defconfig b/configs/Linksprite_pcDuino_defconfig
index 929406a..3f9fbe3 100644
--- a/configs/Linksprite_pcDuino_defconfig
+++ b/configs/Linksprite_pcDuino_defconfig
@@ -6,3 +6,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-pcduino"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MK808C_defconfig b/configs/MK808C_defconfig
index 2f64b26..1c264e0 100644
--- a/configs/MK808C_defconfig
+++ b/configs/MK808C_defconfig
@@ -6,3 +6,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-mk808c"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8536DS_36BIT_defconfig b/configs/MPC8536DS_36BIT_defconfig
index 52f2fd8..f4fd5df 100644
--- a/configs/MPC8536DS_36BIT_defconfig
+++ b/configs/MPC8536DS_36BIT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8536DS=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8536DS_SDCARD_defconfig b/configs/MPC8536DS_SDCARD_defconfig
index f87f845..1319edb 100644
--- a/configs/MPC8536DS_SDCARD_defconfig
+++ b/configs/MPC8536DS_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8536DS=y
CONFIG_SYS_EXTRA_OPTIONS="SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8536DS_SPIFLASH_defconfig b/configs/MPC8536DS_SPIFLASH_defconfig
index 293eabc..e63de24 100644
--- a/configs/MPC8536DS_SPIFLASH_defconfig
+++ b/configs/MPC8536DS_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8536DS=y
CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8536DS_defconfig b/configs/MPC8536DS_defconfig
index b4a1cc8..8a9fd7b 100644
--- a/configs/MPC8536DS_defconfig
+++ b/configs/MPC8536DS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8536DS=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8540ADS_defconfig b/configs/MPC8540ADS_defconfig
index d82f140..5edbad2 100644
--- a/configs/MPC8540ADS_defconfig
+++ b/configs/MPC8540ADS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8540ADS=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8541CDS_defconfig b/configs/MPC8541CDS_defconfig
index 755698c..c16ea4d 100644
--- a/configs/MPC8541CDS_defconfig
+++ b/configs/MPC8541CDS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8541CDS=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8541CDS_legacy_defconfig b/configs/MPC8541CDS_legacy_defconfig
index 4855a1d..edc85e8 100644
--- a/configs/MPC8541CDS_legacy_defconfig
+++ b/configs/MPC8541CDS_legacy_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8541CDS=y
CONFIG_SYS_EXTRA_OPTIONS="LEGACY"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8544DS_defconfig b/configs/MPC8544DS_defconfig
index bf22323..36c7961 100644
--- a/configs/MPC8544DS_defconfig
+++ b/configs/MPC8544DS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8544DS=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8548CDS_36BIT_defconfig b/configs/MPC8548CDS_36BIT_defconfig
index c8fa818..4e38d11 100644
--- a/configs/MPC8548CDS_36BIT_defconfig
+++ b/configs/MPC8548CDS_36BIT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8548CDS=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8548CDS_defconfig b/configs/MPC8548CDS_defconfig
index 916e197..31ac6d0 100644
--- a/configs/MPC8548CDS_defconfig
+++ b/configs/MPC8548CDS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8548CDS=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8548CDS_legacy_defconfig b/configs/MPC8548CDS_legacy_defconfig
index 638dba4..f0270b7 100644
--- a/configs/MPC8548CDS_legacy_defconfig
+++ b/configs/MPC8548CDS_legacy_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8548CDS=y
CONFIG_SYS_EXTRA_OPTIONS="LEGACY"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8555CDS_defconfig b/configs/MPC8555CDS_defconfig
index 1a628e6..0642592 100644
--- a/configs/MPC8555CDS_defconfig
+++ b/configs/MPC8555CDS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8555CDS=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8555CDS_legacy_defconfig b/configs/MPC8555CDS_legacy_defconfig
index e8b6e4d..f9d0c00 100644
--- a/configs/MPC8555CDS_legacy_defconfig
+++ b/configs/MPC8555CDS_legacy_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8555CDS=y
CONFIG_SYS_EXTRA_OPTIONS="LEGACY"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8560ADS_defconfig b/configs/MPC8560ADS_defconfig
index bae46d6..0ce8f9b 100644
--- a/configs/MPC8560ADS_defconfig
+++ b/configs/MPC8560ADS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8560ADS=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8568MDS_defconfig b/configs/MPC8568MDS_defconfig
index 1c35df5..b53cab5 100644
--- a/configs/MPC8568MDS_defconfig
+++ b/configs/MPC8568MDS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8568MDS=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8569MDS_ATM_defconfig b/configs/MPC8569MDS_ATM_defconfig
index 14810a2..20ff765 100644
--- a/configs/MPC8569MDS_ATM_defconfig
+++ b/configs/MPC8569MDS_ATM_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8569MDS=y
CONFIG_SYS_EXTRA_OPTIONS="ATM"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8569MDS_defconfig b/configs/MPC8569MDS_defconfig
index ba70896..394fb04 100644
--- a/configs/MPC8569MDS_defconfig
+++ b/configs/MPC8569MDS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8569MDS=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8572DS_36BIT_defconfig b/configs/MPC8572DS_36BIT_defconfig
index 27e2a03..763d4e5 100644
--- a/configs/MPC8572DS_36BIT_defconfig
+++ b/configs/MPC8572DS_36BIT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8572DS=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MPC8572DS_defconfig b/configs/MPC8572DS_defconfig
index c780e8b..592c28e 100644
--- a/configs/MPC8572DS_defconfig
+++ b/configs/MPC8572DS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_MPC8572DS=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MSI_Primo73_defconfig b/configs/MSI_Primo73_defconfig
index 32ba84f..2b06e55 100644
--- a/configs/MSI_Primo73_defconfig
+++ b/configs/MSI_Primo73_defconfig
@@ -12,3 +12,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-primo73"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig
index 4c3378b..d3c1106 100644
--- a/configs/MSI_Primo81_defconfig
+++ b/configs/MSI_Primo81_defconfig
@@ -11,6 +11,7 @@ CONFIG_VIDEO_LCD_PANEL_MIPI_4_LANE_513_MBPS_VIA_SSD2828=y
CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-primo81"
CONFIG_SPL=y
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_AXP221_DLDO1_VOLT=3300
CONFIG_VIDEO_LCD_SSD2828_TX_CLK=27
CONFIG_VIDEO_LCD_SSD2828_RESET="PA26"
diff --git a/configs/Marsboard_A10_defconfig b/configs/Marsboard_A10_defconfig
index 7d221cf..c91c7c6 100644
--- a/configs/Marsboard_A10_defconfig
+++ b/configs/Marsboard_A10_defconfig
@@ -5,3 +5,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-marsboard"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,AHCI,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
index ea90996..4371bb8 100644
--- a/configs/Mele_A1000_defconfig
+++ b/configs/Mele_A1000_defconfig
@@ -6,3 +6,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-a1000"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/Mele_I7_defconfig b/configs/Mele_I7_defconfig
index aa33c71..8ae8d0c 100644
--- a/configs/Mele_I7_defconfig
+++ b/configs/Mele_I7_defconfig
@@ -8,6 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-i7"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP221_DCDC1_VOLT=3300
CONFIG_AXP221_DLDO1_VOLT=3300
diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig
index f1974da..0d8be65 100644
--- a/configs/Mele_M3_defconfig
+++ b/configs/Mele_M3_defconfig
@@ -9,4 +9,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m3"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig
index 3344970..4b95b44 100644
--- a/configs/Mele_M5_defconfig
+++ b/configs/Mele_M5_defconfig
@@ -8,4 +8,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m5"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,USB_EHCI,STATUSLED=234"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig
index 4416bfd..97201ea 100644
--- a/configs/Mele_M9_defconfig
+++ b/configs/Mele_M9_defconfig
@@ -8,6 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-m9"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP221_DCDC1_VOLT=3300
CONFIG_AXP221_DLDO1_VOLT=3300
diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig
index a7a83f5..dea4e53 100644
--- a/configs/Mini-X_defconfig
+++ b/configs/Mini-X_defconfig
@@ -5,3 +5,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mini-xplus"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/O2MNT_O2M112_defconfig b/configs/O2MNT_O2M112_defconfig
index cc2e5b3..2f4eb99 100644
--- a/configs/O2MNT_O2M112_defconfig
+++ b/configs/O2MNT_O2M112_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC5xxx=y
CONFIG_TARGET_O2MNT=y
CONFIG_SYS_EXTRA_OPTIONS="IFM_SENSOR_TYPE=\"O2M112\""
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/O2MNT_defconfig b/configs/O2MNT_defconfig
index 23c4dc3..095f752 100644
--- a/configs/O2MNT_defconfig
+++ b/configs/O2MNT_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_O2MNT=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig
index fc1638e..d781e7a 100644
--- a/configs/Orangepi_defconfig
+++ b/configs/Orangepi_defconfig
@@ -10,4 +10,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
index 40ed1b9..7700b0d 100644
--- a/configs/Orangepi_mini_defconfig
+++ b/configs/Orangepi_mini_defconfig
@@ -12,4 +12,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi-mini"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
index 6245bd8..abfb6fc 100644
--- a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,NAND_SECBOOT,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig
index 34b37ab..a217c1b 100644
--- a/configs/P1010RDB-PA_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
index 6bffe04..1813ffd 100644
--- a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig
index 8422511..84190ef 100644
--- a/configs/P1010RDB-PA_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
index bed268a..ebb9bc5 100644
--- a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
index 3680b58..9f87a6a 100644
--- a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SPIFLASH,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
index bd4acf6..c688ebd 100644
--- a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
index cec155d..3769896 100644
--- a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,NAND_SECBOOT,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig
index a3132f9..169f898 100644
--- a/configs/P1010RDB-PA_NAND_defconfig
+++ b/configs/P1010RDB-PA_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
index d143079..33a7f73 100644
--- a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig
index 5d5d4b1..a31d905 100644
--- a/configs/P1010RDB-PA_NOR_defconfig
+++ b/configs/P1010RDB-PA_NOR_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig
index 98018f9..e8dfda2 100644
--- a/configs/P1010RDB-PA_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
index a8019bb..76ad367 100644
--- a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SPIFLASH,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig b/configs/P1010RDB-PA_SPIFLASH_defconfig
index 0fdea34..0cbf21c 100644
--- a/configs/P1010RDB-PA_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
index 61e559d..f0ce786 100644
--- a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,NAND_SECBOOT,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig
index 822f7b9..49e383c 100644
--- a/configs/P1010RDB-PB_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
index a4656ea..01d87dd 100644
--- a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig
index f1eb666..a4d8161 100644
--- a/configs/P1010RDB-PB_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
index 5833f90..5baa269 100644
--- a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
index 6ebe23c..cbc6472 100644
--- a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SPIFLASH,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
index 9e3a56a..acbc9f1 100644
--- a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
index c43ea2b..4876308 100644
--- a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,NAND_SECBOOT,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig
index 9c31d1e..52d2679 100644
--- a/configs/P1010RDB-PB_NAND_defconfig
+++ b/configs/P1010RDB-PB_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
index 9c65183..6cb5241 100644
--- a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig
index 815982a..4607fd5 100644
--- a/configs/P1010RDB-PB_NOR_defconfig
+++ b/configs/P1010RDB-PB_NOR_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig
index c8d1a81..5116f8d 100644
--- a/configs/P1010RDB-PB_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
index 65a2a42..1e0bfa6 100644
--- a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1010RDB=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SPIFLASH,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig b/configs/P1010RDB-PB_SPIFLASH_defconfig
index 40a8793..2f3af85 100644
--- a/configs/P1010RDB-PB_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020MBG-PC_36BIT_SDCARD_defconfig b/configs/P1020MBG-PC_36BIT_SDCARD_defconfig
index b5bd709..ebfd0da 100644
--- a/configs/P1020MBG-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020MBG-PC_36BIT_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020MBG,SDCARD,36BIT"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020MBG-PC_36BIT_defconfig b/configs/P1020MBG-PC_36BIT_defconfig
index 9f15bf5..b796578 100644
--- a/configs/P1020MBG-PC_36BIT_defconfig
+++ b/configs/P1020MBG-PC_36BIT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1020MBG,36BIT"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020MBG-PC_SDCARD_defconfig b/configs/P1020MBG-PC_SDCARD_defconfig
index 4e58b5d..50316f7 100644
--- a/configs/P1020MBG-PC_SDCARD_defconfig
+++ b/configs/P1020MBG-PC_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020MBG,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020MBG-PC_defconfig b/configs/P1020MBG-PC_defconfig
index c4e87ab..c7da957 100644
--- a/configs/P1020MBG-PC_defconfig
+++ b/configs/P1020MBG-PC_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1020MBG"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig b/configs/P1020RDB-PC_36BIT_NAND_defconfig
index bfd3b11..4ed6608 100644
--- a/configs/P1020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P1020RDB-PC_36BIT_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
index 50f4953..e0f44b7 100644
--- a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
index c6c47a9..7eef146 100644
--- a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020RDB-PC_36BIT_defconfig b/configs/P1020RDB-PC_36BIT_defconfig
index d4ed23e..00bd7ec 100644
--- a/configs/P1020RDB-PC_36BIT_defconfig
+++ b/configs/P1020RDB-PC_36BIT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020RDB-PC_NAND_defconfig b/configs/P1020RDB-PC_NAND_defconfig
index f78eebb..7ab1103 100644
--- a/configs/P1020RDB-PC_NAND_defconfig
+++ b/configs/P1020RDB-PC_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020RDB-PC_SDCARD_defconfig b/configs/P1020RDB-PC_SDCARD_defconfig
index c4d1e6f..3dc697e 100644
--- a/configs/P1020RDB-PC_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020RDB-PC_SPIFLASH_defconfig b/configs/P1020RDB-PC_SPIFLASH_defconfig
index e4c60cc..ae3325f 100644
--- a/configs/P1020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig
index cff654c..ad825eb 100644
--- a/configs/P1020RDB-PC_defconfig
+++ b/configs/P1020RDB-PC_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig
index a1d0c75..1b7d95c 100644
--- a/configs/P1020RDB-PD_NAND_defconfig
+++ b/configs/P1020RDB-PD_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig
index 945fbfc..a0828a4 100644
--- a/configs/P1020RDB-PD_SDCARD_defconfig
+++ b/configs/P1020RDB-PD_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig b/configs/P1020RDB-PD_SPIFLASH_defconfig
index 618c42d..1d016ff 100644
--- a/configs/P1020RDB-PD_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PD_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig
index a1cbcd8..c34f253 100644
--- a/configs/P1020RDB-PD_defconfig
+++ b/configs/P1020RDB-PD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020UTM-PC_36BIT_SDCARD_defconfig b/configs/P1020UTM-PC_36BIT_SDCARD_defconfig
index 9f5fde7..5de7156 100644
--- a/configs/P1020UTM-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020UTM-PC_36BIT_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020UTM,36BIT,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020UTM-PC_36BIT_defconfig b/configs/P1020UTM-PC_36BIT_defconfig
index a0b6d29..af0d9a2 100644
--- a/configs/P1020UTM-PC_36BIT_defconfig
+++ b/configs/P1020UTM-PC_36BIT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1020UTM,36BIT"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020UTM-PC_SDCARD_defconfig b/configs/P1020UTM-PC_SDCARD_defconfig
index a27d507..33e954c 100644
--- a/configs/P1020UTM-PC_SDCARD_defconfig
+++ b/configs/P1020UTM-PC_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1020UTM,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1020UTM-PC_defconfig b/configs/P1020UTM-PC_defconfig
index 9f8ecd9..1e608f3 100644
--- a/configs/P1020UTM-PC_defconfig
+++ b/configs/P1020UTM-PC_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1020UTM"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1021RDB-PC_36BIT_NAND_defconfig b/configs/P1021RDB-PC_36BIT_NAND_defconfig
index 7c16f4b..6bd81ab 100644
--- a/configs/P1021RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P1021RDB-PC_36BIT_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1021RDB-PC_36BIT_SDCARD_defconfig b/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
index b687972..e30d44d 100644
--- a/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
index fe6c49a..8a1e1d8 100644
--- a/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1021RDB-PC_36BIT_defconfig b/configs/P1021RDB-PC_36BIT_defconfig
index 18649ce..13e5e1a 100644
--- a/configs/P1021RDB-PC_36BIT_defconfig
+++ b/configs/P1021RDB-PC_36BIT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1021RDB-PC_NAND_defconfig b/configs/P1021RDB-PC_NAND_defconfig
index bb37e2e..80a29b5 100644
--- a/configs/P1021RDB-PC_NAND_defconfig
+++ b/configs/P1021RDB-PC_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1021RDB-PC_SDCARD_defconfig b/configs/P1021RDB-PC_SDCARD_defconfig
index eff8ad4..831b1cb 100644
--- a/configs/P1021RDB-PC_SDCARD_defconfig
+++ b/configs/P1021RDB-PC_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1021RDB-PC_SPIFLASH_defconfig b/configs/P1021RDB-PC_SPIFLASH_defconfig
index 561d6c1..eb22b9e 100644
--- a/configs/P1021RDB-PC_SPIFLASH_defconfig
+++ b/configs/P1021RDB-PC_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1021RDB-PC_defconfig b/configs/P1021RDB-PC_defconfig
index 169c0a5..603b140 100644
--- a/configs/P1021RDB-PC_defconfig
+++ b/configs/P1021RDB-PC_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1021RDB"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1022DS_36BIT_NAND_defconfig b/configs/P1022DS_36BIT_NAND_defconfig
index 0c72820..efd2fc9 100644
--- a/configs/P1022DS_36BIT_NAND_defconfig
+++ b/configs/P1022DS_36BIT_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1022DS_36BIT_SDCARD_defconfig b/configs/P1022DS_36BIT_SDCARD_defconfig
index 4b39a0b..4322932 100644
--- a/configs/P1022DS_36BIT_SDCARD_defconfig
+++ b/configs/P1022DS_36BIT_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1022DS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1022DS_36BIT_SPIFLASH_defconfig b/configs/P1022DS_36BIT_SPIFLASH_defconfig
index 128db2d..9b3449f 100644
--- a/configs/P1022DS_36BIT_SPIFLASH_defconfig
+++ b/configs/P1022DS_36BIT_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1022DS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1022DS_36BIT_defconfig b/configs/P1022DS_36BIT_defconfig
index abd425d..17631fa 100644
--- a/configs/P1022DS_36BIT_defconfig
+++ b/configs/P1022DS_36BIT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1022DS=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1022DS_NAND_defconfig b/configs/P1022DS_NAND_defconfig
index 85fbb03..1b19396 100644
--- a/configs/P1022DS_NAND_defconfig
+++ b/configs/P1022DS_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1022DS_SDCARD_defconfig b/configs/P1022DS_SDCARD_defconfig
index ce2eae1..f4ea608 100644
--- a/configs/P1022DS_SDCARD_defconfig
+++ b/configs/P1022DS_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1022DS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1022DS_SPIFLASH_defconfig b/configs/P1022DS_SPIFLASH_defconfig
index a87565e..f52fead 100644
--- a/configs/P1022DS_SPIFLASH_defconfig
+++ b/configs/P1022DS_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1022DS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1022DS_defconfig b/configs/P1022DS_defconfig
index 5791714..62fcdd9 100644
--- a/configs/P1022DS_defconfig
+++ b/configs/P1022DS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1022DS=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1023RDB_defconfig b/configs/P1023RDB_defconfig
index e796e96..8da354b 100644
--- a/configs/P1023RDB_defconfig
+++ b/configs/P1023RDB_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1023RDB=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1024RDB_36BIT_defconfig b/configs/P1024RDB_36BIT_defconfig
index 5883e1d..131fb33 100644
--- a/configs/P1024RDB_36BIT_defconfig
+++ b/configs/P1024RDB_36BIT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,36BIT"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1024RDB_NAND_defconfig b/configs/P1024RDB_NAND_defconfig
index f2503da..968ae27 100644
--- a/configs/P1024RDB_NAND_defconfig
+++ b/configs/P1024RDB_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1024RDB_SDCARD_defconfig b/configs/P1024RDB_SDCARD_defconfig
index 002acf0..39bce88 100644
--- a/configs/P1024RDB_SDCARD_defconfig
+++ b/configs/P1024RDB_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1024RDB_SPIFLASH_defconfig b/configs/P1024RDB_SPIFLASH_defconfig
index dbde60e..c756d3e 100644
--- a/configs/P1024RDB_SPIFLASH_defconfig
+++ b/configs/P1024RDB_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1024RDB_defconfig b/configs/P1024RDB_defconfig
index d03f82c..bb04384 100644
--- a/configs/P1024RDB_defconfig
+++ b/configs/P1024RDB_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1024RDB"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1025RDB_36BIT_defconfig b/configs/P1025RDB_36BIT_defconfig
index caf5e42..49cd118 100644
--- a/configs/P1025RDB_36BIT_defconfig
+++ b/configs/P1025RDB_36BIT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,36BIT"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1025RDB_NAND_defconfig b/configs/P1025RDB_NAND_defconfig
index e2cf251..2c80e49 100644
--- a/configs/P1025RDB_NAND_defconfig
+++ b/configs/P1025RDB_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1025RDB_SDCARD_defconfig b/configs/P1025RDB_SDCARD_defconfig
index 0dbb48e..f2de213 100644
--- a/configs/P1025RDB_SDCARD_defconfig
+++ b/configs/P1025RDB_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1025RDB_SPIFLASH_defconfig b/configs/P1025RDB_SPIFLASH_defconfig
index ee7c4fb..c0d5d79 100644
--- a/configs/P1025RDB_SPIFLASH_defconfig
+++ b/configs/P1025RDB_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P1025RDB_defconfig b/configs/P1025RDB_defconfig
index 9fea0bb..574be9e 100644
--- a/configs/P1025RDB_defconfig
+++ b/configs/P1025RDB_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P1025RDB"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig
index 050cc63..a1ec295 100644
--- a/configs/P2020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
index dce97cb..0d6b6a4 100644
--- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
index f081fc8..3a2bfd1 100644
--- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig
index 6ab00e2..f447f14 100644
--- a/configs/P2020RDB-PC_36BIT_defconfig
+++ b/configs/P2020RDB-PC_36BIT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig
index 6ca1b7e..c380240 100644
--- a/configs/P2020RDB-PC_NAND_defconfig
+++ b/configs/P2020RDB-PC_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_TPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig
index 78736b5..ae7ea67 100644
--- a/configs/P2020RDB-PC_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig
index 0000096..6c04927 100644
--- a/configs/P2020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig
index a17fd76..e9648aa 100644
--- a/configs/P2020RDB-PC_defconfig
+++ b/configs/P2020RDB-PC_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_SYS_EXTRA_OPTIONS="P2020RDB"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P2041RDB_NAND_defconfig b/configs/P2041RDB_NAND_defconfig
index a5bb3f2..fd82824 100644
--- a/configs/P2041RDB_NAND_defconfig
+++ b/configs/P2041RDB_NAND_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P2041RDB=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P2041RDB_SDCARD_defconfig b/configs/P2041RDB_SDCARD_defconfig
index ec9e0fd..06fff32 100644
--- a/configs/P2041RDB_SDCARD_defconfig
+++ b/configs/P2041RDB_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P2041RDB=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P2041RDB_SECURE_BOOT_defconfig b/configs/P2041RDB_SECURE_BOOT_defconfig
index 50f02af..ac8d3fa 100644
--- a/configs/P2041RDB_SECURE_BOOT_defconfig
+++ b/configs/P2041RDB_SECURE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P2041RDB=y
CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P2041RDB_SPIFLASH_defconfig b/configs/P2041RDB_SPIFLASH_defconfig
index 9161a07..19f7267 100644
--- a/configs/P2041RDB_SPIFLASH_defconfig
+++ b/configs/P2041RDB_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P2041RDB=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig b/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
index 0d4984d..d81dd5b 100644
--- a/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P2041RDB=y
CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_REMOTE=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P2041RDB_defconfig b/configs/P2041RDB_defconfig
index 802b38d..df8bbc2 100644
--- a/configs/P2041RDB_defconfig
+++ b/configs/P2041RDB_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P2041RDB=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P3041DS_NAND_defconfig b/configs/P3041DS_NAND_defconfig
index 9fb255a..811268d 100644
--- a/configs/P3041DS_NAND_defconfig
+++ b/configs/P3041DS_NAND_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P3041DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P3041DS_SDCARD_defconfig b/configs/P3041DS_SDCARD_defconfig
index 0312127..ec049828 100644
--- a/configs/P3041DS_SDCARD_defconfig
+++ b/configs/P3041DS_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P3041DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P3041DS_SECURE_BOOT_defconfig b/configs/P3041DS_SECURE_BOOT_defconfig
index 9e0155a..ddd58cf 100644
--- a/configs/P3041DS_SECURE_BOOT_defconfig
+++ b/configs/P3041DS_SECURE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P3041DS=y
CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P3041DS_SPIFLASH_defconfig b/configs/P3041DS_SPIFLASH_defconfig
index be23e04..49583e0 100644
--- a/configs/P3041DS_SPIFLASH_defconfig
+++ b/configs/P3041DS_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P3041DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P3041DS_SRIO_PCIE_BOOT_defconfig b/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
index 46f8224..2aa80d6 100644
--- a/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P3041DS=y
CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_REMOTE=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P3041DS_defconfig b/configs/P3041DS_defconfig
index 3277650..cd76576 100644
--- a/configs/P3041DS_defconfig
+++ b/configs/P3041DS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P3041DS=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P4080DS_SDCARD_defconfig b/configs/P4080DS_SDCARD_defconfig
index 4432926..082b42c 100644
--- a/configs/P4080DS_SDCARD_defconfig
+++ b/configs/P4080DS_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P4080DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P4080DS_SECURE_BOOT_defconfig b/configs/P4080DS_SECURE_BOOT_defconfig
index e2c6bcc..3558b7c 100644
--- a/configs/P4080DS_SECURE_BOOT_defconfig
+++ b/configs/P4080DS_SECURE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P4080DS=y
CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P4080DS_SPIFLASH_defconfig b/configs/P4080DS_SPIFLASH_defconfig
index afa2aaf..322aef0 100644
--- a/configs/P4080DS_SPIFLASH_defconfig
+++ b/configs/P4080DS_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P4080DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P4080DS_SRIO_PCIE_BOOT_defconfig b/configs/P4080DS_SRIO_PCIE_BOOT_defconfig
index 5b683bc..bca6a92 100644
--- a/configs/P4080DS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P4080DS_SRIO_PCIE_BOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P4080DS=y
CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_REMOTE=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P4080DS_defconfig b/configs/P4080DS_defconfig
index 9b5fc89..80144bf 100644
--- a/configs/P4080DS_defconfig
+++ b/configs/P4080DS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P4080DS=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P5020DS_NAND_defconfig b/configs/P5020DS_NAND_defconfig
index 97061c4..15b3404 100644
--- a/configs/P5020DS_NAND_defconfig
+++ b/configs/P5020DS_NAND_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P5020DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P5020DS_SDCARD_defconfig b/configs/P5020DS_SDCARD_defconfig
index 661c035..bad45b9 100644
--- a/configs/P5020DS_SDCARD_defconfig
+++ b/configs/P5020DS_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P5020DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P5020DS_SECURE_BOOT_defconfig b/configs/P5020DS_SECURE_BOOT_defconfig
index 8ab306e..56a83fd 100644
--- a/configs/P5020DS_SECURE_BOOT_defconfig
+++ b/configs/P5020DS_SECURE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P5020DS=y
CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P5020DS_SPIFLASH_defconfig b/configs/P5020DS_SPIFLASH_defconfig
index 240e44c..8b5da2e 100644
--- a/configs/P5020DS_SPIFLASH_defconfig
+++ b/configs/P5020DS_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P5020DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P5020DS_SRIO_PCIE_BOOT_defconfig b/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
index ef231b8..a2b3658 100644
--- a/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P5020DS=y
CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_REMOTE=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P5020DS_defconfig b/configs/P5020DS_defconfig
index d1c5c72..0ea13fb 100644
--- a/configs/P5020DS_defconfig
+++ b/configs/P5020DS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P5020DS=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P5040DS_NAND_defconfig b/configs/P5040DS_NAND_defconfig
index 0daaea1..1c526f9 100644
--- a/configs/P5040DS_NAND_defconfig
+++ b/configs/P5040DS_NAND_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P5040DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P5040DS_SDCARD_defconfig b/configs/P5040DS_SDCARD_defconfig
index dc76d37..e682501 100644
--- a/configs/P5040DS_SDCARD_defconfig
+++ b/configs/P5040DS_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P5040DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P5040DS_SECURE_BOOT_defconfig b/configs/P5040DS_SECURE_BOOT_defconfig
index e4fbcc9..35442b5 100644
--- a/configs/P5040DS_SECURE_BOOT_defconfig
+++ b/configs/P5040DS_SECURE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P5040DS=y
CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P5040DS_SPIFLASH_defconfig b/configs/P5040DS_SPIFLASH_defconfig
index cc5793e..e5085db 100644
--- a/configs/P5040DS_SPIFLASH_defconfig
+++ b/configs/P5040DS_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P5040DS=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/P5040DS_defconfig b/configs/P5040DS_defconfig
index 38f3d58..9c028fe 100644
--- a/configs/P5040DS_defconfig
+++ b/configs/P5040DS_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P5040DS=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1023RDB_NAND_defconfig b/configs/T1023RDB_NAND_defconfig
index e5b9780..c391682 100644
--- a/configs/T1023RDB_NAND_defconfig
+++ b/configs/T1023RDB_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1023RDB_SDCARD_defconfig b/configs/T1023RDB_SDCARD_defconfig
index 5113fb1..3ae3cb2 100644
--- a/configs/T1023RDB_SDCARD_defconfig
+++ b/configs/T1023RDB_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1023RDB_SECURE_BOOT_defconfig b/configs/T1023RDB_SECURE_BOOT_defconfig
index 0da1db2..4908e33 100644
--- a/configs/T1023RDB_SECURE_BOOT_defconfig
+++ b/configs/T1023RDB_SECURE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T102XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1023RDB_SPIFLASH_defconfig b/configs/T1023RDB_SPIFLASH_defconfig
index 1ac7667..42f9a30 100644
--- a/configs/T1023RDB_SPIFLASH_defconfig
+++ b/configs/T1023RDB_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1023RDB_defconfig b/configs/T1023RDB_defconfig
index eea0b9b..7f2094a 100644
--- a/configs/T1023RDB_defconfig
+++ b/configs/T1023RDB_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T102XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1024QDS_D4_SECURE_BOOT_defconfig b/configs/T1024QDS_D4_SECURE_BOOT_defconfig
index 1570ee0..ed02b45 100644
--- a/configs/T1024QDS_D4_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_D4_SECURE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T102XQDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SYS_FSL_DDR4,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1024QDS_NAND_defconfig b/configs/T1024QDS_NAND_defconfig
index 2d21c1b..89fb950 100644
--- a/configs/T1024QDS_NAND_defconfig
+++ b/configs/T1024QDS_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1024QDS_SDCARD_defconfig b/configs/T1024QDS_SDCARD_defconfig
index 67acf88..54a315e 100644
--- a/configs/T1024QDS_SDCARD_defconfig
+++ b/configs/T1024QDS_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1024QDS_SECURE_BOOT_defconfig b/configs/T1024QDS_SECURE_BOOT_defconfig
index dedc60d..7561975 100644
--- a/configs/T1024QDS_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_SECURE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T102XQDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1024QDS_SPIFLASH_defconfig b/configs/T1024QDS_SPIFLASH_defconfig
index 2c42e8d..8b9c654 100644
--- a/configs/T1024QDS_SPIFLASH_defconfig
+++ b/configs/T1024QDS_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1024QDS_defconfig b/configs/T1024QDS_defconfig
index ed5a667..bc2817b 100644
--- a/configs/T1024QDS_defconfig
+++ b/configs/T1024QDS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T102XQDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig
index e34cab2..be92489 100644
--- a/configs/T1024RDB_NAND_defconfig
+++ b/configs/T1024RDB_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig
index 04f75fd..be2dc58 100644
--- a/configs/T1024RDB_SDCARD_defconfig
+++ b/configs/T1024RDB_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1024RDB_SECURE_BOOT_defconfig b/configs/T1024RDB_SECURE_BOOT_defconfig
index 08da947..a00bf74 100644
--- a/configs/T1024RDB_SECURE_BOOT_defconfig
+++ b/configs/T1024RDB_SECURE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T102XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig
index a288848..81faf6f 100644
--- a/configs/T1024RDB_SPIFLASH_defconfig
+++ b/configs/T1024RDB_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig
index 9e96797..47182d1 100644
--- a/configs/T1024RDB_defconfig
+++ b/configs/T1024RDB_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T102XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1040QDS_D4_defconfig b/configs/T1040QDS_D4_defconfig
index b4f6fac..8b3dc2b 100644
--- a/configs/T1040QDS_D4_defconfig
+++ b/configs/T1040QDS_D4_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T1040QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SYS_FSL_DDR4"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1040QDS_SECURE_BOOT_defconfig b/configs/T1040QDS_SECURE_BOOT_defconfig
index 005e762..bf97d71 100644
--- a/configs/T1040QDS_SECURE_BOOT_defconfig
+++ b/configs/T1040QDS_SECURE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T1040QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1040QDS_defconfig b/configs/T1040QDS_defconfig
index 5eb8c83..daeb0c6 100644
--- a/configs/T1040QDS_defconfig
+++ b/configs/T1040QDS_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T1040QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1040RDB_NAND_defconfig b/configs/T1040RDB_NAND_defconfig
index 9e04b77..33a0f39 100644
--- a/configs/T1040RDB_NAND_defconfig
+++ b/configs/T1040RDB_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T104XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1040RDB_SDCARD_defconfig b/configs/T1040RDB_SDCARD_defconfig
index 9f503e7..4530efe 100644
--- a/configs/T1040RDB_SDCARD_defconfig
+++ b/configs/T1040RDB_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T104XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1040RDB_SECURE_BOOT_defconfig b/configs/T1040RDB_SECURE_BOOT_defconfig
index 2e00ccb..6010b19 100644
--- a/configs/T1040RDB_SECURE_BOOT_defconfig
+++ b/configs/T1040RDB_SECURE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT,T1040RDB"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1040RDB_SPIFLASH_defconfig b/configs/T1040RDB_SPIFLASH_defconfig
index 878873f..c7932cd 100644
--- a/configs/T1040RDB_SPIFLASH_defconfig
+++ b/configs/T1040RDB_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T104XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1040RDB_defconfig b/configs/T1040RDB_defconfig
index 1b89f04..a97fe63 100644
--- a/configs/T1040RDB_defconfig
+++ b/configs/T1040RDB_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1042RDB_PI_NAND_defconfig b/configs/T1042RDB_PI_NAND_defconfig
index 4520073..57b2c1e 100644
--- a/configs/T1042RDB_PI_NAND_defconfig
+++ b/configs/T1042RDB_PI_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T104XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1042RDB_PI_SDCARD_defconfig b/configs/T1042RDB_PI_SDCARD_defconfig
index a3c7f45..58cc6ea 100644
--- a/configs/T1042RDB_PI_SDCARD_defconfig
+++ b/configs/T1042RDB_PI_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T104XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig
index acb15f5..eafc51a 100644
--- a/configs/T1042RDB_PI_SPIFLASH_defconfig
+++ b/configs/T1042RDB_PI_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T104XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1042RDB_PI_defconfig b/configs/T1042RDB_PI_defconfig
index 26f4579..8bd142d 100644
--- a/configs/T1042RDB_PI_defconfig
+++ b/configs/T1042RDB_PI_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1042RDB_SECURE_BOOT_defconfig b/configs/T1042RDB_SECURE_BOOT_defconfig
index 8aee85f..851646f 100644
--- a/configs/T1042RDB_SECURE_BOOT_defconfig
+++ b/configs/T1042RDB_SECURE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,SECURE_BOOT,T1042RDB"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T1042RDB_defconfig b/configs/T1042RDB_defconfig
index 07baf20..b8d3316 100644
--- a/configs/T1042RDB_defconfig
+++ b/configs/T1042RDB_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T104XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig
index 9531449..50f1c31 100644
--- a/configs/T2080QDS_NAND_defconfig
+++ b/configs/T2080QDS_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T208XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T2080QDS_SDCARD_defconfig b/configs/T2080QDS_SDCARD_defconfig
index 0a7378f..b9262af 100644
--- a/configs/T2080QDS_SDCARD_defconfig
+++ b/configs/T2080QDS_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T208XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T2080QDS_SECURE_BOOT_defconfig b/configs/T2080QDS_SECURE_BOOT_defconfig
index eb3f086..428d840 100644
--- a/configs/T2080QDS_SECURE_BOOT_defconfig
+++ b/configs/T2080QDS_SECURE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T208XQDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig
index 250f4a9..101c1c0 100644
--- a/configs/T2080QDS_SPIFLASH_defconfig
+++ b/configs/T2080QDS_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T208XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
index 9f3ade2..c0a7932 100644
--- a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T208XQDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_REMOTE=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T2080QDS_defconfig b/configs/T2080QDS_defconfig
index d657dbd..6d839f1 100644
--- a/configs/T2080QDS_defconfig
+++ b/configs/T2080QDS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T208XQDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig
index 36173cf..0650d40 100644
--- a/configs/T2080RDB_NAND_defconfig
+++ b/configs/T2080RDB_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T208XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T2080RDB_SDCARD_defconfig b/configs/T2080RDB_SDCARD_defconfig
index 7062b49..37405f9 100644
--- a/configs/T2080RDB_SDCARD_defconfig
+++ b/configs/T2080RDB_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T208XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T2080RDB_SECURE_BOOT_defconfig b/configs/T2080RDB_SECURE_BOOT_defconfig
index 4af6d0c..bab85e3 100644
--- a/configs/T2080RDB_SECURE_BOOT_defconfig
+++ b/configs/T2080RDB_SECURE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T208XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig
index 5a3eacf..cf81550 100644
--- a/configs/T2080RDB_SPIFLASH_defconfig
+++ b/configs/T2080RDB_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T208XRDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig b/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
index a767e28..8c6a930 100644
--- a/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T208XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_REMOTE=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T2080RDB_defconfig b/configs/T2080RDB_defconfig
index 9da8e89..3211e2b 100644
--- a/configs/T2080RDB_defconfig
+++ b/configs/T2080RDB_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T208XRDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T2081QDS_NAND_defconfig b/configs/T2081QDS_NAND_defconfig
index 97662c4..d645f00 100644
--- a/configs/T2081QDS_NAND_defconfig
+++ b/configs/T2081QDS_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T208XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T2081QDS_SDCARD_defconfig b/configs/T2081QDS_SDCARD_defconfig
index 73d5f1f..73c4f56 100644
--- a/configs/T2081QDS_SDCARD_defconfig
+++ b/configs/T2081QDS_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T208XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T2081QDS_SPIFLASH_defconfig b/configs/T2081QDS_SPIFLASH_defconfig
index 17cff49..0bf001e 100644
--- a/configs/T2081QDS_SPIFLASH_defconfig
+++ b/configs/T2081QDS_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T208XQDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
index 61a5d86..f8a70bb 100644
--- a/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T208XQDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_REMOTE=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T2081QDS_defconfig b/configs/T2081QDS_defconfig
index b24ee59..ee33904 100644
--- a/configs/T2081QDS_defconfig
+++ b/configs/T2081QDS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T208XQDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T4160QDS_NAND_defconfig b/configs/T4160QDS_NAND_defconfig
index 675c1bb..8adbd9c 100644
--- a/configs/T4160QDS_NAND_defconfig
+++ b/configs/T4160QDS_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T4240QDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T4160QDS_SDCARD_defconfig b/configs/T4160QDS_SDCARD_defconfig
index af16c35..825aba9 100644
--- a/configs/T4160QDS_SDCARD_defconfig
+++ b/configs/T4160QDS_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T4240QDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T4160QDS_SECURE_BOOT_defconfig b/configs/T4160QDS_SECURE_BOOT_defconfig
index b55cab9..508cff2 100644
--- a/configs/T4160QDS_SECURE_BOOT_defconfig
+++ b/configs/T4160QDS_SECURE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T4240QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T4160QDS_defconfig b/configs/T4160QDS_defconfig
index b2f81b4..75528e3 100644
--- a/configs/T4160QDS_defconfig
+++ b/configs/T4160QDS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T4240QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T4160RDB_defconfig b/configs/T4160RDB_defconfig
index fc73a47..f7c0aed 100644
--- a/configs/T4160RDB_defconfig
+++ b/configs/T4160RDB_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T4240RDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T4240QDS_NAND_defconfig b/configs/T4240QDS_NAND_defconfig
index 008e140..778b446 100644
--- a/configs/T4240QDS_NAND_defconfig
+++ b/configs/T4240QDS_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T4240QDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T4240QDS_SDCARD_defconfig b/configs/T4240QDS_SDCARD_defconfig
index 9c24e9e..8e8bebb 100644
--- a/configs/T4240QDS_SDCARD_defconfig
+++ b/configs/T4240QDS_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T4240QDS=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T4240QDS_SECURE_BOOT_defconfig b/configs/T4240QDS_SECURE_BOOT_defconfig
index 1488967..f2026d0 100644
--- a/configs/T4240QDS_SECURE_BOOT_defconfig
+++ b/configs/T4240QDS_SECURE_BOOT_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T4240QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,SECURE_BOOT"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig b/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
index 7c66da1..0f27745 100644
--- a/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_T4240QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
CONFIG_ENV_IS_IN_REMOTE=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T4240QDS_defconfig b/configs/T4240QDS_defconfig
index 0fb7e0e..3bb98e8 100644
--- a/configs/T4240QDS_defconfig
+++ b/configs/T4240QDS_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T4240QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T4240RDB_SDCARD_defconfig b/configs/T4240RDB_SDCARD_defconfig
index 9815c63..49d2bce 100644
--- a/configs/T4240RDB_SDCARD_defconfig
+++ b/configs/T4240RDB_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T4240RDB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/T4240RDB_defconfig b/configs/T4240RDB_defconfig
index 35e4aa4..b14dfc2 100644
--- a/configs/T4240RDB_defconfig
+++ b/configs/T4240RDB_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_T4240RDB=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/TWR-P1025_defconfig b/configs/TWR-P1025_defconfig
index f995ead..5ad090f 100644
--- a/configs/TWR-P1025_defconfig
+++ b/configs/TWR-P1025_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_P1_TWR=y
CONFIG_SYS_EXTRA_OPTIONS="TWR_P1025"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/TZX-Q8-713B7_defconfig b/configs/TZX-Q8-713B7_defconfig
index 43c9e64..e63e16b 100644
--- a/configs/TZX-Q8-713B7_defconfig
+++ b/configs/TZX-Q8-713B7_defconfig
@@ -15,3 +15,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-tzx-q8-713b7"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/UCP1020_SPIFLASH_defconfig b/configs/UCP1020_SPIFLASH_defconfig
index 91f2b18..03d8847 100644
--- a/configs/UCP1020_SPIFLASH_defconfig
+++ b/configs/UCP1020_SPIFLASH_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_UCP1020=y
CONFIG_TARGET_UCP1020_SPIFLASH=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/UCP1020_defconfig b/configs/UCP1020_defconfig
index 76a3974..5f3e062 100644
--- a/configs/UCP1020_defconfig
+++ b/configs/UCP1020_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_UCP1020=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/UTOO_P66_defconfig b/configs/UTOO_P66_defconfig
index 12e2fad..b43d207 100644
--- a/configs/UTOO_P66_defconfig
+++ b/configs/UTOO_P66_defconfig
@@ -21,3 +21,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-utoo-p66"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/Wexler_TAB7200_defconfig b/configs/Wexler_TAB7200_defconfig
index 0221d28..5b904c3 100644
--- a/configs/Wexler_TAB7200_defconfig
+++ b/configs/Wexler_TAB7200_defconfig
@@ -10,3 +10,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wexler-tab7200"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig
index 0f2b90a..eadbba5 100644
--- a/configs/Wits_Pro_A20_DKT_defconfig
+++ b/configs/Wits_Pro_A20_DKT_defconfig
@@ -12,4 +12,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wits-pro-a20-dkt"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Yones_Toptech_BD1078_defconfig b/configs/Yones_Toptech_BD1078_defconfig
index 9550012..4428e6a 100644
--- a/configs/Yones_Toptech_BD1078_defconfig
+++ b/configs/Yones_Toptech_BD1078_defconfig
@@ -21,3 +21,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-yones-toptech-bd1078"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/acadia_defconfig b/configs/acadia_defconfig
index d59c925..1b75fd4 100644
--- a/configs/acadia_defconfig
+++ b/configs/acadia_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_ACADIA=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index d2e5e92..5d6ae52 100644
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -4,3 +4,4 @@ CONFIG_TEGRA30=y
CONFIG_TARGET_APALIS_T30=y
CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
index 5f74558..e58dc9b 100644
--- a/configs/apf27_defconfig
+++ b/configs/apf27_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFS=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/arches_defconfig b/configs/arches_defconfig
index 155b323..2a57cc4 100644
--- a/configs/arches_defconfig
+++ b/configs/arches_defconfig
@@ -4,4 +4,5 @@ CONFIG_TARGET_CANYONLANDS=y
CONFIG_ARCHES=y
CONFIG_DEFAULT_DEVICE_TREE="arches"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_OF_CONTROL=y
diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
index 71bc3bc..a9d8e32 100644
--- a/configs/aristainetos_defconfig
+++ b/configs/aristainetos_defconfig
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFS=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig
index e7251fb..3e190a3 100644
--- a/configs/ba10_tv_box_defconfig
+++ b/configs/ba10_tv_box_defconfig
@@ -8,3 +8,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-ba10-tvbox"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/bamboo_defconfig b/configs/bamboo_defconfig
index 954d6e9..709df12 100644
--- a/configs/bamboo_defconfig
+++ b/configs/bamboo_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_BAMBOO=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/bf518f-ezbrd_defconfig b/configs/bf518f-ezbrd_defconfig
index fb35ad0..427c807 100644
--- a/configs/bf518f-ezbrd_defconfig
+++ b/configs/bf518f-ezbrd_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF518F_EZBRD=y
+CONFIG_CMD_SETEXPR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf526-ezbrd_defconfig b/configs/bf526-ezbrd_defconfig
index bd5ead8..8e3fbb0 100644
--- a/configs/bf526-ezbrd_defconfig
+++ b/configs/bf526-ezbrd_defconfig
@@ -1,4 +1,5 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF526_EZBRD=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf527-ad7160-eval_defconfig b/configs/bf527-ad7160-eval_defconfig
index 47f53c9..0a73eb0 100644
--- a/configs/bf527-ad7160-eval_defconfig
+++ b/configs/bf527-ad7160-eval_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF527_AD7160_EVAL=y
+CONFIG_CMD_SETEXPR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf527-sdp_defconfig b/configs/bf527-sdp_defconfig
index 57f47e9..f7f2e24 100644
--- a/configs/bf527-sdp_defconfig
+++ b/configs/bf527-sdp_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF527_SDP=y
+CONFIG_CMD_SETEXPR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf533-stamp_defconfig b/configs/bf533-stamp_defconfig
index 0e3c2ed..599c5af 100644
--- a/configs/bf533-stamp_defconfig
+++ b/configs/bf533-stamp_defconfig
@@ -1,4 +1,5 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF533_STAMP=y
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf538f-ezkit_defconfig b/configs/bf538f-ezkit_defconfig
index e674433..e9f6a04 100644
--- a/configs/bf538f-ezkit_defconfig
+++ b/configs/bf538f-ezkit_defconfig
@@ -1,4 +1,5 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF538F_EZKIT=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig
index 27c6e11..30f4dbf 100644
--- a/configs/bg0900_defconfig
+++ b/configs/bg0900_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_BG0900=y
CONFIG_SPL=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/bubinga_defconfig b/configs/bubinga_defconfig
index 27b2d32..9370d7f 100644
--- a/configs/bubinga_defconfig
+++ b/configs/bubinga_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_BUBINGA=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig
index 2eec149..89d40e4 100644
--- a/configs/cairo_defconfig
+++ b/configs/cairo_defconfig
@@ -3,3 +3,4 @@ CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_CAIRO=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/canyonlands_defconfig b/configs/canyonlands_defconfig
index d79ccb9..bd4263a 100644
--- a/configs/canyonlands_defconfig
+++ b/configs/canyonlands_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_CANYONLANDS=y
CONFIG_CANYONLANDS=y
CONFIG_DEFAULT_DEVICE_TREE="canyonlands"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_REGEX=y
diff --git a/configs/cm-bf533_defconfig b/configs/cm-bf533_defconfig
index 8bc7fe4..8b436f3 100644
--- a/configs/cm-bf533_defconfig
+++ b/configs/cm-bf533_defconfig
@@ -1,4 +1,5 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_CM_BF533=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm-bf537e_defconfig b/configs/cm-bf537e_defconfig
index 5d04223..c5fcbb8 100644
--- a/configs/cm-bf537e_defconfig
+++ b/configs/cm-bf537e_defconfig
@@ -2,4 +2,5 @@ CONFIG_BLACKFIN=y
CONFIG_TARGET_CM_BF537E=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index da7b367..244b877 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -4,3 +4,4 @@ CONFIG_TEGRA20=y
CONFIG_TARGET_COLIBRI_T20=y
CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index 74d0717..86b6a00 100644
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -4,3 +4,4 @@ CONFIG_TEGRA30=y
CONFIG_TARGET_COLIBRI_T30=y
CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
index 580185d..b927dbc 100644
--- a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_CONTROLCENTERD=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD,DEVELOP"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/controlcenterd_36BIT_SDCARD_defconfig b/configs/controlcenterd_36BIT_SDCARD_defconfig
index 3671b86..d825f8d 100644
--- a/configs/controlcenterd_36BIT_SDCARD_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
CONFIG_TARGET_CONTROLCENTERD=y
CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/devconcenter_defconfig b/configs/devconcenter_defconfig
index 793481a..a0fa1e0 100644
--- a/configs/devconcenter_defconfig
+++ b/configs/devconcenter_defconfig
@@ -3,3 +3,4 @@ CONFIG_4xx=y
CONFIG_TARGET_INTIP=y
CONFIG_SYS_EXTRA_OPTIONS="DEVCONCENTER"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/dlvision-10g_defconfig b/configs/dlvision-10g_defconfig
index 4b8972e..0bbeab0 100644
--- a/configs/dlvision-10g_defconfig
+++ b/configs/dlvision-10g_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_DLVISION_10G=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/dlvision_defconfig b/configs/dlvision_defconfig
index f2209d7..e3ec34b 100644
--- a/configs/dlvision_defconfig
+++ b/configs/dlvision_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_DLVISION=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/dnp5370_defconfig b/configs/dnp5370_defconfig
index f2f07e1..510125a 100644
--- a/configs/dnp5370_defconfig
+++ b/configs/dnp5370_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_DNP5370=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/ebony_defconfig b/configs/ebony_defconfig
index 5e9a92f..89c47b2 100644
--- a/configs/ebony_defconfig
+++ b/configs/ebony_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_EBONY=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index 9c1b5fb..6625c9c 100644
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFS=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/forfun_q88db_defconfig b/configs/forfun_q88db_defconfig
index 06778ab..ba54026 100644
--- a/configs/forfun_q88db_defconfig
+++ b/configs/forfun_q88db_defconfig
@@ -14,3 +14,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-forfun-q88db"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/gdppc440etx_defconfig b/configs/gdppc440etx_defconfig
index c0be4d8..fec6158 100644
--- a/configs/gdppc440etx_defconfig
+++ b/configs/gdppc440etx_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_GDPPC440ETX=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/glacier_defconfig b/configs/glacier_defconfig
index 893be85..9d4fab8 100644
--- a/configs/glacier_defconfig
+++ b/configs/glacier_defconfig
@@ -4,5 +4,6 @@ CONFIG_TARGET_CANYONLANDS=y
CONFIG_GLACIER=y
CONFIG_DEFAULT_DEVICE_TREE="glacier"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
diff --git a/configs/glacier_ramboot_defconfig b/configs/glacier_ramboot_defconfig
index 63ac7c6..ee7f12e 100644
--- a/configs/glacier_ramboot_defconfig
+++ b/configs/glacier_ramboot_defconfig
@@ -5,5 +5,6 @@ CONFIG_GLACIER=y
CONFIG_DEFAULT_DEVICE_TREE="glacier"
CONFIG_SYS_EXTRA_OPTIONS="SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/canyonlands/u-boot-ram.lds"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
index 7de8c35..128fa09 100644
--- a/configs/gwventana_defconfig
+++ b/configs/gwventana_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
CONFIG_ENV_IS_IN_NAND=y
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFS=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/haleakala_defconfig b/configs/haleakala_defconfig
index 9845b0a..031f00f 100644
--- a/configs/haleakala_defconfig
+++ b/configs/haleakala_defconfig
@@ -3,3 +3,4 @@ CONFIG_4xx=y
CONFIG_TARGET_KILAUEA=y
CONFIG_SYS_EXTRA_OPTIONS="HALEAKALA"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/hummingboard_solo_defconfig b/configs/hummingboard_solo_defconfig
index c367bd8..34535e0 100644
--- a/configs/hummingboard_solo_defconfig
+++ b/configs/hummingboard_solo_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_HUMMINGBOARD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/solidrun/hummingboard/solo.cfg,MX6S,DDR_MB=512"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
index 8192928..8d4e03c 100644
--- a/configs/i12-tvbox_defconfig
+++ b/configs/i12-tvbox_defconfig
@@ -6,4 +6,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-i12-tvbox"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/iNet_3F_defconfig b/configs/iNet_3F_defconfig
index 1de0b2c..7ccb57b 100644
--- a/configs/iNet_3F_defconfig
+++ b/configs/iNet_3F_defconfig
@@ -16,3 +16,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3f"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/iNet_3W_defconfig b/configs/iNet_3W_defconfig
index 4151a86..142c85b 100644
--- a/configs/iNet_3W_defconfig
+++ b/configs/iNet_3W_defconfig
@@ -16,3 +16,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3w"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/iNet_86VS_defconfig b/configs/iNet_86VS_defconfig
index 559e964..02b1fd0 100644
--- a/configs/iNet_86VS_defconfig
+++ b/configs/iNet_86VS_defconfig
@@ -14,3 +14,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-inet-86vs"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/icon_defconfig b/configs/icon_defconfig
index 67125b4..c620ab0 100644
--- a/configs/icon_defconfig
+++ b/configs/icon_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_ICON=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/intip_defconfig b/configs/intip_defconfig
index 663948f..03d6823 100644
--- a/configs/intip_defconfig
+++ b/configs/intip_defconfig
@@ -3,4 +3,5 @@ CONFIG_4xx=y
CONFIG_TARGET_INTIP=y
CONFIG_SYS_EXTRA_OPTIONS="INTIB"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/io64_defconfig b/configs/io64_defconfig
index c2a7238..b016577 100644
--- a/configs/io64_defconfig
+++ b/configs/io64_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_IO64=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/io_defconfig b/configs/io_defconfig
index 98d9529..d0ffb87 100644
--- a/configs/io_defconfig
+++ b/configs/io_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_IO=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/iocon_defconfig b/configs/iocon_defconfig
index 799ebd7..efd5373 100644
--- a/configs/iocon_defconfig
+++ b/configs/iocon_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_IOCON=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/ip04_defconfig b/configs/ip04_defconfig
index ba737ae..5ea6fca 100644
--- a/configs/ip04_defconfig
+++ b/configs/ip04_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_IP04=y
+CONFIG_CMD_SETEXPR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/jesurun_q5_defconfig b/configs/jesurun_q5_defconfig
index 5104a39..3f2d453 100644
--- a/configs/jesurun_q5_defconfig
+++ b/configs/jesurun_q5_defconfig
@@ -6,3 +6,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-jesurun-q5"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI,MACPWR=SUNXI_GPH(19)"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/katmai_defconfig b/configs/katmai_defconfig
index 554369a..da6d931 100644
--- a/configs/katmai_defconfig
+++ b/configs/katmai_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_KATMAI=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/kilauea_defconfig b/configs/kilauea_defconfig
index b0d086d..002e0a9 100644
--- a/configs/kilauea_defconfig
+++ b/configs/kilauea_defconfig
@@ -3,4 +3,5 @@ CONFIG_4xx=y
CONFIG_TARGET_KILAUEA=y
CONFIG_SYS_EXTRA_OPTIONS="KILAUEA"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index cce2b90..3defd5b 100644
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16"
CONFIG_ENV_IS_IN_EEPROM=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index 0693ae7..6974275 100644
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD"
CONFIG_ENV_IS_IN_EEPROM=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index cc6763f..187cead 100644
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI"
CONFIG_ENV_IS_IN_EEPROM=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig
index f1b18e63..5a85b7d 100644
--- a/configs/kmcoge4_defconfig
+++ b/configs/kmcoge4_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KMP204X=y
CONFIG_SYS_EXTRA_OPTIONS="KMCOGE4"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index 2c1e0a8..54c36e2 100644
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM8360=y
CONFIG_SYS_EXTRA_OPTIONS="KMCOGE5NE"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index 316671f..cf8fffd 100644
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig
index 87b9653..15b633e 100644
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM8360=y
CONFIG_SYS_EXTRA_OPTIONS="KMETER1"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig
index 3ec83d3..ef0914e 100644
--- a/configs/kmlion1_defconfig
+++ b/configs/kmlion1_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KMP204X=y
CONFIG_SYS_EXTRA_OPTIONS="KMLION1"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index 35bfcbf..2ef2ffc 100644
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig
index 0c9d7c0..0bb92b3 100644
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_TUXX1=y
CONFIG_SYS_EXTRA_OPTIONS="KMOPTI2"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig
index 3ae4d96..b56b6e2 100644
--- a/configs/kmsugp1_defconfig
+++ b/configs/kmsugp1_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_SUGP1"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig
index f8b4df9..3140fe0 100644
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_TUXX1=y
CONFIG_SYS_EXTRA_OPTIONS="KMSUPX5"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig
index 0fc2ce2..58d756f 100644
--- a/configs/kmsuv31_defconfig
+++ b/configs/kmsuv31_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_SUV31"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig
index ecd663b..90fff2a 100644
--- a/configs/kmvect1_defconfig
+++ b/configs/kmvect1_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_SUVD3=y
CONFIG_SYS_EXTRA_OPTIONS="KMVECT1"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/luan_defconfig b/configs/luan_defconfig
index e6031dd..d1b73b8 100644
--- a/configs/luan_defconfig
+++ b/configs/luan_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_LUAN=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig
index 7e387ae..80f4465 100644
--- a/configs/m28evk_defconfig
+++ b/configs/m28evk_defconfig
@@ -4,4 +4,5 @@ CONFIG_SPL=y
CONFIG_ENV_IS_IN_NAND=y
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFS=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/m53evk_defconfig b/configs/m53evk_defconfig
index 07db5a3..e9ed55a 100644
--- a/configs/m53evk_defconfig
+++ b/configs/m53evk_defconfig
@@ -5,4 +5,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/denx/m53evk/imximage.cfg"
CONFIG_ENV_IS_IN_NAND=y
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFS=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/makalu_defconfig b/configs/makalu_defconfig
index 6ac3cee..33983a2 100644
--- a/configs/makalu_defconfig
+++ b/configs/makalu_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_MAKALU=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig
index 1136909..499903c 100644
--- a/configs/marsboard_defconfig
+++ b/configs/marsboard_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_EMBESTMX6BOARDS=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,ENV_IS_IN_SPI_FLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/mgcoge3ne_defconfig b/configs/mgcoge3ne_defconfig
index 86323ba..870ecd4 100644
--- a/configs/mgcoge3ne_defconfig
+++ b/configs/mgcoge3ne_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM82XX=y
CONFIG_SYS_EXTRA_OPTIONS="MGCOGE3NE"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig
index 535d01a..f461408 100644
--- a/configs/mgcoge3un_defconfig
+++ b/configs/mgcoge3un_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN"
CONFIG_ENV_IS_IN_EEPROM=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/mgcoge_defconfig b/configs/mgcoge_defconfig
index f2e187b..de9d47a 100644
--- a/configs/mgcoge_defconfig
+++ b/configs/mgcoge_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM82XX=y
CONFIG_SYS_EXTRA_OPTIONS="MGCOGE"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/mixtile_loftq_defconfig b/configs/mixtile_loftq_defconfig
index 3e86418..d79f37f 100644
--- a/configs/mixtile_loftq_defconfig
+++ b/configs/mixtile_loftq_defconfig
@@ -9,5 +9,6 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-mixtile-loftq"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP221_ALDO1_VOLT=3300
diff --git a/configs/mk802_a10s_defconfig b/configs/mk802_a10s_defconfig
index d173705..57d068f 100644
--- a/configs/mk802_a10s_defconfig
+++ b/configs/mk802_a10s_defconfig
@@ -8,3 +8,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-mk802"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/mk802_defconfig b/configs/mk802_defconfig
index e788ff3..64acc08 100644
--- a/configs/mk802_defconfig
+++ b/configs/mk802_defconfig
@@ -6,3 +6,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mk802"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/mk802ii_defconfig b/configs/mk802ii_defconfig
index e389008..59ce434 100644
--- a/configs/mk802ii_defconfig
+++ b/configs/mk802ii_defconfig
@@ -5,3 +5,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mk802ii"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/mpr2_defconfig b/configs/mpr2_defconfig
index c8be987..2883270 100644
--- a/configs/mpr2_defconfig
+++ b/configs/mpr2_defconfig
@@ -1,2 +1,3 @@
CONFIG_SH=y
CONFIG_TARGET_MPR2=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig
index d0bca2a..6f4b1a6 100644
--- a/configs/mx28evk_auart_console_defconfig
+++ b/configs/mx28evk_auart_console_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE,ENV_IS_IN_M
CONFIG_ENV_IS_IN_MMC=y
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFS=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig
index 1f2e3c4..b6cb316 100644
--- a/configs/mx28evk_defconfig
+++ b/configs/mx28evk_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFS=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig
index cba3d1d..d77ca26 100644
--- a/configs/mx28evk_nand_defconfig
+++ b/configs/mx28evk_nand_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_NAND"
CONFIG_ENV_IS_IN_NAND=y
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFS=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig
index a22c57f..26aeaae 100644
--- a/configs/mx28evk_spi_defconfig
+++ b/configs/mx28evk_spi_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_SPI_FLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFS=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/mx53ard_defconfig b/configs/mx53ard_defconfig
index fde7ad8..778c06b 100644
--- a/configs/mx53ard_defconfig
+++ b/configs/mx53ard_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_MX53ARD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53ard/imximage_dd3.cfg"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig
index 3792b2f..1b985e3 100644
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@ -3,5 +3,6 @@ CONFIG_TARGET_MX6CUBOXI=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_DM=y
CONFIG_DM_THERMAL=y
diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
index 3c07681..91e7779 100644
--- a/configs/mx6dlsabreauto_defconfig
+++ b/configs/mx6dlsabreauto_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_MX6QSABREAUTO=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig
index 50f7a8e..52e5ac2 100644
--- a/configs/mx6dlsabresd_defconfig
+++ b/configs/mx6dlsabresd_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_MX6SABRESD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg,MX6DL"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
index 637c658..498f710 100644
--- a/configs/mx6qsabreauto_defconfig
+++ b/configs/mx6qsabreauto_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_MX6QSABREAUTO=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index 89a1849..8b3828c 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -2,5 +2,6 @@ CONFIG_ARM=y
CONFIG_TARGET_NITROGEN6X=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_DM=y
CONFIG_DM_THERMAL=y
diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig
index b6d4092..089311e 100644
--- a/configs/mx6qsabresd_defconfig
+++ b/configs/mx6qsabresd_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_MX6SABRESD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig
index 36e4564..7856d98 100644
--- a/configs/mx6sabresd_spl_defconfig
+++ b/configs/mx6sabresd_spl_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_MX6SABRESD=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/neo_defconfig b/configs/neo_defconfig
index 2c48c08..16ee49a 100644
--- a/configs/neo_defconfig
+++ b/configs/neo_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_NEO=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index 0f55978..88653c5 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_NITROGEN6X=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 8e2872a..34c1987 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_NITROGEN6X=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index 2a5bfd2..5022b1f 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_NITROGEN6X=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index 899475e..fa67c7c 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_NITROGEN6X=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index dc691da..0aa9994 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_NITROGEN6X=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index 2a5533c..852c737 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_NITROGEN6X=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index c295c4d..165f334 100644
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_KOSAGI_NOVENA=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/ocotea_defconfig b/configs/ocotea_defconfig
index f68aaf9..6f39b1f 100644
--- a/configs/ocotea_defconfig
+++ b/configs/ocotea_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_OCOTEA=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index 59eee47..06d93e3 100644
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_ODROID=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_OF_CONTROL=y
CONFIG_DM_I2C=y
CONFIG_DM_I2C_COMPAT=y
diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
index 186228c..ec9f4a3 100644
--- a/configs/omap3_beagle_defconfig
+++ b/configs/omap3_beagle_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_OMAP3_BEAGLE=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="NAND"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index f1b9bb1..b545994 100644
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_LOGIC=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/origen_defconfig b/configs/origen_defconfig
index 29420f8..c728880 100644
--- a/configs/origen_defconfig
+++ b/configs/origen_defconfig
@@ -4,4 +4,5 @@ CONFIG_TARGET_ORIGEN=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen"
CONFIG_SPL=y
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_OF_CONTROL=y
diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig
index c4c204b..18a9f2e 100644
--- a/configs/ot1200_defconfig
+++ b/configs/ot1200_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_OT1200=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx6q_4x_mt41j128.cfg,MX6Q"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig
index 37f88ca..3973260 100644
--- a/configs/ot1200_spl_defconfig
+++ b/configs/ot1200_spl_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_OT1200=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig
index b0305e8..425476e 100644
--- a/configs/portl2_defconfig
+++ b/configs/portl2_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
CONFIG_SYS_EXTRA_OPTIONS="KM_PORTL2"
CONFIG_ENV_IS_IN_EEPROM=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/pr1_defconfig b/configs/pr1_defconfig
index 793a4e8..8c4c21e 100644
--- a/configs/pr1_defconfig
+++ b/configs/pr1_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_PR1=y
+CONFIG_CMD_SETEXPR=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/qemu-ppce500_defconfig b/configs/qemu-ppce500_defconfig
index 2b8f707..7c9d282 100644
--- a/configs/qemu-ppce500_defconfig
+++ b/configs/qemu-ppce500_defconfig
@@ -1,3 +1,4 @@
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_QEMU_PPCE500=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/qong_defconfig b/configs/qong_defconfig
index 4efcd59..18b52d4 100644
--- a/configs/qong_defconfig
+++ b/configs/qong_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_QONG=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFS=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig
index 121a6c4..454f448 100644
--- a/configs/r7-tv-dongle_defconfig
+++ b/configs/r7-tv-dongle_defconfig
@@ -7,3 +7,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-r7-tv-dongle"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/rainier_defconfig b/configs/rainier_defconfig
index 2d74709..25016d8 100644
--- a/configs/rainier_defconfig
+++ b/configs/rainier_defconfig
@@ -3,3 +3,4 @@ CONFIG_4xx=y
CONFIG_TARGET_SEQUOIA=y
CONFIG_SYS_EXTRA_OPTIONS="RAINIER"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/rainier_ramboot_defconfig b/configs/rainier_ramboot_defconfig
index ba22d9d..75a2a2c 100644
--- a/configs/rainier_ramboot_defconfig
+++ b/configs/rainier_ramboot_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_SEQUOIA=y
CONFIG_SYS_EXTRA_OPTIONS="RAINIER,SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/sequoia/u-boot-ram.lds"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/redwood_defconfig b/configs/redwood_defconfig
index f55e154..b14a439 100644
--- a/configs/redwood_defconfig
+++ b/configs/redwood_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_REDWOOD=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index e611ea9..f72d003 100644
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_EMBESTMX6BOARDS=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024,ENV_IS_IN_MMC"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
index 2956857..fdcdf05 100644
--- a/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@ -3,4 +3,5 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_S5PC210_UNIVERSAL=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_OF_CONTROL=y
diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig
index 27b39b6..783e5ae 100644
--- a/configs/sama5d3_xplained_mmc_defconfig
+++ b/configs/sama5d3_xplained_mmc_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC"
CONFIG_ENV_IS_IN_FAT=y
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFS=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig
index 13edd67..1ff49fa 100644
--- a/configs/sama5d3_xplained_nandflash_defconfig
+++ b/configs/sama5d3_xplained_nandflash_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH"
CONFIG_ENV_IS_IN_NAND=y
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFS=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig
index fef864f..0f6c1cc 100644
--- a/configs/sama5d3xek_mmc_defconfig
+++ b/configs/sama5d3xek_mmc_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_SAMA5D3XEK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC"
CONFIG_ENV_IS_IN_FAT=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig
index 3fd7cc7..b112dcb 100644
--- a/configs/sama5d3xek_nandflash_defconfig
+++ b/configs/sama5d3xek_nandflash_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_SAMA5D3XEK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig
index 70c1b58..4e77338 100644
--- a/configs/sama5d3xek_spiflash_defconfig
+++ b/configs/sama5d3xek_spiflash_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_SAMA5D3XEK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_SERIALFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig
index 5dc809b..2664a88 100644
--- a/configs/sama5d4_xplained_mmc_defconfig
+++ b/configs/sama5d4_xplained_mmc_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_SAMA5D4_XPLAINED=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
CONFIG_ENV_IS_IN_FAT=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig
index 5d57bf5..0a13978 100644
--- a/configs/sama5d4_xplained_nandflash_defconfig
+++ b/configs/sama5d4_xplained_nandflash_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_SAMA5D4_XPLAINED=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig
index 6d47d7d..17ca071 100644
--- a/configs/sama5d4_xplained_spiflash_defconfig
+++ b/configs/sama5d4_xplained_spiflash_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_SAMA5D4_XPLAINED=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig
index 150efb7..30b0098 100644
--- a/configs/sama5d4ek_mmc_defconfig
+++ b/configs/sama5d4ek_mmc_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_SAMA5D4EK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
CONFIG_ENV_IS_IN_FAT=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig
index a6b110b..422b013 100644
--- a/configs/sama5d4ek_nandflash_defconfig
+++ b/configs/sama5d4ek_nandflash_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_SAMA5D4EK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig
index fc4c643..b38f9f9 100644
--- a/configs/sama5d4ek_spiflash_defconfig
+++ b/configs/sama5d4ek_spiflash_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_SAMA5D4EK=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/sc_sps_1_defconfig b/configs/sc_sps_1_defconfig
index f14509d..9e81da5 100644
--- a/configs/sc_sps_1_defconfig
+++ b/configs/sc_sps_1_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_SC_SPS_1=y
CONFIG_SPL=y
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/secomx6quq7_defconfig b/configs/secomx6quq7_defconfig
index f584029..3f57740 100644
--- a/configs/secomx6quq7_defconfig
+++ b/configs/secomx6quq7_defconfig
@@ -6,3 +6,4 @@ CONFIG_SECOMX6Q=y
CONFIG_SECOMX6_2GB=y
CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/sequoia_defconfig b/configs/sequoia_defconfig
index 7b2691e..9643ca0 100644
--- a/configs/sequoia_defconfig
+++ b/configs/sequoia_defconfig
@@ -3,4 +3,5 @@ CONFIG_4xx=y
CONFIG_TARGET_SEQUOIA=y
CONFIG_SYS_EXTRA_OPTIONS="SEQUOIA"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/sequoia_ramboot_defconfig b/configs/sequoia_ramboot_defconfig
index 5b2c6f4..20aaabf 100644
--- a/configs/sequoia_ramboot_defconfig
+++ b/configs/sequoia_ramboot_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_SEQUOIA=y
CONFIG_SYS_EXTRA_OPTIONS="SEQUOIA,SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/sequoia/u-boot-ram.lds"
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig
index 15d2f61..7a93476 100644
--- a/configs/smdkv310_defconfig
+++ b/configs/smdkv310_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_SMDKV310=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4210-smdkv310"
CONFIG_SPL=y
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig
index f682492..06cedaf 100644
--- a/configs/socfpga_arria5_defconfig
+++ b/configs/socfpga_arria5_defconfig
@@ -3,5 +3,6 @@ CONFIG_ARCH_SOCFPGA=y
CONFIG_TARGET_SOCFPGA_ARRIA5=y
CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
CONFIG_SPL=y
+CONFIG_CMD_SETEXPR=y
CONFIG_OF_CONTROL=y
CONFIG_REGEX=y
diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig
index 256952e..a16107d 100644
--- a/configs/socfpga_cyclone5_defconfig
+++ b/configs/socfpga_cyclone5_defconfig
@@ -5,6 +5,7 @@ CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
CONFIG_SPL=y
+CONFIG_CMD_SETEXPR=y
CONFIG_OF_CONTROL=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_REGEX=y
diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig
index 8b3cccc..4d7b5ee 100644
--- a/configs/socfpga_socrates_defconfig
+++ b/configs/socfpga_socrates_defconfig
@@ -5,5 +5,6 @@ CONFIG_NET=y
CONFIG_NETDEVICES=y
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
CONFIG_SPL=y
+CONFIG_CMD_SETEXPR=y
CONFIG_OF_CONTROL=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/sunxi_Gemei_G9_defconfig b/configs/sunxi_Gemei_G9_defconfig
index 9c192c6..4573091 100644
--- a/configs/sunxi_Gemei_G9_defconfig
+++ b/configs/sunxi_Gemei_G9_defconfig
@@ -12,3 +12,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-gemei-g9"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig
index fe80714..34c0d25 100644
--- a/configs/suvd3_defconfig
+++ b/configs/suvd3_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_SUVD3=y
CONFIG_SYS_EXTRA_OPTIONS="SUVD3"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/sycamore_defconfig b/configs/sycamore_defconfig
index d433062..6684a48 100644
--- a/configs/sycamore_defconfig
+++ b/configs/sycamore_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_WALNUT=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/t3corp_defconfig b/configs/t3corp_defconfig
index 5c39e5f..314f512 100644
--- a/configs/t3corp_defconfig
+++ b/configs/t3corp_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_T3CORP=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/taihu_defconfig b/configs/taihu_defconfig
index 8de2398..2af602e 100644
--- a/configs/taihu_defconfig
+++ b/configs/taihu_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_TAIHU=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/taishan_defconfig b/configs/taishan_defconfig
index 4bad47a..0ef14fb 100644
--- a/configs/taishan_defconfig
+++ b/configs/taishan_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_TAISHAN=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index e23c87b..a7d7570 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_TBS2910=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig
index 8b8f8b8..68ae43c 100644
--- a/configs/tqma6q_mba6_mmc_defconfig
+++ b/configs/tqma6q_mba6_mmc_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_TQMA6=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_MMC_BOOT"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig
index c035551..66858ef 100644
--- a/configs/tqma6q_mba6_spi_defconfig
+++ b/configs/tqma6q_mba6_spi_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_TQMA6=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_SPI_BOOT"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig
index 851d7f6..ee057e8 100644
--- a/configs/tqma6s_mba6_mmc_defconfig
+++ b/configs/tqma6s_mba6_mmc_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_TQMA6=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_MMC_BOOT"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig
index c0c0222..12c2b60 100644
--- a/configs/tqma6s_mba6_spi_defconfig
+++ b/configs/tqma6s_mba6_spi_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_TQMA6=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_SPI_BOOT"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index 336a2ed..bf4092c 100644
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -4,4 +4,5 @@ CONFIG_TARGET_TRATS2=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_OF_CONTROL=y
diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index 0eff975..18d632c 100644
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -3,4 +3,5 @@ CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_TRATS=y
CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
CONFIG_OF_CONTROL=y
diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index 734581c..d83bf67 100644
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_TUXX1=y
CONFIG_SYS_EXTRA_OPTIONS="TUGE1"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig
index 2a07e51..88f1b1e 100644
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_TUXX1=y
CONFIG_SYS_EXTRA_OPTIONS="TUXX1"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_CMD_UBI=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/udoo_quad_defconfig b/configs/udoo_quad_defconfig
index 7dc03af..675e31c 100644
--- a/configs/udoo_quad_defconfig
+++ b/configs/udoo_quad_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_UDOO=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/udoo/udoo.cfg,MX6Q,DDR_MB=1024"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/walnut_defconfig b/configs/walnut_defconfig
index 016955a..d8abac6 100644
--- a/configs/walnut_defconfig
+++ b/configs/walnut_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_WALNUT=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/wandboard_dl_defconfig b/configs/wandboard_dl_defconfig
index b711d3e..1098301 100644
--- a/configs/wandboard_dl_defconfig
+++ b/configs/wandboard_dl_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_WANDBOARD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/wandboard_quad_defconfig b/configs/wandboard_quad_defconfig
index 41660d3..c6c111d 100644
--- a/configs/wandboard_quad_defconfig
+++ b/configs/wandboard_quad_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_WANDBOARD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/wandboard_solo_defconfig b/configs/wandboard_solo_defconfig
index 888ea12..d8d82dd 100644
--- a/configs/wandboard_solo_defconfig
+++ b/configs/wandboard_solo_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_TARGET_WANDBOARD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/yellowstone_defconfig b/configs/yellowstone_defconfig
index 576111a..f21b13f 100644
--- a/configs/yellowstone_defconfig
+++ b/configs/yellowstone_defconfig
@@ -3,3 +3,4 @@ CONFIG_4xx=y
CONFIG_TARGET_YOSEMITE=y
CONFIG_SYS_EXTRA_OPTIONS="YELLOWSTONE"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
diff --git a/configs/yosemite_defconfig b/configs/yosemite_defconfig
index 867f474..6cba57b 100644
--- a/configs/yosemite_defconfig
+++ b/configs/yosemite_defconfig
@@ -3,4 +3,5 @@ CONFIG_4xx=y
CONFIG_TARGET_YOSEMITE=y
CONFIG_SYS_EXTRA_OPTIONS="YOSEMITE"
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/configs/yucca_defconfig b/configs/yucca_defconfig
index 47e538e..7c8e8a3 100644
--- a/configs/yucca_defconfig
+++ b/configs/yucca_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_YUCCA=y
CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_CMD_SETEXPR=y
CONFIG_REGEX=y
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index 6d9f839..a58d36a 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -83,7 +83,6 @@
#define CONFIG_CMD_SAVES /* save S record dump */
#define CONFIG_CMD_SCSI /* SCSI Support */
#define CONFIG_CMD_SDRAM /* SDRAM DIMM SPD info printout */
-#define CONFIG_CMD_SETEXPR /* setexpr support */
#define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */
#define CONFIG_CMD_SNTP /* SNTP support */
#define CONFIG_CMD_SOURCE /* "source" command support */
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index b2108f4..f683a06 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -764,7 +764,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
#define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_SETEXPR
#ifdef CONFIG_PCI
#define CONFIG_CMD_PCI
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index e80a921..e7d5b6d 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -350,7 +350,6 @@ extern unsigned long get_sdram_size(void);
#define CONFIG_DOS_PARTITION
#define CONFIG_CMD_PING
#define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_SETEXPR
/*
* Miscellaneous configurable options
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 2bdbaf0..e7d1bba 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -587,7 +587,6 @@ combinations. this should be removed later
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI)
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index cc99253..3f42386 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -502,7 +502,6 @@
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
/* Hash command with SHA acceleration supported in hardware */
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 629f2f8..73ad070 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -640,7 +640,6 @@
#define CONFIG_CMD_MII
#define CONFIG_CMD_ELF
#define CONFIG_CMD_IRQ
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI)
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 7b1b3a2..af39671 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -352,7 +352,6 @@
#define CONFIG_CMD_I2C
#define CONFIG_CMD_ELF
#define CONFIG_CMD_IRQ
-#define CONFIG_CMD_SETEXPR
#if defined(CONFIG_PCI)
#define CONFIG_CMD_PCI
diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index 84efcb3..e08665d 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -372,7 +372,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_CMD_MII
#define CONFIG_CMD_ELF
#define CONFIG_CMD_IRQ
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI)
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 41ee5ec..68d2e43 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -388,7 +388,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_CMD_MII
#define CONFIG_CMD_ELF
#define CONFIG_CMD_IRQ
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI)
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index f3d5234..15489b4 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -497,7 +497,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_CMD_MII
#define CONFIG_CMD_ELF
#define CONFIG_CMD_IRQ
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI)
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index d83b0fa..50817ff 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -370,7 +370,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_CMD_MII
#define CONFIG_CMD_ELF
#define CONFIG_CMD_IRQ
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI)
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 26f8789..98ec9ed4 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -388,7 +388,6 @@
#define CONFIG_CMD_I2C
#define CONFIG_CMD_ELF
#define CONFIG_CMD_IRQ
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI)
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index fbc4ca0..f6834e6 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -392,7 +392,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_CMD_MII
#define CONFIG_CMD_ELF
#define CONFIG_CMD_IRQ
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI)
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 526cba9..baabdc8 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -483,7 +483,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_CMD_MII
#define CONFIG_CMD_ELF
#define CONFIG_CMD_IRQ
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI)
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 7b70860..caa4b06 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -600,7 +600,6 @@
#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII
#define CONFIG_CMD_ELF
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI)
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index a6c840c..1a75f75 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -817,7 +817,6 @@ extern unsigned long get_sdram_size(void);
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#undef CONFIG_WATCHDOG /* watchdog disabled */
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 0e5a82a..2b35462 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -683,7 +683,6 @@
#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#ifdef CONFIG_PCI
diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index 8740db7..e1f38ce 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -275,7 +275,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_PING
#define CONFIG_CMD_MII
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI)
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index cdbd4dd..3a7f39b 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -623,7 +623,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
#ifdef CONFIG_PCI
#define CONFIG_CMD_PCI
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index d476231..f9f016e 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -857,7 +857,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
#define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_SETEXPR
#ifdef CONFIG_PCI
#define CONFIG_CMD_PCI
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 117c592..5fa5247 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -863,7 +863,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_CMD_PING
#define CONFIG_CMD_ECHO
#define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_BDI
#ifdef CONFIG_PCI
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 7f3dc2b..ef44cfd 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -731,7 +731,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
#define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_SETEXPR
#ifdef CONFIG_PCI
#define CONFIG_CMD_PCI
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 01f9f7b..c25a9f6 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -756,7 +756,6 @@
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
#define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_SETEXPR
#ifdef CONFIG_PCI
#define CONFIG_CMD_PCI
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index ad5168a..2aec4ed 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -799,7 +799,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#define CONFIG_CMD_BDI
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index e91ca69..748c4c9 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -754,7 +754,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_CMD_I2C
#define CONFIG_CMD_PING
#define CONFIG_CMD_ECHO
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#define CONFIG_CMD_BDI
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 080327f..c5b5fad 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -329,7 +329,6 @@
#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
#ifdef CONFIG_PCI
#define CONFIG_CMD_PCI
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 753734b..163057e 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -500,7 +500,6 @@
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#define CONFIG_CMD_ERRATA
#define CONFIG_CMD_CRAMFS
diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index 9e7f37d..617ee77 100644
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -71,7 +71,6 @@
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
#define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_SETEXPR
/*
* Miscellaneous configurable options
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 3179f09..1c9d97e 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -60,7 +60,6 @@
#define CONFIG_CMD_DHCP
/* Miscellaneous commands */
-#define CONFIG_CMD_SETEXPR
#define CONFIG_FAT_WRITE
/* Increase console I/O buffer size */
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index 10f1916..b6015a2 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -86,7 +86,6 @@
#define CONFIG_CMD_NAND_TRIMFFS
#define CONFIG_CMD_NFS /* NFS support */
#define CONFIG_CMD_PING /* ping support */
-#define CONFIG_CMD_SETEXPR /* setexpr support */
/*
* Memory configurations
diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index a1789c7..b75866e 100644
--- a/include/configs/aristainetos.h
+++ b/include/configs/aristainetos.h
@@ -91,7 +91,6 @@
#define CONFIG_CMD_BMODE
#define CONFIG_CMD_BOOTZ
-#define CONFIG_CMD_SETEXPR
#undef CONFIG_CMD_IMLS
#define CONFIG_BOOTDELAY 3
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index dedb785..931f673 100644
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -54,7 +54,6 @@
#undef CONFIG_CMD_LOADS
#define CONFIG_CMD_PING
#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_SETEXPR
#ifdef CONFIG_SYS_USE_MMC
#define CONFIG_BOOTARGS \
diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h
index 6467239..c5d73c3 100644
--- a/include/configs/bg0900.h
+++ b/include/configs/bg0900.h
@@ -26,7 +26,6 @@
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
#define CONFIG_CMD_SAVEENV
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_SF
#define CONFIG_CMD_SPI
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index a6a285f..f81548e 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -59,7 +59,6 @@
#define CONFIG_CMD_CACHE
/* Miscellaneous commands */
-#define CONFIG_CMD_SETEXPR
#define CONFIG_FAT_WRITE
/* Increase console I/O buffer size */
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 353c0cf..d5d8493 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -53,7 +53,6 @@
#define CONFIG_CMD_DHCP
/* Miscellaneous commands */
-#define CONFIG_CMD_SETEXPR
#define CONFIG_FAT_WRITE
/* Increase console I/O buffer size */
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index eece98b..41323ad 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -404,7 +404,6 @@
#define CONFIG_CMD_MII
#define CONFIG_CMD_NET
#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
/*
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index a2eab2d..01fc332 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -624,7 +624,6 @@
#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
#ifdef CONFIG_PCI
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index e9f5bed..78166bc 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -111,7 +111,6 @@
#undef CONFIG_CMD_FPGA
#define CONFIG_CMD_BMODE
-#define CONFIG_CMD_SETEXPR
#undef CONFIG_CMD_IMLS
#define CONFIG_LOADADDR 0x12000000
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 9026913..7a1028f 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -128,7 +128,6 @@
#define CONFIG_CMD_RARP
#define CONFIG_CMD_REISER
#define CONFIG_CMD_SAVES
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_SF
#define CONFIG_CMD_SNTP
#define CONFIG_CMD_UNZIP
diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index 577afe7..702058f 100644
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -32,7 +32,6 @@
#define CONFIG_CMD_DFU
#define CONFIG_CMD_GPT
#define CONFIG_CMD_PMIC
-#define CONFIG_CMD_SETEXPR
/* USB Composite download gadget - g_dnl */
#define CONFIG_USBDOWNLOAD_GADGET
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index f278413..9a8a643 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -162,7 +162,6 @@
#define CONFIG_CMD_NET
#define CONFIG_CMD_BMODE /* set eFUSE shadow for a boot dev and reset */
#define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_BOOTZ
#define CONFIG_CMD_GSC
#define CONFIG_CMD_EECONFIG /* Gateworks EEPROM config cmd */
diff --git a/include/configs/hummingboard.h b/include/configs/hummingboard.h
index 4979e88..dbd1a04 100644
--- a/include/configs/hummingboard.h
+++ b/include/configs/hummingboard.h
@@ -50,7 +50,6 @@
#undef CONFIG_CMD_I2C
#define CONFIG_CMD_BMODE
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_MEMTEST
#define CONFIG_BOOTDELAY 3
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index ddf2f62..a098e7a 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -27,7 +27,6 @@
#define CONFIG_CMD_I2C
#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_CMD_SETEXPR
#undef CONFIG_WATCHDOG /* disable platform specific watchdog */
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 0dcb5a0..0104308 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -43,7 +43,6 @@
#define CONFIG_CMD_NET
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_SF
#define CONFIG_CMD_SPI
#define CONFIG_CMD_USB
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 70936f4..0c8955e 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -47,7 +47,6 @@
#define CONFIG_CMD_NET
#define CONFIG_CMD_PING
#define CONFIG_CMD_SATA
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_USB
#define CONFIG_VIDEO
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 956c4ef..4c950ae 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -32,7 +32,6 @@
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
#define CONFIG_CMD_SAVEENV
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_SF
#define CONFIG_CMD_SPI
#define CONFIG_CMD_USB
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index 63502cd..23564fd 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -79,7 +79,6 @@
#include <config_cmd_default.h>
#undef CONFIG_CMD_IMLS
-#define CONFIG_CMD_SETEXPR
#define CONFIG_BOOTDELAY 3
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index aa02ea7..1baa0ad 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -72,7 +72,6 @@
#include <config_cmd_default.h>
#define CONFIG_CMD_BOOTZ
-#define CONFIG_CMD_SETEXPR
#define CONFIG_BOOTDELAY 1
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 628704a..f5bf36a 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -93,7 +93,6 @@
#define CONFIG_CMD_BMODE
#define CONFIG_CMD_BOOTZ
-#define CONFIG_CMD_SETEXPR
#undef CONFIG_CMD_IMLS
#define CONFIG_BOOTDELAY 1
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index e20c246..b6cc922 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -132,7 +132,6 @@
/* Miscellaneous commands */
#define CONFIG_CMD_BMODE
-#define CONFIG_CMD_SETEXPR
/* Framebuffer and LCD */
#define CONFIG_VIDEO
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 3a20529..6b0be2d 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -49,7 +49,6 @@
#define CONFIG_CMD_PCI
#define CONFIG_CMD_PING
#define CONFIG_CMD_SATA
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_TIME
#define CONFIG_CMD_USB
#define CONFIG_VIDEO
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index efb3a9a..932f06d 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -109,7 +109,6 @@
#define CONFIG_USB_STORAGE /* USB storage support */
#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_LED /* LED support */
-#define CONFIG_CMD_SETEXPR /* Evaluate expressions */
#define CONFIG_CMD_GPIO /* Enable gpio command */
#define CONFIG_CMD_DHCP
diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
index c6d116f..011cdd7 100644
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -62,7 +62,6 @@
/* commands to include */
#include <config_cmd_default.h>
-#define CONFIG_CMD_SETEXPR /* Evaluate expressions */
#define CONFIG_CMD_NAND_LOCK_UNLOCK
/* Disable some commands */
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 7ab44ba..611b59d 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -109,7 +109,6 @@
#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */
#define CONFIG_CMD_PING
#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_SETEXPR /* Evaluate expressions */
#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
#undef CONFIG_CMD_FPGA /* FPGA configuration Support */
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 92e2ea3..9e3c865 100644
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -144,7 +144,6 @@
/* Miscellaneous commands */
#define CONFIG_CMD_BMODE
-#define CONFIG_CMD_SETEXPR
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index d7b60a0..70381c1 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -901,7 +901,6 @@
#define CONFIG_CMD_MII
#define CONFIG_CMD_DATE
#define CONFIG_CMD_ELF
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
/*
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index 0894b88..8a8d670 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -432,7 +432,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII
#define CONFIG_CMD_ELF
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_REGINFO
/*
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index d2ca043..b9ebd55 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -166,7 +166,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
#define CONFIG_CMD_GREPENV
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
#ifdef CONFIG_PCI
#define CONFIG_CMD_PCI
diff --git a/include/configs/qong.h b/include/configs/qong.h
index 05b37ba..3b43784 100644
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -121,7 +121,6 @@
#define CONFIG_CMD_NAND
#define CONFIG_CMD_NET
#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_SPI
#define CONFIG_CMD_UNZIP
diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h
index 2ff72f3..3a23115 100644
--- a/include/configs/sc_sps_1.h
+++ b/include/configs/sc_sps_1.h
@@ -30,7 +30,6 @@
#define CONFIG_CMD_NET
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_USB
/* Memory configuration */
diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h
index 46ffb7a..2a7e78b 100644
--- a/include/configs/secomx6quq7.h
+++ b/include/configs/secomx6quq7.h
@@ -44,7 +44,6 @@
#undef CONFIG_CMD_IMLS
#define CONFIG_CMD_BMODE
-#define CONFIG_CMD_SETEXPR
#define CONFIG_BOOTDELAY 3
diff --git a/include/configs/socfpga_arria5.h b/include/configs/socfpga_arria5.h
index b8e1c47..4f41547 100644
--- a/include/configs/socfpga_arria5.h
+++ b/include/configs/socfpga_arria5.h
@@ -33,7 +33,6 @@
#define CONFIG_CMD_MMC
#define CONFIG_CMD_NET
#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_USB
#define CONFIG_CMD_USB_MASS_STORAGE
diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h
index 1227711..26a3320 100644
--- a/include/configs/socfpga_cyclone5.h
+++ b/include/configs/socfpga_cyclone5.h
@@ -33,7 +33,6 @@
#define CONFIG_CMD_MMC
#define CONFIG_CMD_NET
#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_USB
#define CONFIG_CMD_USB_MASS_STORAGE
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 908bc64..aa0fa8f 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -93,7 +93,6 @@
#endif
#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_SETEXPR
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_CMDLINE_TAG
diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h
index 75609b9..9c142d6 100644
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -284,7 +284,6 @@
#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII
#define CONFIG_CMD_PING
-#define CONFIG_CMD_SETEXPR
#ifdef CONFIG_PCI
#define CONFIG_CMD_PCI
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index cecb29f..0bf3164 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -79,7 +79,6 @@
#undef CONFIG_CMD_IMLS
#define CONFIG_CMD_BMODE
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_MEMTEST
#define CONFIG_CMD_TIME
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 9443401..17dfcaa 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -150,7 +150,6 @@
#define CONFIG_CMD_BMODE
#define CONFIG_CMD_BOOTZ
#define CONFIG_CMD_ITEST
-#define CONFIG_CMD_SETEXPR
#undef CONFIG_CMD_IMLS
#define CONFIG_BOOTDELAY 3
diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index 8a4a9ec..7de4243 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -76,7 +76,6 @@
#undef CONFIG_CMD_IMLS
#define CONFIG_CMD_BMODE
-#define CONFIG_CMD_SETEXPR
#define CONFIG_BOOTDELAY 3
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index a3f6f95..2685335 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -49,7 +49,6 @@
#undef CONFIG_CMD_IMLS
#define CONFIG_CMD_BMODE
-#define CONFIG_CMD_SETEXPR
#define CONFIG_BOOTDELAY 5
--
1.7.11.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [RFC PATCH 1/8] Add env persist location to Kconfig
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 1/8] Add env persist location to Kconfig Joe Hershberger
@ 2015-05-14 4:43 ` Joe Hershberger
0 siblings, 0 replies; 10+ messages in thread
From: Joe Hershberger @ 2015-05-14 4:43 UTC (permalink / raw)
To: u-boot
On Wed, May 13, 2015 at 11:29 PM, Joe Hershberger
<joe.hershberger@ni.com> wrote:
> All of the ENV_IS_IN_* configs moved to Kconfig.
>
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
>
> ---
>
> common/Kconfig | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 85 insertions(+)
>
> diff --git a/common/Kconfig b/common/Kconfig
> index 15759f7..4397e69 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -1,3 +1,88 @@
> +menu "Environment"
> +
> +choice
> + prompt "Environment location"
> + default ENV_IS_NOWHERE
> + help
> + Select where the environment is persisted.
> +
> +config ENV_IS_IN_DATAFLASH
> + bool "Data Flash"
> + help
> + Select this if you have a DataFlash memory device which you
> + want to use for the environment.
> +
> +config ENV_IS_IN_EEPROM
> + bool "EEPROM"
> + help
> + Select this if you have an EEPROM or similar serial access
> + device and a driver for it.
> +
> +config ENV_IS_IN_FLASH
> + bool "Flash"
> + help
> + Select this if the environment is in flash memory.
> +
> +config ENV_IS_IN_MMC
> + bool "MMC"
> + help
> + Select this if you have an MMC device which you want to use
> + for the environment.
> +
> +config ENV_IS_IN_FAT
> + bool "FAT"
> + help
> + Select this if you want to use the FAT file system for the
> + environment.
> +
> +config ENV_IS_IN_NAND
> + bool "NAND"
> + help
> + Select this if you have a NAND device which you want to use
> + for the environment.
> +
> +config ENV_IS_IN_NVRAM
> + bool "NVRAM"
> + help
> + Select this if you have some non-volatile memory device
> + (NVRAM, battery buffered SRAM) which you want to use for the
> + environment.
> +
> +config ENV_IS_IN_ONENAND
> + bool "OneNAND"
> + help
> + Select this if you have a OneNAND device which you want to use
> + for the environment.
> +
> +config ENV_IS_IN_SPI_FLASH
> + bool "SPI Flash"
> + help
> + Select this if you have a SPI Flash memory device which you
> + want to use for the environment.
> +
> +config ENV_IS_IN_REMOTE
> + bool "Remote"
> + help
> + Select this if you have a remote memory space which you
> + want to use for the local device's environment.
> +
> +config ENV_IS_IN_UBI
> + bool "UBI"
> + help
> + Select this if you have an UBI volume that you want to use for
> + the environment. This has the benefit of wear-leveling the
> + environment accesses, which is important on NAND.
> +
> +config ENV_IS_NOWHERE
> + bool "Nowhere"
> + help
> + Select this if there is no storage for the environment and
> + each boot U-Boot will use the default environment.
> +
> +endchoice
> +
> +endmenu
> +
> menu "Command line interface"
>
> config HUSH_PARSER
This technically needs to be squashed with the patch that follows it
to preserve bisectability, but I wanted to post it separately to be
easier to look at.
-Joe
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-05-14 4:43 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-14 4:29 [U-Boot] [RFC PATCH 0/8] Complex config moves Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 1/8] Add env persist location to Kconfig Joe Hershberger
2015-05-14 4:43 ` Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 2/8] Move env location selection from include to defconfig Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 3/8] Add RBTREE to Kconfig Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 4/8] Add CMD_UBI " Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 5/8] Add decompression " Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 6/8] Add CMD_UBIFS " Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 7/8] Move compression and UBI from include to defconfig Joe Hershberger
2015-05-14 4:29 ` [U-Boot] [RFC PATCH 8/8] Move setexpr to Kconfig Joe Hershberger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.