diff mbox

[U-Boot,1/7] configs: Fixup defconfigs ordering

Message ID 20161208220433.20847-1-afd@ti.com
State Deferred
Delegated to: Tom Rini
Headers show

Commit Message

Andrew Davis Dec. 8, 2016, 10:04 p.m. UTC
When Kconfig options are added, modified, or removed the may this
may change the 'natural' order of the defconfig files. This order
is produced with 'make savedefconfig' and tools that automaticaly
modifiy defconfigs need this order maintained.

This can easily be accomplished by running 'tools/moveconfig.py -s'.

Do this here.

Signed-off-by: Andrew F. Davis <afd@ti.com>
---
 configs/A10-OLinuXino-Lime_defconfig               |  2 +-
 configs/A20-OLinuXino-Lime2_defconfig              |  2 +-
 configs/A20-OLinuXino-Lime_defconfig               |  2 +-
 configs/A20-OLinuXino_MICRO_defconfig              |  2 +-
 configs/A20-Olimex-SOM-EVB_defconfig               |  2 +-
 configs/B4860QDS_SECURE_BOOT_defconfig             |  2 +-
 configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig |  2 +-
 configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig |  2 +-
 configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig  |  2 +-
 configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig  |  2 +-
 .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig   |  2 +-
 .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig   |  2 +-
 .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig |  2 +-
 .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig |  2 +-
 configs/Bananapi_defconfig                         |  2 +-
 configs/Bananapro_defconfig                        |  2 +-
 configs/C29XPCIE_NOR_SECBOOT_defconfig             |  2 +-
 configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig        |  2 +-
 configs/Chuwi_V7_CW0825_defconfig                  |  1 -
 configs/Cubieboard2_defconfig                      |  2 +-
 configs/Cubieboard_defconfig                       |  2 +-
 configs/Cubietruck_defconfig                       |  2 +-
 configs/Itead_Ibox_A20_defconfig                   |  2 +-
 configs/Lamobo_R1_defconfig                        |  2 +-
 configs/Linksprite_pcDuino3_Nano_defconfig         |  2 +-
 configs/Linksprite_pcDuino3_defconfig              |  2 +-
 configs/MPC8610HPCD_defconfig                      |  3 +-
 configs/MPC8641HPCN_36BIT_defconfig                |  3 +-
 configs/MPC8641HPCN_defconfig                      |  3 +-
 configs/MSI_Primo81_defconfig                      |  1 -
 configs/Marsboard_A10_defconfig                    |  2 +-
 configs/Mele_A1000_defconfig                       |  2 +-
 configs/Mele_M5_defconfig                          |  2 +-
 configs/Orangepi_defconfig                         |  2 +-
 configs/Orangepi_mini_defconfig                    |  2 +-
 configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig   |  2 +-
 configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig    |  2 +-
 .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig   |  2 +-
 configs/P1010RDB-PA_NAND_SECBOOT_defconfig         |  2 +-
 configs/P1010RDB-PA_NOR_SECBOOT_defconfig          |  2 +-
 configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig     |  2 +-
 configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig   |  2 +-
 configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig    |  2 +-
 .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig   |  2 +-
 configs/P1010RDB-PB_NAND_SECBOOT_defconfig         |  2 +-
 configs/P1010RDB-PB_NOR_SECBOOT_defconfig          |  2 +-
 configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig     |  2 +-
 configs/P2041RDB_SECURE_BOOT_defconfig             |  2 +-
 configs/P3041DS_NAND_SECURE_BOOT_defconfig         |  2 +-
 configs/P3041DS_SECURE_BOOT_defconfig              |  2 +-
 configs/P4080DS_SECURE_BOOT_defconfig              |  2 +-
 configs/P5020DS_NAND_SECURE_BOOT_defconfig         |  2 +-
 configs/P5020DS_SECURE_BOOT_defconfig              |  2 +-
 configs/P5040DS_NAND_SECURE_BOOT_defconfig         |  2 +-
 configs/P5040DS_SECURE_BOOT_defconfig              |  2 +-
 configs/T1023RDB_SECURE_BOOT_defconfig             |  2 +-
 configs/T1024QDS_DDR4_SECURE_BOOT_defconfig        |  2 +-
 configs/T1024QDS_SECURE_BOOT_defconfig             |  2 +-
 configs/T1024RDB_SECURE_BOOT_defconfig             |  2 +-
 configs/T1040D4RDB_SECURE_BOOT_defconfig           |  2 +-
 configs/T1040QDS_SECURE_BOOT_defconfig             |  2 +-
 configs/T1040RDB_SECURE_BOOT_defconfig             |  2 +-
 configs/T1042D4RDB_SECURE_BOOT_defconfig           |  2 +-
 configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig     |  2 +-
 configs/T1042RDB_SECURE_BOOT_defconfig             |  2 +-
 configs/T2080QDS_SECURE_BOOT_defconfig             |  2 +-
 configs/T2080RDB_SECURE_BOOT_defconfig             |  2 +-
 configs/T4160QDS_SECURE_BOOT_defconfig             |  2 +-
 configs/T4240QDS_SECURE_BOOT_defconfig             |  2 +-
 configs/Wits_Pro_A20_DKT_defconfig                 |  2 +-
 configs/am43xx_evm_defconfig                       |  2 +-
 configs/am43xx_hs_evm_defconfig                    |  2 +-
 configs/am57xx_evm_defconfig                       |  4 +-
 configs/am57xx_hs_evm_defconfig                    |  4 +-
 configs/arndale_defconfig                          |  1 -
 configs/bayleybay_defconfig                        |  2 +-
 configs/chromebit_mickey_defconfig                 |  7 +---
 configs/chromebook_jerry_defconfig                 |  2 +-
 configs/chromebook_link_defconfig                  |  2 +-
 configs/chromebook_minnie_defconfig                |  2 +-
 configs/chromebox_panther_defconfig                |  2 +-
 ...conga-qeval20-qa3-e3845-internal-uart_defconfig |  2 +-
 configs/conga-qeval20-qa3-e3845_defconfig          |  2 +-
 configs/coreboot-x86_defconfig                     |  2 +-
 configs/crownbay_defconfig                         |  2 +-
 configs/dfi-bt700-q7x-151_defconfig                |  2 +-
 configs/dms-ba16-1g_defconfig                      |  2 +-
 configs/dms-ba16_defconfig                         |  2 +-
 configs/e2220-1170_defconfig                       |  8 ----
 configs/evb-rk3288_defconfig                       |  2 +-
 configs/evb-rk3399_defconfig                       |  2 +-
 configs/fennec-rk3288_defconfig                    |  2 +-
 configs/ge_b450v3_defconfig                        |  2 +-
 configs/ge_b650v3_defconfig                        |  2 +-
 configs/ge_b850v3_defconfig                        |  2 +-
 configs/imx6qdl_icore_mmc_defconfig                | 43 ++++++++++------------
 configs/imx6qdl_icore_nand_defconfig               | 41 +++++++++------------
 configs/kc1_defconfig                              |  2 +-
 configs/kylin-rk3036_defconfig                     |  6 +--
 configs/ls1012afrdm_qspi_defconfig                 |  2 +-
 configs/ls1012aqds_qspi_defconfig                  |  2 +-
 configs/ls1012ardb_qspi_defconfig                  |  2 +-
 configs/ls1021aiot_qspi_defconfig                  | 10 ++---
 configs/ls1021aiot_sdcard_defconfig                | 13 +++----
 configs/ls1021aqds_nor_SECURE_BOOT_defconfig       |  2 +-
 configs/ls1021atwr_nor_SECURE_BOOT_defconfig       |  2 +-
 .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig    |  2 +-
 configs/ls1043ardb_SECURE_BOOT_defconfig           |  1 -
 configs/ls1046aqds_lpuart_defconfig                |  5 +--
 configs/ls1046ardb_qspi_defconfig                  |  2 +-
 configs/ls2080aqds_SECURE_BOOT_defconfig           |  1 -
 configs/ls2080ardb_SECURE_BOOT_defconfig           |  1 -
 configs/miniarm-rk3288_defconfig                   |  2 +-
 configs/minnowmax_defconfig                        |  2 +-
 configs/mx25pdk_defconfig                          |  2 +-
 configs/mx53ard_defconfig                          |  2 +-
 configs/mx6ull_14x14_evk_plugin_defconfig          |  2 +-
 configs/mx7dsabresd_secure_defconfig               |  6 +--
 configs/odroid-xu3_defconfig                       |  1 -
 configs/odroid_defconfig                           |  1 -
 configs/origen_defconfig                           |  1 -
 configs/p2371-0000_defconfig                       |  8 ----
 configs/p2371-2180_defconfig                       |  8 ----
 configs/p2571_defconfig                            |  8 ----
 configs/p2771-0000-000_defconfig                   |  8 ----
 configs/p2771-0000-500_defconfig                   |  8 ----
 configs/peach-pi_defconfig                         |  1 -
 configs/peach-pit_defconfig                        |  1 -
 configs/pico-imx6ul_defconfig                      |  2 +-
 configs/popmetal-rk3288_defconfig                  |  2 +-
 configs/qemu-x86_defconfig                         |  2 +-
 configs/qemu-x86_efi_payload32_defconfig           |  2 +-
 configs/qemu-x86_efi_payload64_defconfig           |  4 +-
 configs/rock2_defconfig                            |  1 -
 configs/sama5d2_xplained_mmc_defconfig             |  8 ++--
 configs/sama5d2_xplained_spiflash_defconfig        |  6 +--
 configs/smdk5250_defconfig                         |  1 -
 configs/smdk5420_defconfig                         |  1 -
 configs/sniper_defconfig                           |  2 +-
 configs/snow_defconfig                             |  1 -
 configs/som-db5800-som-6867_defconfig              |  2 +-
 configs/spring_defconfig                           |  1 -
 configs/stm32f429-discovery_defconfig              |  2 +-
 configs/theadorable-x86-dfi-bt700_defconfig        |  2 +-
 configs/theadorable_debug_defconfig                |  1 -
 configs/theadorable_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/tqma6s_wru4_mmc_defconfig                  |  2 +-
 configs/udoo_neo_defconfig                         |  3 +-
 configs/vining_2000_defconfig                      |  2 -
 153 files changed, 184 insertions(+), 275 deletions(-)

Comments

Andrew Davis Dec. 8, 2016, 10:24 p.m. UTC | #1
On 12/08/2016 04:04 PM, Andrew F. Davis wrote:
> When Kconfig options are added, modified, or removed the may this
> may change the 'natural' order of the defconfig files. This order
> is produced with 'make savedefconfig' and tools that automaticaly
> modifiy defconfigs need this order maintained.
> 

Forgot to run the spell check, automatically* modify*

> This can easily be accomplished by running 'tools/moveconfig.py -s'.
> 
> Do this here.
> 
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> ---
>  configs/A10-OLinuXino-Lime_defconfig               |  2 +-
>  configs/A20-OLinuXino-Lime2_defconfig              |  2 +-
>  configs/A20-OLinuXino-Lime_defconfig               |  2 +-
>  configs/A20-OLinuXino_MICRO_defconfig              |  2 +-
>  configs/A20-Olimex-SOM-EVB_defconfig               |  2 +-
>  configs/B4860QDS_SECURE_BOOT_defconfig             |  2 +-
>  configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig |  2 +-
>  configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig |  2 +-
>  configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig  |  2 +-
>  configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig  |  2 +-
>  .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig   |  2 +-
>  .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig   |  2 +-
>  .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig |  2 +-
>  .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig |  2 +-
>  configs/Bananapi_defconfig                         |  2 +-
>  configs/Bananapro_defconfig                        |  2 +-
>  configs/C29XPCIE_NOR_SECBOOT_defconfig             |  2 +-
>  configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig        |  2 +-
>  configs/Chuwi_V7_CW0825_defconfig                  |  1 -
>  configs/Cubieboard2_defconfig                      |  2 +-
>  configs/Cubieboard_defconfig                       |  2 +-
>  configs/Cubietruck_defconfig                       |  2 +-
>  configs/Itead_Ibox_A20_defconfig                   |  2 +-
>  configs/Lamobo_R1_defconfig                        |  2 +-
>  configs/Linksprite_pcDuino3_Nano_defconfig         |  2 +-
>  configs/Linksprite_pcDuino3_defconfig              |  2 +-
>  configs/MPC8610HPCD_defconfig                      |  3 +-
>  configs/MPC8641HPCN_36BIT_defconfig                |  3 +-
>  configs/MPC8641HPCN_defconfig                      |  3 +-
>  configs/MSI_Primo81_defconfig                      |  1 -
>  configs/Marsboard_A10_defconfig                    |  2 +-
>  configs/Mele_A1000_defconfig                       |  2 +-
>  configs/Mele_M5_defconfig                          |  2 +-
>  configs/Orangepi_defconfig                         |  2 +-
>  configs/Orangepi_mini_defconfig                    |  2 +-
>  configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig   |  2 +-
>  configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig    |  2 +-
>  .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig   |  2 +-
>  configs/P1010RDB-PA_NAND_SECBOOT_defconfig         |  2 +-
>  configs/P1010RDB-PA_NOR_SECBOOT_defconfig          |  2 +-
>  configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig     |  2 +-
>  configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig   |  2 +-
>  configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig    |  2 +-
>  .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig   |  2 +-
>  configs/P1010RDB-PB_NAND_SECBOOT_defconfig         |  2 +-
>  configs/P1010RDB-PB_NOR_SECBOOT_defconfig          |  2 +-
>  configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig     |  2 +-
>  configs/P2041RDB_SECURE_BOOT_defconfig             |  2 +-
>  configs/P3041DS_NAND_SECURE_BOOT_defconfig         |  2 +-
>  configs/P3041DS_SECURE_BOOT_defconfig              |  2 +-
>  configs/P4080DS_SECURE_BOOT_defconfig              |  2 +-
>  configs/P5020DS_NAND_SECURE_BOOT_defconfig         |  2 +-
>  configs/P5020DS_SECURE_BOOT_defconfig              |  2 +-
>  configs/P5040DS_NAND_SECURE_BOOT_defconfig         |  2 +-
>  configs/P5040DS_SECURE_BOOT_defconfig              |  2 +-
>  configs/T1023RDB_SECURE_BOOT_defconfig             |  2 +-
>  configs/T1024QDS_DDR4_SECURE_BOOT_defconfig        |  2 +-
>  configs/T1024QDS_SECURE_BOOT_defconfig             |  2 +-
>  configs/T1024RDB_SECURE_BOOT_defconfig             |  2 +-
>  configs/T1040D4RDB_SECURE_BOOT_defconfig           |  2 +-
>  configs/T1040QDS_SECURE_BOOT_defconfig             |  2 +-
>  configs/T1040RDB_SECURE_BOOT_defconfig             |  2 +-
>  configs/T1042D4RDB_SECURE_BOOT_defconfig           |  2 +-
>  configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig     |  2 +-
>  configs/T1042RDB_SECURE_BOOT_defconfig             |  2 +-
>  configs/T2080QDS_SECURE_BOOT_defconfig             |  2 +-
>  configs/T2080RDB_SECURE_BOOT_defconfig             |  2 +-
>  configs/T4160QDS_SECURE_BOOT_defconfig             |  2 +-
>  configs/T4240QDS_SECURE_BOOT_defconfig             |  2 +-
>  configs/Wits_Pro_A20_DKT_defconfig                 |  2 +-
>  configs/am43xx_evm_defconfig                       |  2 +-
>  configs/am43xx_hs_evm_defconfig                    |  2 +-
>  configs/am57xx_evm_defconfig                       |  4 +-
>  configs/am57xx_hs_evm_defconfig                    |  4 +-
>  configs/arndale_defconfig                          |  1 -
>  configs/bayleybay_defconfig                        |  2 +-
>  configs/chromebit_mickey_defconfig                 |  7 +---
>  configs/chromebook_jerry_defconfig                 |  2 +-
>  configs/chromebook_link_defconfig                  |  2 +-
>  configs/chromebook_minnie_defconfig                |  2 +-
>  configs/chromebox_panther_defconfig                |  2 +-
>  ...conga-qeval20-qa3-e3845-internal-uart_defconfig |  2 +-
>  configs/conga-qeval20-qa3-e3845_defconfig          |  2 +-
>  configs/coreboot-x86_defconfig                     |  2 +-
>  configs/crownbay_defconfig                         |  2 +-
>  configs/dfi-bt700-q7x-151_defconfig                |  2 +-
>  configs/dms-ba16-1g_defconfig                      |  2 +-
>  configs/dms-ba16_defconfig                         |  2 +-
>  configs/e2220-1170_defconfig                       |  8 ----
>  configs/evb-rk3288_defconfig                       |  2 +-
>  configs/evb-rk3399_defconfig                       |  2 +-
>  configs/fennec-rk3288_defconfig                    |  2 +-
>  configs/ge_b450v3_defconfig                        |  2 +-
>  configs/ge_b650v3_defconfig                        |  2 +-
>  configs/ge_b850v3_defconfig                        |  2 +-
>  configs/imx6qdl_icore_mmc_defconfig                | 43 ++++++++++------------
>  configs/imx6qdl_icore_nand_defconfig               | 41 +++++++++------------
>  configs/kc1_defconfig                              |  2 +-
>  configs/kylin-rk3036_defconfig                     |  6 +--
>  configs/ls1012afrdm_qspi_defconfig                 |  2 +-
>  configs/ls1012aqds_qspi_defconfig                  |  2 +-
>  configs/ls1012ardb_qspi_defconfig                  |  2 +-
>  configs/ls1021aiot_qspi_defconfig                  | 10 ++---
>  configs/ls1021aiot_sdcard_defconfig                | 13 +++----
>  configs/ls1021aqds_nor_SECURE_BOOT_defconfig       |  2 +-
>  configs/ls1021atwr_nor_SECURE_BOOT_defconfig       |  2 +-
>  .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig    |  2 +-
>  configs/ls1043ardb_SECURE_BOOT_defconfig           |  1 -
>  configs/ls1046aqds_lpuart_defconfig                |  5 +--
>  configs/ls1046ardb_qspi_defconfig                  |  2 +-
>  configs/ls2080aqds_SECURE_BOOT_defconfig           |  1 -
>  configs/ls2080ardb_SECURE_BOOT_defconfig           |  1 -
>  configs/miniarm-rk3288_defconfig                   |  2 +-
>  configs/minnowmax_defconfig                        |  2 +-
>  configs/mx25pdk_defconfig                          |  2 +-
>  configs/mx53ard_defconfig                          |  2 +-
>  configs/mx6ull_14x14_evk_plugin_defconfig          |  2 +-
>  configs/mx7dsabresd_secure_defconfig               |  6 +--
>  configs/odroid-xu3_defconfig                       |  1 -
>  configs/odroid_defconfig                           |  1 -
>  configs/origen_defconfig                           |  1 -
>  configs/p2371-0000_defconfig                       |  8 ----
>  configs/p2371-2180_defconfig                       |  8 ----
>  configs/p2571_defconfig                            |  8 ----
>  configs/p2771-0000-000_defconfig                   |  8 ----
>  configs/p2771-0000-500_defconfig                   |  8 ----
>  configs/peach-pi_defconfig                         |  1 -
>  configs/peach-pit_defconfig                        |  1 -
>  configs/pico-imx6ul_defconfig                      |  2 +-
>  configs/popmetal-rk3288_defconfig                  |  2 +-
>  configs/qemu-x86_defconfig                         |  2 +-
>  configs/qemu-x86_efi_payload32_defconfig           |  2 +-
>  configs/qemu-x86_efi_payload64_defconfig           |  4 +-
>  configs/rock2_defconfig                            |  1 -
>  configs/sama5d2_xplained_mmc_defconfig             |  8 ++--
>  configs/sama5d2_xplained_spiflash_defconfig        |  6 +--
>  configs/smdk5250_defconfig                         |  1 -
>  configs/smdk5420_defconfig                         |  1 -
>  configs/sniper_defconfig                           |  2 +-
>  configs/snow_defconfig                             |  1 -
>  configs/som-db5800-som-6867_defconfig              |  2 +-
>  configs/spring_defconfig                           |  1 -
>  configs/stm32f429-discovery_defconfig              |  2 +-
>  configs/theadorable-x86-dfi-bt700_defconfig        |  2 +-
>  configs/theadorable_debug_defconfig                |  1 -
>  configs/theadorable_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/tqma6s_wru4_mmc_defconfig                  |  2 +-
>  configs/udoo_neo_defconfig                         |  3 +-
>  configs/vining_2000_defconfig                      |  2 -
>  153 files changed, 184 insertions(+), 275 deletions(-)
> 
> diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
> index bb7eaf8..50436a7 100644
> --- a/configs/A10-OLinuXino-Lime_defconfig
> +++ b/configs/A10-OLinuXino-Lime_defconfig
> @@ -7,8 +7,8 @@ CONFIG_DRAM_EMR1=4
>  CONFIG_SYS_CLK_FREQ=912000000
>  CONFIG_MMC0_CD_PIN="PH1"
>  CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,SATAPWR=SUNXI_GPC(3)"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
> index d48e35d..8fd7c64 100644
> --- a/configs/A20-OLinuXino-Lime2_defconfig
> +++ b/configs/A20-OLinuXino-Lime2_defconfig
> @@ -7,8 +7,8 @@ CONFIG_MMC0_CD_PIN="PH1"
>  CONFIG_USB0_VBUS_PIN="PC17"
>  CONFIG_USB0_VBUS_DET="PH5"
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPC(3)"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
> index 7c5d84d..26e6ace 100644
> --- a/configs/A20-OLinuXino-Lime_defconfig
> +++ b/configs/A20-OLinuXino-Lime_defconfig
> @@ -5,8 +5,8 @@ CONFIG_MACH_SUN7I=y
>  CONFIG_DRAM_CLK=384
>  CONFIG_MMC0_CD_PIN="PH1"
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPC(3)"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
> index 9eb5f1b..d629eb1 100644
> --- a/configs/A20-OLinuXino_MICRO_defconfig
> +++ b/configs/A20-OLinuXino_MICRO_defconfig
> @@ -8,8 +8,8 @@ CONFIG_MMC3_CD_PIN="PH11"
>  CONFIG_MMC_SUNXI_SLOT_EXTRA=3
>  CONFIG_VIDEO_VGA=y
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPB(8)"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/A20-Olimex-SOM-EVB_defconfig b/configs/A20-Olimex-SOM-EVB_defconfig
> index 53d800f..b5d52db 100644
> --- a/configs/A20-Olimex-SOM-EVB_defconfig
> +++ b/configs/A20-Olimex-SOM-EVB_defconfig
> @@ -10,8 +10,8 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=3
>  CONFIG_USB0_VBUS_PIN="PB9"
>  CONFIG_USB0_VBUS_DET="PH5"
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olimex-som-evb"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPC(3)"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/B4860QDS_SECURE_BOOT_defconfig b/configs/B4860QDS_SECURE_BOOT_defconfig
> index e2e16fb..69edc00 100644
> --- a/configs/B4860QDS_SECURE_BOOT_defconfig
> +++ b/configs/B4860QDS_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_B4860QDS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -6,7 +7,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
> index 52d5fe9..c05788c 100644
> --- a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
> +++ b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_BSC9132QDS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT,SYS_CLK_100_DDR_100"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
> index afa4aad..b501c20 100644
> --- a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
> +++ b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_BSC9132QDS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT,SYS_CLK_100_DDR_133"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
> index 5c3f150..61655c7 100644
> --- a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
> +++ b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_BSC9132QDS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_CLK_100_DDR_100"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
> index 0c0b5e3..3c71a0b 100644
> --- a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
> +++ b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_BSC9132QDS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_CLK_100_DDR_133"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
> index 45b46df..63a208c 100644
> --- a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
> +++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_BSC9132QDS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="SDCARD,SYS_CLK_100_DDR_100"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
> index 417ac5a..9e540c4 100644
> --- a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
> +++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_BSC9132QDS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="SDCARD,SYS_CLK_100_DDR_133"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
> index 5145c3a..6b445d6 100644
> --- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
> +++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_BSC9132QDS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH,SYS_CLK_100_DDR_100"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
> index 0f65f96..8994e99 100644
> --- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
> +++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_BSC9132QDS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH,SYS_CLK_100_DDR_133"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
> index 3da1cf7..0f2ef1b 100644
> --- a/configs/Bananapi_defconfig
> +++ b/configs/Bananapi_defconfig
> @@ -6,8 +6,8 @@ CONFIG_DRAM_CLK=432
>  CONFIG_VIDEO_COMPOSITE=y
>  CONFIG_GMAC_TX_DELAY=3
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig
> index 2b9c865..e3bb4b2 100644
> --- a/configs/Bananapro_defconfig
> +++ b/configs/Bananapro_defconfig
> @@ -8,8 +8,8 @@ CONFIG_USB2_VBUS_PIN="PH1"
>  CONFIG_VIDEO_COMPOSITE=y
>  CONFIG_GMAC_TX_DELAY=3
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapro"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/C29XPCIE_NOR_SECBOOT_defconfig b/configs/C29XPCIE_NOR_SECBOOT_defconfig
> index ed46dbe..737467d 100644
> --- a/configs/C29XPCIE_NOR_SECBOOT_defconfig
> +++ b/configs/C29XPCIE_NOR_SECBOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_C29XPCIE=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -6,7 +7,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=-1
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
> index ef1100f..56e7066 100644
> --- a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
> +++ b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_C29XPCIE=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=-1
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig
> index a67038b..8507f73 100644
> --- a/configs/Chuwi_V7_CW0825_defconfig
> +++ b/configs/Chuwi_V7_CW0825_defconfig
> @@ -22,4 +22,3 @@ CONFIG_USB_MUSB_HOST=y
>  CONFIG_VIDEO_LCD_SPI_CS="PA0"
>  CONFIG_VIDEO_LCD_SPI_SCLK="PA1"
>  CONFIG_VIDEO_LCD_SPI_MOSI="PA2"
> -CONFIG_CFB_CONSOLE=y
> diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
> index 9212a17..dfeb66c 100644
> --- a/configs/Cubieboard2_defconfig
> +++ b/configs/Cubieboard2_defconfig
> @@ -5,8 +5,8 @@ CONFIG_MACH_SUN7I=y
>  CONFIG_DRAM_CLK=480
>  CONFIG_MMC0_CD_PIN="PH1"
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPB(8)"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
> index 6e7e741..64aebed 100644
> --- a/configs/Cubieboard_defconfig
> +++ b/configs/Cubieboard_defconfig
> @@ -5,8 +5,8 @@ CONFIG_MACH_SUN4I=y
>  CONFIG_DRAM_CLK=480
>  CONFIG_MMC0_CD_PIN="PH1"
>  CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,SATAPWR=SUNXI_GPB(8)"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
> index 37b60b85..10f3237 100644
> --- a/configs/Cubietruck_defconfig
> +++ b/configs/Cubietruck_defconfig
> @@ -10,8 +10,8 @@ CONFIG_USB0_ID_DET="PH19"
>  CONFIG_VIDEO_VGA=y
>  CONFIG_GMAC_TX_DELAY=1
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPH(12)"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/Itead_Ibox_A20_defconfig b/configs/Itead_Ibox_A20_defconfig
> index d544d50..baca3e8 100644
> --- a/configs/Itead_Ibox_A20_defconfig
> +++ b/configs/Itead_Ibox_A20_defconfig
> @@ -5,8 +5,8 @@ CONFIG_MACH_SUN7I=y
>  CONFIG_DRAM_CLK=480
>  CONFIG_MMC0_CD_PIN="PH1"
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-itead-ibox"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPB(8)"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/Lamobo_R1_defconfig b/configs/Lamobo_R1_defconfig
> index 58bc5a2..6fe79e2 100644
> --- a/configs/Lamobo_R1_defconfig
> +++ b/configs/Lamobo_R1_defconfig
> @@ -6,8 +6,8 @@ CONFIG_DRAM_CLK=432
>  CONFIG_MMC0_CD_PIN="PH10"
>  CONFIG_GMAC_TX_DELAY=4
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-lamobo-r1"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),SATAPWR=SUNXI_GPB(3)"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig
> index 8cbe9c3..622d35c 100644
> --- a/configs/Linksprite_pcDuino3_Nano_defconfig
> +++ b/configs/Linksprite_pcDuino3_Nano_defconfig
> @@ -7,8 +7,8 @@ CONFIG_DRAM_ZQ=122
>  CONFIG_USB1_VBUS_PIN="PH11"
>  CONFIG_GMAC_TX_DELAY=3
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3-nano"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPH(2)"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
> index 5d155b4..9d2dfa5a 100644
> --- a/configs/Linksprite_pcDuino3_defconfig
> +++ b/configs/Linksprite_pcDuino3_defconfig
> @@ -5,8 +5,8 @@ CONFIG_MACH_SUN7I=y
>  CONFIG_DRAM_CLK=480
>  CONFIG_DRAM_ZQ=122
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPH(2)"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/MPC8610HPCD_defconfig b/configs/MPC8610HPCD_defconfig
> index b4e053a..9327955 100644
> --- a/configs/MPC8610HPCD_defconfig
> +++ b/configs/MPC8610HPCD_defconfig
> @@ -6,7 +6,6 @@ CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_BOOTDELAY=10
>  # CONFIG_CONSOLE_MUX is not set
> -CONFIG_SYS_STDIO_DEREGISTER=y
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_I2C=y
>  CONFIG_CMD_USB=y
> @@ -15,6 +14,6 @@ CONFIG_CMD_MII=y
>  CONFIG_CMD_PING=y
>  CONFIG_CMD_EXT2=y
>  CONFIG_SYS_NS16550=y
> -CONFIG_OF_LIBFDT=y
>  CONFIG_USB=y
>  CONFIG_USB_KEYBOARD=y
> +CONFIG_OF_LIBFDT=y
> diff --git a/configs/MPC8641HPCN_36BIT_defconfig b/configs/MPC8641HPCN_36BIT_defconfig
> index 8ffa5e9..d1f9e10 100644
> --- a/configs/MPC8641HPCN_36BIT_defconfig
> +++ b/configs/MPC8641HPCN_36BIT_defconfig
> @@ -7,7 +7,6 @@ CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_BOOTDELAY=10
>  # CONFIG_CONSOLE_MUX is not set
> -CONFIG_SYS_STDIO_DEREGISTER=y
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_I2C=y
>  CONFIG_CMD_USB=y
> @@ -15,6 +14,6 @@ CONFIG_CMD_USB=y
>  CONFIG_CMD_PING=y
>  CONFIG_CMD_EXT2=y
>  CONFIG_SYS_NS16550=y
> -CONFIG_OF_LIBFDT=y
>  CONFIG_USB=y
>  CONFIG_USB_KEYBOARD=y
> +CONFIG_OF_LIBFDT=y
> diff --git a/configs/MPC8641HPCN_defconfig b/configs/MPC8641HPCN_defconfig
> index 6f9bf01..0672345 100644
> --- a/configs/MPC8641HPCN_defconfig
> +++ b/configs/MPC8641HPCN_defconfig
> @@ -6,7 +6,6 @@ CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_BOOTDELAY=10
>  # CONFIG_CONSOLE_MUX is not set
> -CONFIG_SYS_STDIO_DEREGISTER=y
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_I2C=y
>  CONFIG_CMD_USB=y
> @@ -14,6 +13,6 @@ CONFIG_CMD_USB=y
>  CONFIG_CMD_PING=y
>  CONFIG_CMD_EXT2=y
>  CONFIG_SYS_NS16550=y
> -CONFIG_OF_LIBFDT=y
>  CONFIG_USB=y
>  CONFIG_USB_KEYBOARD=y
> +CONFIG_OF_LIBFDT=y
> diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig
> index e9d5be4..8847271 100644
> --- a/configs/MSI_Primo81_defconfig
> +++ b/configs/MSI_Primo81_defconfig
> @@ -25,4 +25,3 @@ CONFIG_VIDEO_LCD_SPI_CS="PH9"
>  CONFIG_VIDEO_LCD_SPI_SCLK="PH10"
>  CONFIG_VIDEO_LCD_SPI_MOSI="PH11"
>  CONFIG_VIDEO_LCD_SPI_MISO="PH12"
> -CONFIG_CFB_CONSOLE=y
> diff --git a/configs/Marsboard_A10_defconfig b/configs/Marsboard_A10_defconfig
> index 6a88238..0d381ff 100644
> --- a/configs/Marsboard_A10_defconfig
> +++ b/configs/Marsboard_A10_defconfig
> @@ -2,8 +2,8 @@ CONFIG_ARM=y
>  CONFIG_ARCH_SUNXI=y
>  CONFIG_MACH_SUN4I=y
>  CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-marsboard"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
> index d678ffb..820d5ed 100644
> --- a/configs/Mele_A1000_defconfig
> +++ b/configs/Mele_A1000_defconfig
> @@ -5,8 +5,8 @@ CONFIG_MACH_SUN4I=y
>  CONFIG_VIDEO_VGA=y
>  CONFIG_VIDEO_COMPOSITE=y
>  CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-a1000"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,MACPWR=SUNXI_GPH(15)"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig
> index 09addc5..e64e452 100644
> --- a/configs/Mele_M5_defconfig
> +++ b/configs/Mele_M5_defconfig
> @@ -7,8 +7,8 @@ CONFIG_DRAM_ZQ=122
>  CONFIG_MMC0_CD_PIN="PH1"
>  CONFIG_VIDEO_COMPOSITE=y
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m5"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig
> index 052ca83..ccece01 100644
> --- a/configs/Orangepi_defconfig
> +++ b/configs/Orangepi_defconfig
> @@ -9,8 +9,8 @@ CONFIG_VIDEO_VGA=y
>  CONFIG_VIDEO_COMPOSITE=y
>  CONFIG_GMAC_TX_DELAY=3
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
> index 63db70d..febdcd0 100644
> --- a/configs/Orangepi_mini_defconfig
> +++ b/configs/Orangepi_mini_defconfig
> @@ -11,8 +11,8 @@ CONFIG_USB2_VBUS_PIN="PH22"
>  CONFIG_VIDEO_COMPOSITE=y
>  CONFIG_GMAC_TX_DELAY=3
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi-mini"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
> index 0430076..3a5b844 100644
> --- a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P1010RDB_PA=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -8,7 +9,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
> index f091938..881afc5 100644
> --- a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P1010RDB_PA=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
> index f78a54d..ed10fcf 100644
> --- a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P1010RDB_PA=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -8,7 +9,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
> index ef3cd29..8677c66 100644
> --- a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P1010RDB_PA=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
> index 9716b4a..9e99739 100644
> --- a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P1010RDB_PA=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -6,7 +7,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
> index 1f03841..7826443 100644
> --- a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P1010RDB_PA=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
> index 5145f41..b1fc348 100644
> --- a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P1010RDB_PB=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -8,7 +9,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
> index 205df6d..53d0adc 100644
> --- a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P1010RDB_PB=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
> index 7b6340d..8bd846c 100644
> --- a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P1010RDB_PB=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -8,7 +9,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
> index 589223d..3613049 100644
> --- a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P1010RDB_PB=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
> index a9494ee..fcba2f0 100644
> --- a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P1010RDB_PB=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -6,7 +7,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
> index 1a26a5d..d14bf14 100644
> --- a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
> +++ b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P1010RDB_PB=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/P2041RDB_SECURE_BOOT_defconfig b/configs/P2041RDB_SECURE_BOOT_defconfig
> index 7a811ae..c751a9b 100644
> --- a/configs/P2041RDB_SECURE_BOOT_defconfig
> +++ b/configs/P2041RDB_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P2041RDB=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -6,7 +7,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_GREPENV=y
> diff --git a/configs/P3041DS_NAND_SECURE_BOOT_defconfig b/configs/P3041DS_NAND_SECURE_BOOT_defconfig
> index 38407ba..dc99ed6 100644
> --- a/configs/P3041DS_NAND_SECURE_BOOT_defconfig
> +++ b/configs/P3041DS_NAND_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P3041DS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_GREPENV=y
> diff --git a/configs/P3041DS_SECURE_BOOT_defconfig b/configs/P3041DS_SECURE_BOOT_defconfig
> index 75c0ef3..755dfc5 100644
> --- a/configs/P3041DS_SECURE_BOOT_defconfig
> +++ b/configs/P3041DS_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P3041DS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -6,7 +7,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_GREPENV=y
> diff --git a/configs/P4080DS_SECURE_BOOT_defconfig b/configs/P4080DS_SECURE_BOOT_defconfig
> index 46b4672..7b41915 100644
> --- a/configs/P4080DS_SECURE_BOOT_defconfig
> +++ b/configs/P4080DS_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P4080DS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -6,7 +7,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_GREPENV=y
> diff --git a/configs/P5020DS_NAND_SECURE_BOOT_defconfig b/configs/P5020DS_NAND_SECURE_BOOT_defconfig
> index 592aae7..60d890d 100644
> --- a/configs/P5020DS_NAND_SECURE_BOOT_defconfig
> +++ b/configs/P5020DS_NAND_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P5020DS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_GREPENV=y
> diff --git a/configs/P5020DS_SECURE_BOOT_defconfig b/configs/P5020DS_SECURE_BOOT_defconfig
> index 27f43ef..b6fdedd 100644
> --- a/configs/P5020DS_SECURE_BOOT_defconfig
> +++ b/configs/P5020DS_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P5020DS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -6,7 +7,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_GREPENV=y
> diff --git a/configs/P5040DS_NAND_SECURE_BOOT_defconfig b/configs/P5040DS_NAND_SECURE_BOOT_defconfig
> index 9fdf4b2..8b52375 100644
> --- a/configs/P5040DS_NAND_SECURE_BOOT_defconfig
> +++ b/configs/P5040DS_NAND_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P5040DS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_GREPENV=y
> diff --git a/configs/P5040DS_SECURE_BOOT_defconfig b/configs/P5040DS_SECURE_BOOT_defconfig
> index b8d7d3b..512c7ad 100644
> --- a/configs/P5040DS_SECURE_BOOT_defconfig
> +++ b/configs/P5040DS_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_P5040DS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -6,7 +7,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_GREPENV=y
> diff --git a/configs/T1023RDB_SECURE_BOOT_defconfig b/configs/T1023RDB_SECURE_BOOT_defconfig
> index 1b474d3..d35e288 100644
> --- a/configs/T1023RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1023RDB_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_T1023RDB=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="T1023RDB"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
> index bdc0a9d..166bee3 100644
> --- a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
> +++ b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_VIDEO=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_T1024QDS=y
> @@ -8,7 +9,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SILENT_CONSOLE=y
>  # CONFIG_CONSOLE_MUX is not set
> diff --git a/configs/T1024QDS_SECURE_BOOT_defconfig b/configs/T1024QDS_SECURE_BOOT_defconfig
> index b092068..f067c8c 100644
> --- a/configs/T1024QDS_SECURE_BOOT_defconfig
> +++ b/configs/T1024QDS_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_VIDEO=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_T1024QDS=y
> @@ -7,7 +8,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SILENT_CONSOLE=y
>  # CONFIG_CONSOLE_MUX is not set
> diff --git a/configs/T1024RDB_SECURE_BOOT_defconfig b/configs/T1024RDB_SECURE_BOOT_defconfig
> index 9d082f7..f138dd5 100644
> --- a/configs/T1024RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1024RDB_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_T1024RDB=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="T1024RDB"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SILENT_CONSOLE=y
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> diff --git a/configs/T1040D4RDB_SECURE_BOOT_defconfig b/configs/T1040D4RDB_SECURE_BOOT_defconfig
> index 6f948a1..6c96cd0 100644
> --- a/configs/T1040D4RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1040D4RDB_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_T1040D4RDB=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SILENT_CONSOLE=y
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> diff --git a/configs/T1040QDS_SECURE_BOOT_defconfig b/configs/T1040QDS_SECURE_BOOT_defconfig
> index 3f15b09..a07afc7 100644
> --- a/configs/T1040QDS_SECURE_BOOT_defconfig
> +++ b/configs/T1040QDS_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_VIDEO=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_T1040QDS=y
> @@ -7,7 +8,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SILENT_CONSOLE=y
>  # CONFIG_CONSOLE_MUX is not set
> diff --git a/configs/T1040RDB_SECURE_BOOT_defconfig b/configs/T1040RDB_SECURE_BOOT_defconfig
> index a9b61a8..c0965eb 100644
> --- a/configs/T1040RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1040RDB_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_T1040RDB=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -6,7 +7,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SILENT_CONSOLE=y
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> diff --git a/configs/T1042D4RDB_SECURE_BOOT_defconfig b/configs/T1042D4RDB_SECURE_BOOT_defconfig
> index e20d412..b07464f 100644
> --- a/configs/T1042D4RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1042D4RDB_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_VIDEO=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_T1042D4RDB=y
> @@ -8,7 +9,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SILENT_CONSOLE=y
>  # CONFIG_CONSOLE_MUX is not set
> diff --git a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
> index 26db750..14aa1fd 100644
> --- a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
> +++ b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
> @@ -1,6 +1,7 @@
>  CONFIG_PPC=y
>  CONFIG_SPL_LIBCOMMON_SUPPORT=y
>  CONFIG_SPL_LIBGENERIC_SUPPORT=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_SPL_I2C_SUPPORT=y
>  CONFIG_SPL_NAND_SUPPORT=y
>  CONFIG_SPL_SERIAL_SUPPORT=y
> @@ -14,7 +15,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=0
>  CONFIG_SILENT_CONSOLE=y
>  # CONFIG_CONSOLE_MUX is not set
> diff --git a/configs/T1042RDB_SECURE_BOOT_defconfig b/configs/T1042RDB_SECURE_BOOT_defconfig
> index edd1ff6..dbb9c0b 100644
> --- a/configs/T1042RDB_SECURE_BOOT_defconfig
> +++ b/configs/T1042RDB_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_T1042RDB=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -6,7 +7,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_SILENT_CONSOLE=y
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> diff --git a/configs/T2080QDS_SECURE_BOOT_defconfig b/configs/T2080QDS_SECURE_BOOT_defconfig
> index 95f6804..bb13249 100644
> --- a/configs/T2080QDS_SECURE_BOOT_defconfig
> +++ b/configs/T2080QDS_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_T2080QDS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -6,7 +7,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_GREPENV=y
> diff --git a/configs/T2080RDB_SECURE_BOOT_defconfig b/configs/T2080RDB_SECURE_BOOT_defconfig
> index 64204e0..0e2ff06 100644
> --- a/configs/T2080RDB_SECURE_BOOT_defconfig
> +++ b/configs/T2080RDB_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_T2080RDB=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -6,7 +7,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_MEMTEST=y
> diff --git a/configs/T4160QDS_SECURE_BOOT_defconfig b/configs/T4160QDS_SECURE_BOOT_defconfig
> index e637f1e..d0e4f11 100644
> --- a/configs/T4160QDS_SECURE_BOOT_defconfig
> +++ b/configs/T4160QDS_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_T4160QDS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -6,7 +7,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_GREPENV=y
> diff --git a/configs/T4240QDS_SECURE_BOOT_defconfig b/configs/T4240QDS_SECURE_BOOT_defconfig
> index 61028e3..f2cf58a 100644
> --- a/configs/T4240QDS_SECURE_BOOT_defconfig
> +++ b/configs/T4240QDS_SECURE_BOOT_defconfig
> @@ -1,4 +1,5 @@
>  CONFIG_PPC=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_MPC85xx=y
>  CONFIG_TARGET_T4240QDS=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -6,7 +7,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_GREPENV=y
> diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig
> index d847fc7..0735055 100644
> --- a/configs/Wits_Pro_A20_DKT_defconfig
> +++ b/configs/Wits_Pro_A20_DKT_defconfig
> @@ -10,8 +10,8 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
>  CONFIG_VIDEO_LCD_BL_PWM="PB2"
>  CONFIG_VIDEO_LCD_PANEL_LVDS=y
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wits-pro-a20-dkt"
> -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_AHCI=y
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII"
>  CONFIG_SPL=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
> index e596106..00f186a 100644
> --- a/configs/am43xx_evm_defconfig
> +++ b/configs/am43xx_evm_defconfig
> @@ -45,6 +45,7 @@ CONFIG_DM_GPIO=y
>  CONFIG_DM_I2C=y
>  CONFIG_DM_MMC=y
>  # CONFIG_DM_MMC_OPS is not set
> +CONFIG_DM_SPI_FLASH=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_SPI_FLASH_BAR=y
>  CONFIG_SPI_FLASH_MACRONIX=y
> @@ -52,7 +53,6 @@ CONFIG_DM_ETH=y
>  CONFIG_DM_SERIAL=y
>  CONFIG_SYS_NS16550=y
>  CONFIG_DM_SPI=y
> -CONFIG_DM_SPI_FLASH=y
>  CONFIG_TI_QSPI=y
>  CONFIG_TIMER=y
>  CONFIG_OMAP_TIMER=y
> diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig
> index a605d0a..60b2122 100644
> --- a/configs/am43xx_hs_evm_defconfig
> +++ b/configs/am43xx_hs_evm_defconfig
> @@ -47,13 +47,13 @@ CONFIG_DM_GPIO=y
>  CONFIG_DM_I2C=y
>  CONFIG_DM_MMC=y
>  # CONFIG_DM_MMC_OPS is not set
> +CONFIG_DM_SPI_FLASH=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_SPI_FLASH_MACRONIX=y
>  CONFIG_DM_ETH=y
>  CONFIG_DM_SERIAL=y
>  CONFIG_SYS_NS16550=y
>  CONFIG_DM_SPI=y
> -CONFIG_DM_SPI_FLASH=y
>  CONFIG_TI_QSPI=y
>  CONFIG_TIMER=y
>  CONFIG_OMAP_TIMER=y
> diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig
> index 7fd418f..a582055 100644
> --- a/configs/am57xx_evm_defconfig
> +++ b/configs/am57xx_evm_defconfig
> @@ -36,8 +36,6 @@ CONFIG_CMD_SPI=y
>  CONFIG_CMD_I2C=y
>  CONFIG_CMD_USB=y
>  CONFIG_CMD_DFU=y
> -CONFIG_DFU_RAM=y
> -CONFIG_DFU_MMC=y
>  CONFIG_CMD_GPIO=y
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_CMD_DHCP=y
> @@ -53,6 +51,8 @@ CONFIG_OF_CONTROL=y
>  CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am572x-idk am571x-idk"
>  CONFIG_DM=y
>  # CONFIG_BLK is not set
> +CONFIG_DFU_MMC=y
> +CONFIG_DFU_RAM=y
>  CONFIG_DM_GPIO=y
>  CONFIG_DM_I2C=y
>  CONFIG_DM_MMC=y
> diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig
> index 2b1d695..c8b52ce 100644
> --- a/configs/am57xx_hs_evm_defconfig
> +++ b/configs/am57xx_hs_evm_defconfig
> @@ -37,8 +37,6 @@ CONFIG_CMD_SPI=y
>  CONFIG_CMD_I2C=y
>  CONFIG_CMD_USB=y
>  CONFIG_CMD_DFU=y
> -CONFIG_DFU_RAM=y
> -CONFIG_DFU_MMC=y
>  CONFIG_CMD_GPIO=y
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_CMD_DHCP=y
> @@ -52,6 +50,8 @@ CONFIG_CMD_FS_GENERIC=y
>  CONFIG_OF_CONTROL=y
>  CONFIG_DM=y
>  # CONFIG_BLK is not set
> +CONFIG_DFU_MMC=y
> +CONFIG_DFU_RAM=y
>  CONFIG_DM_GPIO=y
>  CONFIG_DM_I2C=y
>  CONFIG_DM_MMC=y
> diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
> index e0332f7..6eef60d 100644
> --- a/configs/arndale_defconfig
> +++ b/configs/arndale_defconfig
> @@ -21,7 +21,6 @@ CONFIG_CMD_CACHE=y
>  CONFIG_CMD_TIME=y
>  CONFIG_CMD_SOUND=y
>  CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_DM_I2C=y
>  CONFIG_DM_I2C_COMPAT=y
>  CONFIG_SOUND=y
>  CONFIG_I2S=y
> diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
> index 6daa675..1eb6142 100644
> --- a/configs/bayleybay_defconfig
> +++ b/configs/bayleybay_defconfig
> @@ -54,8 +54,8 @@ CONFIG_TIMER=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_DM_VIDEO=y
>  CONFIG_USB_KEYBOARD=y
> +CONFIG_DM_VIDEO=y
>  CONFIG_VIDEO_VESA=y
>  CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
>  CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
> diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig
> index b118907..9203f73 100644
> --- a/configs/chromebit_mickey_defconfig
> +++ b/configs/chromebit_mickey_defconfig
> @@ -7,7 +7,6 @@ CONFIG_TARGET_CHROMEBIT_MICKEY=y
>  CONFIG_SPL_SPI_FLASH_SUPPORT=y
>  CONFIG_SPL_SPI_SUPPORT=y
>  CONFIG_SPL_STACK_R_ADDR=0x80000
> -CONFIG_DM_KEYBOARD=y
>  CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-mickey"
>  # CONFIG_DISPLAY_CPUINFO is not set
>  CONFIG_SPL_STACK_R=y
> @@ -34,6 +33,7 @@ CONFIG_CMD_FAT=y
>  CONFIG_CMD_FS_GENERIC=y
>  CONFIG_SPL_OF_CONTROL=y
>  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_SPL_OF_PLATDATA=y
>  CONFIG_REGMAP=y
>  CONFIG_SPL_REGMAP=y
>  CONFIG_SYSCON=y
> @@ -45,8 +45,8 @@ CONFIG_ROCKCHIP_GPIO=y
>  CONFIG_I2C_CROS_EC_TUNNEL=y
>  CONFIG_SYS_I2C_ROCKCHIP=y
>  CONFIG_I2C_MUX=y
> +CONFIG_DM_KEYBOARD=y
>  CONFIG_CROS_EC_KEYB=y
> -CONFIG_CMD_CROS_EC=y
>  CONFIG_CROS_EC=y
>  CONFIG_CROS_EC_SPI=y
>  CONFIG_PWRSEQ=y
> @@ -58,11 +58,9 @@ CONFIG_ROCKCHIP_RK3288_PINCTRL=y
>  CONFIG_DM_PMIC=y
>  # CONFIG_SPL_PMIC_CHILDREN is not set
>  CONFIG_PMIC_RK808=y
> -CONFIG_DM_REGULATOR=y
>  CONFIG_SPL_DM_REGULATOR=y
>  CONFIG_DM_REGULATOR_FIXED=y
>  CONFIG_REGULATOR_RK808=y
> -CONFIG_DM_PWM=y
>  CONFIG_PWM_ROCKCHIP=y
>  CONFIG_RAM=y
>  CONFIG_SPL_RAM=y
> @@ -80,5 +78,4 @@ CONFIG_VIDEO_ROCKCHIP=y
>  CONFIG_USE_TINY_PRINTF=y
>  CONFIG_CMD_DHRYSTONE=y
>  CONFIG_ERRNO_STR=y
> -CONFIG_SPL_OF_PLATDATA=y
>  # CONFIG_SPL_OF_LIBFDT is not set
> diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
> index 46df1a6..95e5f57 100644
> --- a/configs/chromebook_jerry_defconfig
> +++ b/configs/chromebook_jerry_defconfig
> @@ -34,6 +34,7 @@ CONFIG_CMD_FAT=y
>  CONFIG_CMD_FS_GENERIC=y
>  CONFIG_SPL_OF_CONTROL=y
>  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_SPL_OF_PLATDATA=y
>  CONFIG_REGMAP=y
>  CONFIG_SPL_REGMAP=y
>  CONFIG_SYSCON=y
> @@ -78,5 +79,4 @@ CONFIG_CONSOLE_SCROLL_LINES=10
>  CONFIG_USE_TINY_PRINTF=y
>  CONFIG_CMD_DHRYSTONE=y
>  CONFIG_ERRNO_STR=y
> -CONFIG_SPL_OF_PLATDATA=y
>  # CONFIG_SPL_OF_LIBFDT is not set
> diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
> index 782123b..8407731 100644
> --- a/configs/chromebook_link_defconfig
> +++ b/configs/chromebook_link_defconfig
> @@ -57,8 +57,8 @@ CONFIG_TPM_TIS_LPC=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_DM_VIDEO=y
>  CONFIG_USB_KEYBOARD=y
> +CONFIG_DM_VIDEO=y
>  CONFIG_VIDEO_VESA=y
>  CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
>  CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
> diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig
> index 6aced14..49cd640 100644
> --- a/configs/chromebook_minnie_defconfig
> +++ b/configs/chromebook_minnie_defconfig
> @@ -34,6 +34,7 @@ CONFIG_CMD_FAT=y
>  CONFIG_CMD_FS_GENERIC=y
>  CONFIG_SPL_OF_CONTROL=y
>  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_SPL_OF_PLATDATA=y
>  CONFIG_REGMAP=y
>  CONFIG_SPL_REGMAP=y
>  CONFIG_SYSCON=y
> @@ -78,5 +79,4 @@ CONFIG_CONSOLE_SCROLL_LINES=10
>  CONFIG_USE_TINY_PRINTF=y
>  CONFIG_CMD_DHRYSTONE=y
>  CONFIG_ERRNO_STR=y
> -CONFIG_SPL_OF_PLATDATA=y
>  # CONFIG_SPL_OF_LIBFDT is not set
> diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
> index 8bf94cb..f8cf92b 100644
> --- a/configs/chromebox_panther_defconfig
> +++ b/configs/chromebox_panther_defconfig
> @@ -49,8 +49,8 @@ CONFIG_TPM_TIS_LPC=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_DM_VIDEO=y
>  CONFIG_USB_KEYBOARD=y
> +CONFIG_DM_VIDEO=y
>  CONFIG_VIDEO_VESA=y
>  CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
>  CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
> diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
> index 2b317b8..28f69e4 100644
> --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
> +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
> @@ -62,8 +62,8 @@ CONFIG_TIMER=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_DM_VIDEO=y
>  CONFIG_USB_KEYBOARD=y
> +CONFIG_DM_VIDEO=y
>  CONFIG_VIDEO_VESA=y
>  CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
>  CONFIG_FRAMEBUFFER_VESA_MODE_114=y
> diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
> index e4d1e0d..2528db9 100644
> --- a/configs/conga-qeval20-qa3-e3845_defconfig
> +++ b/configs/conga-qeval20-qa3-e3845_defconfig
> @@ -61,8 +61,8 @@ CONFIG_TIMER=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_DM_VIDEO=y
>  CONFIG_USB_KEYBOARD=y
> +CONFIG_DM_VIDEO=y
>  CONFIG_VIDEO_VESA=y
>  CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
>  CONFIG_FRAMEBUFFER_VESA_MODE_114=y
> diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
> index 352055a..2195fc6 100644
> --- a/configs/coreboot-x86_defconfig
> +++ b/configs/coreboot-x86_defconfig
> @@ -41,9 +41,9 @@ CONFIG_TPM_TIS_LPC=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USB_STORAGE=y
> +CONFIG_USB_KEYBOARD=y
>  CONFIG_DM_VIDEO=y
>  CONFIG_VIDEO_COREBOOT=y
> -CONFIG_USB_KEYBOARD=y
>  CONFIG_CONSOLE_SCROLL_LINES=5
>  CONFIG_USE_PRIVATE_LIBGCC=y
>  CONFIG_TPM=y
> diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
> index 402d141..5aa7234 100644
> --- a/configs/crownbay_defconfig
> +++ b/configs/crownbay_defconfig
> @@ -48,8 +48,8 @@ CONFIG_TIMER=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_DM_VIDEO=y
>  CONFIG_USB_KEYBOARD=y
> +CONFIG_DM_VIDEO=y
>  CONFIG_VIDEO_VESA=y
>  CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
>  CONFIG_CONSOLE_SCROLL_LINES=5
> diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
> index 897c48d..f657ef6 100644
> --- a/configs/dfi-bt700-q7x-151_defconfig
> +++ b/configs/dfi-bt700-q7x-151_defconfig
> @@ -59,8 +59,8 @@ CONFIG_TIMER=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_DM_VIDEO=y
>  CONFIG_USB_KEYBOARD=y
> +CONFIG_DM_VIDEO=y
>  CONFIG_VIDEO_VESA=y
>  CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
>  CONFIG_FRAMEBUFFER_VESA_MODE_114=y
> diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig
> index c8251ff..9dcb6ad 100644
> --- a/configs/dms-ba16-1g_defconfig
> +++ b/configs/dms-ba16-1g_defconfig
> @@ -1,7 +1,6 @@
>  CONFIG_ARM=y
>  CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_ADVANTECH_DMS_BA16=y
> -CONFIG_DEFAULT_FDT_FILE="imx6q-dms-ba16.dtb"
>  CONFIG_SYS_DDR_1G=y
>  CONFIG_VIDEO=y
>  CONFIG_BOOTDELAY=1
> @@ -9,6 +8,7 @@ CONFIG_BOOTDELAY=1
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
>  # CONFIG_SYS_STDIO_DEREGISTER is not set
> +CONFIG_DEFAULT_FDT_FILE="imx6q-dms-ba16.dtb"
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig
> index 56dec74..664f039 100644
> --- a/configs/dms-ba16_defconfig
> +++ b/configs/dms-ba16_defconfig
> @@ -2,12 +2,12 @@ CONFIG_ARM=y
>  CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_ADVANTECH_DMS_BA16=y
>  CONFIG_VIDEO=y
> -CONFIG_DEFAULT_FDT_FILE="imx6q-dms-ba16.dtb"
>  CONFIG_BOOTDELAY=1
>  # CONFIG_CONSOLE_MUX is not set
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
>  # CONFIG_SYS_STDIO_DEREGISTER is not set
> +CONFIG_DEFAULT_FDT_FILE="imx6q-dms-ba16.dtb"
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig
> index c88cd36..c5563a4 100644
> --- a/configs/e2220-1170_defconfig
> +++ b/configs/e2220-1170_defconfig
> @@ -5,7 +5,6 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-e2220-1170"
>  CONFIG_OF_SYSTEM_SETUP=y
>  CONFIG_CONSOLE_MUX=y
>  CONFIG_SYS_STDIO_DEREGISTER=y
> -CONFIG_HUSH_PARSER=y
>  CONFIG_SYS_PROMPT="Tegra210 (E2220-1170) # "
>  # CONFIG_CMD_IMI is not set
>  # CONFIG_CMD_IMLS is not set
> @@ -20,15 +19,8 @@ CONFIG_CMD_USB_MASS_STORAGE=y
>  # CONFIG_CMD_FPGA is not set
>  CONFIG_CMD_GPIO=y
>  # CONFIG_CMD_SETEXPR is not set
> -CONFIG_CMD_DHCP=y
>  # CONFIG_CMD_NFS is not set
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
>  CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
>  # CONFIG_BLK is not set
>  CONFIG_DFU_MMC=y
>  CONFIG_DFU_RAM=y
> diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig
> index 8db9041..e5e550c 100644
> --- a/configs/evb-rk3288_defconfig
> +++ b/configs/evb-rk3288_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
>  CONFIG_ARCH_ROCKCHIP=y
>  CONFIG_SYS_MALLOC_F_LEN=0x2000
>  CONFIG_ROCKCHIP_RK3288=y
> +CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
>  CONFIG_TARGET_EVB_RK3288=y
>  CONFIG_SPL_STACK_R_ADDR=0x80000
>  CONFIG_DEFAULT_DEVICE_TREE="rk3288-evb"
> @@ -64,4 +65,3 @@ CONFIG_SYSRESET=y
>  CONFIG_USE_TINY_PRINTF=y
>  CONFIG_CMD_DHRYSTONE=y
>  CONFIG_ERRNO_STR=y
> -CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
> diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig
> index 40a8295..95029d7 100644
> --- a/configs/evb-rk3399_defconfig
> +++ b/configs/evb-rk3399_defconfig
> @@ -24,9 +24,9 @@ CONFIG_ROCKCHIP_DWMMC=y
>  CONFIG_ROCKCHIP_SDHCI=y
>  CONFIG_PINCTRL=y
>  CONFIG_ROCKCHIP_RK3399_PINCTRL=y
> -CONFIG_PWM_ROCKCHIP=y
>  CONFIG_REGULATOR_PWM=y
>  CONFIG_DM_REGULATOR_FIXED=y
> +CONFIG_PWM_ROCKCHIP=y
>  CONFIG_RAM=y
>  CONFIG_DEBUG_UART=y
>  CONFIG_DEBUG_UART_BASE=0xFF1A0000
> diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig
> index d5452004b..eff5e15 100644
> --- a/configs/fennec-rk3288_defconfig
> +++ b/configs/fennec-rk3288_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
>  CONFIG_ARCH_ROCKCHIP=y
>  CONFIG_SYS_MALLOC_F_LEN=0x2000
>  CONFIG_ROCKCHIP_RK3288=y
> +CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
>  CONFIG_TARGET_FENNEC_RK3288=y
>  CONFIG_SPL_STACK_R_ADDR=0x80000
>  CONFIG_DEFAULT_DEVICE_TREE="rk3288-fennec"
> @@ -63,4 +64,3 @@ CONFIG_SYSRESET=y
>  CONFIG_USE_TINY_PRINTF=y
>  CONFIG_CMD_DHRYSTONE=y
>  CONFIG_ERRNO_STR=y
> -CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
> diff --git a/configs/ge_b450v3_defconfig b/configs/ge_b450v3_defconfig
> index b5a68e2..6550c9e 100644
> --- a/configs/ge_b450v3_defconfig
> +++ b/configs/ge_b450v3_defconfig
> @@ -1,11 +1,11 @@
>  CONFIG_ARM=y
>  CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_GE_B450V3=y
> -CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b450v3.dtb"
>  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_BOOTDELAY=1
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> +CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b450v3.dtb"
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig
> index 7f4ba29..7cf1899 100644
> --- a/configs/ge_b650v3_defconfig
> +++ b/configs/ge_b650v3_defconfig
> @@ -1,11 +1,11 @@
>  CONFIG_ARM=y
>  CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_GE_B650V3=y
> -CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b650v3.dtb"
>  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_BOOTDELAY=1
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> +CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b650v3.dtb"
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/ge_b850v3_defconfig b/configs/ge_b850v3_defconfig
> index db2609f..63025bc 100644
> --- a/configs/ge_b850v3_defconfig
> +++ b/configs/ge_b850v3_defconfig
> @@ -1,11 +1,11 @@
>  CONFIG_ARM=y
>  CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_GE_B850V3=y
> -CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b850v3.dtb"
>  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_BOOTDELAY=1
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> +CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b850v3.dtb"
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig
> index fcf4934..5d3e073 100644
> --- a/configs/imx6qdl_icore_mmc_defconfig
> +++ b/configs/imx6qdl_icore_mmc_defconfig
> @@ -1,44 +1,39 @@
>  CONFIG_ARM=y
>  CONFIG_ARCH_MX6=y
> +CONFIG_SPL_GPIO_SUPPORT=y
> +CONFIG_SPL_LIBCOMMON_SUPPORT=y
> +CONFIG_SPL_LIBGENERIC_SUPPORT=y
>  CONFIG_TARGET_MX6Q_ICORE=y
> +CONFIG_SPL_EXT_SUPPORT=y
> +CONFIG_SPL_I2C_SUPPORT=y
> +CONFIG_SPL_LIBDISK_SUPPORT=y
> +CONFIG_SPL_SERIAL_SUPPORT=y
> +CONFIG_SPL_WATCHDOG_SUPPORT=y
> +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore"
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
> +CONFIG_BOOTDELAY=3
>  CONFIG_DEFAULT_FDT_FILE="imx6dl-icore.dtb"
> -CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore"
> -CONFIG_SYS_PROMPT="icorem6qdl> "
>  CONFIG_SPL=y
> -CONFIG_BOOTDELAY=3
> -CONFIG_BOARD_EARLY_INIT_F=y
> -CONFIG_DISPLAY_CPUINFO=y
>  CONFIG_HUSH_PARSER=y
> -CONFIG_AUTO_COMPLETE=y
> -CONFIG_SYS_MAXARGS=32
> -# CONFIG_CMD_IMLS is not set
> -# CONFIG_BLK is not set
> -# CONFIG_DM_MMC_OPS is not set
> +CONFIG_SYS_PROMPT="icorem6qdl> "
>  CONFIG_CMD_BOOTZ=y
> +# CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_MEMTEST=y
> +CONFIG_CMD_MMC=y
>  CONFIG_CMD_GPIO=y
>  CONFIG_CMD_MII=y
>  CONFIG_CMD_PING=y
> -CONFIG_CMD_MEMTEST=y
> -CONFIG_CMD_MMC=y
>  CONFIG_CMD_CACHE=y
>  CONFIG_CMD_EXT2=y
>  CONFIG_CMD_EXT4=y
>  CONFIG_CMD_EXT4_WRITE=y
>  CONFIG_CMD_FAT=y
>  CONFIG_CMD_FS_GENERIC=y
> -CONFIG_OF_LIBFDT=y
> -CONFIG_FEC_MXC=y
> -CONFIG_MXC_UART=y
> +# CONFIG_BLK is not set
> +# CONFIG_DM_MMC_OPS is not set
>  CONFIG_NETDEVICES=y
> -CONFIG_IMX_THERMAL=y
> +CONFIG_FEC_MXC=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_IMX6=y
> -CONFIG_SPL_LIBDISK_SUPPORT=y
> -CONFIG_SPL_LIBCOMMON_SUPPORT=y
> -CONFIG_SPL_LIBGENERIC_SUPPORT=y
> -CONFIG_SPL_SERIAL_SUPPORT=y
> -CONFIG_SPL_I2C_SUPPORT=y
> -CONFIG_SPL_GPIO_SUPPORT=y
> -CONFIG_SPL_WATCHDOG_SUPPORT=y
> -CONFIG_SPL_EXT_SUPPORT=y
> +CONFIG_MXC_UART=y
> +CONFIG_IMX_THERMAL=y
> diff --git a/configs/imx6qdl_icore_nand_defconfig b/configs/imx6qdl_icore_nand_defconfig
> index 4919d44..c7843c1 100644
> --- a/configs/imx6qdl_icore_nand_defconfig
> +++ b/configs/imx6qdl_icore_nand_defconfig
> @@ -1,39 +1,34 @@
>  CONFIG_ARM=y
>  CONFIG_ARCH_MX6=y
> +CONFIG_SPL_GPIO_SUPPORT=y
> +CONFIG_SPL_LIBCOMMON_SUPPORT=y
> +CONFIG_SPL_LIBGENERIC_SUPPORT=y
>  CONFIG_TARGET_MX6Q_ICORE=y
> +CONFIG_SPL_I2C_SUPPORT=y
> +CONFIG_SPL_SERIAL_SUPPORT=y
> +CONFIG_SPL_WATCHDOG_SUPPORT=y
> +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore"
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND"
> +CONFIG_BOOTDELAY=3
>  CONFIG_DEFAULT_FDT_FILE="imx6dl-icore.dtb"
> -CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore"
> -CONFIG_SYS_PROMPT="icorem6qdl> "
>  CONFIG_SPL=y
> -CONFIG_BOOTDELAY=3
> -CONFIG_BOARD_EARLY_INIT_F=y
> -CONFIG_DISPLAY_CPUINFO=y
> +CONFIG_SPL_DMA_SUPPORT=y
>  CONFIG_HUSH_PARSER=y
> -CONFIG_AUTO_COMPLETE=y
> -CONFIG_SYS_MAXARGS=32
> -# CONFIG_CMD_IMLS is not set
> +CONFIG_SYS_PROMPT="icorem6qdl> "
>  CONFIG_CMD_BOOTZ=y
> +# CONFIG_CMD_IMLS is not set
> +CONFIG_CMD_MEMTEST=y
> +CONFIG_CMD_NAND=y
>  CONFIG_CMD_GPIO=y
>  CONFIG_CMD_MII=y
>  CONFIG_CMD_PING=y
> -CONFIG_CMD_MEMTEST=y
> -CONFIG_CMD_NAND=y
>  CONFIG_CMD_CACHE=y
> -CONFIG_OF_LIBFDT=y
> -CONFIG_FEC_MXC=y
> -CONFIG_MXC_UART=y
> -CONFIG_NAND_MXS=y
> -CONFIG_NETDEVICES=y
> -CONFIG_IMX_THERMAL=y
>  # CONFIG_BLK is not set
>  # CONFIG_DM_MMC_OPS is not set
> +CONFIG_NAND_MXS=y
> +CONFIG_NETDEVICES=y
> +CONFIG_FEC_MXC=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_IMX6=y
> -CONFIG_SPL_LIBCOMMON_SUPPORT=y
> -CONFIG_SPL_LIBGENERIC_SUPPORT=y
> -CONFIG_SPL_SERIAL_SUPPORT=y
> -CONFIG_SPL_I2C_SUPPORT=y
> -CONFIG_SPL_GPIO_SUPPORT=y
> -CONFIG_SPL_WATCHDOG_SUPPORT=y
> -CONFIG_SPL_DMA_SUPPORT=y
> +CONFIG_MXC_UART=y
> +CONFIG_IMX_THERMAL=y
> diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig
> index c2d5d47..76226e9 100644
> --- a/configs/kc1_defconfig
> +++ b/configs/kc1_defconfig
> @@ -4,6 +4,7 @@ CONFIG_OMAP44XX=y
>  CONFIG_TARGET_KC1=y
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_SPL=y
> +# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
>  CONFIG_HUSH_PARSER=y
>  CONFIG_SYS_PROMPT="kc1 # "
>  CONFIG_CMD_BOOTZ=y
> @@ -31,4 +32,3 @@ CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
>  CONFIG_G_DNL_VENDOR_NUM=0x0451
>  CONFIG_G_DNL_PRODUCT_NUM=0xd022
>  CONFIG_OF_LIBFDT=y
> -# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
> diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig
> index 631d1f5..a4281c9 100644
> --- a/configs/kylin-rk3036_defconfig
> +++ b/configs/kylin-rk3036_defconfig
> @@ -13,6 +13,7 @@ CONFIG_CMD_MMC=y
>  CONFIG_CMD_SF=y
>  CONFIG_CMD_SPI=y
>  CONFIG_CMD_I2C=y
> +CONFIG_CMD_USB=y
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_CMD_DHCP=y
>  CONFIG_CMD_MII=y
> @@ -35,8 +36,7 @@ CONFIG_ROCKCHIP_RK3036_PINCTRL=y
>  CONFIG_DM_REGULATOR_FIXED=y
>  CONFIG_RAM=y
>  CONFIG_SYSRESET=y
> -CONFIG_CMD_DHRYSTONE=y
> -CONFIG_ERRNO_STR=y
> -CONFIG_CMD_USB=y
>  CONFIG_USB=y
>  CONFIG_USB_STORAGE=y
> +CONFIG_CMD_DHRYSTONE=y
> +CONFIG_ERRNO_STR=y
> diff --git a/configs/ls1012afrdm_qspi_defconfig b/configs/ls1012afrdm_qspi_defconfig
> index c83b2eb..252d45a 100644
> --- a/configs/ls1012afrdm_qspi_defconfig
> +++ b/configs/ls1012afrdm_qspi_defconfig
> @@ -1,5 +1,6 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_LS1012AFRDM=y
> +CONFIG_QSPI_AHB_INIT=y
>  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-frdm"
>  # CONFIG_SYS_MALLOC_F is not set
>  CONFIG_FIT=y
> @@ -34,4 +35,3 @@ CONFIG_USB=y
>  CONFIG_USB_XHCI_HCD=y
>  CONFIG_USB_XHCI_DWC3=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_QSPI_AHB_INIT=y
> diff --git a/configs/ls1012aqds_qspi_defconfig b/configs/ls1012aqds_qspi_defconfig
> index 27bccd1..e74141f 100644
> --- a/configs/ls1012aqds_qspi_defconfig
> +++ b/configs/ls1012aqds_qspi_defconfig
> @@ -1,5 +1,6 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_LS1012AQDS=y
> +CONFIG_QSPI_AHB_INIT=y
>  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-qds"
>  # CONFIG_SYS_MALLOC_F is not set
>  CONFIG_FIT=y
> @@ -38,4 +39,3 @@ CONFIG_USB=y
>  CONFIG_USB_XHCI_HCD=y
>  CONFIG_USB_XHCI_DWC3=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_QSPI_AHB_INIT=y
> diff --git a/configs/ls1012ardb_qspi_defconfig b/configs/ls1012ardb_qspi_defconfig
> index 459682d..d5ed70f 100644
> --- a/configs/ls1012ardb_qspi_defconfig
> +++ b/configs/ls1012ardb_qspi_defconfig
> @@ -1,5 +1,6 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_LS1012ARDB=y
> +CONFIG_QSPI_AHB_INIT=y
>  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb"
>  # CONFIG_SYS_MALLOC_F is not set
>  CONFIG_FIT=y
> @@ -38,4 +39,3 @@ CONFIG_USB=y
>  CONFIG_USB_XHCI_HCD=y
>  CONFIG_USB_XHCI_DWC3=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_QSPI_AHB_INIT=y
> diff --git a/configs/ls1021aiot_qspi_defconfig b/configs/ls1021aiot_qspi_defconfig
> index 6c9140b..21464cb 100644
> --- a/configs/ls1021aiot_qspi_defconfig
> +++ b/configs/ls1021aiot_qspi_defconfig
> @@ -1,15 +1,15 @@
> -CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
>  CONFIG_ARM=y
> -CONFIG_DM_SPI=y
> -CONFIG_DM=y
> +CONFIG_TARGET_LS1021AIOT=y
> +CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart"
> +CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
>  CONFIG_OF_CONTROL=y
> +CONFIG_DM=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_SPI_FLASH_ATMEL=y
>  CONFIG_SPI_FLASH_STMICRO=y
>  CONFIG_NETDEVICES=y
>  CONFIG_E1000=y
>  CONFIG_SYS_NS16550=y
> +CONFIG_DM_SPI=y
>  CONFIG_FSL_DSPI=y
>  CONFIG_FSL_QSPI=y
> -CONFIG_TARGET_LS1021AIOT=y
> -CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart"
> diff --git a/configs/ls1021aiot_sdcard_defconfig b/configs/ls1021aiot_sdcard_defconfig
> index a5a391d..1369fe6 100644
> --- a/configs/ls1021aiot_sdcard_defconfig
> +++ b/configs/ls1021aiot_sdcard_defconfig
> @@ -1,19 +1,18 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_LS1021AIOT=y
> +CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart"
> +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI"
>  CONFIG_SPL=y
>  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
>  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xe8
> -CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart"
> -CONFIG_DM_SPI=y
> -CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI"
> -CONFIG_CMD_DM=y
> -CONFIG_DM=y
>  CONFIG_OF_CONTROL=y
> +CONFIG_DM=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_SPI_FLASH_ATMEL=y
>  CONFIG_SPI_FLASH_STMICRO=y
> -CONFIG_FSL_DSPI=y
> -CONFIG_FSL_QSPI=y
>  CONFIG_NETDEVICES=y
>  CONFIG_E1000=y
>  CONFIG_SYS_NS16550=y
> +CONFIG_DM_SPI=y
> +CONFIG_FSL_DSPI=y
> +CONFIG_FSL_QSPI=y
> diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
> index 8b869fa..f3de25f 100644
> --- a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
> +++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
> @@ -1,5 +1,6 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_LS1021AQDS=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_SYS_FSL_DDR3=y
>  CONFIG_VIDEO=y
>  # CONFIG_SYS_MALLOC_F is not set
> @@ -7,7 +8,6 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=3
>  CONFIG_SILENT_CONSOLE=y
>  # CONFIG_CONSOLE_MUX is not set
> diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
> index 946945f..746a66a 100644
> --- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
> +++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
> @@ -1,12 +1,12 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_LS1021ATWR=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_VIDEO=y
>  # CONFIG_SYS_MALLOC_F is not set
>  CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=3
>  CONFIG_SILENT_CONSOLE=y
>  # CONFIG_CONSOLE_MUX is not set
> diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
> index 5e74645..6f22f1a 100644
> --- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
> +++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
>  CONFIG_TARGET_LS1021ATWR=y
>  CONFIG_SPL_LIBCOMMON_SUPPORT=y
>  CONFIG_SPL_LIBGENERIC_SUPPORT=y
> +CONFIG_SECURE_BOOT=y
>  CONFIG_SPL_I2C_SUPPORT=y
>  CONFIG_SPL_MMC_SUPPORT=y
>  CONFIG_SPL_SERIAL_SUPPORT=y
> @@ -14,7 +15,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=0
>  CONFIG_SILENT_CONSOLE=y
>  # CONFIG_CONSOLE_MUX is not set
> diff --git a/configs/ls1043ardb_SECURE_BOOT_defconfig b/configs/ls1043ardb_SECURE_BOOT_defconfig
> index b892e35..ae2efeb 100644
> --- a/configs/ls1043ardb_SECURE_BOOT_defconfig
> +++ b/configs/ls1043ardb_SECURE_BOOT_defconfig
> @@ -5,7 +5,6 @@ CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb"
>  CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_MMC=y
> diff --git a/configs/ls1046aqds_lpuart_defconfig b/configs/ls1046aqds_lpuart_defconfig
> index 25bb5f9..83ed0e0 100644
> --- a/configs/ls1046aqds_lpuart_defconfig
> +++ b/configs/ls1046aqds_lpuart_defconfig
> @@ -1,6 +1,5 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_LS1046AQDS=y
> -CONFIG_SYS_FSL_DDR4=y
>  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-lpuart"
>  CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
> @@ -23,8 +22,8 @@ CONFIG_CMD_EXT2=y
>  CONFIG_CMD_FAT=y
>  CONFIG_OF_CONTROL=y
>  CONFIG_DM=y
> -CONFIG_DM_SPI=y
>  CONFIG_SPI_FLASH=y
> -CONFIG_FSL_DSPI=y
>  CONFIG_DM_SERIAL=y
>  CONFIG_FSL_LPUART=y
> +CONFIG_DM_SPI=y
> +CONFIG_FSL_DSPI=y
> diff --git a/configs/ls1046ardb_qspi_defconfig b/configs/ls1046ardb_qspi_defconfig
> index fa17373..a973cf4 100644
> --- a/configs/ls1046ardb_qspi_defconfig
> +++ b/configs/ls1046ardb_qspi_defconfig
> @@ -1,5 +1,6 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_LS1046ARDB=y
> +CONFIG_QSPI_AHB_INIT=y
>  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
>  CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
> @@ -24,4 +25,3 @@ CONFIG_SPI_FLASH=y
>  CONFIG_SYS_NS16550=y
>  CONFIG_DM_SPI=y
>  CONFIG_FSL_QSPI=y
> -CONFIG_QSPI_AHB_INIT=y
> diff --git a/configs/ls2080aqds_SECURE_BOOT_defconfig b/configs/ls2080aqds_SECURE_BOOT_defconfig
> index 0c70f92..1ed6e05 100644
> --- a/configs/ls2080aqds_SECURE_BOOT_defconfig
> +++ b/configs/ls2080aqds_SECURE_BOOT_defconfig
> @@ -7,7 +7,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, LS2080A"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_CMD_GREPENV=y
>  CONFIG_CMD_MMC=y
> diff --git a/configs/ls2080ardb_SECURE_BOOT_defconfig b/configs/ls2080ardb_SECURE_BOOT_defconfig
> index 1d20175..848abbc 100644
> --- a/configs/ls2080ardb_SECURE_BOOT_defconfig
> +++ b/configs/ls2080ardb_SECURE_BOOT_defconfig
> @@ -7,7 +7,6 @@ CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_STDOUT_VIA_ALIAS=y
>  CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, LS2080A"
> -CONFIG_SECURE_BOOT=y
>  CONFIG_BOOTDELAY=10
>  CONFIG_CMD_GREPENV=y
>  CONFIG_CMD_MMC=y
> diff --git a/configs/miniarm-rk3288_defconfig b/configs/miniarm-rk3288_defconfig
> index 888563b..1e273a6 100644
> --- a/configs/miniarm-rk3288_defconfig
> +++ b/configs/miniarm-rk3288_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
>  CONFIG_ARCH_ROCKCHIP=y
>  CONFIG_SYS_MALLOC_F_LEN=0x2000
>  CONFIG_ROCKCHIP_RK3288=y
> +CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
>  CONFIG_TARGET_MINIARM_RK3288=y
>  CONFIG_SPL_STACK_R_ADDR=0x80000
>  CONFIG_DEFAULT_DEVICE_TREE="rk3288-miniarm"
> @@ -62,4 +63,3 @@ CONFIG_SYSRESET=y
>  CONFIG_USE_TINY_PRINTF=y
>  CONFIG_CMD_DHRYSTONE=y
>  CONFIG_ERRNO_STR=y
> -CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
> diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
> index 0706ddf..45d8a87 100644
> --- a/configs/minnowmax_defconfig
> +++ b/configs/minnowmax_defconfig
> @@ -58,8 +58,8 @@ CONFIG_TIMER=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_DM_VIDEO=y
>  CONFIG_USB_KEYBOARD=y
> +CONFIG_DM_VIDEO=y
>  CONFIG_VIDEO_VESA=y
>  CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
>  CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
> diff --git a/configs/mx25pdk_defconfig b/configs/mx25pdk_defconfig
> index c3ab7c2..87d7fab 100644
> --- a/configs/mx25pdk_defconfig
> +++ b/configs/mx25pdk_defconfig
> @@ -1,8 +1,8 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_MX25PDK=y
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx25pdk/imximage.cfg"
> -CONFIG_DEFAULT_FDT_FILE="imx25-pdk.dtb"
>  CONFIG_BOOTDELAY=1
> +CONFIG_DEFAULT_FDT_FILE="imx25-pdk.dtb"
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/mx53ard_defconfig b/configs/mx53ard_defconfig
> index fe0f106..886296b 100644
> --- a/configs/mx53ard_defconfig
> +++ b/configs/mx53ard_defconfig
> @@ -1,8 +1,8 @@
>  CONFIG_ARM=y
>  CONFIG_TARGET_MX53ARD=y
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53ard/imximage_dd3.cfg"
> -CONFIG_DEFAULT_FDT_FILE="imx53-ard.dtb"
>  CONFIG_BOOTDELAY=3
> +CONFIG_DEFAULT_FDT_FILE="imx53-ard.dtb"
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/mx6ull_14x14_evk_plugin_defconfig b/configs/mx6ull_14x14_evk_plugin_defconfig
> index 095e48d..56d35dd 100644
> --- a/configs/mx6ull_14x14_evk_plugin_defconfig
> +++ b/configs/mx6ull_14x14_evk_plugin_defconfig
> @@ -21,11 +21,11 @@ CONFIG_CMD_EXT4_WRITE=y
>  CONFIG_CMD_FAT=y
>  CONFIG_CMD_FS_GENERIC=y
>  CONFIG_OF_CONTROL=y
> +# CONFIG_BLK is not set
>  CONFIG_DM_GPIO=y
>  CONFIG_DM_74X164=y
>  CONFIG_DM_I2C=y
>  CONFIG_DM_MMC=y
> -# CONFIG_BLK is not set
>  # CONFIG_DM_MMC_OPS is not set
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_IMX6=y
> diff --git a/configs/mx7dsabresd_secure_defconfig b/configs/mx7dsabresd_secure_defconfig
> index ef93522..e8ccbd3 100644
> --- a/configs/mx7dsabresd_secure_defconfig
> +++ b/configs/mx7dsabresd_secure_defconfig
> @@ -19,6 +19,7 @@ CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMPORTENV is not set
>  CONFIG_CMD_MEMTEST=y
>  CONFIG_CMD_MMC=y
> +CONFIG_CMD_SF=y
>  CONFIG_CMD_I2C=y
>  CONFIG_CMD_USB=y
>  CONFIG_CMD_DFU=y
> @@ -34,6 +35,8 @@ CONFIG_CMD_EXT4_WRITE=y
>  CONFIG_CMD_FAT=y
>  CONFIG_DFU_MMC=y
>  CONFIG_DFU_RAM=y
> +CONFIG_SPI_FLASH=y
> +CONFIG_SPI_FLASH_EON=y
>  CONFIG_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_MXC_USB_OTG_HACTIVE=y
> @@ -45,6 +48,3 @@ CONFIG_G_DNL_MANUFACTURER="FSL"
>  CONFIG_G_DNL_VENDOR_NUM=0x0525
>  CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
>  CONFIG_OF_LIBFDT=y
> -CONFIG_SPI_FLASH=y
> -CONFIG_CMD_SF=y
> -CONFIG_SPI_FLASH_EON=y
> diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
> index 3926552..727c13a 100644
> --- a/configs/odroid-xu3_defconfig
> +++ b/configs/odroid-xu3_defconfig
> @@ -25,7 +25,6 @@ CONFIG_CMD_EXT4_WRITE=y
>  CONFIG_ADC=y
>  CONFIG_ADC_EXYNOS=y
>  CONFIG_DFU_MMC=y
> -CONFIG_DM_I2C=y
>  CONFIG_DM_I2C_COMPAT=y
>  CONFIG_DM_PMIC=y
>  CONFIG_PMIC_S2MPS11=y
> diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
> index f3ddc74..e250d16 100644
> --- a/configs/odroid_defconfig
> +++ b/configs/odroid_defconfig
> @@ -35,7 +35,6 @@ CONFIG_CMD_FAT=y
>  CONFIG_CMD_FS_GENERIC=y
>  CONFIG_OF_CONTROL=y
>  CONFIG_DFU_MMC=y
> -CONFIG_DM_I2C=y
>  CONFIG_DM_I2C_COMPAT=y
>  CONFIG_DM_PMIC=y
>  CONFIG_DM_PMIC_MAX77686=y
> diff --git a/configs/origen_defconfig b/configs/origen_defconfig
> index 7b9826a..0d91ec1 100644
> --- a/configs/origen_defconfig
> +++ b/configs/origen_defconfig
> @@ -37,4 +37,3 @@ CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Samsung"
>  CONFIG_G_DNL_VENDOR_NUM=0x04e8
>  CONFIG_G_DNL_PRODUCT_NUM=0x6601
> -CONFIG_DM_I2C=y
> diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig
> index 0b074ec..0ff4c13 100644
> --- a/configs/p2371-0000_defconfig
> +++ b/configs/p2371-0000_defconfig
> @@ -6,7 +6,6 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-0000"
>  CONFIG_OF_SYSTEM_SETUP=y
>  CONFIG_CONSOLE_MUX=y
>  CONFIG_SYS_STDIO_DEREGISTER=y
> -CONFIG_HUSH_PARSER=y
>  CONFIG_SYS_PROMPT="Tegra210 (P2371-0000) # "
>  # CONFIG_CMD_IMI is not set
>  # CONFIG_CMD_IMLS is not set
> @@ -21,15 +20,8 @@ CONFIG_CMD_USB_MASS_STORAGE=y
>  # CONFIG_CMD_FPGA is not set
>  CONFIG_CMD_GPIO=y
>  # CONFIG_CMD_SETEXPR is not set
> -CONFIG_CMD_DHCP=y
>  # CONFIG_CMD_NFS is not set
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
>  CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
>  # CONFIG_BLK is not set
>  CONFIG_DFU_MMC=y
>  CONFIG_DFU_RAM=y
> diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
> index 70e43a1..4dfb02d 100644
> --- a/configs/p2371-2180_defconfig
> +++ b/configs/p2371-2180_defconfig
> @@ -6,7 +6,6 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-2180"
>  CONFIG_OF_SYSTEM_SETUP=y
>  CONFIG_CONSOLE_MUX=y
>  CONFIG_SYS_STDIO_DEREGISTER=y
> -CONFIG_HUSH_PARSER=y
>  CONFIG_SYS_PROMPT="Tegra210 (P2371-2180) # "
>  # CONFIG_CMD_IMI is not set
>  # CONFIG_CMD_IMLS is not set
> @@ -21,15 +20,8 @@ CONFIG_CMD_USB_MASS_STORAGE=y
>  # CONFIG_CMD_FPGA is not set
>  CONFIG_CMD_GPIO=y
>  # CONFIG_CMD_SETEXPR is not set
> -CONFIG_CMD_DHCP=y
>  # CONFIG_CMD_NFS is not set
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
>  CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
>  # CONFIG_BLK is not set
>  CONFIG_DFU_MMC=y
>  CONFIG_DFU_RAM=y
> diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig
> index a114ce3..e49a42f 100644
> --- a/configs/p2571_defconfig
> +++ b/configs/p2571_defconfig
> @@ -6,7 +6,6 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571"
>  CONFIG_OF_SYSTEM_SETUP=y
>  CONFIG_CONSOLE_MUX=y
>  CONFIG_SYS_STDIO_DEREGISTER=y
> -CONFIG_HUSH_PARSER=y
>  CONFIG_SYS_PROMPT="Tegra210 (P2571) # "
>  # CONFIG_CMD_IMI is not set
>  # CONFIG_CMD_IMLS is not set
> @@ -21,15 +20,8 @@ CONFIG_CMD_USB_MASS_STORAGE=y
>  # CONFIG_CMD_FPGA is not set
>  CONFIG_CMD_GPIO=y
>  # CONFIG_CMD_SETEXPR is not set
> -CONFIG_CMD_DHCP=y
>  # CONFIG_CMD_NFS is not set
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
>  CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
>  # CONFIG_BLK is not set
>  CONFIG_DFU_MMC=y
>  CONFIG_DFU_RAM=y
> diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-000_defconfig
> index 61bb3a1..b4daa12 100644
> --- a/configs/p2771-0000-000_defconfig
> +++ b/configs/p2771-0000-000_defconfig
> @@ -5,7 +5,6 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-000"
>  CONFIG_OF_SYSTEM_SETUP=y
>  CONFIG_CONSOLE_MUX=y
>  CONFIG_SYS_STDIO_DEREGISTER=y
> -CONFIG_HUSH_PARSER=y
>  CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-000) # "
>  # CONFIG_CMD_IMI is not set
>  # CONFIG_CMD_IMLS is not set
> @@ -18,15 +17,8 @@ CONFIG_CMD_USB=y
>  # CONFIG_CMD_FPGA is not set
>  CONFIG_CMD_GPIO=y
>  # CONFIG_CMD_SETEXPR is not set
> -CONFIG_CMD_DHCP=y
>  # CONFIG_CMD_NFS is not set
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
>  CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
>  # CONFIG_BLK is not set
>  CONFIG_TEGRA186_BPMP_I2C=y
>  # CONFIG_DM_MMC_OPS is not set
> diff --git a/configs/p2771-0000-500_defconfig b/configs/p2771-0000-500_defconfig
> index 79f4808..02e974d 100644
> --- a/configs/p2771-0000-500_defconfig
> +++ b/configs/p2771-0000-500_defconfig
> @@ -5,7 +5,6 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-500"
>  CONFIG_OF_SYSTEM_SETUP=y
>  CONFIG_CONSOLE_MUX=y
>  CONFIG_SYS_STDIO_DEREGISTER=y
> -CONFIG_HUSH_PARSER=y
>  CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-500) # "
>  # CONFIG_CMD_IMI is not set
>  # CONFIG_CMD_IMLS is not set
> @@ -18,15 +17,8 @@ CONFIG_CMD_USB=y
>  # CONFIG_CMD_FPGA is not set
>  CONFIG_CMD_GPIO=y
>  # CONFIG_CMD_SETEXPR is not set
> -CONFIG_CMD_DHCP=y
>  # CONFIG_CMD_NFS is not set
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
>  CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
>  # CONFIG_BLK is not set
>  CONFIG_TEGRA186_BPMP_I2C=y
>  # CONFIG_DM_MMC_OPS is not set
> diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
> index a39cfd2..41b3bcb 100644
> --- a/configs/peach-pi_defconfig
> +++ b/configs/peach-pi_defconfig
> @@ -25,7 +25,6 @@ CONFIG_CMD_REGULATOR=y
>  CONFIG_CMD_TPM=y
>  CONFIG_CMD_TPM_TEST=y
>  CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_DM_I2C=y
>  CONFIG_DM_I2C_COMPAT=y
>  CONFIG_I2C_CROS_EC_TUNNEL=y
>  CONFIG_I2C_MUX=y
> diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
> index 4e00f19..770ab71 100644
> --- a/configs/peach-pit_defconfig
> +++ b/configs/peach-pit_defconfig
> @@ -25,7 +25,6 @@ CONFIG_CMD_REGULATOR=y
>  CONFIG_CMD_TPM=y
>  CONFIG_CMD_TPM_TEST=y
>  CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_DM_I2C=y
>  CONFIG_DM_I2C_COMPAT=y
>  CONFIG_I2C_CROS_EC_TUNNEL=y
>  CONFIG_I2C_MUX=y
> diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig
> index dba67bb..8856afb 100644
> --- a/configs/pico-imx6ul_defconfig
> +++ b/configs/pico-imx6ul_defconfig
> @@ -2,8 +2,8 @@ CONFIG_ARM=y
>  CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_PICO_IMX6UL=y
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/technexion/pico-imx6ul/imximage.cfg"
> -CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-hobbit.dtb"
>  CONFIG_BOOTDELAY=3
> +CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-hobbit.dtb"
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig
> index 1e70ae0..663724e 100644
> --- a/configs/popmetal-rk3288_defconfig
> +++ b/configs/popmetal-rk3288_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
>  CONFIG_ARCH_ROCKCHIP=y
>  CONFIG_SYS_MALLOC_F_LEN=0x2000
>  CONFIG_ROCKCHIP_RK3288=y
> +CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
>  CONFIG_TARGET_POPMETAL_RK3288=y
>  CONFIG_SPL_STACK_R_ADDR=0x80000
>  CONFIG_DEFAULT_DEVICE_TREE="rk3288-popmetal"
> @@ -62,4 +63,3 @@ CONFIG_SYSRESET=y
>  CONFIG_USE_TINY_PRINTF=y
>  CONFIG_CMD_DHRYSTONE=y
>  CONFIG_ERRNO_STR=y
> -CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
> diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
> index f593110..4566d37 100644
> --- a/configs/qemu-x86_defconfig
> +++ b/configs/qemu-x86_defconfig
> @@ -45,8 +45,8 @@ CONFIG_TIMER=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_DM_VIDEO=y
>  CONFIG_USB_KEYBOARD=y
> +CONFIG_DM_VIDEO=y
>  CONFIG_VIDEO_VESA=y
>  CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
>  CONFIG_FRAMEBUFFER_VESA_MODE_111=y
> diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig
> index e65fa78..f580d45 100644
> --- a/configs/qemu-x86_efi_payload32_defconfig
> +++ b/configs/qemu-x86_efi_payload32_defconfig
> @@ -42,8 +42,8 @@ CONFIG_TIMER=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_DM_VIDEO=y
>  CONFIG_USB_KEYBOARD=y
> +CONFIG_DM_VIDEO=y
>  CONFIG_VIDEO_VESA=y
>  CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
>  CONFIG_FRAMEBUFFER_VESA_MODE_111=y
> diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig
> index eaf0e32..975714b 100644
> --- a/configs/qemu-x86_efi_payload64_defconfig
> +++ b/configs/qemu-x86_efi_payload64_defconfig
> @@ -8,6 +8,7 @@ CONFIG_BOOTSTAGE_REPORT=y
>  CONFIG_SYS_CONSOLE_INFO_QUIET=y
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_CPU=y
> +# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
>  CONFIG_CMD_SF=y
> @@ -42,8 +43,8 @@ CONFIG_TIMER=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_DM_VIDEO=y
>  CONFIG_USB_KEYBOARD=y
> +CONFIG_DM_VIDEO=y
>  CONFIG_VIDEO_VESA=y
>  CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
>  CONFIG_FRAMEBUFFER_VESA_MODE_111=y
> @@ -52,4 +53,3 @@ CONFIG_USE_PRIVATE_LIBGCC=y
>  CONFIG_EFI=y
>  CONFIG_EFI_STUB=y
>  CONFIG_EFI_STUB_64BIT=y
> -# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
> diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
> index 1883f07..9e332bc 100644
> --- a/configs/rock2_defconfig
> +++ b/configs/rock2_defconfig
> @@ -1,7 +1,6 @@
>  CONFIG_ARM=y
>  CONFIG_ARCH_ROCKCHIP=y
>  CONFIG_SYS_MALLOC_F_LEN=0x2000
> -# CONFIG_SPL_MMC_SUPPORT is not set
>  CONFIG_ROCKCHIP_RK3288=y
>  CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
>  CONFIG_TARGET_ROCK2=y
> diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig
> index 8a786f1..931defc 100644
> --- a/configs/sama5d2_xplained_mmc_defconfig
> +++ b/configs/sama5d2_xplained_mmc_defconfig
> @@ -8,8 +8,6 @@ CONFIG_SPL_FAT_SUPPORT=y
>  CONFIG_SPL_LIBDISK_SUPPORT=y
>  CONFIG_SPL_MMC_SUPPORT=y
>  CONFIG_SPL_SERIAL_SUPPORT=y
> -CONFIG_DM_GPIO=y
> -CONFIG_DM_SERIAL=y
>  CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained"
>  CONFIG_FIT=y
>  CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC"
> @@ -34,24 +32,24 @@ CONFIG_OF_CONTROL=y
>  CONFIG_SPL_OF_CONTROL=y
>  CONFIG_DM=y
>  CONFIG_SPL_DM=y
> -CONFIG_BLK=y
>  CONFIG_CLK=y
>  CONFIG_SPL_CLK=y
>  CONFIG_CLK_AT91=y
>  CONFIG_AT91_UTMI=y
>  CONFIG_AT91_H32MX=y
>  CONFIG_AT91_GENERIC_CLK=y
> +CONFIG_DM_GPIO=y
>  CONFIG_ATMEL_PIO4=y
>  CONFIG_DM_I2C=y
>  CONFIG_SYS_I2C_AT91=y
>  CONFIG_DM_MMC=y
> -CONFIG_DM_MMC_OPS=y
>  CONFIG_ATMEL_SDHCI=y
>  CONFIG_DM_SPI_FLASH=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_SPI_FLASH_ATMEL=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_AT91PIO4=y
> +CONFIG_DM_SERIAL=y
>  CONFIG_DEBUG_UART=y
>  CONFIG_DEBUG_UART_ATMEL=y
>  CONFIG_DEBUG_UART_BASE=0xf8020000
> @@ -62,8 +60,8 @@ CONFIG_ATMEL_USART=y
>  CONFIG_DM_SPI=y
>  CONFIG_ATMEL_SPI=y
>  CONFIG_USB=y
> -CONFIG_USB_STORAGE=y
>  CONFIG_DM_USB=y
>  CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
>  CONFIG_USB_GADGET_ATMEL_USBA=y
> diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig
> index 51594e7..a04f9ea 100644
> --- a/configs/sama5d2_xplained_spiflash_defconfig
> +++ b/configs/sama5d2_xplained_spiflash_defconfig
> @@ -7,8 +7,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
>  CONFIG_SPL_SERIAL_SUPPORT=y
>  CONFIG_SPL_SPI_FLASH_SUPPORT=y
>  CONFIG_SPL_SPI_SUPPORT=y
> -CONFIG_DM_GPIO=y
> -CONFIG_DM_SERIAL=y
>  CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained"
>  CONFIG_FIT=y
>  CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_SERIALFLASH"
> @@ -33,24 +31,24 @@ CONFIG_OF_CONTROL=y
>  CONFIG_SPL_OF_CONTROL=y
>  CONFIG_DM=y
>  CONFIG_SPL_DM=y
> -CONFIG_BLK=y
>  CONFIG_CLK=y
>  CONFIG_SPL_CLK=y
>  CONFIG_CLK_AT91=y
>  CONFIG_AT91_UTMI=y
>  CONFIG_AT91_H32MX=y
>  CONFIG_AT91_GENERIC_CLK=y
> +CONFIG_DM_GPIO=y
>  CONFIG_ATMEL_PIO4=y
>  CONFIG_DM_I2C=y
>  CONFIG_SYS_I2C_AT91=y
>  CONFIG_DM_MMC=y
> -CONFIG_DM_MMC_OPS=y
>  CONFIG_ATMEL_SDHCI=y
>  CONFIG_DM_SPI_FLASH=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_SPI_FLASH_ATMEL=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_AT91PIO4=y
> +CONFIG_DM_SERIAL=y
>  CONFIG_DEBUG_UART=y
>  CONFIG_DEBUG_UART_ATMEL=y
>  CONFIG_DEBUG_UART_BASE=0xf8020000
> diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
> index 93a70eb..0d77be7 100644
> --- a/configs/smdk5250_defconfig
> +++ b/configs/smdk5250_defconfig
> @@ -25,7 +25,6 @@ CONFIG_CMD_SOUND=y
>  CONFIG_CMD_PMIC=y
>  CONFIG_CMD_REGULATOR=y
>  CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_DM_I2C=y
>  CONFIG_DM_I2C_COMPAT=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_SPI_FLASH_GIGADEVICE=y
> diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
> index 2141270..69f8d40 100644
> --- a/configs/smdk5420_defconfig
> +++ b/configs/smdk5420_defconfig
> @@ -22,7 +22,6 @@ CONFIG_CMD_GPIO=y
>  CONFIG_CMD_CACHE=y
>  CONFIG_CMD_TIME=y
>  CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_DM_I2C=y
>  CONFIG_DM_I2C_COMPAT=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_SPI_FLASH_GIGADEVICE=y
> diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig
> index d529a69..6f55503 100644
> --- a/configs/sniper_defconfig
> +++ b/configs/sniper_defconfig
> @@ -5,6 +5,7 @@ CONFIG_OMAP34XX=y
>  CONFIG_TARGET_SNIPER=y
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_SPL=y
> +# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
>  CONFIG_HUSH_PARSER=y
>  CONFIG_SYS_PROMPT="sniper # "
>  CONFIG_CMD_BOOTZ=y
> @@ -32,4 +33,3 @@ CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
>  CONFIG_G_DNL_VENDOR_NUM=0x0451
>  CONFIG_G_DNL_PRODUCT_NUM=0xd022
>  CONFIG_OF_LIBFDT=y
> -# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
> diff --git a/configs/snow_defconfig b/configs/snow_defconfig
> index 5385495..19e6117 100644
> --- a/configs/snow_defconfig
> +++ b/configs/snow_defconfig
> @@ -26,7 +26,6 @@ CONFIG_CMD_REGULATOR=y
>  CONFIG_CMD_TPM=y
>  CONFIG_CMD_TPM_TEST=y
>  CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_DM_I2C=y
>  CONFIG_DM_I2C_COMPAT=y
>  CONFIG_I2C_CROS_EC_LDO=y
>  CONFIG_I2C_MUX=y
> diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig
> index 3980cf5..a3ba8c1 100644
> --- a/configs/som-db5800-som-6867_defconfig
> +++ b/configs/som-db5800-som-6867_defconfig
> @@ -56,8 +56,8 @@ CONFIG_TIMER=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_DM_VIDEO=y
>  CONFIG_USB_KEYBOARD=y
> +CONFIG_DM_VIDEO=y
>  CONFIG_VIDEO_VESA=y
>  CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
>  CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
> diff --git a/configs/spring_defconfig b/configs/spring_defconfig
> index bfd3265..d78588b 100644
> --- a/configs/spring_defconfig
> +++ b/configs/spring_defconfig
> @@ -26,7 +26,6 @@ CONFIG_CMD_REGULATOR=y
>  CONFIG_CMD_TPM=y
>  CONFIG_CMD_TPM_TEST=y
>  CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_DM_I2C=y
>  CONFIG_DM_I2C_COMPAT=y
>  CONFIG_I2C_CROS_EC_LDO=y
>  CONFIG_I2C_MUX=y
> diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig
> index bb161d4..f7d3fc2 100644
> --- a/configs/stm32f429-discovery_defconfig
> +++ b/configs/stm32f429-discovery_defconfig
> @@ -7,7 +7,7 @@ CONFIG_BOOTDELAY=3
>  # CONFIG_DISPLAY_BOARDINFO is not set
>  CONFIG_HUSH_PARSER=y
>  CONFIG_SYS_PROMPT="U-Boot > "
> +# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_CMD_TIMER=y
>  CONFIG_OF_LIBFDT=y
> -# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
> diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
> index 51cdcba..135c904 100644
> --- a/configs/theadorable-x86-dfi-bt700_defconfig
> +++ b/configs/theadorable-x86-dfi-bt700_defconfig
> @@ -56,8 +56,8 @@ CONFIG_TIMER=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USB_STORAGE=y
> -CONFIG_DM_VIDEO=y
>  CONFIG_USB_KEYBOARD=y
> +CONFIG_DM_VIDEO=y
>  CONFIG_VIDEO_VESA=y
>  CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
>  CONFIG_FRAMEBUFFER_VESA_MODE_114=y
> diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
> index 0065647..e642475 100644
> --- a/configs/theadorable_debug_defconfig
> +++ b/configs/theadorable_debug_defconfig
> @@ -54,5 +54,4 @@ CONFIG_DM_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_VIDEO_MVEBU=y
> -CONFIG_CFB_CONSOLE=y
>  # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/theadorable_defconfig b/configs/theadorable_defconfig
> index 8bb4697..a063047 100644
> --- a/configs/theadorable_defconfig
> +++ b/configs/theadorable_defconfig
> @@ -43,7 +43,6 @@ CONFIG_DEBUG_UART_CLOCK=250000000
>  CONFIG_DEBUG_UART_SHIFT=2
>  CONFIG_SYS_NS16550=y
>  CONFIG_VIDEO_MVEBU=y
> -CONFIG_CFB_CONSOLE=y
>  # CONFIG_VIDEO_SW_CURSOR is not set
>  CONFIG_REGEX=y
>  CONFIG_LIB_RAND=y
> diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig
> index ff7b826..fd623e0 100644
> --- a/configs/tqma6q_mba6_mmc_defconfig
> +++ b/configs/tqma6q_mba6_mmc_defconfig
> @@ -4,8 +4,8 @@ CONFIG_TARGET_TQMA6=y
>  CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
> -CONFIG_DEFAULT_FDT_FILE="imx6q-mba6x.dtb"
>  CONFIG_BOOTDELAY=3
> +CONFIG_DEFAULT_FDT_FILE="imx6q-mba6x.dtb"
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig
> index e6f99b1..6dc0941 100644
> --- a/configs/tqma6q_mba6_spi_defconfig
> +++ b/configs/tqma6q_mba6_spi_defconfig
> @@ -5,8 +5,8 @@ CONFIG_TQMA6X_SPI_BOOT=y
>  CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
> -CONFIG_DEFAULT_FDT_FILE="imx6q-mba6x.dtb"
>  CONFIG_BOOTDELAY=3
> +CONFIG_DEFAULT_FDT_FILE="imx6q-mba6x.dtb"
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig
> index 33436fc..7b46177 100644
> --- a/configs/tqma6s_mba6_mmc_defconfig
> +++ b/configs/tqma6s_mba6_mmc_defconfig
> @@ -5,8 +5,8 @@ CONFIG_TQMA6S=y
>  CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
> -CONFIG_DEFAULT_FDT_FILE="imx6dl-mba6x.dtb"
>  CONFIG_BOOTDELAY=3
> +CONFIG_DEFAULT_FDT_FILE="imx6dl-mba6x.dtb"
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig
> index 7805638..07e0491 100644
> --- a/configs/tqma6s_mba6_spi_defconfig
> +++ b/configs/tqma6s_mba6_spi_defconfig
> @@ -6,8 +6,8 @@ CONFIG_TQMA6X_SPI_BOOT=y
>  CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
> -CONFIG_DEFAULT_FDT_FILE="imx6dl-mba6x.dtb"
>  CONFIG_BOOTDELAY=3
> +CONFIG_DEFAULT_FDT_FILE="imx6dl-mba6x.dtb"
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig
> index 0f5950d..e5cfcc6 100644
> --- a/configs/tqma6s_wru4_mmc_defconfig
> +++ b/configs/tqma6s_wru4_mmc_defconfig
> @@ -7,12 +7,12 @@ CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_BOOTDELAY=3
> +CONFIG_DEFAULT_FDT_FILE="imx6s-wru4.dtb"
>  CONFIG_HUSH_PARSER=y
>  CONFIG_AUTOBOOT_KEYED=y
>  CONFIG_AUTOBOOT_PROMPT="Enter password in %d seconds to stop autoboot\n"
>  CONFIG_AUTOBOOT_ENCRYPTION=y
>  CONFIG_AUTOBOOT_STOP_STR_SHA256="36a9e7f1c95b82ffb99743e0c5c4ce95d83c9a430aac59f84ef3cbfab6145068"
> -CONFIG_DEFAULT_FDT_FILE="imx6s-wru4.dtb"
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
>  CONFIG_CMD_MMC=y
> diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig
> index 3304afb..98679cf 100644
> --- a/configs/udoo_neo_defconfig
> +++ b/configs/udoo_neo_defconfig
> @@ -10,8 +10,8 @@ CONFIG_SPL_MMC_SUPPORT=y
>  CONFIG_SPL_SERIAL_SUPPORT=y
>  CONFIG_SPL_ENV_SUPPORT=y
>  CONFIG_SPL_WATCHDOG_SUPPORT=y
> -CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SX"
> +CONFIG_SPL=y
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> @@ -19,7 +19,6 @@ CONFIG_CMD_BOOTZ=y
>  CONFIG_CMD_MMC=y
>  CONFIG_CMD_GPIO=y
>  # CONFIG_CMD_SETEXPR is not set
> -# CONFIG_CMD_DHCP=y
>  CONFIG_CMD_CACHE=y
>  CONFIG_CMD_TIME=y
>  CONFIG_CMD_EXT2=y
> diff --git a/configs/vining_2000_defconfig b/configs/vining_2000_defconfig
> index b1f64f1..9410703 100644
> --- a/configs/vining_2000_defconfig
> +++ b/configs/vining_2000_defconfig
> @@ -3,7 +3,6 @@ CONFIG_ARCH_MX6=y
>  CONFIG_TARGET_SAMTEC_VINING_2000=y
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/samtec/vining_2000/imximage.cfg"
>  CONFIG_BOOTDELAY=0
> -CONFIG_CONSOLE_MUX is not set
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
> @@ -28,4 +27,3 @@ CONFIG_PCI=y
>  CONFIG_USB=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_OF_LIBFDT=y
> -CONFIG_MXC_USB_OTG_HACTIVE=y
>
diff mbox

Patch

diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
index bb7eaf8..50436a7 100644
--- a/configs/A10-OLinuXino-Lime_defconfig
+++ b/configs/A10-OLinuXino-Lime_defconfig
@@ -7,8 +7,8 @@  CONFIG_DRAM_EMR1=4
 CONFIG_SYS_CLK_FREQ=912000000
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,SATAPWR=SUNXI_GPC(3)"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
index d48e35d..8fd7c64 100644
--- a/configs/A20-OLinuXino-Lime2_defconfig
+++ b/configs/A20-OLinuXino-Lime2_defconfig
@@ -7,8 +7,8 @@  CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_USB0_VBUS_PIN="PC17"
 CONFIG_USB0_VBUS_DET="PH5"
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPC(3)"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
index 7c5d84d..26e6ace 100644
--- a/configs/A20-OLinuXino-Lime_defconfig
+++ b/configs/A20-OLinuXino-Lime_defconfig
@@ -5,8 +5,8 @@  CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPC(3)"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
index 9eb5f1b..d629eb1 100644
--- a/configs/A20-OLinuXino_MICRO_defconfig
+++ b/configs/A20-OLinuXino_MICRO_defconfig
@@ -8,8 +8,8 @@  CONFIG_MMC3_CD_PIN="PH11"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=3
 CONFIG_VIDEO_VGA=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPB(8)"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/A20-Olimex-SOM-EVB_defconfig b/configs/A20-Olimex-SOM-EVB_defconfig
index 53d800f..b5d52db 100644
--- a/configs/A20-Olimex-SOM-EVB_defconfig
+++ b/configs/A20-Olimex-SOM-EVB_defconfig
@@ -10,8 +10,8 @@  CONFIG_MMC_SUNXI_SLOT_EXTRA=3
 CONFIG_USB0_VBUS_PIN="PB9"
 CONFIG_USB0_VBUS_DET="PH5"
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olimex-som-evb"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPC(3)"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/B4860QDS_SECURE_BOOT_defconfig b/configs/B4860QDS_SECURE_BOOT_defconfig
index e2e16fb..69edc00 100644
--- a/configs/B4860QDS_SECURE_BOOT_defconfig
+++ b/configs/B4860QDS_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_B4860QDS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -6,7 +7,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
index 52d5fe9..c05788c 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT,SYS_CLK_100_DDR_100"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
index afa4aad..b501c20 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT,SYS_CLK_100_DDR_133"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
index 5c3f150..61655c7 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_CLK_100_DDR_100"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
index 0c0b5e3..3c71a0b 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_CLK_100_DDR_133"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
index 45b46df..63a208c 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SDCARD,SYS_CLK_100_DDR_100"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
index 417ac5a..9e540c4 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SDCARD,SYS_CLK_100_DDR_133"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
index 5145c3a..6b445d6 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH,SYS_CLK_100_DDR_100"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
index 0f65f96..8994e99 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH,SYS_CLK_100_DDR_133"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
index 3da1cf7..0f2ef1b 100644
--- a/configs/Bananapi_defconfig
+++ b/configs/Bananapi_defconfig
@@ -6,8 +6,8 @@  CONFIG_DRAM_CLK=432
 CONFIG_VIDEO_COMPOSITE=y
 CONFIG_GMAC_TX_DELAY=3
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig
index 2b9c865..e3bb4b2 100644
--- a/configs/Bananapro_defconfig
+++ b/configs/Bananapro_defconfig
@@ -8,8 +8,8 @@  CONFIG_USB2_VBUS_PIN="PH1"
 CONFIG_VIDEO_COMPOSITE=y
 CONFIG_GMAC_TX_DELAY=3
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapro"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/C29XPCIE_NOR_SECBOOT_defconfig b/configs/C29XPCIE_NOR_SECBOOT_defconfig
index ed46dbe..737467d 100644
--- a/configs/C29XPCIE_NOR_SECBOOT_defconfig
+++ b/configs/C29XPCIE_NOR_SECBOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_C29XPCIE=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -6,7 +7,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=-1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
index ef1100f..56e7066 100644
--- a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
+++ b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_C29XPCIE=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=-1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig
index a67038b..8507f73 100644
--- a/configs/Chuwi_V7_CW0825_defconfig
+++ b/configs/Chuwi_V7_CW0825_defconfig
@@ -22,4 +22,3 @@  CONFIG_USB_MUSB_HOST=y
 CONFIG_VIDEO_LCD_SPI_CS="PA0"
 CONFIG_VIDEO_LCD_SPI_SCLK="PA1"
 CONFIG_VIDEO_LCD_SPI_MOSI="PA2"
-CONFIG_CFB_CONSOLE=y
diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
index 9212a17..dfeb66c 100644
--- a/configs/Cubieboard2_defconfig
+++ b/configs/Cubieboard2_defconfig
@@ -5,8 +5,8 @@  CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=480
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPB(8)"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
index 6e7e741..64aebed 100644
--- a/configs/Cubieboard_defconfig
+++ b/configs/Cubieboard_defconfig
@@ -5,8 +5,8 @@  CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=480
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,SATAPWR=SUNXI_GPB(8)"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index 37b60b85..10f3237 100644
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -10,8 +10,8 @@  CONFIG_USB0_ID_DET="PH19"
 CONFIG_VIDEO_VGA=y
 CONFIG_GMAC_TX_DELAY=1
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPH(12)"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/Itead_Ibox_A20_defconfig b/configs/Itead_Ibox_A20_defconfig
index d544d50..baca3e8 100644
--- a/configs/Itead_Ibox_A20_defconfig
+++ b/configs/Itead_Ibox_A20_defconfig
@@ -5,8 +5,8 @@  CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=480
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-itead-ibox"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPB(8)"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/Lamobo_R1_defconfig b/configs/Lamobo_R1_defconfig
index 58bc5a2..6fe79e2 100644
--- a/configs/Lamobo_R1_defconfig
+++ b/configs/Lamobo_R1_defconfig
@@ -6,8 +6,8 @@  CONFIG_DRAM_CLK=432
 CONFIG_MMC0_CD_PIN="PH10"
 CONFIG_GMAC_TX_DELAY=4
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-lamobo-r1"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),SATAPWR=SUNXI_GPB(3)"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig
index 8cbe9c3..622d35c 100644
--- a/configs/Linksprite_pcDuino3_Nano_defconfig
+++ b/configs/Linksprite_pcDuino3_Nano_defconfig
@@ -7,8 +7,8 @@  CONFIG_DRAM_ZQ=122
 CONFIG_USB1_VBUS_PIN="PH11"
 CONFIG_GMAC_TX_DELAY=3
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3-nano"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPH(2)"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
index 5d155b4..9d2dfa5a 100644
--- a/configs/Linksprite_pcDuino3_defconfig
+++ b/configs/Linksprite_pcDuino3_defconfig
@@ -5,8 +5,8 @@  CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=480
 CONFIG_DRAM_ZQ=122
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPH(2)"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/MPC8610HPCD_defconfig b/configs/MPC8610HPCD_defconfig
index b4e053a..9327955 100644
--- a/configs/MPC8610HPCD_defconfig
+++ b/configs/MPC8610HPCD_defconfig
@@ -6,7 +6,6 @@  CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=10
 # CONFIG_CONSOLE_MUX is not set
-CONFIG_SYS_STDIO_DEREGISTER=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
@@ -15,6 +14,6 @@  CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
 CONFIG_USB=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_OF_LIBFDT=y
diff --git a/configs/MPC8641HPCN_36BIT_defconfig b/configs/MPC8641HPCN_36BIT_defconfig
index 8ffa5e9..d1f9e10 100644
--- a/configs/MPC8641HPCN_36BIT_defconfig
+++ b/configs/MPC8641HPCN_36BIT_defconfig
@@ -7,7 +7,6 @@  CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=10
 # CONFIG_CONSOLE_MUX is not set
-CONFIG_SYS_STDIO_DEREGISTER=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
@@ -15,6 +14,6 @@  CONFIG_CMD_USB=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
 CONFIG_USB=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_OF_LIBFDT=y
diff --git a/configs/MPC8641HPCN_defconfig b/configs/MPC8641HPCN_defconfig
index 6f9bf01..0672345 100644
--- a/configs/MPC8641HPCN_defconfig
+++ b/configs/MPC8641HPCN_defconfig
@@ -6,7 +6,6 @@  CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=10
 # CONFIG_CONSOLE_MUX is not set
-CONFIG_SYS_STDIO_DEREGISTER=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
@@ -14,6 +13,6 @@  CONFIG_CMD_USB=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
 CONFIG_USB=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_OF_LIBFDT=y
diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig
index e9d5be4..8847271 100644
--- a/configs/MSI_Primo81_defconfig
+++ b/configs/MSI_Primo81_defconfig
@@ -25,4 +25,3 @@  CONFIG_VIDEO_LCD_SPI_CS="PH9"
 CONFIG_VIDEO_LCD_SPI_SCLK="PH10"
 CONFIG_VIDEO_LCD_SPI_MOSI="PH11"
 CONFIG_VIDEO_LCD_SPI_MISO="PH12"
-CONFIG_CFB_CONSOLE=y
diff --git a/configs/Marsboard_A10_defconfig b/configs/Marsboard_A10_defconfig
index 6a88238..0d381ff 100644
--- a/configs/Marsboard_A10_defconfig
+++ b/configs/Marsboard_A10_defconfig
@@ -2,8 +2,8 @@  CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-marsboard"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
index d678ffb..820d5ed 100644
--- a/configs/Mele_A1000_defconfig
+++ b/configs/Mele_A1000_defconfig
@@ -5,8 +5,8 @@  CONFIG_MACH_SUN4I=y
 CONFIG_VIDEO_VGA=y
 CONFIG_VIDEO_COMPOSITE=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-a1000"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,MACPWR=SUNXI_GPH(15)"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig
index 09addc5..e64e452 100644
--- a/configs/Mele_M5_defconfig
+++ b/configs/Mele_M5_defconfig
@@ -7,8 +7,8 @@  CONFIG_DRAM_ZQ=122
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_VIDEO_COMPOSITE=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m5"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig
index 052ca83..ccece01 100644
--- a/configs/Orangepi_defconfig
+++ b/configs/Orangepi_defconfig
@@ -9,8 +9,8 @@  CONFIG_VIDEO_VGA=y
 CONFIG_VIDEO_COMPOSITE=y
 CONFIG_GMAC_TX_DELAY=3
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
index 63db70d..febdcd0 100644
--- a/configs/Orangepi_mini_defconfig
+++ b/configs/Orangepi_mini_defconfig
@@ -11,8 +11,8 @@  CONFIG_USB2_VBUS_PIN="PH22"
 CONFIG_VIDEO_COMPOSITE=y
 CONFIG_GMAC_TX_DELAY=3
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi-mini"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
index 0430076..3a5b844 100644
--- a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB_PA=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -8,7 +9,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
index f091938..881afc5 100644
--- a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB_PA=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
index f78a54d..ed10fcf 100644
--- a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB_PA=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -8,7 +9,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
index ef3cd29..8677c66 100644
--- a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB_PA=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
index 9716b4a..9e99739 100644
--- a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB_PA=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -6,7 +7,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
index 1f03841..7826443 100644
--- a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB_PA=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
index 5145f41..b1fc348 100644
--- a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB_PB=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -8,7 +9,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
index 205df6d..53d0adc 100644
--- a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB_PB=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
index 7b6340d..8bd846c 100644
--- a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB_PB=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -8,7 +9,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
index 589223d..3613049 100644
--- a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB_PB=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="NAND_SECBOOT"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
index a9494ee..fcba2f0 100644
--- a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB_PB=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -6,7 +7,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
index 1a26a5d..d14bf14 100644
--- a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB_PB=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/P2041RDB_SECURE_BOOT_defconfig b/configs/P2041RDB_SECURE_BOOT_defconfig
index 7a811ae..c751a9b 100644
--- a/configs/P2041RDB_SECURE_BOOT_defconfig
+++ b/configs/P2041RDB_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -6,7 +7,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
diff --git a/configs/P3041DS_NAND_SECURE_BOOT_defconfig b/configs/P3041DS_NAND_SECURE_BOOT_defconfig
index 38407ba..dc99ed6 100644
--- a/configs/P3041DS_NAND_SECURE_BOOT_defconfig
+++ b/configs/P3041DS_NAND_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
diff --git a/configs/P3041DS_SECURE_BOOT_defconfig b/configs/P3041DS_SECURE_BOOT_defconfig
index 75c0ef3..755dfc5 100644
--- a/configs/P3041DS_SECURE_BOOT_defconfig
+++ b/configs/P3041DS_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -6,7 +7,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
diff --git a/configs/P4080DS_SECURE_BOOT_defconfig b/configs/P4080DS_SECURE_BOOT_defconfig
index 46b4672..7b41915 100644
--- a/configs/P4080DS_SECURE_BOOT_defconfig
+++ b/configs/P4080DS_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P4080DS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -6,7 +7,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
diff --git a/configs/P5020DS_NAND_SECURE_BOOT_defconfig b/configs/P5020DS_NAND_SECURE_BOOT_defconfig
index 592aae7..60d890d 100644
--- a/configs/P5020DS_NAND_SECURE_BOOT_defconfig
+++ b/configs/P5020DS_NAND_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5020DS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
diff --git a/configs/P5020DS_SECURE_BOOT_defconfig b/configs/P5020DS_SECURE_BOOT_defconfig
index 27f43ef..b6fdedd 100644
--- a/configs/P5020DS_SECURE_BOOT_defconfig
+++ b/configs/P5020DS_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5020DS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -6,7 +7,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
diff --git a/configs/P5040DS_NAND_SECURE_BOOT_defconfig b/configs/P5040DS_NAND_SECURE_BOOT_defconfig
index 9fdf4b2..8b52375 100644
--- a/configs/P5040DS_NAND_SECURE_BOOT_defconfig
+++ b/configs/P5040DS_NAND_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
diff --git a/configs/P5040DS_SECURE_BOOT_defconfig b/configs/P5040DS_SECURE_BOOT_defconfig
index b8d7d3b..512c7ad 100644
--- a/configs/P5040DS_SECURE_BOOT_defconfig
+++ b/configs/P5040DS_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -6,7 +7,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
diff --git a/configs/T1023RDB_SECURE_BOOT_defconfig b/configs/T1023RDB_SECURE_BOOT_defconfig
index 1b474d3..d35e288 100644
--- a/configs/T1023RDB_SECURE_BOOT_defconfig
+++ b/configs/T1023RDB_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1023RDB=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="T1023RDB"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
index bdc0a9d..166bee3 100644
--- a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1024QDS=y
@@ -8,7 +9,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
 # CONFIG_CONSOLE_MUX is not set
diff --git a/configs/T1024QDS_SECURE_BOOT_defconfig b/configs/T1024QDS_SECURE_BOOT_defconfig
index b092068..f067c8c 100644
--- a/configs/T1024QDS_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1024QDS=y
@@ -7,7 +8,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
 # CONFIG_CONSOLE_MUX is not set
diff --git a/configs/T1024RDB_SECURE_BOOT_defconfig b/configs/T1024RDB_SECURE_BOOT_defconfig
index 9d082f7..f138dd5 100644
--- a/configs/T1024RDB_SECURE_BOOT_defconfig
+++ b/configs/T1024RDB_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1024RDB=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="T1024RDB"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/T1040D4RDB_SECURE_BOOT_defconfig b/configs/T1040D4RDB_SECURE_BOOT_defconfig
index 6f948a1..6c96cd0 100644
--- a/configs/T1040D4RDB_SECURE_BOOT_defconfig
+++ b/configs/T1040D4RDB_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1040D4RDB=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/T1040QDS_SECURE_BOOT_defconfig b/configs/T1040QDS_SECURE_BOOT_defconfig
index 3f15b09..a07afc7 100644
--- a/configs/T1040QDS_SECURE_BOOT_defconfig
+++ b/configs/T1040QDS_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1040QDS=y
@@ -7,7 +8,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
 # CONFIG_CONSOLE_MUX is not set
diff --git a/configs/T1040RDB_SECURE_BOOT_defconfig b/configs/T1040RDB_SECURE_BOOT_defconfig
index a9b61a8..c0965eb 100644
--- a/configs/T1040RDB_SECURE_BOOT_defconfig
+++ b/configs/T1040RDB_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1040RDB=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -6,7 +7,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/T1042D4RDB_SECURE_BOOT_defconfig b/configs/T1042D4RDB_SECURE_BOOT_defconfig
index e20d412..b07464f 100644
--- a/configs/T1042D4RDB_SECURE_BOOT_defconfig
+++ b/configs/T1042D4RDB_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_VIDEO=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1042D4RDB=y
@@ -8,7 +9,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
 # CONFIG_CONSOLE_MUX is not set
diff --git a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
index 26db750..14aa1fd 100644
--- a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
+++ b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
@@ -1,6 +1,7 @@ 
 CONFIG_PPC=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SECURE_BOOT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
@@ -14,7 +15,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=0
 CONFIG_SILENT_CONSOLE=y
 # CONFIG_CONSOLE_MUX is not set
diff --git a/configs/T1042RDB_SECURE_BOOT_defconfig b/configs/T1042RDB_SECURE_BOOT_defconfig
index edd1ff6..dbb9c0b 100644
--- a/configs/T1042RDB_SECURE_BOOT_defconfig
+++ b/configs/T1042RDB_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1042RDB=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -6,7 +7,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SILENT_CONSOLE=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/T2080QDS_SECURE_BOOT_defconfig b/configs/T2080QDS_SECURE_BOOT_defconfig
index 95f6804..bb13249 100644
--- a/configs/T2080QDS_SECURE_BOOT_defconfig
+++ b/configs/T2080QDS_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080QDS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -6,7 +7,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
diff --git a/configs/T2080RDB_SECURE_BOOT_defconfig b/configs/T2080RDB_SECURE_BOOT_defconfig
index 64204e0..0e2ff06 100644
--- a/configs/T2080RDB_SECURE_BOOT_defconfig
+++ b/configs/T2080RDB_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080RDB=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -6,7 +7,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MEMTEST=y
diff --git a/configs/T4160QDS_SECURE_BOOT_defconfig b/configs/T4160QDS_SECURE_BOOT_defconfig
index e637f1e..d0e4f11 100644
--- a/configs/T4160QDS_SECURE_BOOT_defconfig
+++ b/configs/T4160QDS_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T4160QDS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -6,7 +7,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
diff --git a/configs/T4240QDS_SECURE_BOOT_defconfig b/configs/T4240QDS_SECURE_BOOT_defconfig
index 61028e3..f2cf58a 100644
--- a/configs/T4240QDS_SECURE_BOOT_defconfig
+++ b/configs/T4240QDS_SECURE_BOOT_defconfig
@@ -1,4 +1,5 @@ 
 CONFIG_PPC=y
+CONFIG_SECURE_BOOT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -6,7 +7,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_GREPENV=y
diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig
index d847fc7..0735055 100644
--- a/configs/Wits_Pro_A20_DKT_defconfig
+++ b/configs/Wits_Pro_A20_DKT_defconfig
@@ -10,8 +10,8 @@  CONFIG_VIDEO_LCD_BL_EN="PH7"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_VIDEO_LCD_PANEL_LVDS=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wits-pro-a20-dkt"
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_AHCI=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index e596106..00f186a 100644
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -45,6 +45,7 @@  CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
 # CONFIG_DM_MMC_OPS is not set
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_MACRONIX=y
@@ -52,7 +53,6 @@  CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
 CONFIG_DM_SPI=y
-CONFIG_DM_SPI_FLASH=y
 CONFIG_TI_QSPI=y
 CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig
index a605d0a..60b2122 100644
--- a/configs/am43xx_hs_evm_defconfig
+++ b/configs/am43xx_hs_evm_defconfig
@@ -47,13 +47,13 @@  CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
 # CONFIG_DM_MMC_OPS is not set
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
 CONFIG_DM_SPI=y
-CONFIG_DM_SPI_FLASH=y
 CONFIG_TI_QSPI=y
 CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig
index 7fd418f..a582055 100644
--- a/configs/am57xx_evm_defconfig
+++ b/configs/am57xx_evm_defconfig
@@ -36,8 +36,6 @@  CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_DFU=y
-CONFIG_DFU_RAM=y
-CONFIG_DFU_MMC=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -53,6 +51,8 @@  CONFIG_OF_CONTROL=y
 CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am572x-idk am571x-idk"
 CONFIG_DM=y
 # CONFIG_BLK is not set
+CONFIG_DFU_MMC=y
+CONFIG_DFU_RAM=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig
index 2b1d695..c8b52ce 100644
--- a/configs/am57xx_hs_evm_defconfig
+++ b/configs/am57xx_hs_evm_defconfig
@@ -37,8 +37,6 @@  CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_DFU=y
-CONFIG_DFU_RAM=y
-CONFIG_DFU_MMC=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -52,6 +50,8 @@  CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 # CONFIG_BLK is not set
+CONFIG_DFU_MMC=y
+CONFIG_DFU_RAM=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index e0332f7..6eef60d 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -21,7 +21,6 @@  CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_SOUND=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_SOUND=y
 CONFIG_I2S=y
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index 6daa675..1eb6142 100644
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -54,8 +54,8 @@  CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_DM_VIDEO=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig
index b118907..9203f73 100644
--- a/configs/chromebit_mickey_defconfig
+++ b/configs/chromebit_mickey_defconfig
@@ -7,7 +7,6 @@  CONFIG_TARGET_CHROMEBIT_MICKEY=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
-CONFIG_DM_KEYBOARD=y
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-mickey"
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_SPL_STACK_R=y
@@ -34,6 +33,7 @@  CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_SPL_OF_PLATDATA=y
 CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SYSCON=y
@@ -45,8 +45,8 @@  CONFIG_ROCKCHIP_GPIO=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_I2C_MUX=y
+CONFIG_DM_KEYBOARD=y
 CONFIG_CROS_EC_KEYB=y
-CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
 CONFIG_PWRSEQ=y
@@ -58,11 +58,9 @@  CONFIG_ROCKCHIP_RK3288_PINCTRL=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_PMIC_CHILDREN is not set
 CONFIG_PMIC_RK808=y
-CONFIG_DM_REGULATOR=y
 CONFIG_SPL_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_REGULATOR_RK808=y
-CONFIG_DM_PWM=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
@@ -80,5 +78,4 @@  CONFIG_VIDEO_ROCKCHIP=y
 CONFIG_USE_TINY_PRINTF=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_ERRNO_STR=y
-CONFIG_SPL_OF_PLATDATA=y
 # CONFIG_SPL_OF_LIBFDT is not set
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index 46df1a6..95e5f57 100644
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -34,6 +34,7 @@  CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_SPL_OF_PLATDATA=y
 CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SYSCON=y
@@ -78,5 +79,4 @@  CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_USE_TINY_PRINTF=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_ERRNO_STR=y
-CONFIG_SPL_OF_PLATDATA=y
 # CONFIG_SPL_OF_LIBFDT is not set
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 782123b..8407731 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -57,8 +57,8 @@  CONFIG_TPM_TIS_LPC=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_DM_VIDEO=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig
index 6aced14..49cd640 100644
--- a/configs/chromebook_minnie_defconfig
+++ b/configs/chromebook_minnie_defconfig
@@ -34,6 +34,7 @@  CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_SPL_OF_PLATDATA=y
 CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SYSCON=y
@@ -78,5 +79,4 @@  CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_USE_TINY_PRINTF=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_ERRNO_STR=y
-CONFIG_SPL_OF_PLATDATA=y
 # CONFIG_SPL_OF_LIBFDT is not set
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 8bf94cb..f8cf92b 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -49,8 +49,8 @@  CONFIG_TPM_TIS_LPC=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_DM_VIDEO=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
index 2b317b8..28f69e4 100644
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -62,8 +62,8 @@  CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_DM_VIDEO=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index e4d1e0d..2528db9 100644
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -61,8 +61,8 @@  CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_DM_VIDEO=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 352055a..2195fc6 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -41,9 +41,9 @@  CONFIG_TPM_TIS_LPC=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_COREBOOT=y
-CONFIG_USB_KEYBOARD=y
 CONFIG_CONSOLE_SCROLL_LINES=5
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_TPM=y
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index 402d141..5aa7234 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -48,8 +48,8 @@  CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_DM_VIDEO=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_CONSOLE_SCROLL_LINES=5
diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
index 897c48d..f657ef6 100644
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -59,8 +59,8 @@  CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_DM_VIDEO=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig
index c8251ff..9dcb6ad 100644
--- a/configs/dms-ba16-1g_defconfig
+++ b/configs/dms-ba16-1g_defconfig
@@ -1,7 +1,6 @@ 
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_ADVANTECH_DMS_BA16=y
-CONFIG_DEFAULT_FDT_FILE="imx6q-dms-ba16.dtb"
 CONFIG_SYS_DDR_1G=y
 CONFIG_VIDEO=y
 CONFIG_BOOTDELAY=1
@@ -9,6 +8,7 @@  CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 # CONFIG_SYS_STDIO_DEREGISTER is not set
+CONFIG_DEFAULT_FDT_FILE="imx6q-dms-ba16.dtb"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig
index 56dec74..664f039 100644
--- a/configs/dms-ba16_defconfig
+++ b/configs/dms-ba16_defconfig
@@ -2,12 +2,12 @@  CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_ADVANTECH_DMS_BA16=y
 CONFIG_VIDEO=y
-CONFIG_DEFAULT_FDT_FILE="imx6q-dms-ba16.dtb"
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 # CONFIG_SYS_STDIO_DEREGISTER is not set
+CONFIG_DEFAULT_FDT_FILE="imx6q-dms-ba16.dtb"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig
index c88cd36..c5563a4 100644
--- a/configs/e2220-1170_defconfig
+++ b/configs/e2220-1170_defconfig
@@ -5,7 +5,6 @@  CONFIG_DEFAULT_DEVICE_TREE="tegra210-e2220-1170"
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_CONSOLE_MUX=y
 CONFIG_SYS_STDIO_DEREGISTER=y
-CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra210 (E2220-1170) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -20,15 +19,8 @@  CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
 # CONFIG_CMD_NFS is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
 # CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig
index 8db9041..e5e550c 100644
--- a/configs/evb-rk3288_defconfig
+++ b/configs/evb-rk3288_defconfig
@@ -2,6 +2,7 @@  CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ROCKCHIP_RK3288=y
+CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
 CONFIG_TARGET_EVB_RK3288=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-evb"
@@ -64,4 +65,3 @@  CONFIG_SYSRESET=y
 CONFIG_USE_TINY_PRINTF=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_ERRNO_STR=y
-CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig
index 40a8295..95029d7 100644
--- a/configs/evb-rk3399_defconfig
+++ b/configs/evb-rk3399_defconfig
@@ -24,9 +24,9 @@  CONFIG_ROCKCHIP_DWMMC=y
 CONFIG_ROCKCHIP_SDHCI=y
 CONFIG_PINCTRL=y
 CONFIG_ROCKCHIP_RK3399_PINCTRL=y
-CONFIG_PWM_ROCKCHIP=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_UART_BASE=0xFF1A0000
diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig
index d5452004b..eff5e15 100644
--- a/configs/fennec-rk3288_defconfig
+++ b/configs/fennec-rk3288_defconfig
@@ -2,6 +2,7 @@  CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ROCKCHIP_RK3288=y
+CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
 CONFIG_TARGET_FENNEC_RK3288=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-fennec"
@@ -63,4 +64,3 @@  CONFIG_SYSRESET=y
 CONFIG_USE_TINY_PRINTF=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_ERRNO_STR=y
-CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
diff --git a/configs/ge_b450v3_defconfig b/configs/ge_b450v3_defconfig
index b5a68e2..6550c9e 100644
--- a/configs/ge_b450v3_defconfig
+++ b/configs/ge_b450v3_defconfig
@@ -1,11 +1,11 @@ 
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_GE_B450V3=y
-CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b450v3.dtb"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b450v3.dtb"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig
index 7f4ba29..7cf1899 100644
--- a/configs/ge_b650v3_defconfig
+++ b/configs/ge_b650v3_defconfig
@@ -1,11 +1,11 @@ 
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_GE_B650V3=y
-CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b650v3.dtb"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b650v3.dtb"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/ge_b850v3_defconfig b/configs/ge_b850v3_defconfig
index db2609f..63025bc 100644
--- a/configs/ge_b850v3_defconfig
+++ b/configs/ge_b850v3_defconfig
@@ -1,11 +1,11 @@ 
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_GE_B850V3=y
-CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b850v3.dtb"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_DEFAULT_FDT_FILE="/boot/imx6q-b850v3.dtb"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig
index fcf4934..5d3e073 100644
--- a/configs/imx6qdl_icore_mmc_defconfig
+++ b/configs/imx6qdl_icore_mmc_defconfig
@@ -1,44 +1,39 @@ 
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_TARGET_MX6Q_ICORE=y
+CONFIG_SPL_EXT_SUPPORT=y
+CONFIG_SPL_I2C_SUPPORT=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
+CONFIG_BOOTDELAY=3
 CONFIG_DEFAULT_FDT_FILE="imx6dl-icore.dtb"
-CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore"
-CONFIG_SYS_PROMPT="icorem6qdl> "
 CONFIG_SPL=y
-CONFIG_BOOTDELAY=3
-CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_DISPLAY_CPUINFO=y
 CONFIG_HUSH_PARSER=y
-CONFIG_AUTO_COMPLETE=y
-CONFIG_SYS_MAXARGS=32
-# CONFIG_CMD_IMLS is not set
-# CONFIG_BLK is not set
-# CONFIG_DM_MMC_OPS is not set
+CONFIG_SYS_PROMPT="icorem6qdl> "
 CONFIG_CMD_BOOTZ=y
+# CONFIG_CMD_IMLS is not set
+CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_MMC=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_MEMTEST=y
-CONFIG_CMD_MMC=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
-CONFIG_OF_LIBFDT=y
-CONFIG_FEC_MXC=y
-CONFIG_MXC_UART=y
+# CONFIG_BLK is not set
+# CONFIG_DM_MMC_OPS is not set
 CONFIG_NETDEVICES=y
-CONFIG_IMX_THERMAL=y
+CONFIG_FEC_MXC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
-CONFIG_SPL_LIBDISK_SUPPORT=y
-CONFIG_SPL_LIBCOMMON_SUPPORT=y
-CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_SPL_I2C_SUPPORT=y
-CONFIG_SPL_GPIO_SUPPORT=y
-CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SPL_EXT_SUPPORT=y
+CONFIG_MXC_UART=y
+CONFIG_IMX_THERMAL=y
diff --git a/configs/imx6qdl_icore_nand_defconfig b/configs/imx6qdl_icore_nand_defconfig
index 4919d44..c7843c1 100644
--- a/configs/imx6qdl_icore_nand_defconfig
+++ b/configs/imx6qdl_icore_nand_defconfig
@@ -1,39 +1,34 @@ 
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_TARGET_MX6Q_ICORE=y
+CONFIG_SPL_I2C_SUPPORT=y
+CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND"
+CONFIG_BOOTDELAY=3
 CONFIG_DEFAULT_FDT_FILE="imx6dl-icore.dtb"
-CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore"
-CONFIG_SYS_PROMPT="icorem6qdl> "
 CONFIG_SPL=y
-CONFIG_BOOTDELAY=3
-CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_DISPLAY_CPUINFO=y
+CONFIG_SPL_DMA_SUPPORT=y
 CONFIG_HUSH_PARSER=y
-CONFIG_AUTO_COMPLETE=y
-CONFIG_SYS_MAXARGS=32
-# CONFIG_CMD_IMLS is not set
+CONFIG_SYS_PROMPT="icorem6qdl> "
 CONFIG_CMD_BOOTZ=y
+# CONFIG_CMD_IMLS is not set
+CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_MEMTEST=y
-CONFIG_CMD_NAND=y
 CONFIG_CMD_CACHE=y
-CONFIG_OF_LIBFDT=y
-CONFIG_FEC_MXC=y
-CONFIG_MXC_UART=y
-CONFIG_NAND_MXS=y
-CONFIG_NETDEVICES=y
-CONFIG_IMX_THERMAL=y
 # CONFIG_BLK is not set
 # CONFIG_DM_MMC_OPS is not set
+CONFIG_NAND_MXS=y
+CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
-CONFIG_SPL_LIBCOMMON_SUPPORT=y
-CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_SPL_I2C_SUPPORT=y
-CONFIG_SPL_GPIO_SUPPORT=y
-CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SPL_DMA_SUPPORT=y
+CONFIG_MXC_UART=y
+CONFIG_IMX_THERMAL=y
diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig
index c2d5d47..76226e9 100644
--- a/configs/kc1_defconfig
+++ b/configs/kc1_defconfig
@@ -4,6 +4,7 @@  CONFIG_OMAP44XX=y
 CONFIG_TARGET_KC1=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
+# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="kc1 # "
 CONFIG_CMD_BOOTZ=y
@@ -31,4 +32,3 @@  CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
 CONFIG_G_DNL_VENDOR_NUM=0x0451
 CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_OF_LIBFDT=y
-# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig
index 631d1f5..a4281c9 100644
--- a/configs/kylin-rk3036_defconfig
+++ b/configs/kylin-rk3036_defconfig
@@ -13,6 +13,7 @@  CONFIG_CMD_MMC=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
@@ -35,8 +36,7 @@  CONFIG_ROCKCHIP_RK3036_PINCTRL=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_RAM=y
 CONFIG_SYSRESET=y
-CONFIG_CMD_DHRYSTONE=y
-CONFIG_ERRNO_STR=y
-CONFIG_CMD_USB=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_CMD_DHRYSTONE=y
+CONFIG_ERRNO_STR=y
diff --git a/configs/ls1012afrdm_qspi_defconfig b/configs/ls1012afrdm_qspi_defconfig
index c83b2eb..252d45a 100644
--- a/configs/ls1012afrdm_qspi_defconfig
+++ b/configs/ls1012afrdm_qspi_defconfig
@@ -1,5 +1,6 @@ 
 CONFIG_ARM=y
 CONFIG_TARGET_LS1012AFRDM=y
+CONFIG_QSPI_AHB_INIT=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-frdm"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
@@ -34,4 +35,3 @@  CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
-CONFIG_QSPI_AHB_INIT=y
diff --git a/configs/ls1012aqds_qspi_defconfig b/configs/ls1012aqds_qspi_defconfig
index 27bccd1..e74141f 100644
--- a/configs/ls1012aqds_qspi_defconfig
+++ b/configs/ls1012aqds_qspi_defconfig
@@ -1,5 +1,6 @@ 
 CONFIG_ARM=y
 CONFIG_TARGET_LS1012AQDS=y
+CONFIG_QSPI_AHB_INIT=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-qds"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
@@ -38,4 +39,3 @@  CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
-CONFIG_QSPI_AHB_INIT=y
diff --git a/configs/ls1012ardb_qspi_defconfig b/configs/ls1012ardb_qspi_defconfig
index 459682d..d5ed70f 100644
--- a/configs/ls1012ardb_qspi_defconfig
+++ b/configs/ls1012ardb_qspi_defconfig
@@ -1,5 +1,6 @@ 
 CONFIG_ARM=y
 CONFIG_TARGET_LS1012ARDB=y
+CONFIG_QSPI_AHB_INIT=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
@@ -38,4 +39,3 @@  CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
-CONFIG_QSPI_AHB_INIT=y
diff --git a/configs/ls1021aiot_qspi_defconfig b/configs/ls1021aiot_qspi_defconfig
index 6c9140b..21464cb 100644
--- a/configs/ls1021aiot_qspi_defconfig
+++ b/configs/ls1021aiot_qspi_defconfig
@@ -1,15 +1,15 @@ 
-CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
 CONFIG_ARM=y
-CONFIG_DM_SPI=y
-CONFIG_DM=y
+CONFIG_TARGET_LS1021AIOT=y
+CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart"
+CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
 CONFIG_OF_CONTROL=y
+CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
+CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
 CONFIG_FSL_QSPI=y
-CONFIG_TARGET_LS1021AIOT=y
-CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart"
diff --git a/configs/ls1021aiot_sdcard_defconfig b/configs/ls1021aiot_sdcard_defconfig
index a5a391d..1369fe6 100644
--- a/configs/ls1021aiot_sdcard_defconfig
+++ b/configs/ls1021aiot_sdcard_defconfig
@@ -1,19 +1,18 @@ 
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AIOT=y
+CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart"
+CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI"
 CONFIG_SPL=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xe8
-CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart"
-CONFIG_DM_SPI=y
-CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI"
-CONFIG_CMD_DM=y
-CONFIG_DM=y
 CONFIG_OF_CONTROL=y
+CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_FSL_DSPI=y
-CONFIG_FSL_QSPI=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
+CONFIG_DM_SPI=y
+CONFIG_FSL_DSPI=y
+CONFIG_FSL_QSPI=y
diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
index 8b869fa..f3de25f 100644
--- a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
@@ -1,5 +1,6 @@ 
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
+CONFIG_SECURE_BOOT=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_VIDEO=y
 # CONFIG_SYS_MALLOC_F is not set
@@ -7,7 +8,6 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_SILENT_CONSOLE=y
 # CONFIG_CONSOLE_MUX is not set
diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
index 946945f..746a66a 100644
--- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
@@ -1,12 +1,12 @@ 
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
+CONFIG_SECURE_BOOT=y
 CONFIG_VIDEO=y
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_SILENT_CONSOLE=y
 # CONFIG_CONSOLE_MUX is not set
diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
index 5e74645..6f22f1a 100644
--- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@  CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SECURE_BOOT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
@@ -14,7 +15,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=0
 CONFIG_SILENT_CONSOLE=y
 # CONFIG_CONSOLE_MUX is not set
diff --git a/configs/ls1043ardb_SECURE_BOOT_defconfig b/configs/ls1043ardb_SECURE_BOOT_defconfig
index b892e35..ae2efeb 100644
--- a/configs/ls1043ardb_SECURE_BOOT_defconfig
+++ b/configs/ls1043ardb_SECURE_BOOT_defconfig
@@ -5,7 +5,6 @@  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
diff --git a/configs/ls1046aqds_lpuart_defconfig b/configs/ls1046aqds_lpuart_defconfig
index 25bb5f9..83ed0e0 100644
--- a/configs/ls1046aqds_lpuart_defconfig
+++ b/configs/ls1046aqds_lpuart_defconfig
@@ -1,6 +1,5 @@ 
 CONFIG_ARM=y
 CONFIG_TARGET_LS1046AQDS=y
-CONFIG_SYS_FSL_DDR4=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-lpuart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
@@ -23,8 +22,8 @@  CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
-CONFIG_DM_SPI=y
 CONFIG_SPI_FLASH=y
-CONFIG_FSL_DSPI=y
 CONFIG_DM_SERIAL=y
 CONFIG_FSL_LPUART=y
+CONFIG_DM_SPI=y
+CONFIG_FSL_DSPI=y
diff --git a/configs/ls1046ardb_qspi_defconfig b/configs/ls1046ardb_qspi_defconfig
index fa17373..a973cf4 100644
--- a/configs/ls1046ardb_qspi_defconfig
+++ b/configs/ls1046ardb_qspi_defconfig
@@ -1,5 +1,6 @@ 
 CONFIG_ARM=y
 CONFIG_TARGET_LS1046ARDB=y
+CONFIG_QSPI_AHB_INIT=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
@@ -24,4 +25,3 @@  CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
-CONFIG_QSPI_AHB_INIT=y
diff --git a/configs/ls2080aqds_SECURE_BOOT_defconfig b/configs/ls2080aqds_SECURE_BOOT_defconfig
index 0c70f92..1ed6e05 100644
--- a/configs/ls2080aqds_SECURE_BOOT_defconfig
+++ b/configs/ls2080aqds_SECURE_BOOT_defconfig
@@ -7,7 +7,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, LS2080A"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
diff --git a/configs/ls2080ardb_SECURE_BOOT_defconfig b/configs/ls2080ardb_SECURE_BOOT_defconfig
index 1d20175..848abbc 100644
--- a/configs/ls2080ardb_SECURE_BOOT_defconfig
+++ b/configs/ls2080ardb_SECURE_BOOT_defconfig
@@ -7,7 +7,6 @@  CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, LS2080A"
-CONFIG_SECURE_BOOT=y
 CONFIG_BOOTDELAY=10
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MMC=y
diff --git a/configs/miniarm-rk3288_defconfig b/configs/miniarm-rk3288_defconfig
index 888563b..1e273a6 100644
--- a/configs/miniarm-rk3288_defconfig
+++ b/configs/miniarm-rk3288_defconfig
@@ -2,6 +2,7 @@  CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ROCKCHIP_RK3288=y
+CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
 CONFIG_TARGET_MINIARM_RK3288=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-miniarm"
@@ -62,4 +63,3 @@  CONFIG_SYSRESET=y
 CONFIG_USE_TINY_PRINTF=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_ERRNO_STR=y
-CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index 0706ddf..45d8a87 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -58,8 +58,8 @@  CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_DM_VIDEO=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
diff --git a/configs/mx25pdk_defconfig b/configs/mx25pdk_defconfig
index c3ab7c2..87d7fab 100644
--- a/configs/mx25pdk_defconfig
+++ b/configs/mx25pdk_defconfig
@@ -1,8 +1,8 @@ 
 CONFIG_ARM=y
 CONFIG_TARGET_MX25PDK=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx25pdk/imximage.cfg"
-CONFIG_DEFAULT_FDT_FILE="imx25-pdk.dtb"
 CONFIG_BOOTDELAY=1
+CONFIG_DEFAULT_FDT_FILE="imx25-pdk.dtb"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/mx53ard_defconfig b/configs/mx53ard_defconfig
index fe0f106..886296b 100644
--- a/configs/mx53ard_defconfig
+++ b/configs/mx53ard_defconfig
@@ -1,8 +1,8 @@ 
 CONFIG_ARM=y
 CONFIG_TARGET_MX53ARD=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53ard/imximage_dd3.cfg"
-CONFIG_DEFAULT_FDT_FILE="imx53-ard.dtb"
 CONFIG_BOOTDELAY=3
+CONFIG_DEFAULT_FDT_FILE="imx53-ard.dtb"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/mx6ull_14x14_evk_plugin_defconfig b/configs/mx6ull_14x14_evk_plugin_defconfig
index 095e48d..56d35dd 100644
--- a/configs/mx6ull_14x14_evk_plugin_defconfig
+++ b/configs/mx6ull_14x14_evk_plugin_defconfig
@@ -21,11 +21,11 @@  CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_CONTROL=y
+# CONFIG_BLK is not set
 CONFIG_DM_GPIO=y
 CONFIG_DM_74X164=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
-# CONFIG_BLK is not set
 # CONFIG_DM_MMC_OPS is not set
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
diff --git a/configs/mx7dsabresd_secure_defconfig b/configs/mx7dsabresd_secure_defconfig
index ef93522..e8ccbd3 100644
--- a/configs/mx7dsabresd_secure_defconfig
+++ b/configs/mx7dsabresd_secure_defconfig
@@ -19,6 +19,7 @@  CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMPORTENV is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_SF=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_DFU=y
@@ -34,6 +35,8 @@  CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_EON=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_MXC_USB_OTG_HACTIVE=y
@@ -45,6 +48,3 @@  CONFIG_G_DNL_MANUFACTURER="FSL"
 CONFIG_G_DNL_VENDOR_NUM=0x0525
 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y
-CONFIG_SPI_FLASH=y
-CONFIG_CMD_SF=y
-CONFIG_SPI_FLASH_EON=y
diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
index 3926552..727c13a 100644
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -25,7 +25,6 @@  CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ADC=y
 CONFIG_ADC_EXYNOS=y
 CONFIG_DFU_MMC=y
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_S2MPS11=y
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index f3ddc74..e250d16 100644
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -35,7 +35,6 @@  CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_CONTROL=y
 CONFIG_DFU_MMC=y
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_PMIC_MAX77686=y
diff --git a/configs/origen_defconfig b/configs/origen_defconfig
index 7b9826a..0d91ec1 100644
--- a/configs/origen_defconfig
+++ b/configs/origen_defconfig
@@ -37,4 +37,3 @@  CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Samsung"
 CONFIG_G_DNL_VENDOR_NUM=0x04e8
 CONFIG_G_DNL_PRODUCT_NUM=0x6601
-CONFIG_DM_I2C=y
diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig
index 0b074ec..0ff4c13 100644
--- a/configs/p2371-0000_defconfig
+++ b/configs/p2371-0000_defconfig
@@ -6,7 +6,6 @@  CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-0000"
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_CONSOLE_MUX=y
 CONFIG_SYS_STDIO_DEREGISTER=y
-CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra210 (P2371-0000) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -21,15 +20,8 @@  CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
 # CONFIG_CMD_NFS is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
 # CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
index 70e43a1..4dfb02d 100644
--- a/configs/p2371-2180_defconfig
+++ b/configs/p2371-2180_defconfig
@@ -6,7 +6,6 @@  CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-2180"
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_CONSOLE_MUX=y
 CONFIG_SYS_STDIO_DEREGISTER=y
-CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra210 (P2371-2180) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -21,15 +20,8 @@  CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
 # CONFIG_CMD_NFS is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
 # CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig
index a114ce3..e49a42f 100644
--- a/configs/p2571_defconfig
+++ b/configs/p2571_defconfig
@@ -6,7 +6,6 @@  CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571"
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_CONSOLE_MUX=y
 CONFIG_SYS_STDIO_DEREGISTER=y
-CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra210 (P2571) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -21,15 +20,8 @@  CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
 # CONFIG_CMD_NFS is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
 # CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-000_defconfig
index 61bb3a1..b4daa12 100644
--- a/configs/p2771-0000-000_defconfig
+++ b/configs/p2771-0000-000_defconfig
@@ -5,7 +5,6 @@  CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-000"
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_CONSOLE_MUX=y
 CONFIG_SYS_STDIO_DEREGISTER=y
-CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-000) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -18,15 +17,8 @@  CONFIG_CMD_USB=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
 # CONFIG_CMD_NFS is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
 # CONFIG_BLK is not set
 CONFIG_TEGRA186_BPMP_I2C=y
 # CONFIG_DM_MMC_OPS is not set
diff --git a/configs/p2771-0000-500_defconfig b/configs/p2771-0000-500_defconfig
index 79f4808..02e974d 100644
--- a/configs/p2771-0000-500_defconfig
+++ b/configs/p2771-0000-500_defconfig
@@ -5,7 +5,6 @@  CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-500"
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_CONSOLE_MUX=y
 CONFIG_SYS_STDIO_DEREGISTER=y
-CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-500) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -18,15 +17,8 @@  CONFIG_CMD_USB=y
 # CONFIG_CMD_FPGA is not set
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
 # CONFIG_CMD_NFS is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
 # CONFIG_BLK is not set
 CONFIG_TEGRA186_BPMP_I2C=y
 # CONFIG_DM_MMC_OPS is not set
diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
index a39cfd2..41b3bcb 100644
--- a/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@ -25,7 +25,6 @@  CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_MUX=y
diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index 4e00f19..770ab71 100644
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -25,7 +25,6 @@  CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_MUX=y
diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig
index dba67bb..8856afb 100644
--- a/configs/pico-imx6ul_defconfig
+++ b/configs/pico-imx6ul_defconfig
@@ -2,8 +2,8 @@  CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_PICO_IMX6UL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/technexion/pico-imx6ul/imximage.cfg"
-CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-hobbit.dtb"
 CONFIG_BOOTDELAY=3
+CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-hobbit.dtb"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig
index 1e70ae0..663724e 100644
--- a/configs/popmetal-rk3288_defconfig
+++ b/configs/popmetal-rk3288_defconfig
@@ -2,6 +2,7 @@  CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ROCKCHIP_RK3288=y
+CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
 CONFIG_TARGET_POPMETAL_RK3288=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-popmetal"
@@ -62,4 +63,3 @@  CONFIG_SYSRESET=y
 CONFIG_USE_TINY_PRINTF=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_ERRNO_STR=y
-CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index f593110..4566d37 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -45,8 +45,8 @@  CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_DM_VIDEO=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig
index e65fa78..f580d45 100644
--- a/configs/qemu-x86_efi_payload32_defconfig
+++ b/configs/qemu-x86_efi_payload32_defconfig
@@ -42,8 +42,8 @@  CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_DM_VIDEO=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig
index eaf0e32..975714b 100644
--- a/configs/qemu-x86_efi_payload64_defconfig
+++ b/configs/qemu-x86_efi_payload64_defconfig
@@ -8,6 +8,7 @@  CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
+# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_SF=y
@@ -42,8 +43,8 @@  CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_DM_VIDEO=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
@@ -52,4 +53,3 @@  CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 CONFIG_EFI_STUB_64BIT=y
-# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
index 1883f07..9e332bc 100644
--- a/configs/rock2_defconfig
+++ b/configs/rock2_defconfig
@@ -1,7 +1,6 @@ 
 CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
-# CONFIG_SPL_MMC_SUPPORT is not set
 CONFIG_ROCKCHIP_RK3288=y
 CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
 CONFIG_TARGET_ROCK2=y
diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig
index 8a786f1..931defc 100644
--- a/configs/sama5d2_xplained_mmc_defconfig
+++ b/configs/sama5d2_xplained_mmc_defconfig
@@ -8,8 +8,6 @@  CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_DM_GPIO=y
-CONFIG_DM_SERIAL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained"
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC"
@@ -34,24 +32,24 @@  CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
-CONFIG_BLK=y
 CONFIG_CLK=y
 CONFIG_SPL_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_UTMI=y
 CONFIG_AT91_H32MX=y
 CONFIG_AT91_GENERIC_CLK=y
+CONFIG_DM_GPIO=y
 CONFIG_ATMEL_PIO4=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_AT91=y
 CONFIG_DM_MMC=y
-CONFIG_DM_MMC_OPS=y
 CONFIG_ATMEL_SDHCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91PIO4=y
+CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_UART_ATMEL=y
 CONFIG_DEBUG_UART_BASE=0xf8020000
@@ -62,8 +60,8 @@  CONFIG_ATMEL_USART=y
 CONFIG_DM_SPI=y
 CONFIG_ATMEL_SPI=y
 CONFIG_USB=y
-CONFIG_USB_STORAGE=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_ATMEL_USBA=y
diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig
index 51594e7..a04f9ea 100644
--- a/configs/sama5d2_xplained_spiflash_defconfig
+++ b/configs/sama5d2_xplained_spiflash_defconfig
@@ -7,8 +7,6 @@  CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_DM_GPIO=y
-CONFIG_DM_SERIAL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained"
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_SERIALFLASH"
@@ -33,24 +31,24 @@  CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
-CONFIG_BLK=y
 CONFIG_CLK=y
 CONFIG_SPL_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_UTMI=y
 CONFIG_AT91_H32MX=y
 CONFIG_AT91_GENERIC_CLK=y
+CONFIG_DM_GPIO=y
 CONFIG_ATMEL_PIO4=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_AT91=y
 CONFIG_DM_MMC=y
-CONFIG_DM_MMC_OPS=y
 CONFIG_ATMEL_SDHCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91PIO4=y
+CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_UART_ATMEL=y
 CONFIG_DEBUG_UART_BASE=0xf8020000
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 93a70eb..0d77be7 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -25,7 +25,6 @@  CONFIG_CMD_SOUND=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index 2141270..69f8d40 100644
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -22,7 +22,6 @@  CONFIG_CMD_GPIO=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig
index d529a69..6f55503 100644
--- a/configs/sniper_defconfig
+++ b/configs/sniper_defconfig
@@ -5,6 +5,7 @@  CONFIG_OMAP34XX=y
 CONFIG_TARGET_SNIPER=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
+# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="sniper # "
 CONFIG_CMD_BOOTZ=y
@@ -32,4 +33,3 @@  CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
 CONFIG_G_DNL_VENDOR_NUM=0x0451
 CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_OF_LIBFDT=y
-# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 5385495..19e6117 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -26,7 +26,6 @@  CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_LDO=y
 CONFIG_I2C_MUX=y
diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig
index 3980cf5..a3ba8c1 100644
--- a/configs/som-db5800-som-6867_defconfig
+++ b/configs/som-db5800-som-6867_defconfig
@@ -56,8 +56,8 @@  CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_DM_VIDEO=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
diff --git a/configs/spring_defconfig b/configs/spring_defconfig
index bfd3265..d78588b 100644
--- a/configs/spring_defconfig
+++ b/configs/spring_defconfig
@@ -26,7 +26,6 @@  CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_LDO=y
 CONFIG_I2C_MUX=y
diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig
index bb161d4..f7d3fc2 100644
--- a/configs/stm32f429-discovery_defconfig
+++ b/configs/stm32f429-discovery_defconfig
@@ -7,7 +7,7 @@  CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot > "
+# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIMER=y
 CONFIG_OF_LIBFDT=y
-# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index 51cdcba..135c904 100644
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -56,8 +56,8 @@  CONFIG_TIMER=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
-CONFIG_DM_VIDEO=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_114=y
diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
index 0065647..e642475 100644
--- a/configs/theadorable_debug_defconfig
+++ b/configs/theadorable_debug_defconfig
@@ -54,5 +54,4 @@  CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_MVEBU=y
-CONFIG_CFB_CONSOLE=y
 # CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/configs/theadorable_defconfig b/configs/theadorable_defconfig
index 8bb4697..a063047 100644
--- a/configs/theadorable_defconfig
+++ b/configs/theadorable_defconfig
@@ -43,7 +43,6 @@  CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
 CONFIG_VIDEO_MVEBU=y
-CONFIG_CFB_CONSOLE=y
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_REGEX=y
 CONFIG_LIB_RAND=y
diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig
index ff7b826..fd623e0 100644
--- a/configs/tqma6q_mba6_mmc_defconfig
+++ b/configs/tqma6q_mba6_mmc_defconfig
@@ -4,8 +4,8 @@  CONFIG_TARGET_TQMA6=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_DEFAULT_FDT_FILE="imx6q-mba6x.dtb"
 CONFIG_BOOTDELAY=3
+CONFIG_DEFAULT_FDT_FILE="imx6q-mba6x.dtb"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig
index e6f99b1..6dc0941 100644
--- a/configs/tqma6q_mba6_spi_defconfig
+++ b/configs/tqma6q_mba6_spi_defconfig
@@ -5,8 +5,8 @@  CONFIG_TQMA6X_SPI_BOOT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_DEFAULT_FDT_FILE="imx6q-mba6x.dtb"
 CONFIG_BOOTDELAY=3
+CONFIG_DEFAULT_FDT_FILE="imx6q-mba6x.dtb"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig
index 33436fc..7b46177 100644
--- a/configs/tqma6s_mba6_mmc_defconfig
+++ b/configs/tqma6s_mba6_mmc_defconfig
@@ -5,8 +5,8 @@  CONFIG_TQMA6S=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_DEFAULT_FDT_FILE="imx6dl-mba6x.dtb"
 CONFIG_BOOTDELAY=3
+CONFIG_DEFAULT_FDT_FILE="imx6dl-mba6x.dtb"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig
index 7805638..07e0491 100644
--- a/configs/tqma6s_mba6_spi_defconfig
+++ b/configs/tqma6s_mba6_spi_defconfig
@@ -6,8 +6,8 @@  CONFIG_TQMA6X_SPI_BOOT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_DEFAULT_FDT_FILE="imx6dl-mba6x.dtb"
 CONFIG_BOOTDELAY=3
+CONFIG_DEFAULT_FDT_FILE="imx6dl-mba6x.dtb"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig
index 0f5950d..e5cfcc6 100644
--- a/configs/tqma6s_wru4_mmc_defconfig
+++ b/configs/tqma6s_wru4_mmc_defconfig
@@ -7,12 +7,12 @@  CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=3
+CONFIG_DEFAULT_FDT_FILE="imx6s-wru4.dtb"
 CONFIG_HUSH_PARSER=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Enter password in %d seconds to stop autoboot\n"
 CONFIG_AUTOBOOT_ENCRYPTION=y
 CONFIG_AUTOBOOT_STOP_STR_SHA256="36a9e7f1c95b82ffb99743e0c5c4ce95d83c9a430aac59f84ef3cbfab6145068"
-CONFIG_DEFAULT_FDT_FILE="imx6s-wru4.dtb"
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MMC=y
diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig
index 3304afb..98679cf 100644
--- a/configs/udoo_neo_defconfig
+++ b/configs/udoo_neo_defconfig
@@ -10,8 +10,8 @@  CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SX"
+CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
@@ -19,7 +19,6 @@  CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
-# CONFIG_CMD_DHCP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT2=y
diff --git a/configs/vining_2000_defconfig b/configs/vining_2000_defconfig
index b1f64f1..9410703 100644
--- a/configs/vining_2000_defconfig
+++ b/configs/vining_2000_defconfig
@@ -3,7 +3,6 @@  CONFIG_ARCH_MX6=y
 CONFIG_TARGET_SAMTEC_VINING_2000=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/samtec/vining_2000/imximage.cfg"
 CONFIG_BOOTDELAY=0
-CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
@@ -28,4 +27,3 @@  CONFIG_PCI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
-CONFIG_MXC_USB_OTG_HACTIVE=y