[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Hans de Goede]

Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
needing to have this in every sunxi defconfig file.

This also fixes the Merrii_A80_Optimus defconfig no longer building.

Cc: Maxin B. John <maxin.john@enea.com>
Reported-by: Maxin B. John <maxin.john@enea.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 board/sunxi/Kconfig                          | 6 ++++++
 configs/A10-OLinuXino-Lime_defconfig         | 2 --
 configs/A10s-OLinuXino-M_defconfig           | 2 --
 configs/A13-OLinuXinoM_defconfig             | 2 --
 configs/A13-OLinuXino_defconfig              | 2 --
 configs/A20-OLinuXino-Lime2_defconfig        | 2 --
 configs/A20-OLinuXino-Lime_defconfig         | 2 --
 configs/A20-OLinuXino_MICRO_defconfig        | 2 --
 configs/Ainol_AW1_defconfig                  | 2 --
 configs/Ampe_A76_defconfig                   | 2 --
 configs/Auxtek-T004_defconfig                | 2 --
 configs/Bananapi_defconfig                   | 2 --
 configs/Bananapro_defconfig                  | 2 --
 configs/CSQ_CS908_defconfig                  | 2 --
 configs/Chuwi_V7_CW0825_defconfig            | 2 --
 configs/Colombus_defconfig                   | 2 --
 configs/Cubieboard2_defconfig                | 2 --
 configs/Cubieboard_defconfig                 | 2 --
 configs/Cubietruck_defconfig                 | 2 --
 configs/Et_q8_v1_6_defconfig                 | 2 --
 configs/Hummingbird_A31_defconfig            | 2 --
 configs/Hyundai_A7HD_defconfig               | 2 --
 configs/Ippo_q8h_v1_2_a33_1024x600_defconfig | 2 --
 configs/Ippo_q8h_v1_2_defconfig              | 2 --
 configs/Ippo_q8h_v5_defconfig                | 2 --
 configs/Linksprite_pcDuino3_Nano_defconfig   | 2 --
 configs/Linksprite_pcDuino3_defconfig        | 2 --
 configs/Linksprite_pcDuino_defconfig         | 2 --
 configs/MK808C_defconfig                     | 2 --
 configs/MSI_Primo73_defconfig                | 2 --
 configs/MSI_Primo81_defconfig                | 2 --
 configs/Marsboard_A10_defconfig              | 2 --
 configs/Mele_A1000_defconfig                 | 2 --
 configs/Mele_I7_defconfig                    | 2 --
 configs/Mele_M3_defconfig                    | 2 --
 configs/Mele_M5_defconfig                    | 2 --
 configs/Mele_M9_defconfig                    | 2 --
 configs/Mini-X_defconfig                     | 2 --
 configs/Orangepi_defconfig                   | 2 --
 configs/Orangepi_mini_defconfig              | 2 --
 configs/TZX-Q8-713B7_defconfig               | 2 --
 configs/UTOO_P66_defconfig                   | 2 --
 configs/Wexler_TAB7200_defconfig             | 2 --
 configs/Wits_Pro_A20_DKT_defconfig           | 2 --
 configs/Yones_Toptech_BD1078_defconfig       | 2 --
 configs/ba10_tv_box_defconfig                | 2 --
 configs/forfun_q88db_defconfig               | 2 --
 configs/ga10h_v1_1_defconfig                 | 2 --
 configs/i12-tvbox_defconfig                  | 2 --
 configs/iNet_3F_defconfig                    | 2 --
 configs/iNet_3W_defconfig                    | 2 --
 configs/iNet_86VS_defconfig                  | 2 --
 configs/jesurun_q5_defconfig                 | 2 --
 configs/mixtile_loftq_defconfig              | 2 --
 configs/mk802_a10s_defconfig                 | 2 --
 configs/mk802_defconfig                      | 2 --
 configs/mk802ii_defconfig                    | 2 --
 configs/r7-tv-dongle_defconfig               | 2 --
 configs/sunxi_Gemei_G9_defconfig             | 2 --
 59 files changed, 6 insertions(+), 116 deletions(-)

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index e744d4a..b2eca51 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -581,4 +581,10 @@ config DM_SERIAL
 config DM_USB
 	default y if !USB_MUSB_SUNXI
 
+config CMD_SETEXPR
+	default y
+
+config CMD_NET
+	default y
+
 endif
diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
index c46279e..971e11a 100644
--- a/configs/A10-OLinuXino-Lime_defconfig
+++ b/configs/A10-OLinuXino-Lime_defconfig
@@ -7,5 +7,3 @@ CONFIG_SYS_CLK_FREQ=912000000
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig
index 0fbc880..d4953aa 100644
--- a/configs/A10s-OLinuXino-M_defconfig
+++ b/configs/A10s-OLinuXino-M_defconfig
@@ -9,5 +9,3 @@ CONFIG_USB1_VBUS_PIN="PB10"
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-olinuxino-micro"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,SUNXI_EMAC,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
index 5d541b0..4bee362 100644
--- a/configs/A13-OLinuXinoM_defconfig
+++ b/configs/A13-OLinuXinoM_defconfig
@@ -13,5 +13,3 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino-micro"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index 5125224..43d5fa1 100644
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -14,5 +14,3 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
index 5493b1e..78eee6a 100644
--- a/configs/A20-OLinuXino-Lime2_defconfig
+++ b/configs/A20-OLinuXino-Lime2_defconfig
@@ -8,6 +8,4 @@ CONFIG_USB0_VBUS_DET="PH5"
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
index 114b811..0b64d94 100644
--- a/configs/A20-OLinuXino-Lime_defconfig
+++ b/configs/A20-OLinuXino-Lime_defconfig
@@ -5,6 +5,4 @@ CONFIG_DRAM_CLK=480
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
index fc736b0..e61067d 100644
--- a/configs/A20-OLinuXino_MICRO_defconfig
+++ b/configs/A20-OLinuXino_MICRO_defconfig
@@ -9,6 +9,4 @@ CONFIG_VIDEO_VGA=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig
index 4ac6ffa..94c5443 100644
--- a/configs/Ainol_AW1_defconfig
+++ b/configs/Ainol_AW1_defconfig
@@ -15,5 +15,3 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-ainol-aw1"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/Ampe_A76_defconfig b/configs/Ampe_A76_defconfig
index 410b152..63307b8 100644
--- a/configs/Ampe_A76_defconfig
+++ b/configs/Ampe_A76_defconfig
@@ -14,5 +14,3 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-ampe-a76"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig
index ce46f01..6e320bd 100644
--- a/configs/Auxtek-T004_defconfig
+++ b/configs/Auxtek-T004_defconfig
@@ -6,5 +6,3 @@ CONFIG_USB1_VBUS_PIN="PG13"
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-auxtek-t004"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
index 2779719..904d27d 100644
--- a/configs/Bananapi_defconfig
+++ b/configs/Bananapi_defconfig
@@ -6,6 +6,4 @@ CONFIG_GMAC_TX_DELAY=3
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig
index 5740d82..7b7556b 100644
--- a/configs/Bananapro_defconfig
+++ b/configs/Bananapro_defconfig
@@ -8,6 +8,4 @@ CONFIG_GMAC_TX_DELAY=3
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapro"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/CSQ_CS908_defconfig b/configs/CSQ_CS908_defconfig
index db22e4c..850d70d 100644
--- a/configs/CSQ_CS908_defconfig
+++ b/configs/CSQ_CS908_defconfig
@@ -7,8 +7,6 @@ CONFIG_USB2_VBUS_PIN=""
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-cs908"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3300
diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig
index 9bce985..819b353 100644
--- a/configs/Chuwi_V7_CW0825_defconfig
+++ b/configs/Chuwi_V7_CW0825_defconfig
@@ -14,8 +14,6 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-chuwi-v7-cw0825"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_VIDEO_LCD_SPI_CS="PA0"
 CONFIG_VIDEO_LCD_SPI_SCLK="PA1"
 CONFIG_VIDEO_LCD_SPI_MOSI="PA2"
diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
index 04f0e2a..e6bed2d 100644
--- a/configs/Colombus_defconfig
+++ b/configs/Colombus_defconfig
@@ -7,7 +7,5 @@ CONFIG_USB1_VBUS_PIN=""
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-colombus"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_AXP221_ALDO1_VOLT=3300
diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
index 4f403d4..e88cce4 100644
--- a/configs/Cubieboard2_defconfig
+++ b/configs/Cubieboard2_defconfig
@@ -6,6 +6,4 @@ CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
index 5ed877c..ce9591d 100644
--- a/configs/Cubieboard_defconfig
+++ b/configs/Cubieboard_defconfig
@@ -5,5 +5,3 @@ CONFIG_DRAM_CLK=480
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index 2acc3ad..c34ab50 100644
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -7,6 +7,4 @@ CONFIG_GMAC_TX_DELAY=1
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Et_q8_v1_6_defconfig b/configs/Et_q8_v1_6_defconfig
index b3ae133..4e8350f 100644
--- a/configs/Et_q8_v1_6_defconfig
+++ b/configs/Et_q8_v1_6_defconfig
@@ -15,7 +15,5 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-et-q8-v1.6"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig
index 2fea609..015140f 100644
--- a/configs/Hummingbird_A31_defconfig
+++ b/configs/Hummingbird_A31_defconfig
@@ -9,7 +9,5 @@ CONFIG_VIDEO_VGA_EXTERNAL_DAC_EN="PH25"
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-hummingbird"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_AXP221_ALDO1_VOLT=3300
diff --git a/configs/Hyundai_A7HD_defconfig b/configs/Hyundai_A7HD_defconfig
index 2c86124..e26f4f0 100644
--- a/configs/Hyundai_A7HD_defconfig
+++ b/configs/Hyundai_A7HD_defconfig
@@ -16,5 +16,3 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-hyundai-a7hd"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
index 7ad3e28..5b1080f 100644
--- a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
+++ b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
@@ -15,7 +15,5 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ippo-q8h-v1.2-lcd1024x600"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Ippo_q8h_v1_2_defconfig b/configs/Ippo_q8h_v1_2_defconfig
index 47631f0..8d03300 100644
--- a/configs/Ippo_q8h_v1_2_defconfig
+++ b/configs/Ippo_q8h_v1_2_defconfig
@@ -15,7 +15,5 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v1.2"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Ippo_q8h_v5_defconfig b/configs/Ippo_q8h_v5_defconfig
index fc9428b..1a07064 100644
--- a/configs/Ippo_q8h_v5_defconfig
+++ b/configs/Ippo_q8h_v5_defconfig
@@ -15,7 +15,5 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v5"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig
index e750508..be381ef 100644
--- a/configs/Linksprite_pcDuino3_Nano_defconfig
+++ b/configs/Linksprite_pcDuino3_Nano_defconfig
@@ -8,6 +8,4 @@ CONFIG_GMAC_TX_DELAY=3
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3-nano"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
index 0e8bec7..2c846f9 100644
--- a/configs/Linksprite_pcDuino3_defconfig
+++ b/configs/Linksprite_pcDuino3_defconfig
@@ -6,6 +6,4 @@ CONFIG_DRAM_ZQ=122
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Linksprite_pcDuino_defconfig b/configs/Linksprite_pcDuino_defconfig
index 3ec7b2b..aed5b59 100644
--- a/configs/Linksprite_pcDuino_defconfig
+++ b/configs/Linksprite_pcDuino_defconfig
@@ -5,5 +5,3 @@ CONFIG_DRAM_CLK=408
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-pcduino"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MK808C_defconfig b/configs/MK808C_defconfig
index 4f37304..88df54c 100644
--- a/configs/MK808C_defconfig
+++ b/configs/MK808C_defconfig
@@ -5,5 +5,3 @@ CONFIG_DRAM_CLK=384
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-mk808c"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MSI_Primo73_defconfig b/configs/MSI_Primo73_defconfig
index 5c43450..00f0796 100644
--- a/configs/MSI_Primo73_defconfig
+++ b/configs/MSI_Primo73_defconfig
@@ -11,5 +11,3 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-primo73"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig
index ab04519..83a95cb 100644
--- a/configs/MSI_Primo81_defconfig
+++ b/configs/MSI_Primo81_defconfig
@@ -10,8 +10,6 @@ CONFIG_VIDEO_LCD_PANEL_MIPI_4_LANE_513_MBPS_VIA_SSD2828=y
 # CONFIG_USB_KEYBOARD is not set
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-primo81"
 CONFIG_SPL=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_VIDEO_LCD_SSD2828_TX_CLK=27
 CONFIG_VIDEO_LCD_SSD2828_RESET="PA26"
diff --git a/configs/Marsboard_A10_defconfig b/configs/Marsboard_A10_defconfig
index dad41bb..5a9703d 100644
--- a/configs/Marsboard_A10_defconfig
+++ b/configs/Marsboard_A10_defconfig
@@ -4,5 +4,3 @@ CONFIG_MACH_SUN4I=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-marsboard"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,AHCI,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
index 65cdcd0..6678e4c 100644
--- a/configs/Mele_A1000_defconfig
+++ b/configs/Mele_A1000_defconfig
@@ -5,5 +5,3 @@ CONFIG_VIDEO_VGA=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-a1000"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/Mele_I7_defconfig b/configs/Mele_I7_defconfig
index ab545f9..bf67433 100644
--- a/configs/Mele_I7_defconfig
+++ b/configs/Mele_I7_defconfig
@@ -7,8 +7,6 @@ CONFIG_USB2_VBUS_PIN=""
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-i7"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_AXP221_DCDC1_VOLT=3300
 CONFIG_AXP221_DLDO1_VOLT=3300
diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig
index 42bff2f..9c2eb86 100644
--- a/configs/Mele_M3_defconfig
+++ b/configs/Mele_M3_defconfig
@@ -8,6 +8,4 @@ CONFIG_VIDEO_VGA=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m3"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig
index 72d55e2..5ee648b 100644
--- a/configs/Mele_M5_defconfig
+++ b/configs/Mele_M5_defconfig
@@ -7,6 +7,4 @@ CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m5"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,USB_EHCI,STATUSLED=234"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig
index 955366a..16881fa 100644
--- a/configs/Mele_M9_defconfig
+++ b/configs/Mele_M9_defconfig
@@ -17,8 +17,6 @@ CONFIG_USB2_VBUS_PIN=""
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-m9"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_AXP221_DCDC1_VOLT=3300
 CONFIG_AXP221_DLDO1_VOLT=3300
diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig
index b107827..918b639 100644
--- a/configs/Mini-X_defconfig
+++ b/configs/Mini-X_defconfig
@@ -4,5 +4,3 @@ CONFIG_MACH_SUN4I=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mini-xplus"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig
index b700a9f..9d5e5dc 100644
--- a/configs/Orangepi_defconfig
+++ b/configs/Orangepi_defconfig
@@ -9,6 +9,4 @@ CONFIG_GMAC_TX_DELAY=3
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
index 8a07bae..99cc600 100644
--- a/configs/Orangepi_mini_defconfig
+++ b/configs/Orangepi_mini_defconfig
@@ -11,6 +11,4 @@ CONFIG_GMAC_TX_DELAY=3
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi-mini"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/TZX-Q8-713B7_defconfig b/configs/TZX-Q8-713B7_defconfig
index 52642d6..c33317e 100644
--- a/configs/TZX-Q8-713B7_defconfig
+++ b/configs/TZX-Q8-713B7_defconfig
@@ -14,5 +14,3 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-tzx-q8-713b7"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/UTOO_P66_defconfig b/configs/UTOO_P66_defconfig
index bd6b66f..9ab2fa5 100644
--- a/configs/UTOO_P66_defconfig
+++ b/configs/UTOO_P66_defconfig
@@ -20,5 +20,3 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-utoo-p66"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/Wexler_TAB7200_defconfig b/configs/Wexler_TAB7200_defconfig
index 2beda9e..011e921 100644
--- a/configs/Wexler_TAB7200_defconfig
+++ b/configs/Wexler_TAB7200_defconfig
@@ -9,5 +9,3 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wexler-tab7200"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig
index e8fc4f0..8bdca23 100644
--- a/configs/Wits_Pro_A20_DKT_defconfig
+++ b/configs/Wits_Pro_A20_DKT_defconfig
@@ -11,6 +11,4 @@ CONFIG_VIDEO_LCD_PANEL_LVDS=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wits-pro-a20-dkt"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/Yones_Toptech_BD1078_defconfig b/configs/Yones_Toptech_BD1078_defconfig
index e684267..346e689 100644
--- a/configs/Yones_Toptech_BD1078_defconfig
+++ b/configs/Yones_Toptech_BD1078_defconfig
@@ -20,5 +20,3 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-yones-toptech-bd1078"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig
index 80d2bd5..f2ab415 100644
--- a/configs/ba10_tv_box_defconfig
+++ b/configs/ba10_tv_box_defconfig
@@ -7,5 +7,3 @@ CONFIG_USB2_VBUS_PIN="PH12"
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-ba10-tvbox"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/forfun_q88db_defconfig b/configs/forfun_q88db_defconfig
index d6e6bd6..fc7ce6a 100644
--- a/configs/forfun_q88db_defconfig
+++ b/configs/forfun_q88db_defconfig
@@ -13,5 +13,3 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-forfun-q88db"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/ga10h_v1_1_defconfig b/configs/ga10h_v1_1_defconfig
index 4344bb7..67b40c2 100644
--- a/configs/ga10h_v1_1_defconfig
+++ b/configs/ga10h_v1_1_defconfig
@@ -17,7 +17,5 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ga10h-v1.1"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
index ec3c3e0..c8ccf45 100644
--- a/configs/i12-tvbox_defconfig
+++ b/configs/i12-tvbox_defconfig
@@ -5,6 +5,4 @@ CONFIG_DRAM_CLK=384
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-i12-tvbox"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/iNet_3F_defconfig b/configs/iNet_3F_defconfig
index 919be44..e807aeb 100644
--- a/configs/iNet_3F_defconfig
+++ b/configs/iNet_3F_defconfig
@@ -15,5 +15,3 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3f"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/iNet_3W_defconfig b/configs/iNet_3W_defconfig
index b195f78..eaf7c5a 100644
--- a/configs/iNet_3W_defconfig
+++ b/configs/iNet_3W_defconfig
@@ -15,5 +15,3 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3w"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/iNet_86VS_defconfig b/configs/iNet_86VS_defconfig
index b12af76..017a87a 100644
--- a/configs/iNet_86VS_defconfig
+++ b/configs/iNet_86VS_defconfig
@@ -13,5 +13,3 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-inet-86vs"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/jesurun_q5_defconfig b/configs/jesurun_q5_defconfig
index 86be75c..da41bff 100644
--- a/configs/jesurun_q5_defconfig
+++ b/configs/jesurun_q5_defconfig
@@ -5,5 +5,3 @@ CONFIG_DRAM_CLK=312
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-jesurun-q5"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI,MACPWR=SUNXI_GPH(19)"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/mixtile_loftq_defconfig b/configs/mixtile_loftq_defconfig
index 7d3d6bb..5c60634 100644
--- a/configs/mixtile_loftq_defconfig
+++ b/configs/mixtile_loftq_defconfig
@@ -8,7 +8,5 @@ CONFIG_USB2_VBUS_PIN=""
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-mixtile-loftq"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_AXP221_ALDO1_VOLT=3300
diff --git a/configs/mk802_a10s_defconfig b/configs/mk802_a10s_defconfig
index 1c3897b..4994936 100644
--- a/configs/mk802_a10s_defconfig
+++ b/configs/mk802_a10s_defconfig
@@ -7,5 +7,3 @@ CONFIG_USB1_VBUS_PIN="PB10"
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-mk802"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/mk802_defconfig b/configs/mk802_defconfig
index 96252de..1a9a361 100644
--- a/configs/mk802_defconfig
+++ b/configs/mk802_defconfig
@@ -5,5 +5,3 @@ CONFIG_USB2_VBUS_PIN="PH12"
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mk802"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/mk802ii_defconfig b/configs/mk802ii_defconfig
index 1d297ac..3850fba 100644
--- a/configs/mk802ii_defconfig
+++ b/configs/mk802ii_defconfig
@@ -4,5 +4,3 @@ CONFIG_MACH_SUN4I=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mk802ii"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig
index 49ba7e1..bc1657d 100644
--- a/configs/r7-tv-dongle_defconfig
+++ b/configs/r7-tv-dongle_defconfig
@@ -6,5 +6,3 @@ CONFIG_USB1_VBUS_PIN="PG13"
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-r7-tv-dongle"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/sunxi_Gemei_G9_defconfig b/configs/sunxi_Gemei_G9_defconfig
index e96eb65..35aa847 100644
--- a/configs/sunxi_Gemei_G9_defconfig
+++ b/configs/sunxi_Gemei_G9_defconfig
@@ -11,5 +11,3 @@ CONFIG_VIDEO_LCD_PANEL_LVDS=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-gemei-g9"
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
-- 
2.4.2

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Ian Campbell]

On Wed, 2015-06-03 at 20:12 +0200, Hans de Goede wrote:
> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
> needing to have this in every sunxi defconfig file.
> 
> This also fixes the Merrii_A80_Optimus defconfig no longer building.
> 
> Cc: Maxin B. John <maxin.john@enea.com>
> Reported-by: Maxin B. John <maxin.john@enea.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Seem like the sorts of things which ought to be default y at the actual
definition, since they would usually be wanted I think, but anyway:

Acked-by: Ian Campbell <ijc@hellion.org.uk>

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Tom Rini]

On Wed, Jun 03, 2015 at 08:12:16PM +0200, Hans de Goede wrote:

> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
> needing to have this in every sunxi defconfig file.
> 
> This also fixes the Merrii_A80_Optimus defconfig no longer building.
> 
> Cc: Maxin B. John <maxin.john@enea.com>
> Reported-by: Maxin B. John <maxin.john@enea.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Joe? Masahiro?  It feels like something has gone wrong with the
conversion here.  Or do people need to get used to the defconfig files
being a non-trivial size?  Or do we need some more default y if ...
lines around things?  Or a few of the above?  Thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150603/aae7474e/attachment.sig>

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Joe Hershberger]

Hi Tom,

On Wed, Jun 3, 2015 at 5:12 PM, Tom Rini <trini@konsulko.com> wrote:
> On Wed, Jun 03, 2015 at 08:12:16PM +0200, Hans de Goede wrote:
>
>> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
>> needing to have this in every sunxi defconfig file.
>>
>> This also fixes the Merrii_A80_Optimus defconfig no longer building.
>>
>> Cc: Maxin B. John <maxin.john@enea.com>
>> Reported-by: Maxin B. John <maxin.john@enea.com>
>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>
> Joe? Masahiro?  It feels like something has gone wrong with the
> conversion here.  Or do people need to get used to the defconfig files
> being a non-trivial size?  Or do we need some more default y if ...
> lines around things?  Or a few of the above?  Thanks!

It seems we should select good defaults. Maybe we should try to agree
which way we should err. Make u-boot bigger by default, and boards
that are limited can disable features? Or should we enable commands on
boards that "need" a feature and keep u-boot slim by default?

I don't like the half measure of defining a different default for one
platform than another unless it is actually something inherent in the
platform, and in that case it should be enabled by a "selects" under
the platform Kconfig.

I agree we want to have smaller defconfigs rather than bigger, but
there are lots of features and many boards will not agree, so the
defconfigs of many boards will have to contain something.

-Joe

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Tom Rini]

On Wed, Jun 03, 2015 at 05:21:44PM -0500, Joe Hershberger wrote:
> Hi Tom,
> 
> On Wed, Jun 3, 2015 at 5:12 PM, Tom Rini <trini@konsulko.com> wrote:
> > On Wed, Jun 03, 2015 at 08:12:16PM +0200, Hans de Goede wrote:
> >
> >> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
> >> needing to have this in every sunxi defconfig file.
> >>
> >> This also fixes the Merrii_A80_Optimus defconfig no longer building.
> >>
> >> Cc: Maxin B. John <maxin.john@enea.com>
> >> Reported-by: Maxin B. John <maxin.john@enea.com>
> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> >
> > Joe? Masahiro?  It feels like something has gone wrong with the
> > conversion here.  Or do people need to get used to the defconfig files
> > being a non-trivial size?  Or do we need some more default y if ...
> > lines around things?  Or a few of the above?  Thanks!
> 
> It seems we should select good defaults. Maybe we should try to agree
> which way we should err. Make u-boot bigger by default, and boards
> that are limited can disable features? Or should we enable commands on
> boards that "need" a feature and keep u-boot slim by default?
> 
> I don't like the half measure of defining a different default for one
> platform than another unless it is actually something inherent in the
> platform, and in that case it should be enabled by a "selects" under
> the platform Kconfig.
> 
> I agree we want to have smaller defconfigs rather than bigger, but
> there are lots of features and many boards will not agree, so the
> defconfigs of many boards will have to contain something.

The first thing that pops to mind is that if it used to be in
config_cmd_default.h it should be on by default and disabled when needed
(and this means we can be smart about CMD_FLASH / CMD_IMLS).  Otherwise
we need to think hard on if something new should be on by default or
not.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150603/6c3bbb29/attachment.sig>

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Joe Hershberger]

On Wed, Jun 3, 2015 at 5:26 PM, Tom Rini <trini@konsulko.com> wrote:
> On Wed, Jun 03, 2015 at 05:21:44PM -0500, Joe Hershberger wrote:
>> Hi Tom,
>>
>> On Wed, Jun 3, 2015 at 5:12 PM, Tom Rini <trini@konsulko.com> wrote:
>> > On Wed, Jun 03, 2015 at 08:12:16PM +0200, Hans de Goede wrote:
>> >
>> >> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
>> >> needing to have this in every sunxi defconfig file.
>> >>
>> >> This also fixes the Merrii_A80_Optimus defconfig no longer building.
>> >>
>> >> Cc: Maxin B. John <maxin.john@enea.com>
>> >> Reported-by: Maxin B. John <maxin.john@enea.com>
>> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>> >
>> > Joe? Masahiro?  It feels like something has gone wrong with the
>> > conversion here.  Or do people need to get used to the defconfig files
>> > being a non-trivial size?  Or do we need some more default y if ...
>> > lines around things?  Or a few of the above?  Thanks!
>>
>> It seems we should select good defaults. Maybe we should try to agree
>> which way we should err. Make u-boot bigger by default, and boards
>> that are limited can disable features? Or should we enable commands on
>> boards that "need" a feature and keep u-boot slim by default?
>>
>> I don't like the half measure of defining a different default for one
>> platform than another unless it is actually something inherent in the
>> platform, and in that case it should be enabled by a "selects" under
>> the platform Kconfig.
>>
>> I agree we want to have smaller defconfigs rather than bigger, but
>> there are lots of features and many boards will not agree, so the
>> defconfigs of many boards will have to contain something.
>
> The first thing that pops to mind is that if it used to be in
> config_cmd_default.h it should be on by default and disabled when needed
> (and this means we can be smart about CMD_FLASH / CMD_IMLS).  Otherwise
> we need to think hard on if something new should be on by default or
> not.

I have the gut feeling that things that depend on hardware existing
(such as CMD_NET) should not be default.  However, I guess if it's
totally ubiquitous (such as CMD_MEMORY - though it's already in
config_cmd_default.h) then it should be default just to shrink the
defconfigs.

Ian, you indicated that you thought CMD_NET should be a default since
it is usually wanted. It seems that is generally the case. It looks
like 94% of boards enable CMD_NET, which makes it pretty much
ubiquitous.

Perhaps that should be the metric for deciding (probably with
flexibility for making an argument to the contrary)... if more that
80% (good enough water-mark?) of the boards enable a feature, then it
should be the default?  50% would optimize for overall defconfig
size... maybe that's better?

-Joe

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Hans de Goede]

Hi,

On 04-06-15 00:55, Joe Hershberger wrote:
> On Wed, Jun 3, 2015 at 5:26 PM, Tom Rini <trini@konsulko.com> wrote:
>> On Wed, Jun 03, 2015 at 05:21:44PM -0500, Joe Hershberger wrote:
>>> Hi Tom,
>>>
>>> On Wed, Jun 3, 2015 at 5:12 PM, Tom Rini <trini@konsulko.com> wrote:
>>>> On Wed, Jun 03, 2015 at 08:12:16PM +0200, Hans de Goede wrote:
>>>>
>>>>> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
>>>>> needing to have this in every sunxi defconfig file.
>>>>>
>>>>> This also fixes the Merrii_A80_Optimus defconfig no longer building.
>>>>>
>>>>> Cc: Maxin B. John <maxin.john@enea.com>
>>>>> Reported-by: Maxin B. John <maxin.john@enea.com>
>>>>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>>>>
>>>> Joe? Masahiro?  It feels like something has gone wrong with the
>>>> conversion here.  Or do people need to get used to the defconfig files
>>>> being a non-trivial size?  Or do we need some more default y if ...
>>>> lines around things?  Or a few of the above?  Thanks!
>>>
>>> It seems we should select good defaults. Maybe we should try to agree
>>> which way we should err. Make u-boot bigger by default, and boards
>>> that are limited can disable features? Or should we enable commands on
>>> boards that "need" a feature and keep u-boot slim by default?
>>>
>>> I don't like the half measure of defining a different default for one
>>> platform than another unless it is actually something inherent in the
>>> platform, and in that case it should be enabled by a "selects" under
>>> the platform Kconfig.
>>>
>>> I agree we want to have smaller defconfigs rather than bigger, but
>>> there are lots of features and many boards will not agree, so the
>>> defconfigs of many boards will have to contain something.
>>
>> The first thing that pops to mind is that if it used to be in
>> config_cmd_default.h it should be on by default and disabled when needed
>> (and this means we can be smart about CMD_FLASH / CMD_IMLS).  Otherwise
>> we need to think hard on if something new should be on by default or
>> not.
>
> I have the gut feeling that things that depend on hardware existing
> (such as CMD_NET) should not be default.

Well taking CMD_NET as example, most boards may not have (wired) ethernet
but they often to have USB and u-boot supports several popular
USB <-> ethernet adapters...

TBH given modern system memory sizes I think it makes sense for a lot
of stuff to just default to y, and then one really space / mem
constrained systems they can be disabled via a select from the
ARCH setting.

>  However, I guess if it's
> totally ubiquitous (such as CMD_MEMORY - though it's already in
> config_cmd_default.h) then it should be default just to shrink the
> defconfigs.
>
> Ian, you indicated that you thought CMD_NET should be a default since
> it is usually wanted. It seems that is generally the case. It looks
> like 94% of boards enable CMD_NET, which makes it pretty much
> ubiquitous.
>
> Perhaps that should be the metric for deciding (probably with
> flexibility for making an argument to the contrary)... if more that
> 80% (good enough water-mark?) of the boards enable a feature, then it
> should be the default?  50% would optimize for overall defconfig
> size... maybe that's better?

Regards,

Hans

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Masahiro Yamada]

Hi.


2015-06-04 7:55 GMT+09:00 Joe Hershberger <joe.hershberger@gmail.com>:
> On Wed, Jun 3, 2015 at 5:26 PM, Tom Rini <trini@konsulko.com> wrote:
>> On Wed, Jun 03, 2015 at 05:21:44PM -0500, Joe Hershberger wrote:
>>> Hi Tom,
>>>
>>> On Wed, Jun 3, 2015 at 5:12 PM, Tom Rini <trini@konsulko.com> wrote:
>>> > On Wed, Jun 03, 2015 at 08:12:16PM +0200, Hans de Goede wrote:
>>> >
>>> >> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
>>> >> needing to have this in every sunxi defconfig file.
>>> >>
>>> >> This also fixes the Merrii_A80_Optimus defconfig no longer building.
>>> >>
>>> >> Cc: Maxin B. John <maxin.john@enea.com>
>>> >> Reported-by: Maxin B. John <maxin.john@enea.com>
>>> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>>> >
>>> > Joe? Masahiro?  It feels like something has gone wrong with the
>>> > conversion here.  Or do people need to get used to the defconfig files
>>> > being a non-trivial size?  Or do we need some more default y if ...
>>> > lines around things?  Or a few of the above?  Thanks!


I think too much (ab)use of "default y if ..." in board Kconfigs is wrong.



>>> It seems we should select good defaults. Maybe we should try to agree
>>> which way we should err. Make u-boot bigger by default, and boards
>>> that are limited can disable features? Or should we enable commands on
>>> boards that "need" a feature and keep u-boot slim by default?
>>>
>>> I don't like the half measure of defining a different default for one
>>> platform than another unless it is actually something inherent in the
>>> platform, and in that case it should be enabled by a "selects" under
>>> the platform Kconfig.
>>>
>>> I agree we want to have smaller defconfigs rather than bigger, but
>>> there are lots of features and many boards will not agree, so the
>>> defconfigs of many boards will have to contain something.
>>
>> The first thing that pops to mind is that if it used to be in
>> config_cmd_default.h it should be on by default and disabled when needed
>> (and this means we can be smart about CMD_FLASH / CMD_IMLS).  Otherwise
>> we need to think hard on if something new should be on by default or
>> not.
>
> I have the gut feeling that things that depend on hardware existing
> (such as CMD_NET) should not be default.  However, I guess if it's
> totally ubiquitous (such as CMD_MEMORY - though it's already in
> config_cmd_default.h) then it should be default just to shrink the
> defconfigs.


Even if your board has a network device,
you may not want to enable it by default in some cases.

Network functions are often useful during development and debugging,
but might not for mass-production, for example.


> Ian, you indicated that you thought CMD_NET should be a default since
> it is usually wanted. It seems that is generally the case. It looks
> like 94% of boards enable CMD_NET, which makes it pretty much
> ubiquitous.
>
> Perhaps that should be the metric for deciding (probably with
> flexibility for making an argument to the contrary)... if more that
> 80% (good enough water-mark?) of the boards enable a feature, then it
> should be the default?  50% would optimize for overall defconfig
> size... maybe that's better?

The "Ubiquitous" thing is one criteria, but I prefer the best judge
for each CONFIG.
I think the default value should be well-reviewed, because once we
decide the default y (or n)
it is hard to invert it later.



-- 
Best Regards
Masahiro Yamada

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Joe Hershberger]

Hi Masahiro-san,

On Thu, Jun 4, 2015 at 12:29 PM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> Hi.
>
>
> 2015-06-04 7:55 GMT+09:00 Joe Hershberger <joe.hershberger@gmail.com>:
>> On Wed, Jun 3, 2015 at 5:26 PM, Tom Rini <trini@konsulko.com> wrote:
>>> On Wed, Jun 03, 2015 at 05:21:44PM -0500, Joe Hershberger wrote:
>>>> Hi Tom,
>>>>
>>>> On Wed, Jun 3, 2015 at 5:12 PM, Tom Rini <trini@konsulko.com> wrote:
>>>> > On Wed, Jun 03, 2015 at 08:12:16PM +0200, Hans de Goede wrote:
>>>> >
>>>> >> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
>>>> >> needing to have this in every sunxi defconfig file.
>>>> >>
>>>> >> This also fixes the Merrii_A80_Optimus defconfig no longer building.
>>>> >>
>>>> >> Cc: Maxin B. John <maxin.john@enea.com>
>>>> >> Reported-by: Maxin B. John <maxin.john@enea.com>
>>>> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>>>> >
>>>> > Joe? Masahiro?  It feels like something has gone wrong with the
>>>> > conversion here.  Or do people need to get used to the defconfig files
>>>> > being a non-trivial size?  Or do we need some more default y if ...
>>>> > lines around things?  Or a few of the above?  Thanks!
>
>
> I think too much (ab)use of "default y if ..." in board Kconfigs is wrong.

I completely agree. I'd like to see them all go away, but maybe that's
just me. Doing this even causes the help for the option to incorrectly
indicate where that token is defined - it indicates the first default
setting inside some arch that's not even yours and not the real
definition location.

>>>> It seems we should select good defaults. Maybe we should try to agree
>>>> which way we should err. Make u-boot bigger by default, and boards
>>>> that are limited can disable features? Or should we enable commands on
>>>> boards that "need" a feature and keep u-boot slim by default?
>>>>
>>>> I don't like the half measure of defining a different default for one
>>>> platform than another unless it is actually something inherent in the
>>>> platform, and in that case it should be enabled by a "selects" under
>>>> the platform Kconfig.
>>>>
>>>> I agree we want to have smaller defconfigs rather than bigger, but
>>>> there are lots of features and many boards will not agree, so the
>>>> defconfigs of many boards will have to contain something.
>>>
>>> The first thing that pops to mind is that if it used to be in
>>> config_cmd_default.h it should be on by default and disabled when needed
>>> (and this means we can be smart about CMD_FLASH / CMD_IMLS).  Otherwise
>>> we need to think hard on if something new should be on by default or
>>> not.
>>
>> I have the gut feeling that things that depend on hardware existing
>> (such as CMD_NET) should not be default.  However, I guess if it's
>> totally ubiquitous (such as CMD_MEMORY - though it's already in
>> config_cmd_default.h) then it should be default just to shrink the
>> defconfigs.
>
>
> Even if your board has a network device,
> you may not want to enable it by default in some cases.

This is the reason for not making it a platform "selects X_FEATURE",
but defaults are just that.

> Network functions are often useful during development and debugging,
> but might not for mass-production, for example.

Do you think many (or any) boards are mass-produced based on the
main-line defconfigs?

>> Ian, you indicated that you thought CMD_NET should be a default since
>> it is usually wanted. It seems that is generally the case. It looks
>> like 94% of boards enable CMD_NET, which makes it pretty much
>> ubiquitous.
>>
>> Perhaps that should be the metric for deciding (probably with
>> flexibility for making an argument to the contrary)... if more that
>> 80% (good enough water-mark?) of the boards enable a feature, then it
>> should be the default?  50% would optimize for overall defconfig
>> size... maybe that's better?
>
> The "Ubiquitous" thing is one criteria, but I prefer the best judge
> for each CONFIG.

It would help to have an idea of the criteria you would use to judge
it. What do you do you consider important criteria?

> I think the default value should be well-reviewed, because once we
> decide the default y (or n)
> it is hard to invert it later.

It is actually easy now with my new patch to moveconfig:
https://patchwork.ozlabs.org/patch/478053/

Cheers,
-Joe

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Masahiro Yamada]

Hi Joe,


2015-06-05 2:54 GMT+09:00 Joe Hershberger <joe.hershberger@gmail.com>:
> Hi Masahiro-san,
>
> On Thu, Jun 4, 2015 at 12:29 PM, Masahiro Yamada
> <yamada.masahiro@socionext.com> wrote:
>> Hi.
>>
>>
>> 2015-06-04 7:55 GMT+09:00 Joe Hershberger <joe.hershberger@gmail.com>:
>>> On Wed, Jun 3, 2015 at 5:26 PM, Tom Rini <trini@konsulko.com> wrote:
>>>> On Wed, Jun 03, 2015 at 05:21:44PM -0500, Joe Hershberger wrote:
>>>>> Hi Tom,
>>>>>
>>>>> On Wed, Jun 3, 2015 at 5:12 PM, Tom Rini <trini@konsulko.com> wrote:
>>>>> > On Wed, Jun 03, 2015 at 08:12:16PM +0200, Hans de Goede wrote:
>>>>> >
>>>>> >> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
>>>>> >> needing to have this in every sunxi defconfig file.
>>>>> >>
>>>>> >> This also fixes the Merrii_A80_Optimus defconfig no longer building.
>>>>> >>
>>>>> >> Cc: Maxin B. John <maxin.john@enea.com>
>>>>> >> Reported-by: Maxin B. John <maxin.john@enea.com>
>>>>> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>>>>> >
>>>>> > Joe? Masahiro?  It feels like something has gone wrong with the
>>>>> > conversion here.  Or do people need to get used to the defconfig files
>>>>> > being a non-trivial size?  Or do we need some more default y if ...
>>>>> > lines around things?  Or a few of the above?  Thanks!
>>
>>
>> I think too much (ab)use of "default y if ..." in board Kconfigs is wrong.
>
> I completely agree. I'd like to see them all go away, but maybe that's
> just me. Doing this even causes the help for the option to incorrectly
> indicate where that token is defined - it indicates the first default
> setting inside some arch that's not even yours and not the real
> definition location.

Joe, you are not alone.

I see another problem for adding default entries to board Kconfigs.

If you see commit ece26f623c93afe95821f89d4dd53ae8f3cfa1b6,
you will notice CONFIG_NET=y and CONFIG_NET_RANDOM_ETHADDR=y
were added to separate places in defconfig files.
(Please note the defconfigs were sorted by savedefconfig.)

They should have been lined up together because their real definitions
are placed in net/Kconfig.

At the point when I posted the patch, board/sunxi/Kconfig had the
default setting:

config NET
        default y

so savedefconfig put CONFIG_NET=y much earlier than it should be.


Periodical attempt for cleaning defconfigs by savedefconfig comes to nothing
because the order changes every single time someone adds a default
entry into his board Kconfig.



>>>>> It seems we should select good defaults. Maybe we should try to agree
>>>>> which way we should err. Make u-boot bigger by default, and boards
>>>>> that are limited can disable features? Or should we enable commands on
>>>>> boards that "need" a feature and keep u-boot slim by default?
>>>>>
>>>>> I don't like the half measure of defining a different default for one
>>>>> platform than another unless it is actually something inherent in the
>>>>> platform, and in that case it should be enabled by a "selects" under
>>>>> the platform Kconfig.
>>>>>
>>>>> I agree we want to have smaller defconfigs rather than bigger, but
>>>>> there are lots of features and many boards will not agree, so the
>>>>> defconfigs of many boards will have to contain something.
>>>>
>>>> The first thing that pops to mind is that if it used to be in
>>>> config_cmd_default.h it should be on by default and disabled when needed
>>>> (and this means we can be smart about CMD_FLASH / CMD_IMLS).  Otherwise
>>>> we need to think hard on if something new should be on by default or
>>>> not.
>>>
>>> I have the gut feeling that things that depend on hardware existing
>>> (such as CMD_NET) should not be default.  However, I guess if it's
>>> totally ubiquitous (such as CMD_MEMORY - though it's already in
>>> config_cmd_default.h) then it should be default just to shrink the
>>> defconfigs.
>>
>>
>> Even if your board has a network device,
>> you may not want to enable it by default in some cases.
>
> This is the reason for not making it a platform "selects X_FEATURE",
> but defaults are just that.
>
>> Network functions are often useful during development and debugging,
>> but might not for mass-production, for example.
>
> Do you think many (or any) boards are mass-produced based on the
> main-line defconfigs?

No, I think they are mostly for development boards.

Anyway, U-boot without network makes sense.


>>> Ian, you indicated that you thought CMD_NET should be a default since
>>> it is usually wanted. It seems that is generally the case. It looks
>>> like 94% of boards enable CMD_NET, which makes it pretty much
>>> ubiquitous.
>>>
>>> Perhaps that should be the metric for deciding (probably with
>>> flexibility for making an argument to the contrary)... if more that
>>> 80% (good enough water-mark?) of the boards enable a feature, then it
>>> should be the default?  50% would optimize for overall defconfig
>>> size... maybe that's better?
>>
>> The "Ubiquitous" thing is one criteria, but I prefer the best judge
>> for each CONFIG.
>
> It would help to have an idea of the criteria you would use to judge
> it. What do you do you consider important criteria?

I cannot describe it well, but I guess a kind of common sense.


>> I think the default value should be well-reviewed, because once we
>> decide the default y (or n)
>> it is hard to invert it later.
>
> It is actually easy now with my new patch to moveconfig:
> https://patchwork.ozlabs.org/patch/478053/


It is true that in-tree boards are correctly converted,
but boards that are going be merged in near future might
have opposite configs of authors' intention.



-- 
Best Regards
Masahiro Yamada

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Tom Rini]

On Fri, Jun 05, 2015 at 01:02:16PM +0900, Masahiro Yamada wrote:
> Hi Joe,
> 
> 
> 2015-06-05 2:54 GMT+09:00 Joe Hershberger <joe.hershberger@gmail.com>:
> > Hi Masahiro-san,
> >
> > On Thu, Jun 4, 2015 at 12:29 PM, Masahiro Yamada
> > <yamada.masahiro@socionext.com> wrote:
> >> Hi.
> >>
> >>
> >> 2015-06-04 7:55 GMT+09:00 Joe Hershberger <joe.hershberger@gmail.com>:
> >>> On Wed, Jun 3, 2015 at 5:26 PM, Tom Rini <trini@konsulko.com> wrote:
> >>>> On Wed, Jun 03, 2015 at 05:21:44PM -0500, Joe Hershberger wrote:
> >>>>> Hi Tom,
> >>>>>
> >>>>> On Wed, Jun 3, 2015 at 5:12 PM, Tom Rini <trini@konsulko.com> wrote:
> >>>>> > On Wed, Jun 03, 2015 at 08:12:16PM +0200, Hans de Goede wrote:
> >>>>> >
> >>>>> >> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
> >>>>> >> needing to have this in every sunxi defconfig file.
> >>>>> >>
> >>>>> >> This also fixes the Merrii_A80_Optimus defconfig no longer building.
> >>>>> >>
> >>>>> >> Cc: Maxin B. John <maxin.john@enea.com>
> >>>>> >> Reported-by: Maxin B. John <maxin.john@enea.com>
> >>>>> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> >>>>> >
> >>>>> > Joe? Masahiro?  It feels like something has gone wrong with the
> >>>>> > conversion here.  Or do people need to get used to the defconfig files
> >>>>> > being a non-trivial size?  Or do we need some more default y if ...
> >>>>> > lines around things?  Or a few of the above?  Thanks!
> >>
> >>
> >> I think too much (ab)use of "default y if ..." in board Kconfigs is wrong.
> >
> > I completely agree. I'd like to see them all go away, but maybe that's
> > just me. Doing this even causes the help for the option to incorrectly
> > indicate where that token is defined - it indicates the first default
> > setting inside some arch that's not even yours and not the real
> > definition location.
> 
> Joe, you are not alone.

I hope that we can largely move away from "default y if ..." in the long
term but still have "default y" (because it can be set to off).

> 
> I see another problem for adding default entries to board Kconfigs.
> 
> If you see commit ece26f623c93afe95821f89d4dd53ae8f3cfa1b6,
> you will notice CONFIG_NET=y and CONFIG_NET_RANDOM_ETHADDR=y
> were added to separate places in defconfig files.
> (Please note the defconfigs were sorted by savedefconfig.)
> 
> They should have been lined up together because their real definitions
> are placed in net/Kconfig.
> 
> At the point when I posted the patch, board/sunxi/Kconfig had the
> default setting:
> 
> config NET
>         default y
> 
> so savedefconfig put CONFIG_NET=y much earlier than it should be.
> 
> 
> Periodical attempt for cleaning defconfigs by savedefconfig comes to nothing
> because the order changes every single time someone adds a default
> entry into his board Kconfig.

I think what we're seeing here is the conflicts between "we do not want
to enable many things by default", "we do not want to suddenly break
users" and "we do not want super huge defconfigs".

> 
> 
> 
> >>>>> It seems we should select good defaults. Maybe we should try to agree
> >>>>> which way we should err. Make u-boot bigger by default, and boards
> >>>>> that are limited can disable features? Or should we enable commands on
> >>>>> boards that "need" a feature and keep u-boot slim by default?
> >>>>>
> >>>>> I don't like the half measure of defining a different default for one
> >>>>> platform than another unless it is actually something inherent in the
> >>>>> platform, and in that case it should be enabled by a "selects" under
> >>>>> the platform Kconfig.
> >>>>>
> >>>>> I agree we want to have smaller defconfigs rather than bigger, but
> >>>>> there are lots of features and many boards will not agree, so the
> >>>>> defconfigs of many boards will have to contain something.
> >>>>
> >>>> The first thing that pops to mind is that if it used to be in
> >>>> config_cmd_default.h it should be on by default and disabled when needed
> >>>> (and this means we can be smart about CMD_FLASH / CMD_IMLS).  Otherwise
> >>>> we need to think hard on if something new should be on by default or
> >>>> not.
> >>>
> >>> I have the gut feeling that things that depend on hardware existing
> >>> (such as CMD_NET) should not be default.  However, I guess if it's
> >>> totally ubiquitous (such as CMD_MEMORY - though it's already in
> >>> config_cmd_default.h) then it should be default just to shrink the
> >>> defconfigs.
> >>
> >>
> >> Even if your board has a network device,
> >> you may not want to enable it by default in some cases.
> >
> > This is the reason for not making it a platform "selects X_FEATURE",
> > but defaults are just that.
> >
> >> Network functions are often useful during development and debugging,
> >> but might not for mass-production, for example.
> >
> > Do you think many (or any) boards are mass-produced based on the
> > main-line defconfigs?
> 
> No, I think they are mostly for development boards.
> 
> Anyway, U-boot without network makes sense.
> 
> 
> >>> Ian, you indicated that you thought CMD_NET should be a default since
> >>> it is usually wanted. It seems that is generally the case. It looks
> >>> like 94% of boards enable CMD_NET, which makes it pretty much
> >>> ubiquitous.
> >>>
> >>> Perhaps that should be the metric for deciding (probably with
> >>> flexibility for making an argument to the contrary)... if more that
> >>> 80% (good enough water-mark?) of the boards enable a feature, then it
> >>> should be the default?  50% would optimize for overall defconfig
> >>> size... maybe that's better?
> >>
> >> The "Ubiquitous" thing is one criteria, but I prefer the best judge
> >> for each CONFIG.
> >
> > It would help to have an idea of the criteria you would use to judge
> > it. What do you do you consider important criteria?
> 
> I cannot describe it well, but I guess a kind of common sense.

I think I agree as well.  But I would say (and I'm looking at a
no-network board right now) that CMD_NET and everything else that was/is
in config_cmd_default.h should start out as "default y" and let the
boards that don't need it, disable it.

I also really want to avoid board/.../Kconfig from touching generic
options like this which they will want to do to avoid breaking users.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150605/bf999220/attachment.sig>

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Joe Hershberger]

Hi Masahiro-san,

On Thu, Jun 4, 2015 at 11:02 PM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> Hi Joe,
>
>
> 2015-06-05 2:54 GMT+09:00 Joe Hershberger <joe.hershberger@gmail.com>:
>> Hi Masahiro-san,
>>
>> On Thu, Jun 4, 2015 at 12:29 PM, Masahiro Yamada
>> <yamada.masahiro@socionext.com> wrote:
>>> Hi.
>>>
>>>
>>> 2015-06-04 7:55 GMT+09:00 Joe Hershberger <joe.hershberger@gmail.com>:
>>>> On Wed, Jun 3, 2015 at 5:26 PM, Tom Rini <trini@konsulko.com> wrote:
>>>>> On Wed, Jun 03, 2015 at 05:21:44PM -0500, Joe Hershberger wrote:
>>>>>> Hi Tom,
>>>>>>
>>>>>> On Wed, Jun 3, 2015 at 5:12 PM, Tom Rini <trini@konsulko.com> wrote:
>>>>>> > On Wed, Jun 03, 2015 at 08:12:16PM +0200, Hans de Goede wrote:
>>>>>> >
>>>>>> >> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
>>>>>> >> needing to have this in every sunxi defconfig file.
>>>>>> >>
>>>>>> >> This also fixes the Merrii_A80_Optimus defconfig no longer building.
>>>>>> >>
>>>>>> >> Cc: Maxin B. John <maxin.john@enea.com>
>>>>>> >> Reported-by: Maxin B. John <maxin.john@enea.com>
>>>>>> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>>>>>> >
>>>>>> > Joe? Masahiro?  It feels like something has gone wrong with the
>>>>>> > conversion here.  Or do people need to get used to the defconfig files
>>>>>> > being a non-trivial size?  Or do we need some more default y if ...
>>>>>> > lines around things?  Or a few of the above?  Thanks!
>>>
>>>
>>> I think too much (ab)use of "default y if ..." in board Kconfigs is wrong.
>>
>> I completely agree. I'd like to see them all go away, but maybe that's
>> just me. Doing this even causes the help for the option to incorrectly
>> indicate where that token is defined - it indicates the first default
>> setting inside some arch that's not even yours and not the real
>> definition location.
>
> Joe, you are not alone.
>
> I see another problem for adding default entries to board Kconfigs.
>
> If you see commit ece26f623c93afe95821f89d4dd53ae8f3cfa1b6,
> you will notice CONFIG_NET=y and CONFIG_NET_RANDOM_ETHADDR=y
> were added to separate places in defconfig files.
> (Please note the defconfigs were sorted by savedefconfig.)
>
> They should have been lined up together because their real definitions
> are placed in net/Kconfig.
>
> At the point when I posted the patch, board/sunxi/Kconfig had the
> default setting:
>
> config NET
>         default y
>
> so savedefconfig put CONFIG_NET=y much earlier than it should be.
>
>
> Periodical attempt for cleaning defconfigs by savedefconfig comes to nothing
> because the order changes every single time someone adds a default
> entry into his board Kconfig.

I had not noticed that, but it's an even more compelling reason to
simply disallow it entirely.

>>>>>> It seems we should select good defaults. Maybe we should try to agree
>>>>>> which way we should err. Make u-boot bigger by default, and boards
>>>>>> that are limited can disable features? Or should we enable commands on
>>>>>> boards that "need" a feature and keep u-boot slim by default?
>>>>>>
>>>>>> I don't like the half measure of defining a different default for one
>>>>>> platform than another unless it is actually something inherent in the
>>>>>> platform, and in that case it should be enabled by a "selects" under
>>>>>> the platform Kconfig.
>>>>>>
>>>>>> I agree we want to have smaller defconfigs rather than bigger, but
>>>>>> there are lots of features and many boards will not agree, so the
>>>>>> defconfigs of many boards will have to contain something.
>>>>>
>>>>> The first thing that pops to mind is that if it used to be in
>>>>> config_cmd_default.h it should be on by default and disabled when needed
>>>>> (and this means we can be smart about CMD_FLASH / CMD_IMLS).  Otherwise
>>>>> we need to think hard on if something new should be on by default or
>>>>> not.
>>>>
>>>> I have the gut feeling that things that depend on hardware existing
>>>> (such as CMD_NET) should not be default.  However, I guess if it's
>>>> totally ubiquitous (such as CMD_MEMORY - though it's already in
>>>> config_cmd_default.h) then it should be default just to shrink the
>>>> defconfigs.
>>>
>>>
>>> Even if your board has a network device,
>>> you may not want to enable it by default in some cases.
>>
>> This is the reason for not making it a platform "selects X_FEATURE",
>> but defaults are just that.
>>
>>> Network functions are often useful during development and debugging,
>>> but might not for mass-production, for example.
>>
>> Do you think many (or any) boards are mass-produced based on the
>> main-line defconfigs?
>
> No, I think they are mostly for development boards.
>
> Anyway, U-boot without network makes sense.

For sure!

>>>> Ian, you indicated that you thought CMD_NET should be a default since
>>>> it is usually wanted. It seems that is generally the case. It looks
>>>> like 94% of boards enable CMD_NET, which makes it pretty much
>>>> ubiquitous.
>>>>
>>>> Perhaps that should be the metric for deciding (probably with
>>>> flexibility for making an argument to the contrary)... if more that
>>>> 80% (good enough water-mark?) of the boards enable a feature, then it
>>>> should be the default?  50% would optimize for overall defconfig
>>>> size... maybe that's better?
>>>
>>> The "Ubiquitous" thing is one criteria, but I prefer the best judge
>>> for each CONFIG.
>>
>> It would help to have an idea of the criteria you would use to judge
>> it. What do you do you consider important criteria?
>
> I cannot describe it well, but I guess a kind of common sense.
>
>
>>> I think the default value should be well-reviewed, because once we
>>> decide the default y (or n)
>>> it is hard to invert it later.
>>
>> It is actually easy now with my new patch to moveconfig:
>> https://patchwork.ozlabs.org/patch/478053/
>
>
> It is true that in-tree boards are correctly converted,
> but boards that are going be merged in near future might
> have opposite configs of authors' intention.

That is true, and we will all have to be careful. Hopefully
maintainers pulling in new boards can watch for this. Maybe we should
start a Wiki page that lists the configs that we change the default on
and the date that it hit mainline so that board contributors and
maintainers have a place to look to check their defconfig.

Cheers,
-Joe

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Joe Hershberger]

Hi Tom,

On Fri, Jun 5, 2015 at 11:25 AM, Tom Rini <trini@konsulko.com> wrote:
> On Fri, Jun 05, 2015 at 01:02:16PM +0900, Masahiro Yamada wrote:
>> Hi Joe,
>>
>>
>> 2015-06-05 2:54 GMT+09:00 Joe Hershberger <joe.hershberger@gmail.com>:
>> > Hi Masahiro-san,
>> >
>> > On Thu, Jun 4, 2015 at 12:29 PM, Masahiro Yamada
>> > <yamada.masahiro@socionext.com> wrote:
>> >> Hi.
>> >>
>> >>
>> >> 2015-06-04 7:55 GMT+09:00 Joe Hershberger <joe.hershberger@gmail.com>:
>> >>> On Wed, Jun 3, 2015 at 5:26 PM, Tom Rini <trini@konsulko.com> wrote:
>> >>>> On Wed, Jun 03, 2015 at 05:21:44PM -0500, Joe Hershberger wrote:
>> >>>>> Hi Tom,
>> >>>>>
>> >>>>> On Wed, Jun 3, 2015 at 5:12 PM, Tom Rini <trini@konsulko.com> wrote:
>> >>>>> > On Wed, Jun 03, 2015 at 08:12:16PM +0200, Hans de Goede wrote:
>> >>>>> >
>> >>>>> >> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
>> >>>>> >> needing to have this in every sunxi defconfig file.
>> >>>>> >>
>> >>>>> >> This also fixes the Merrii_A80_Optimus defconfig no longer building.
>> >>>>> >>
>> >>>>> >> Cc: Maxin B. John <maxin.john@enea.com>
>> >>>>> >> Reported-by: Maxin B. John <maxin.john@enea.com>
>> >>>>> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>> >>>>> >
>> >>>>> > Joe? Masahiro?  It feels like something has gone wrong with the
>> >>>>> > conversion here.  Or do people need to get used to the defconfig files
>> >>>>> > being a non-trivial size?  Or do we need some more default y if ...
>> >>>>> > lines around things?  Or a few of the above?  Thanks!
>> >>
>> >>
>> >> I think too much (ab)use of "default y if ..." in board Kconfigs is wrong.
>> >
>> > I completely agree. I'd like to see them all go away, but maybe that's
>> > just me. Doing this even causes the help for the option to incorrectly
>> > indicate where that token is defined - it indicates the first default
>> > setting inside some arch that's not even yours and not the real
>> > definition location.
>>
>> Joe, you are not alone.
>
> I hope that we can largely move away from "default y if ..." in the long
> term but still have "default y" (because it can be set to off).
>
>> I see another problem for adding default entries to board Kconfigs.
>>
>> If you see commit ece26f623c93afe95821f89d4dd53ae8f3cfa1b6,
>> you will notice CONFIG_NET=y and CONFIG_NET_RANDOM_ETHADDR=y
>> were added to separate places in defconfig files.
>> (Please note the defconfigs were sorted by savedefconfig.)
>>
>> They should have been lined up together because their real definitions
>> are placed in net/Kconfig.
>>
>> At the point when I posted the patch, board/sunxi/Kconfig had the
>> default setting:
>>
>> config NET
>>         default y
>>
>> so savedefconfig put CONFIG_NET=y much earlier than it should be.
>>
>>
>> Periodical attempt for cleaning defconfigs by savedefconfig comes to nothing
>> because the order changes every single time someone adds a default
>> entry into his board Kconfig.
>
> I think what we're seeing here is the conflicts between "we do not want
> to enable many things by default", "we do not want to suddenly break
> users" and "we do not want super huge defconfigs".

This reordering issue makes it much worse of a problem. I think we
should simply disallow it completely. I can make a patch that removes
all of them and updates their defconfigs to include the configs.

>> >>>>> It seems we should select good defaults. Maybe we should try to agree
>> >>>>> which way we should err. Make u-boot bigger by default, and boards
>> >>>>> that are limited can disable features? Or should we enable commands on
>> >>>>> boards that "need" a feature and keep u-boot slim by default?
>> >>>>>
>> >>>>> I don't like the half measure of defining a different default for one
>> >>>>> platform than another unless it is actually something inherent in the
>> >>>>> platform, and in that case it should be enabled by a "selects" under
>> >>>>> the platform Kconfig.
>> >>>>>
>> >>>>> I agree we want to have smaller defconfigs rather than bigger, but
>> >>>>> there are lots of features and many boards will not agree, so the
>> >>>>> defconfigs of many boards will have to contain something.
>> >>>>
>> >>>> The first thing that pops to mind is that if it used to be in
>> >>>> config_cmd_default.h it should be on by default and disabled when needed
>> >>>> (and this means we can be smart about CMD_FLASH / CMD_IMLS).  Otherwise
>> >>>> we need to think hard on if something new should be on by default or
>> >>>> not.
>> >>>
>> >>> I have the gut feeling that things that depend on hardware existing
>> >>> (such as CMD_NET) should not be default.  However, I guess if it's
>> >>> totally ubiquitous (such as CMD_MEMORY - though it's already in
>> >>> config_cmd_default.h) then it should be default just to shrink the
>> >>> defconfigs.
>> >>
>> >>
>> >> Even if your board has a network device,
>> >> you may not want to enable it by default in some cases.
>> >
>> > This is the reason for not making it a platform "selects X_FEATURE",
>> > but defaults are just that.
>> >
>> >> Network functions are often useful during development and debugging,
>> >> but might not for mass-production, for example.
>> >
>> > Do you think many (or any) boards are mass-produced based on the
>> > main-line defconfigs?
>>
>> No, I think they are mostly for development boards.
>>
>> Anyway, U-boot without network makes sense.
>>
>>
>> >>> Ian, you indicated that you thought CMD_NET should be a default since
>> >>> it is usually wanted. It seems that is generally the case. It looks
>> >>> like 94% of boards enable CMD_NET, which makes it pretty much
>> >>> ubiquitous.
>> >>>
>> >>> Perhaps that should be the metric for deciding (probably with
>> >>> flexibility for making an argument to the contrary)... if more that
>> >>> 80% (good enough water-mark?) of the boards enable a feature, then it
>> >>> should be the default?  50% would optimize for overall defconfig
>> >>> size... maybe that's better?
>> >>
>> >> The "Ubiquitous" thing is one criteria, but I prefer the best judge
>> >> for each CONFIG.
>> >
>> > It would help to have an idea of the criteria you would use to judge
>> > it. What do you do you consider important criteria?
>>
>> I cannot describe it well, but I guess a kind of common sense.
>
> I think I agree as well.  But I would say (and I'm looking at a
> no-network board right now) that CMD_NET and everything else that was/is
> in config_cmd_default.h should start out as "default y" and let the
> boards that don't need it, disable it.
>
> I also really want to avoid board/.../Kconfig from touching generic
> options like this which they will want to do to avoid breaking users.

Sounds like at least the 3 of us are in agreement...

-Joe

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Joe Hershberger]

Hi Tom,

On Wed, Jun 3, 2015 at 5:12 PM, Tom Rini <trini@konsulko.com> wrote:
> On Wed, Jun 03, 2015 at 08:12:16PM +0200, Hans de Goede wrote:
>
>> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
>> needing to have this in every sunxi defconfig file.
>>
>> This also fixes the Merrii_A80_Optimus defconfig no longer building.
>>
>> Cc: Maxin B. John <maxin.john@enea.com>
>> Reported-by: Maxin B. John <maxin.john@enea.com>
>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>
> Joe? Masahiro?  It feels like something has gone wrong with the
> conversion here.  Or do people need to get used to the defconfig files
> being a non-trivial size?  Or do we need some more default y if ...
> lines around things?  Or a few of the above?  Thanks!

I'm surprised you pulled this in for -rc2. I guess we can always revert it.

-Joe

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Tom Rini]

On Thu, Jun 11, 2015 at 09:14:33AM -0500, Joe Hershberger wrote:
> Hi Tom,
> 
> On Wed, Jun 3, 2015 at 5:12 PM, Tom Rini <trini@konsulko.com> wrote:
> > On Wed, Jun 03, 2015 at 08:12:16PM +0200, Hans de Goede wrote:
> >
> >> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
> >> needing to have this in every sunxi defconfig file.
> >>
> >> This also fixes the Merrii_A80_Optimus defconfig no longer building.
> >>
> >> Cc: Maxin B. John <maxin.john@enea.com>
> >> Reported-by: Maxin B. John <maxin.john@enea.com>
> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> >
> > Joe? Masahiro?  It feels like something has gone wrong with the
> > conversion here.  Or do people need to get used to the defconfig files
> > being a non-trivial size?  Or do we need some more default y if ...
> > lines around things?  Or a few of the above?  Thanks!
> 
> I'm surprised you pulled this in for -rc2. I guess we can always revert it.

OK, so where did we end up again exactly?  Ah yes, (a) we can't
unexpectedly break peoples build.  So I took this for now.  (b) I'm
being stubborn here and saying that if it was in
include/config_cmd_default.h as a #define it needs to get converted to
Kconfig as a "default y" (with text so that it's a question and not a
silently enforced option).  That doesn't preclude boards from setting it
to N in their defconfig and savedefconfig capturing it.  That's in fact
what I want.  So I'm expecting (or hunting for time to make) a patch
that updates CMD_NET/etc to match that behavour.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150611/10ebb27a/attachment.sig>

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Joe Hershberger]

Hi Tom,

On Thu, Jun 11, 2015 at 10:12 AM, Tom Rini <trini@konsulko.com> wrote:
> On Thu, Jun 11, 2015 at 09:14:33AM -0500, Joe Hershberger wrote:
>> Hi Tom,
>>
>> On Wed, Jun 3, 2015 at 5:12 PM, Tom Rini <trini@konsulko.com> wrote:
>> > On Wed, Jun 03, 2015 at 08:12:16PM +0200, Hans de Goede wrote:
>> >
>> >> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
>> >> needing to have this in every sunxi defconfig file.
>> >>
>> >> This also fixes the Merrii_A80_Optimus defconfig no longer building.
>> >>
>> >> Cc: Maxin B. John <maxin.john@enea.com>
>> >> Reported-by: Maxin B. John <maxin.john@enea.com>
>> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>> >
>> > Joe? Masahiro?  It feels like something has gone wrong with the
>> > conversion here.  Or do people need to get used to the defconfig files
>> > being a non-trivial size?  Or do we need some more default y if ...
>> > lines around things?  Or a few of the above?  Thanks!
>>
>> I'm surprised you pulled this in for -rc2. I guess we can always revert it.
>
> OK, so where did we end up again exactly?  Ah yes, (a) we can't
> unexpectedly break peoples build.  So I took this for now.

This isn't fixing a breakage... it simply reduced the size of the
sunxi boards' defconfig and caused defconfig noise in every other
board when running savedefconfig.

> (b) I'm being stubborn here and saying that if it was in
> include/config_cmd_default.h as a #define it needs to get converted to
> Kconfig as a "default y" (with text so that it's a question and not a
> silently enforced option).

Agreed... but this doesn't do that either... only for sunxi.

> That doesn't preclude boards from setting it
> to N in their defconfig and savedefconfig capturing it.  That's in fact
> what I want.  So I'm expecting (or hunting for time to make) a patch
> that updates CMD_NET/etc to match that behavour.

OK... I can take a stab at it if you want it for this release.

Cheers,
-Joe

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Hans de Goede]

Hi,

On 11-06-15 18:12, Joe Hershberger wrote:
> Hi Tom,
>
> On Thu, Jun 11, 2015 at 10:12 AM, Tom Rini <trini@konsulko.com> wrote:
>> On Thu, Jun 11, 2015 at 09:14:33AM -0500, Joe Hershberger wrote:
>>> Hi Tom,
>>>
>>> On Wed, Jun 3, 2015 at 5:12 PM, Tom Rini <trini@konsulko.com> wrote:
>>>> On Wed, Jun 03, 2015 at 08:12:16PM +0200, Hans de Goede wrote:
>>>>
>>>>> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
>>>>> needing to have this in every sunxi defconfig file.
>>>>>
>>>>> This also fixes the Merrii_A80_Optimus defconfig no longer building.
>>>>>
>>>>> Cc: Maxin B. John <maxin.john@enea.com>
>>>>> Reported-by: Maxin B. John <maxin.john@enea.com>
>>>>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>>>>
>>>> Joe? Masahiro?  It feels like something has gone wrong with the
>>>> conversion here.  Or do people need to get used to the defconfig files
>>>> being a non-trivial size?  Or do we need some more default y if ...
>>>> lines around things?  Or a few of the above?  Thanks!
>>>
>>> I'm surprised you pulled this in for -rc2. I guess we can always revert it.
>>
>> OK, so where did we end up again exactly?  Ah yes, (a) we can't
>> unexpectedly break peoples build.  So I took this for now.
>
> This isn't fixing a breakage...

It does fix breakage as stated i the commit message the Merrii_A80_Optimus
target was broken by your patch, likely because your patch was generated
against a tree which did not have that one yet.

> it simply reduced the size of the sunxi boards' defconfig

That is because I choose a solution were I do not need to fix this over
and over again and one were something which comes pretty close to
pure noise was poluting all the sunxi defconfigs.

 > and caused defconfig noise in every other
> board when running savedefconfig.

I did not realize that, sorry about that.

Regards,

Hans

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Tom Rini]

On Thu, Jun 11, 2015 at 11:12:43AM -0500, Joe Hershberger wrote:
> Hi Tom,
> 
> On Thu, Jun 11, 2015 at 10:12 AM, Tom Rini <trini@konsulko.com> wrote:
> > On Thu, Jun 11, 2015 at 09:14:33AM -0500, Joe Hershberger wrote:
> >> Hi Tom,
> >>
> >> On Wed, Jun 3, 2015 at 5:12 PM, Tom Rini <trini@konsulko.com> wrote:
> >> > On Wed, Jun 03, 2015 at 08:12:16PM +0200, Hans de Goede wrote:
> >> >
> >> >> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
> >> >> needing to have this in every sunxi defconfig file.
> >> >>
> >> >> This also fixes the Merrii_A80_Optimus defconfig no longer building.
> >> >>
> >> >> Cc: Maxin B. John <maxin.john@enea.com>
> >> >> Reported-by: Maxin B. John <maxin.john@enea.com>
> >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> >> >
> >> > Joe? Masahiro?  It feels like something has gone wrong with the
> >> > conversion here.  Or do people need to get used to the defconfig files
> >> > being a non-trivial size?  Or do we need some more default y if ...
> >> > lines around things?  Or a few of the above?  Thanks!
> >>
> >> I'm surprised you pulled this in for -rc2. I guess we can always revert it.
> >
> > OK, so where did we end up again exactly?  Ah yes, (a) we can't
> > unexpectedly break peoples build.  So I took this for now.
> 
> This isn't fixing a breakage... it simply reduced the size of the
> sunxi boards' defconfig and caused defconfig noise in every other
> board when running savedefconfig.
> 
> > (b) I'm being stubborn here and saying that if it was in
> > include/config_cmd_default.h as a #define it needs to get converted to
> > Kconfig as a "default y" (with text so that it's a question and not a
> > silently enforced option).
> 
> Agreed... but this doesn't do that either... only for sunxi.
> 
> > That doesn't preclude boards from setting it
> > to N in their defconfig and savedefconfig capturing it.  That's in fact
> > what I want.  So I'm expecting (or hunting for time to make) a patch
> > that updates CMD_NET/etc to match that behavour.
> 
> OK... I can take a stab at it if you want it for this release.

Yes please, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150612/dc0e7501/attachment.sig>

[U-Boot] [PATCH 0/7] Move include/config_cmd_default.h into Kconfig / remove arch defaults

[Joe Hershberger]

This series addresses a few build failures and minor tweaks needed to
move the default commands to Kconfig. It then moves defaults out of
arch Kconfig files and updates the defaults in common/Kconfig to enable
the default commands from include/config_cmd_default.h.

This was requested by Tom here: http://lists.denx.de/pipermail/u-boot/2015-June/216510.html


Joe Hershberger (7):
  mtd: spi: Add the SPI_FLASH config to Kconfig
  common: Fix comment for saveenv in Kconfig
  common: Add the CMD_ENV_EXISTS config to Kconfig
  arm: Make new baltos board not break on savedefconfig
  a3m071: Add needed dependency on LIB_RAND
  Move default y configs out of arch/board Kconfig
  Move defaults from config_cmd_default.h to Kconfig

 README                                             |  4 +-
 arch/arc/Kconfig                                   |  3 --
 arch/arm/cpu/armv7/exynos/Kconfig                  |  3 --
 arch/arm/mach-bcm283x/Kconfig                      |  3 --
 arch/arm/mach-tegra/Kconfig                        | 12 ------
 arch/mips/Kconfig                                  |  3 --
 arch/sh/Kconfig                                    |  3 --
 arch/x86/Kconfig                                   | 15 --------
 board/Arcturus/ucp1020/Kconfig                     |  8 ----
 board/sunxi/Kconfig                                | 21 -----------
 common/Kconfig                                     | 32 +++++++++++++++-
 configs/A10-OLinuXino-Lime_defconfig               |  8 ++++
 configs/A10s-OLinuXino-M_defconfig                 |  8 ++++
 configs/A13-OLinuXinoM_defconfig                   |  8 ++++
 configs/A13-OLinuXino_defconfig                    |  8 ++++
 configs/A20-OLinuXino-Lime2_defconfig              |  8 ++++
 configs/A20-OLinuXino-Lime_defconfig               |  8 ++++
 configs/A20-OLinuXino_MICRO_defconfig              |  8 ++++
 configs/Ainol_AW1_defconfig                        |  6 +++
 configs/Ampe_A76_defconfig                         |  6 +++
 configs/Auxtek-T004_defconfig                      |  8 ++++
 configs/B4420QDS_NAND_defconfig                    |  3 +-
 configs/B4420QDS_SPIFLASH_defconfig                |  3 +-
 configs/B4420QDS_defconfig                         |  3 +-
 configs/B4860QDS_NAND_defconfig                    |  3 +-
 configs/B4860QDS_SECURE_BOOT_defconfig             |  3 +-
 configs/B4860QDS_SPIFLASH_defconfig                |  3 +-
 configs/B4860QDS_SRIO_PCIE_BOOT_defconfig          |  5 ++-
 configs/B4860QDS_defconfig                         |  3 +-
 configs/BSC9131RDB_NAND_SYSCLK100_defconfig        |  5 ++-
 configs/BSC9131RDB_NAND_defconfig                  |  5 ++-
 configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig    |  5 ++-
 configs/BSC9131RDB_SPIFLASH_defconfig              |  5 ++-
 configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig |  3 +-
 configs/BSC9132QDS_NAND_DDRCLK100_defconfig        |  3 +-
 configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig |  3 +-
 configs/BSC9132QDS_NAND_DDRCLK133_defconfig        |  3 +-
 configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig  |  3 +-
 configs/BSC9132QDS_NOR_DDRCLK100_defconfig         |  3 +-
 configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig  |  3 +-
 configs/BSC9132QDS_NOR_DDRCLK133_defconfig         |  3 +-
 .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig   |  3 +-
 configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig      |  3 +-
 .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig   |  3 +-
 configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig      |  3 +-
 .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig |  3 +-
 configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig    |  3 +-
 .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig |  3 +-
 configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig    |  3 +-
 configs/Bananapi_defconfig                         |  8 ++++
 configs/Bananapro_defconfig                        |  8 ++++
 configs/C29XPCIE_NAND_defconfig                    |  3 +-
 configs/C29XPCIE_NOR_SECBOOT_defconfig             |  3 +-
 configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig        |  3 +-
 configs/C29XPCIE_SPIFLASH_defconfig                |  3 +-
 configs/C29XPCIE_defconfig                         |  3 +-
 configs/CPCI2DP_defconfig                          |  3 ++
 configs/CPCI4052_defconfig                         |  2 +-
 configs/CSQ_CS908_defconfig                        |  8 ++++
 configs/Chuwi_V7_CW0825_defconfig                  |  6 +++
 configs/Colombus_defconfig                         |  8 ++++
 configs/Cubieboard2_defconfig                      |  8 ++++
 configs/Cubieboard_defconfig                       |  8 ++++
 configs/Cubietruck_defconfig                       |  8 ++++
 configs/Et_q8_v1_6_defconfig                       |  6 +++
 configs/Hummingbird_A31_defconfig                  |  8 ++++
 configs/Hyundai_A7HD_defconfig                     |  6 +++
 configs/Ippo_q8h_v1_2_a33_1024x600_defconfig       |  6 +++
 configs/Ippo_q8h_v1_2_defconfig                    |  6 +++
 configs/Ippo_q8h_v5_defconfig                      |  6 +++
 configs/Linksprite_pcDuino3_Nano_defconfig         |  8 ++++
 configs/Linksprite_pcDuino3_defconfig              |  8 ++++
 configs/Linksprite_pcDuino_defconfig               |  8 ++++
 configs/M5208EVBE_defconfig                        |  2 +-
 configs/M52277EVB_defconfig                        |  4 ++
 configs/M52277EVB_stmicro_defconfig                |  4 ++
 configs/M5235EVB_Flash32_defconfig                 |  4 +-
 configs/M5235EVB_defconfig                         |  4 +-
 configs/M5249EVB_defconfig                         |  2 +
 configs/M5253DEMO_defconfig                        |  2 +-
 configs/M5253EVBE_defconfig                        |  2 +
 configs/M5272C3_defconfig                          |  4 +-
 configs/M5275EVB_defconfig                         |  4 +-
 configs/M5282EVB_defconfig                         |  4 +-
 configs/M53017EVB_defconfig                        |  2 +-
 configs/M5329AFEE_defconfig                        |  2 +-
 configs/M5329BFEE_defconfig                        |  2 +-
 configs/M5373EVB_defconfig                         |  2 +-
 configs/M54418TWR_defconfig                        |  7 +++-
 configs/M54418TWR_nand_mii_defconfig               |  7 +++-
 configs/M54418TWR_nand_rmii_defconfig              |  7 +++-
 configs/M54418TWR_nand_rmii_lowfreq_defconfig      |  7 +++-
 configs/M54418TWR_serial_mii_defconfig             |  7 +++-
 configs/M54418TWR_serial_rmii_defconfig            |  7 +++-
 configs/M54451EVB_defconfig                        |  5 ++-
 configs/M54451EVB_stmicro_defconfig                |  5 ++-
 configs/M54455EVB_a66_defconfig                    |  5 ++-
 configs/M54455EVB_defconfig                        |  5 ++-
 configs/M54455EVB_i66_defconfig                    |  5 ++-
 configs/M54455EVB_intel_defconfig                  |  5 ++-
 configs/M54455EVB_stm33_defconfig                  |  5 ++-
 configs/M5475AFE_defconfig                         |  2 +-
 configs/M5475BFE_defconfig                         |  2 +-
 configs/M5475CFE_defconfig                         |  2 +-
 configs/M5475DFE_defconfig                         |  2 +-
 configs/M5475EFE_defconfig                         |  2 +-
 configs/M5475FFE_defconfig                         |  2 +-
 configs/M5475GFE_defconfig                         |  2 +-
 configs/M5485AFE_defconfig                         |  2 +-
 configs/M5485BFE_defconfig                         |  2 +-
 configs/M5485CFE_defconfig                         |  2 +-
 configs/M5485DFE_defconfig                         |  2 +-
 configs/M5485EFE_defconfig                         |  2 +-
 configs/M5485FFE_defconfig                         |  2 +-
 configs/M5485GFE_defconfig                         |  2 +-
 configs/M5485HFE_defconfig                         |  2 +-
 configs/MIP405T_defconfig                          |  2 +-
 configs/MIP405_defconfig                           |  2 +-
 configs/MK808C_defconfig                           |  8 ++++
 configs/MPC8308RDB_defconfig                       |  2 +-
 configs/MPC8313ERDB_33_defconfig                   |  2 +-
 configs/MPC8313ERDB_66_defconfig                   |  2 +-
 configs/MPC8313ERDB_NAND_33_defconfig              |  2 +-
 configs/MPC8313ERDB_NAND_66_defconfig              |  2 +-
 configs/MPC8315ERDB_defconfig                      |  2 +-
 configs/MPC8323ERDB_defconfig                      |  2 +-
 configs/MPC832XEMDS_ATM_defconfig                  |  2 +-
 configs/MPC832XEMDS_HOST_33_defconfig              |  2 +-
 configs/MPC832XEMDS_HOST_66_defconfig              |  2 +-
 configs/MPC832XEMDS_SLAVE_defconfig                |  2 +-
 configs/MPC832XEMDS_defconfig                      |  2 +-
 configs/MPC8349EMDS_defconfig                      |  2 +-
 configs/MPC8349ITXGP_defconfig                     |  2 +-
 configs/MPC8349ITX_LOWBOOT_defconfig               |  2 +-
 configs/MPC8349ITX_defconfig                       |  2 +-
 configs/MPC837XEMDS_HOST_defconfig                 |  2 +-
 configs/MPC837XEMDS_defconfig                      |  2 +-
 configs/MPC837XERDB_defconfig                      |  2 +-
 configs/MPC8536DS_36BIT_defconfig                  |  3 +-
 configs/MPC8536DS_SDCARD_defconfig                 |  3 +-
 configs/MPC8536DS_SPIFLASH_defconfig               |  3 +-
 configs/MPC8536DS_defconfig                        |  3 +-
 configs/MPC8540ADS_defconfig                       |  2 -
 configs/MPC8541CDS_defconfig                       |  2 -
 configs/MPC8541CDS_legacy_defconfig                |  2 -
 configs/MPC8544DS_defconfig                        |  2 -
 configs/MPC8548CDS_36BIT_defconfig                 |  2 -
 configs/MPC8548CDS_defconfig                       |  2 -
 configs/MPC8548CDS_legacy_defconfig                |  2 -
 configs/MPC8555CDS_defconfig                       |  2 -
 configs/MPC8555CDS_legacy_defconfig                |  2 -
 configs/MPC8560ADS_defconfig                       |  2 -
 configs/MPC8568MDS_defconfig                       |  2 -
 configs/MPC8569MDS_ATM_defconfig                   |  2 -
 configs/MPC8569MDS_defconfig                       |  2 -
 configs/MPC8572DS_36BIT_defconfig                  |  2 -
 configs/MPC8572DS_defconfig                        |  2 -
 configs/MPC8610HPCD_defconfig                      |  2 +-
 configs/MPC8641HPCN_36BIT_defconfig                |  2 +-
 configs/MPC8641HPCN_defconfig                      |  2 +-
 configs/MSI_Primo73_defconfig                      |  8 ++++
 configs/MSI_Primo81_defconfig                      | 16 ++++++--
 configs/Marsboard_A10_defconfig                    |  8 ++++
 configs/Mele_A1000G_quad_defconfig                 | 18 ++++-----
 configs/Mele_A1000_defconfig                       |  8 ++++
 configs/Mele_I7_defconfig                          |  8 ++++
 configs/Mele_M3_defconfig                          |  8 ++++
 configs/Mele_M5_defconfig                          |  8 ++++
 configs/Mele_M9_defconfig                          | 18 ++++-----
 configs/Merrii_A80_Optimus_defconfig               | 17 ++++++---
 configs/MigoR_defconfig                            | 17 ++++++++-
 configs/Mini-X_defconfig                           |  8 ++++
 configs/MiniFAP_defconfig                          |  2 +-
 configs/O2D300_defconfig                           |  2 +-
 configs/O2DNT2_RAMBOOT_defconfig                   |  2 +-
 configs/O2DNT2_defconfig                           |  2 +-
 configs/O2D_defconfig                              |  2 +-
 configs/O2I_defconfig                              |  2 +-
 configs/O2MNT_O2M110_defconfig                     |  2 +-
 configs/O2MNT_O2M112_defconfig                     |  2 +-
 configs/O2MNT_O2M113_defconfig                     |  2 +-
 configs/O2MNT_defconfig                            |  2 +-
 configs/O3DNT_defconfig                            |  2 +-
 configs/Orangepi_defconfig                         |  8 ++++
 configs/Orangepi_mini_defconfig                    |  8 ++++
 configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig   |  3 +-
 configs/P1010RDB-PA_36BIT_NAND_defconfig           |  3 +-
 configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig    |  3 +-
 configs/P1010RDB-PA_36BIT_NOR_defconfig            |  3 +-
 configs/P1010RDB-PA_36BIT_SDCARD_defconfig         |  3 +-
 .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig   |  3 +-
 configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig       |  3 +-
 configs/P1010RDB-PA_NAND_SECBOOT_defconfig         |  3 +-
 configs/P1010RDB-PA_NAND_defconfig                 |  3 +-
 configs/P1010RDB-PA_NOR_SECBOOT_defconfig          |  3 +-
 configs/P1010RDB-PA_NOR_defconfig                  |  3 +-
 configs/P1010RDB-PA_SDCARD_defconfig               |  3 +-
 configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig     |  3 +-
 configs/P1010RDB-PA_SPIFLASH_defconfig             |  3 +-
 configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig   |  3 +-
 configs/P1010RDB-PB_36BIT_NAND_defconfig           |  3 +-
 configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig    |  3 +-
 configs/P1010RDB-PB_36BIT_NOR_defconfig            |  3 +-
 configs/P1010RDB-PB_36BIT_SDCARD_defconfig         |  3 +-
 .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig   |  3 +-
 configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig       |  3 +-
 configs/P1010RDB-PB_NAND_SECBOOT_defconfig         |  3 +-
 configs/P1010RDB-PB_NAND_defconfig                 |  3 +-
 configs/P1010RDB-PB_NOR_SECBOOT_defconfig          |  3 +-
 configs/P1010RDB-PB_NOR_defconfig                  |  3 +-
 configs/P1010RDB-PB_SDCARD_defconfig               |  3 +-
 configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig     |  3 +-
 configs/P1010RDB-PB_SPIFLASH_defconfig             |  3 +-
 configs/P1020MBG-PC_36BIT_SDCARD_defconfig         |  2 -
 configs/P1020MBG-PC_36BIT_defconfig                |  2 -
 configs/P1020MBG-PC_SDCARD_defconfig               |  2 -
 configs/P1020MBG-PC_defconfig                      |  2 -
 configs/P1020RDB-PC_36BIT_NAND_defconfig           |  3 +-
 configs/P1020RDB-PC_36BIT_SDCARD_defconfig         |  3 +-
 configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig       |  3 +-
 configs/P1020RDB-PC_36BIT_defconfig                |  3 +-
 configs/P1020RDB-PC_NAND_defconfig                 |  3 +-
 configs/P1020RDB-PC_SDCARD_defconfig               |  3 +-
 configs/P1020RDB-PC_SPIFLASH_defconfig             |  3 +-
 configs/P1020RDB-PC_defconfig                      |  3 +-
 configs/P1020RDB-PD_NAND_defconfig                 |  3 +-
 configs/P1020RDB-PD_SDCARD_defconfig               |  3 +-
 configs/P1020RDB-PD_SPIFLASH_defconfig             |  3 +-
 configs/P1020RDB-PD_defconfig                      |  3 +-
 configs/P1020UTM-PC_36BIT_SDCARD_defconfig         |  2 -
 configs/P1020UTM-PC_36BIT_defconfig                |  2 -
 configs/P1020UTM-PC_SDCARD_defconfig               |  2 -
 configs/P1020UTM-PC_defconfig                      |  2 -
 configs/P1021RDB-PC_36BIT_NAND_defconfig           |  3 +-
 configs/P1021RDB-PC_36BIT_SDCARD_defconfig         |  3 +-
 configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig       |  3 +-
 configs/P1021RDB-PC_36BIT_defconfig                |  3 +-
 configs/P1021RDB-PC_NAND_defconfig                 |  3 +-
 configs/P1021RDB-PC_SDCARD_defconfig               |  3 +-
 configs/P1021RDB-PC_SPIFLASH_defconfig             |  3 +-
 configs/P1021RDB-PC_defconfig                      |  3 +-
 configs/P1022DS_36BIT_NAND_defconfig               |  3 +-
 configs/P1022DS_36BIT_SDCARD_defconfig             |  3 +-
 configs/P1022DS_36BIT_SPIFLASH_defconfig           |  3 +-
 configs/P1022DS_36BIT_defconfig                    |  3 +-
 configs/P1022DS_NAND_defconfig                     |  3 +-
 configs/P1022DS_SDCARD_defconfig                   |  3 +-
 configs/P1022DS_SPIFLASH_defconfig                 |  3 +-
 configs/P1022DS_defconfig                          |  3 +-
 configs/P1023RDB_defconfig                         |  2 -
 configs/P1024RDB_36BIT_defconfig                   |  3 +-
 configs/P1024RDB_NAND_defconfig                    |  3 +-
 configs/P1024RDB_SDCARD_defconfig                  |  3 +-
 configs/P1024RDB_SPIFLASH_defconfig                |  3 +-
 configs/P1024RDB_defconfig                         |  3 +-
 configs/P1025RDB_36BIT_defconfig                   |  3 +-
 configs/P1025RDB_NAND_defconfig                    |  3 +-
 configs/P1025RDB_SDCARD_defconfig                  |  3 +-
 configs/P1025RDB_SPIFLASH_defconfig                |  3 +-
 configs/P1025RDB_defconfig                         |  3 +-
 configs/P2020RDB-PC_36BIT_NAND_defconfig           |  3 +-
 configs/P2020RDB-PC_36BIT_SDCARD_defconfig         |  3 +-
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig       |  3 +-
 configs/P2020RDB-PC_36BIT_defconfig                |  3 +-
 configs/P2020RDB-PC_NAND_defconfig                 |  3 +-
 configs/P2020RDB-PC_SDCARD_defconfig               |  3 +-
 configs/P2020RDB-PC_SPIFLASH_defconfig             |  3 +-
 configs/P2020RDB-PC_defconfig                      |  3 +-
 configs/P2041RDB_NAND_defconfig                    |  3 +-
 configs/P2041RDB_SDCARD_defconfig                  |  3 +-
 configs/P2041RDB_SECURE_BOOT_defconfig             |  3 +-
 configs/P2041RDB_SPIFLASH_defconfig                |  3 +-
 configs/P2041RDB_SRIO_PCIE_BOOT_defconfig          |  5 ++-
 configs/P2041RDB_defconfig                         |  3 +-
 configs/P3041DS_NAND_defconfig                     |  3 +-
 configs/P3041DS_SDCARD_defconfig                   |  3 +-
 configs/P3041DS_SECURE_BOOT_defconfig              |  3 +-
 configs/P3041DS_SPIFLASH_defconfig                 |  3 +-
 configs/P3041DS_SRIO_PCIE_BOOT_defconfig           |  5 ++-
 configs/P3041DS_defconfig                          |  3 +-
 configs/P4080DS_SDCARD_defconfig                   |  3 +-
 configs/P4080DS_SECURE_BOOT_defconfig              |  3 +-
 configs/P4080DS_SPIFLASH_defconfig                 |  3 +-
 configs/P4080DS_SRIO_PCIE_BOOT_defconfig           |  5 ++-
 configs/P4080DS_defconfig                          |  3 +-
 configs/P5020DS_NAND_defconfig                     |  3 +-
 configs/P5020DS_SDCARD_defconfig                   |  3 +-
 configs/P5020DS_SECURE_BOOT_defconfig              |  3 +-
 configs/P5020DS_SPIFLASH_defconfig                 |  3 +-
 configs/P5020DS_SRIO_PCIE_BOOT_defconfig           |  5 ++-
 configs/P5020DS_defconfig                          |  3 +-
 configs/P5040DS_NAND_defconfig                     |  3 +-
 configs/P5040DS_SDCARD_defconfig                   |  3 +-
 configs/P5040DS_SECURE_BOOT_defconfig              |  3 +-
 configs/P5040DS_SPIFLASH_defconfig                 |  3 +-
 configs/P5040DS_defconfig                          |  3 +-
 configs/PATI_defconfig                             | 12 ++++++
 configs/PIP405_defconfig                           |  2 +-
 configs/PLU405_defconfig                           |  2 +-
 configs/PMC405DE_defconfig                         |  2 +-
 configs/PMC440_defconfig                           |  2 +-
 configs/T1023RDB_NAND_defconfig                    |  5 ++-
 configs/T1023RDB_SDCARD_defconfig                  |  5 ++-
 configs/T1023RDB_SECURE_BOOT_defconfig             |  3 +-
 configs/T1023RDB_SPIFLASH_defconfig                |  5 ++-
 configs/T1023RDB_defconfig                         |  3 +-
 configs/T1024QDS_D4_SECURE_BOOT_defconfig          |  3 +-
 configs/T1024QDS_NAND_defconfig                    |  3 +-
 configs/T1024QDS_SDCARD_defconfig                  |  3 +-
 configs/T1024QDS_SECURE_BOOT_defconfig             |  3 +-
 configs/T1024QDS_SPIFLASH_defconfig                |  3 +-
 configs/T1024QDS_defconfig                         |  3 +-
 configs/T1024RDB_NAND_defconfig                    |  3 +-
 configs/T1024RDB_SDCARD_defconfig                  |  3 +-
 configs/T1024RDB_SECURE_BOOT_defconfig             |  3 +-
 configs/T1024RDB_SPIFLASH_defconfig                |  3 +-
 configs/T1024RDB_defconfig                         |  3 +-
 configs/T1040QDS_D4_defconfig                      |  3 +-
 configs/T1040QDS_SECURE_BOOT_defconfig             |  3 +-
 configs/T1040QDS_defconfig                         |  3 +-
 configs/T1040RDB_NAND_defconfig                    |  3 +-
 configs/T1040RDB_SDCARD_defconfig                  |  3 +-
 configs/T1040RDB_SECURE_BOOT_defconfig             |  3 +-
 configs/T1040RDB_SPIFLASH_defconfig                |  3 +-
 configs/T1040RDB_defconfig                         |  3 +-
 configs/T1042RDB_PI_NAND_defconfig                 |  3 +-
 configs/T1042RDB_PI_SDCARD_defconfig               |  3 +-
 configs/T1042RDB_PI_SPIFLASH_defconfig             |  3 +-
 configs/T1042RDB_PI_defconfig                      |  3 +-
 configs/T1042RDB_SECURE_BOOT_defconfig             |  3 +-
 configs/T1042RDB_defconfig                         |  3 +-
 configs/T2080QDS_NAND_defconfig                    |  3 +-
 configs/T2080QDS_SDCARD_defconfig                  |  3 +-
 configs/T2080QDS_SECURE_BOOT_defconfig             |  3 +-
 configs/T2080QDS_SPIFLASH_defconfig                |  3 +-
 configs/T2080QDS_SRIO_PCIE_BOOT_defconfig          |  5 ++-
 configs/T2080QDS_defconfig                         |  3 +-
 configs/T2080RDB_NAND_defconfig                    |  3 +-
 configs/T2080RDB_SDCARD_defconfig                  |  3 +-
 configs/T2080RDB_SECURE_BOOT_defconfig             |  3 +-
 configs/T2080RDB_SPIFLASH_defconfig                |  3 +-
 configs/T2080RDB_SRIO_PCIE_BOOT_defconfig          |  5 ++-
 configs/T2080RDB_defconfig                         |  3 +-
 configs/T2081QDS_NAND_defconfig                    |  3 +-
 configs/T2081QDS_SDCARD_defconfig                  |  3 +-
 configs/T2081QDS_SPIFLASH_defconfig                |  3 +-
 configs/T2081QDS_SRIO_PCIE_BOOT_defconfig          |  5 ++-
 configs/T2081QDS_defconfig                         |  3 +-
 configs/T4160QDS_NAND_defconfig                    |  3 +-
 configs/T4160QDS_SDCARD_defconfig                  |  3 +-
 configs/T4160QDS_SECURE_BOOT_defconfig             |  3 +-
 configs/T4160QDS_defconfig                         |  3 +-
 configs/T4160RDB_defconfig                         |  3 +-
 configs/T4240QDS_NAND_defconfig                    |  3 +-
 configs/T4240QDS_SDCARD_defconfig                  |  3 +-
 configs/T4240QDS_SECURE_BOOT_defconfig             |  3 +-
 configs/T4240QDS_SRIO_PCIE_BOOT_defconfig          |  5 ++-
 configs/T4240QDS_defconfig                         |  3 +-
 configs/T4240RDB_SDCARD_defconfig                  |  3 +-
 configs/T4240RDB_defconfig                         |  3 +-
 configs/TQM5200S_HIGHBOOT_defconfig                |  2 +-
 configs/TQM5200S_defconfig                         |  2 +-
 configs/TQM5200_B_HIGHBOOT_defconfig               |  2 +-
 configs/TQM5200_B_defconfig                        |  2 +-
 configs/TQM5200_STK100_defconfig                   |  2 +-
 configs/TQM5200_defconfig                          |  2 +-
 configs/TQM823L_LCD_defconfig                      |  2 +-
 configs/TQM823L_defconfig                          |  2 +-
 configs/TQM823M_defconfig                          |  2 +-
 configs/TQM834x_defconfig                          |  2 +-
 configs/TQM850L_defconfig                          |  2 +-
 configs/TQM850M_defconfig                          |  2 +-
 configs/TQM855L_defconfig                          |  2 +-
 configs/TQM855M_defconfig                          |  2 +-
 configs/TQM860L_defconfig                          |  2 +-
 configs/TQM860M_defconfig                          |  2 +-
 configs/TQM862L_defconfig                          |  2 +-
 configs/TQM862M_defconfig                          |  2 +-
 configs/TQM866M_defconfig                          |  2 +-
 configs/TQM885D_defconfig                          |  2 +-
 configs/TTTech_defconfig                           |  2 +-
 configs/TWR-P1025_defconfig                        |  2 -
 configs/TZX-Q8-713B7_defconfig                     |  6 +++
 configs/UCP1020_SPIFLASH_defconfig                 |  3 +-
 configs/UCP1020_defconfig                          |  3 +-
 configs/UTOO_P66_defconfig                         |  6 ++-
 configs/VCMA9_defconfig                            |  2 +-
 configs/VOM405_defconfig                           |  2 +-
 configs/Wexler_TAB7200_defconfig                   |  8 ++++
 configs/Wits_Pro_A20_DKT_defconfig                 |  8 ++++
 configs/Yones_Toptech_BD1078_defconfig             |  6 +++
 configs/a3m071_defconfig                           |  3 +-
 configs/a4m072_defconfig                           |  2 +-
 configs/a4m2k_defconfig                            |  3 +-
 configs/ac14xx_defconfig                           |  2 +-
 configs/acadia_defconfig                           |  2 -
 configs/adp-ag101_defconfig                        |  2 +-
 configs/adp-ag101p_defconfig                       |  2 +-
 configs/adp-ag102_defconfig                        |  4 +-
 configs/alpr_defconfig                             |  5 ++-
 configs/alt_defconfig                              | 17 ++++++++-
 configs/am335x_baltos_defconfig                    | 11 ++++--
 configs/am335x_boneblack_defconfig                 |  5 ++-
 configs/am335x_boneblack_vboot_defconfig           |  7 +++-
 configs/am335x_evm_defconfig                       |  5 ++-
 configs/am335x_evm_nor_defconfig                   |  4 +-
 configs/am335x_evm_norboot_defconfig               |  4 +-
 configs/am335x_evm_spiboot_defconfig               |  5 ++-
 configs/am335x_evm_usbspl_defconfig                |  5 ++-
 configs/am335x_igep0033_defconfig                  |  4 +-
 configs/am3517_crane_defconfig                     |  7 ++++
 configs/am3517_evm_defconfig                       |  6 ++-
 configs/am43xx_evm_defconfig                       |  5 ++-
 configs/am43xx_evm_qspiboot_defconfig              |  5 ++-
 configs/amcore_defconfig                           |  6 +++
 configs/ap325rxa_defconfig                         | 17 ++++++++-
 configs/ap_sh4a_4a_defconfig                       | 19 +++++++++-
 configs/apalis_t30_defconfig                       | 11 +++++-
 configs/apf27_defconfig                            |  4 +-
 configs/apx4devkit_defconfig                       |  4 +-
 configs/arcangel4-be_defconfig                     |  7 +++-
 configs/arcangel4_defconfig                        |  7 +++-
 configs/arches_defconfig                           |  2 -
 configs/aria_defconfig                             |  2 +-
 configs/aristainetos2_defconfig                    |  5 ++-
 configs/aristainetos_defconfig                     |  5 ++-
 configs/armadillo-800eva_defconfig                 | 18 ++++++++-
 configs/arndale_defconfig                          |  5 ++-
 configs/aspenite_defconfig                         |  5 +++
 configs/astro_mcf5373l_defconfig                   |  3 ++
 configs/at91rm9200ek_defconfig                     |  3 +-
 configs/at91rm9200ek_ram_defconfig                 |  3 +-
 configs/at91sam9260ek_dataflash_cs0_defconfig      |  8 +++-
 configs/at91sam9260ek_dataflash_cs1_defconfig      |  8 +++-
 configs/at91sam9260ek_nandflash_defconfig          |  8 +++-
 configs/at91sam9261ek_dataflash_cs0_defconfig      |  8 +++-
 configs/at91sam9261ek_dataflash_cs3_defconfig      |  8 +++-
 configs/at91sam9261ek_nandflash_defconfig          |  8 +++-
 configs/at91sam9263ek_dataflash_cs0_defconfig      |  8 +++-
 configs/at91sam9263ek_dataflash_defconfig          |  8 +++-
 configs/at91sam9263ek_nandflash_defconfig          |  8 +++-
 configs/at91sam9263ek_norflash_boot_defconfig      |  8 +++-
 configs/at91sam9263ek_norflash_defconfig           |  8 +++-
 configs/at91sam9g10ek_dataflash_cs0_defconfig      |  8 +++-
 configs/at91sam9g10ek_dataflash_cs3_defconfig      |  8 +++-
 configs/at91sam9g10ek_nandflash_defconfig          |  8 +++-
 configs/at91sam9g20ek_2mmc_defconfig               |  8 +++-
 configs/at91sam9g20ek_2mmc_nandflash_defconfig     |  8 +++-
 configs/at91sam9g20ek_dataflash_cs0_defconfig      |  8 +++-
 configs/at91sam9g20ek_dataflash_cs1_defconfig      |  8 +++-
 configs/at91sam9g20ek_nandflash_defconfig          |  8 +++-
 configs/at91sam9m10g45ek_mmc_defconfig             |  8 +++-
 configs/at91sam9m10g45ek_nandflash_defconfig       |  8 +++-
 configs/at91sam9n12ek_mmc_defconfig                |  6 ++-
 configs/at91sam9n12ek_nandflash_defconfig          |  6 ++-
 configs/at91sam9n12ek_spiflash_defconfig           |  6 ++-
 configs/at91sam9rlek_dataflash_defconfig           |  9 +++++
 configs/at91sam9rlek_mmc_defconfig                 |  9 +++++
 configs/at91sam9rlek_nandflash_defconfig           |  9 +++++
 configs/at91sam9x5ek_dataflash_defconfig           |  7 +++-
 configs/at91sam9x5ek_mmc_defconfig                 |  7 +++-
 configs/at91sam9x5ek_nandflash_defconfig           |  7 +++-
 configs/at91sam9x5ek_spiflash_defconfig            |  7 +++-
 configs/at91sam9xeek_dataflash_cs0_defconfig       |  8 +++-
 configs/at91sam9xeek_dataflash_cs1_defconfig       |  8 +++-
 configs/at91sam9xeek_nandflash_defconfig           |  8 +++-
 configs/atngw100_defconfig                         |  6 ++-
 configs/atngw100mkii_defconfig                     |  5 ++-
 configs/atstk1002_defconfig                        |  5 ++-
 configs/axm_defconfig                              |  9 ++++-
 configs/axs101_defconfig                           |  7 +++-
 configs/axs103_defconfig                           |  7 +++-
 configs/ba10_tv_box_defconfig                      |  8 ++++
 configs/balloon3_defconfig                         |  4 ++
 configs/bamboo_defconfig                           |  2 -
 configs/bcm11130_defconfig                         |  5 +++
 configs/bcm11130_nand_defconfig                    |  5 +++
 configs/bcm28155_ap_defconfig                      |  5 +++
 configs/bcm28155_w1d_defconfig                     |  5 +++
 configs/bcm911360_entphn-ns_defconfig              |  4 +-
 configs/bcm911360_entphn_defconfig                 |  4 +-
 configs/bcm911360k_defconfig                       |  4 +-
 configs/bcm958300k-ns_defconfig                    |  4 +-
 configs/bcm958300k_defconfig                       |  4 +-
 configs/bcm958305k_defconfig                       |  4 +-
 configs/bcm958622hr_defconfig                      |  4 +-
 configs/bct-brettl2_defconfig                      |  2 +-
 configs/beagle_x15_defconfig                       |  4 +-
 configs/beaver_defconfig                           | 12 +++++-
 configs/bf506f-ezkit_defconfig                     | 21 +++++++++++
 configs/bf518f-ezbrd_defconfig                     |  3 +-
 configs/bf525-ucr2_defconfig                       |  6 +++
 configs/bf526-ezbrd_defconfig                      |  3 +-
 configs/bf527-ad7160-eval_defconfig                |  5 +++
 configs/bf527-ezkit-v2_defconfig                   |  3 +-
 configs/bf527-ezkit_defconfig                      |  3 +-
 configs/bf527-sdp_defconfig                        |  5 +++
 configs/bf533-ezkit_defconfig                      |  2 +-
 configs/bf533-stamp_defconfig                      |  2 +-
 configs/bf537-minotaur_defconfig                   |  5 ++-
 configs/bf537-pnav_defconfig                       |  3 +-
 configs/bf537-srv1_defconfig                       |  5 ++-
 configs/bf537-stamp_defconfig                      |  3 +-
 configs/bf538f-ezkit_defconfig                     |  2 +-
 configs/bf548-ezkit_defconfig                      |  3 +-
 configs/bf561-acvilon_defconfig                    |  5 ++-
 configs/bf561-ezkit_defconfig                      |  2 +-
 configs/bf609-ezkit_defconfig                      |  5 ++-
 configs/bg0900_defconfig                           |  5 ++-
 configs/birdland_bav335a_defconfig                 |  5 ++-
 configs/birdland_bav335b_defconfig                 |  5 ++-
 configs/blackstamp_defconfig                       |  5 ++-
 configs/blackvme_defconfig                         |  5 ++-
 configs/br4_defconfig                              |  5 ++-
 configs/bubinga_defconfig                          |  2 -
 configs/caddy2_defconfig                           |  2 +-
 configs/cairo_defconfig                            |  6 ++-
 configs/calimain_defconfig                         |  2 +-
 configs/cam5200_defconfig                          |  2 +-
 configs/cam5200_niosflash_defconfig                |  2 +-
 configs/cam_enc_4xx_defconfig                      |  6 ++-
 configs/canmb_defconfig                            |  2 +-
 configs/canyonlands_defconfig                      |  2 -
 configs/cardhu_defconfig                           | 12 +++++-
 configs/cgtqmx6qeval_defconfig                     |  4 +-
 configs/charon_defconfig                           |  2 +-
 configs/chromebook_link_defconfig                  | 15 ++++++--
 configs/chromebox_panther_defconfig                | 15 ++++++--
 configs/cm-bf527_defconfig                         |  2 +-
 configs/cm-bf533_defconfig                         |  2 +-
 configs/cm-bf537e_defconfig                        |  2 +-
 configs/cm-bf537u_defconfig                        |  2 +-
 configs/cm-bf548_defconfig                         |  2 +-
 configs/cm-bf561_defconfig                         |  2 +-
 configs/cm5200_defconfig                           |  2 +-
 configs/cm_fx6_defconfig                           |  9 ++++-
 configs/cm_t335_defconfig                          |  4 +-
 configs/cm_t3517_defconfig                         |  5 ++-
 configs/cm_t35_defconfig                           |  5 ++-
 configs/cm_t54_defconfig                           |  5 ++-
 configs/cmi_mpc5xx_defconfig                       |  3 ++
 configs/cobra5272_defconfig                        |  4 +-
 configs/colibri_pxa270_defconfig                   |  5 ++-
 configs/colibri_t20_defconfig                      | 11 +++++-
 configs/colibri_t30_defconfig                      | 11 +++++-
 configs/colibri_vf_defconfig                       |  5 ++-
 configs/colibri_vf_dtb_defconfig                   |  9 +++--
 .../controlcenterd_36BIT_SDCARD_DEVELOP_defconfig  |  5 ++-
 configs/controlcenterd_36BIT_SDCARD_defconfig      |  5 ++-
 .../controlcenterd_TRAILBLAZER_DEVELOP_defconfig   |  4 +-
 configs/controlcenterd_TRAILBLAZER_defconfig       |  4 +-
 configs/coreboot-x86_defconfig                     | 13 ++++++-
 configs/corvus_defconfig                           |  7 +++-
 configs/cpu9260_128M_defconfig                     |  7 +++-
 configs/cpu9260_defconfig                          |  7 +++-
 configs/cpu9260_nand_128M_defconfig                |  7 +++-
 configs/cpu9260_nand_defconfig                     |  7 +++-
 configs/cpu9G20_128M_defconfig                     |  7 +++-
 configs/cpu9G20_defconfig                          |  7 +++-
 configs/cpu9G20_nand_128M_defconfig                |  7 +++-
 configs/cpu9G20_nand_defconfig                     |  7 +++-
 configs/cpuat91_defconfig                          |  6 ++-
 configs/cpuat91_ram_defconfig                      |  6 ++-
 configs/crownbay_defconfig                         | 11 +++++-
 configs/csb272_defconfig                           |  2 +-
 configs/csb472_defconfig                           |  2 +-
 configs/d2net_v2_defconfig                         |  5 ++-
 configs/da830evm_defconfig                         |  6 ++-
 configs/da850_am18xxevm_defconfig                  |  5 ++-
 configs/da850evm_defconfig                         |  5 ++-
 configs/da850evm_direct_nor_defconfig              |  3 +-
 configs/dalmore_defconfig                          | 12 +++++-
 configs/davinci_dm355evm_defconfig                 |  6 ++-
 configs/davinci_dm355leopard_defconfig             |  6 ++-
 configs/davinci_dm365evm_defconfig                 |  6 ++-
 configs/davinci_dm6467Tevm_defconfig               |  6 ++-
 configs/davinci_dm6467evm_defconfig                |  6 ++-
 configs/davinci_dvevm_defconfig                    |  6 ++-
 configs/davinci_schmoogie_defconfig                |  6 ++-
 configs/davinci_sffsdr_defconfig                   |  6 ++-
 configs/davinci_sonata_defconfig                   |  4 +-
 configs/db-88f6820-gp_defconfig                    |  5 ++-
 configs/db-mv784mp-gp_defconfig                    |  5 ++-
 configs/dbau1000_defconfig                         | 10 ++++-
 configs/dbau1100_defconfig                         | 10 ++++-
 configs/dbau1500_defconfig                         | 10 ++++-
 configs/dbau1550_defconfig                         |  8 +++-
 configs/dbau1550_el_defconfig                      |  8 +++-
 configs/devconcenter_defconfig                     |  2 -
 configs/devkit3250_defconfig                       |  2 +-
 configs/devkit8000_defconfig                       |  6 ++-
 configs/dig297_defconfig                           |  7 +++-
 configs/digsy_mtc_RAMBOOT_defconfig                |  2 +-
 configs/digsy_mtc_defconfig                        |  2 +-
 configs/digsy_mtc_rev5_RAMBOOT_defconfig           |  2 +-
 configs/digsy_mtc_rev5_defconfig                   |  2 +-
 configs/dlvision-10g_defconfig                     |  3 +-
 configs/dlvision_defconfig                         |  3 +-
 configs/dnp5370_defconfig                          |  2 +-
 configs/dns325_defconfig                           |  4 +-
 configs/dockstar_defconfig                         |  4 +-
 configs/dra7xx_evm_defconfig                       |  6 ++-
 configs/dra7xx_evm_qspiboot_defconfig              |  6 ++-
 configs/dra7xx_evm_uart3_defconfig                 |  6 ++-
 configs/draco_defconfig                            |  5 ++-
 configs/dreamplug_defconfig                        |  5 ++-
 configs/duovero_defconfig                          |  5 ++-
 configs/ea20_defconfig                             |  5 ++-
 configs/eb_cpu5282_defconfig                       |  3 +-
 configs/eb_cpu5282_internal_defconfig              |  3 +-
 configs/eb_cpux9k2_defconfig                       |  2 +-
 configs/eb_cpux9k2_ram_defconfig                   |  2 +-
 configs/ebony_defconfig                            |  2 -
 configs/eco5pk_defconfig                           |  4 +-
 configs/ecovec_defconfig                           | 19 +++++++++-
 configs/edb9315a_defconfig                         |  4 +-
 configs/edminiv2_defconfig                         |  2 +-
 configs/enbw_cmc_defconfig                         |  3 +-
 configs/espt_defconfig                             | 19 +++++++++-
 configs/ethernut5_defconfig                        |  6 ++-
 configs/flea3_defconfig                            |  2 +-
 configs/fo300_defconfig                            |  2 +-
 configs/forfun_q88db_defconfig                     |  6 +++
 configs/fx12mm_defconfig                           |  4 ++
 configs/fx12mm_flash_defconfig                     |  4 ++
 configs/ga10h_v1_1_defconfig                       |  6 +++
 configs/galileo_defconfig                          | 15 ++++++--
 configs/gdppc440etx_defconfig                      |  2 -
 configs/glacier_defconfig                          |  2 -
 configs/glacier_ramboot_defconfig                  |  2 -
 configs/goflexhome_defconfig                       |  4 +-
 configs/gose_defconfig                             | 17 ++++++++-
 configs/gplugd_defconfig                           |  6 ++-
 configs/gr_cpci_ax2000_defconfig                   |  2 +-
 configs/gr_ep2s60_defconfig                        |  2 +-
 configs/gr_xc3s_1500_defconfig                     |  2 +-
 configs/grasshopper_defconfig                      |  3 +-
 configs/grsim_defconfig                            | 11 +++++-
 configs/grsim_leon2_defconfig                      | 11 ++++++
 configs/guruplug_defconfig                         |  4 +-
 configs/gwventana_defconfig                        |  7 ++--
 configs/h2200_defconfig                            | 18 ++++++++-
 configs/haleakala_defconfig                        |  2 -
 configs/harmony_defconfig                          | 11 +++++-
 configs/highbank_defconfig                         |  4 +-
 configs/hrcon_defconfig                            |  2 +-
 configs/i12-tvbox_defconfig                        |  8 ++++
 configs/iNet_3F_defconfig                          |  6 +++
 configs/iNet_3W_defconfig                          |  6 +++
 configs/iNet_86VS_defconfig                        |  6 +++
 configs/ib62x0_defconfig                           |  4 +-
 configs/ibf-dsp561_defconfig                       |  2 +-
 configs/icon_defconfig                             |  2 -
 configs/iconnect_defconfig                         |  4 +-
 configs/ids8313_defconfig                          |  2 +-
 configs/igep0020_defconfig                         |  4 +-
 configs/igep0020_nand_defconfig                    |  4 +-
 configs/igep0030_defconfig                         |  4 +-
 configs/igep0030_nand_defconfig                    |  4 +-
 configs/igep0032_defconfig                         |  4 +-
 configs/ima3-mx53_defconfig                        |  3 +-
 configs/imx27lite_defconfig                        |  2 +-
 configs/imx31_litekit_defconfig                    |  2 +-
 configs/imx31_phycore_defconfig                    |  2 +-
 configs/imx31_phycore_eet_defconfig                |  2 +-
 configs/inetspace_v2_defconfig                     |  5 ++-
 configs/inka4x0_defconfig                          |  2 +-
 configs/integratorap_cm720t_defconfig              |  2 +-
 configs/integratorap_cm920t_defconfig              |  2 +-
 configs/integratorap_cm926ejs_defconfig            |  2 +-
 configs/integratorap_cm946es_defconfig             |  2 +-
 configs/integratorcp_cm1136_defconfig              |  2 +-
 configs/integratorcp_cm920t_defconfig              |  2 +-
 configs/integratorcp_cm926ejs_defconfig            |  2 +-
 configs/integratorcp_cm946es_defconfig             |  2 +-
 configs/intip_defconfig                            |  2 -
 configs/io64_defconfig                             |  2 -
 configs/io_defconfig                               |  3 +-
 configs/iocon_defconfig                            |  3 +-
 configs/ip04_defconfig                             |  5 ++-
 configs/ipam390_defconfig                          |  4 +-
 configs/ipek01_defconfig                           |  2 +-
 configs/jesurun_q5_defconfig                       |  8 ++++
 configs/jetson-tk1_defconfig                       | 12 +++++-
 configs/jornada_defconfig                          |  6 +++
 configs/jupiter_defconfig                          |  2 +-
 configs/k2e_evm_defconfig                          |  5 ++-
 configs/k2hk_evm_defconfig                         |  5 ++-
 configs/k2l_evm_defconfig                          |  5 ++-
 configs/katmai_defconfig                           |  2 -
 configs/kilauea_defconfig                          |  2 -
 configs/km_kirkwood_128m16_defconfig               |  5 ++-
 configs/km_kirkwood_defconfig                      |  5 ++-
 configs/km_kirkwood_pci_defconfig                  |  5 ++-
 configs/kmcoge4_defconfig                          |  5 ++-
 configs/kmcoge5ne_defconfig                        |  2 -
 configs/kmcoge5un_defconfig                        |  5 ++-
 configs/kmeter1_defconfig                          |  2 -
 configs/kmlion1_defconfig                          |  5 ++-
 configs/kmnusa_defconfig                           |  5 ++-
 configs/kmopti2_defconfig                          |  2 -
 configs/kmsugp1_defconfig                          |  5 ++-
 configs/kmsupx5_defconfig                          |  2 -
 configs/kmsuv31_defconfig                          |  5 ++-
 configs/kmvect1_defconfig                          |  2 -
 configs/koelsch_defconfig                          | 17 ++++++++-
 configs/kwb_defconfig                              | 12 +++++-
 configs/kzm9g_defconfig                            |  2 +-
 configs/lager_defconfig                            | 17 ++++++++-
 configs/lcd4_lwmon5_defconfig                      |  2 +-
 configs/lp8x4x_defconfig                           |  3 +-
 configs/ls1021aqds_ddr4_nor_defconfig              |  2 +-
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig       |  2 +-
 configs/ls1021aqds_nand_defconfig                  |  2 +-
 configs/ls1021aqds_nor_SECURE_BOOT_defconfig       |  2 +-
 configs/ls1021aqds_nor_defconfig                   |  2 +-
 configs/ls1021aqds_nor_lpuart_defconfig            |  2 +-
 configs/ls1021aqds_qspi_defconfig                  |  4 +-
 configs/ls1021aqds_sdcard_defconfig                |  2 +-
 configs/ls1021atwr_nor_SECURE_BOOT_defconfig       |  2 +-
 configs/ls1021atwr_nor_defconfig                   |  2 +-
 configs/ls1021atwr_nor_lpuart_defconfig            |  2 +-
 configs/ls1021atwr_qspi_defconfig                  |  4 +-
 configs/ls1021atwr_sdcard_defconfig                |  2 +-
 configs/ls2085a_emu_D4_defconfig                   | 12 +++++-
 configs/ls2085a_emu_defconfig                      | 12 +++++-
 configs/ls2085a_simu_defconfig                     | 12 +++++-
 configs/ls2085aqds_defconfig                       |  2 +-
 configs/ls2085aqds_nand_defconfig                  |  2 +-
 configs/ls2085ardb_defconfig                       |  2 +-
 configs/ls2085ardb_nand_defconfig                  |  2 +-
 configs/lschlv2_defconfig                          |  5 ++-
 configs/lsxhl_defconfig                            |  5 ++-
 configs/luan_defconfig                             |  2 -
 configs/lwmon5_defconfig                           |  2 +-
 configs/m28evk_defconfig                           |  5 ++-
 configs/m53evk_defconfig                           |  4 +-
 configs/magnesium_defconfig                        |  2 +-
 configs/makalu_defconfig                           |  2 -
 configs/malta_defconfig                            |  7 +++-
 configs/maltael_defconfig                          |  7 +++-
 configs/marsboard_defconfig                        |  5 ++-
 configs/maxbcm_defconfig                           |  5 ++-
 configs/mcx_defconfig                              |  6 ++-
 configs/mecp5123_defconfig                         |  2 +-
 configs/medcom-wide_defconfig                      | 11 +++++-
 configs/meesc_dataflash_defconfig                  |  6 ++-
 configs/meesc_defconfig                            |  6 ++-
 configs/mgcoge3ne_defconfig                        |  2 -
 configs/mgcoge3un_defconfig                        |  5 ++-
 configs/mgcoge_defconfig                           |  2 -
 configs/microblaze-generic_defconfig               |  2 +-
 configs/minnowmax_defconfig                        | 17 +++++++--
 configs/mixtile_loftq_defconfig                    |  8 ++++
 configs/mk802_a10s_defconfig                       |  8 ++++
 configs/mk802_defconfig                            |  8 ++++
 configs/mk802ii_defconfig                          |  8 ++++
 configs/ml507_defconfig                            |  4 ++
 configs/ml507_flash_defconfig                      |  4 ++
 configs/motionpro_defconfig                        |  2 +-
 configs/mpc5121ads_defconfig                       |  2 +-
 configs/mpc5121ads_rev2_defconfig                  |  2 +-
 configs/mpc8308_p1m_defconfig                      |  2 +-
 configs/mpr2_defconfig                             | 20 ++++++++++
 configs/ms7720se_defconfig                         | 20 ++++++++++
 configs/ms7722se_defconfig                         | 19 +++++++++-
 configs/ms7750se_defconfig                         | 21 +++++++++++
 configs/mt_ventoux_defconfig                       |  4 +-
 configs/munices_defconfig                          |  2 +-
 configs/mv88f6281gtw_ge_defconfig                  |  5 ++-
 configs/mx23_olinuxino_defconfig                   |  4 +-
 configs/mx23evk_defconfig                          |  5 +++
 configs/mx25pdk_defconfig                          |  4 +-
 configs/mx28evk_auart_console_defconfig            |  5 ++-
 configs/mx28evk_defconfig                          |  5 ++-
 configs/mx28evk_nand_defconfig                     |  5 ++-
 configs/mx28evk_spi_defconfig                      |  5 ++-
 configs/mx31ads_defconfig                          |  2 +-
 configs/mx31pdk_defconfig                          |  3 +-
 configs/mx35pdk_defconfig                          |  2 +-
 configs/mx51_efikamx_defconfig                     |  4 +-
 configs/mx51_efikasb_defconfig                     |  4 +-
 configs/mx51evk_defconfig                          |  3 +-
 configs/mx53ard_defconfig                          |  3 +-
 configs/mx53evk_defconfig                          |  3 +-
 configs/mx53loco_defconfig                         |  3 +-
 configs/mx53smd_defconfig                          |  3 +-
 configs/mx6cuboxi_defconfig                        |  4 +-
 configs/mx6dlarm2_defconfig                        |  4 +-
 configs/mx6dlarm2_lpddr2_defconfig                 |  4 +-
 configs/mx6dlsabreauto_defconfig                   |  5 ++-
 configs/mx6dlsabresd_defconfig                     |  5 ++-
 configs/mx6qarm2_defconfig                         |  4 +-
 configs/mx6qarm2_lpddr2_defconfig                  |  4 +-
 configs/mx6qsabreauto_defconfig                    |  5 ++-
 configs/mx6qsabrelite_defconfig                    |  5 ++-
 configs/mx6qsabresd_defconfig                      |  5 ++-
 configs/mx6sabresd_spl_defconfig                   |  5 ++-
 configs/mx6slevk_defconfig                         |  5 ++-
 configs/mx6slevk_spinor_defconfig                  |  5 ++-
 configs/mx6sxsabresd_defconfig                     |  5 ++-
 configs/mx6sxsabresd_spl_defconfig                 |  5 ++-
 configs/nas220_defconfig                           |  4 +-
 configs/neo_defconfig                              |  3 +-
 configs/net2big_v2_defconfig                       |  5 ++-
 configs/netspace_lite_v2_defconfig                 |  5 ++-
 configs/netspace_max_v2_defconfig                  |  5 ++-
 configs/netspace_mini_v2_defconfig                 |  5 ++-
 configs/netspace_v2_defconfig                      |  5 ++-
 configs/nhk8815_defconfig                          |  4 +-
 configs/nhk8815_onenand_defconfig                  |  4 +-
 configs/nios2-generic_defconfig                    |  8 +++-
 configs/nitrogen6dl2g_defconfig                    |  5 ++-
 configs/nitrogen6dl_defconfig                      |  5 ++-
 configs/nitrogen6q2g_defconfig                     |  5 ++-
 configs/nitrogen6q_defconfig                       |  5 ++-
 configs/nitrogen6s1g_defconfig                     |  5 ++-
 configs/nitrogen6s_defconfig                       |  5 ++-
 configs/nokia_rx51_defconfig                       |  8 ++++
 configs/novena_defconfig                           |  4 +-
 configs/nyan-big_defconfig                         | 19 +++++++---
 configs/ocotea_defconfig                           |  2 -
 configs/odroid-xu3_defconfig                       |  7 +++-
 configs/odroid_defconfig                           | 13 +++++--
 configs/omap3_beagle_defconfig                     |  4 +-
 configs/omap3_evm_defconfig                        |  6 ++-
 configs/omap3_evm_quick_mmc_defconfig              | 22 ++++++++++-
 configs/omap3_evm_quick_nand_defconfig             | 22 ++++++++++-
 configs/omap3_ha_defconfig                         |  6 ++-
 configs/omap3_logic_defconfig                      |  6 ++-
 configs/omap3_mvblx_defconfig                      |  4 +-
 configs/omap3_overo_defconfig                      |  7 +++-
 configs/omap3_pandora_defconfig                    |  7 ++++
 configs/omap3_sdp3430_defconfig                    |  4 +-
 configs/omap3_zoom1_defconfig                      |  6 ++-
 configs/omap4_panda_defconfig                      |  5 ++-
 configs/omap4_sdp4430_defconfig                    |  5 +++
 configs/omap5_uevm_defconfig                       |  4 +-
 configs/omapl138_lcdk_defconfig                    |  5 ++-
 configs/openrd_base_defconfig                      |  4 +-
 configs/openrd_client_defconfig                    |  4 +-
 configs/openrd_ultimate_defconfig                  |  4 +-
 configs/openrisc-generic_defconfig                 |  4 +-
 configs/origen_defconfig                           | 11 +++++-
 configs/ot1200_defconfig                           |  5 ++-
 configs/ot1200_spl_defconfig                       |  5 ++-
 configs/otc570_dataflash_defconfig                 |  5 ++-
 configs/otc570_defconfig                           |  5 ++-
 configs/p3p440_defconfig                           |  2 +-
 configs/palmld_defconfig                           |  4 ++
 configs/palmtc_defconfig                           |  3 ++
 configs/palmtreo680_defconfig                      |  9 +++++
 configs/paz00_defconfig                            | 11 +++++-
 configs/pb1000_defconfig                           | 10 ++++-
 configs/pcm030_LOWBOOT_defconfig                   |  2 +-
 configs/pcm030_defconfig                           |  2 +-
 configs/pcm051_rev1_defconfig                      |  5 ++-
 configs/pcm051_rev3_defconfig                      |  5 ++-
 configs/pcs440ep_defconfig                         |  2 +-
 configs/pdm360ng_defconfig                         |  2 +-
 configs/peach-pi_defconfig                         |  6 ++-
 configs/peach-pit_defconfig                        |  6 ++-
 configs/pengwyn_defconfig                          |  4 +-
 configs/pepper_defconfig                           |  4 +-
 configs/ph1_ld4_defconfig                          | 25 +++----------
 configs/ph1_pro4_defconfig                         | 25 +++----------
 configs/ph1_sld8_defconfig                         | 25 +++----------
 configs/platinum_picon_defconfig                   |  4 +-
 configs/platinum_titanium_defconfig                |  4 +-
 configs/plutux_defconfig                           | 11 +++++-
 configs/pm9261_defconfig                           |  7 +++-
 configs/pm9263_defconfig                           |  7 +++-
 configs/pm9g45_defconfig                           |  5 ++-
 configs/pogo_e02_defconfig                         |  4 +-
 configs/polaris_defconfig                          |  2 +-
 configs/porter_defconfig                           | 17 ++++++++-
 configs/portl2_defconfig                           |  5 ++-
 configs/portuxg20_defconfig                        |  7 +++-
 configs/pr1_defconfig                              |  5 ++-
 configs/pxa255_idp_defconfig                       |  2 +-
 configs/pxm2_defconfig                             |  5 ++-
 configs/qemu-ppce500_defconfig                     |  4 +-
 configs/qemu-x86_defconfig                         | 13 +++++--
 configs/qemu_mips64_defconfig                      |  5 ++-
 configs/qemu_mips64el_defconfig                    |  5 ++-
 configs/qemu_mips_defconfig                        |  5 ++-
 configs/qemu_mipsel_defconfig                      |  5 ++-
 configs/qong_defconfig                             |  2 -
 configs/r0p7734_defconfig                          | 19 +++++++++-
 configs/r2dplus_defconfig                          |  3 +-
 configs/r7-tv-dongle_defconfig                     |  8 ++++
 configs/r7780mp_defconfig                          | 19 +++++++++-
 configs/rainier_defconfig                          |  2 -
 configs/rainier_ramboot_defconfig                  |  2 -
 configs/rd6281a_defconfig                          |  4 +-
 configs/redwood_defconfig                          |  2 -
 configs/riotboard_defconfig                        |  5 ++-
 configs/rpi_2_defconfig                            |  6 ++-
 configs/rpi_defconfig                              |  6 ++-
 configs/rsk7203_defconfig                          | 19 +++++++++-
 configs/rsk7264_defconfig                          |  3 +-
 configs/rsk7269_defconfig                          |  3 +-
 configs/rut_defconfig                              |  5 ++-
 configs/s5p_goni_defconfig                         |  8 ++++
 configs/s5pc210_universal_defconfig                | 11 +++++-
 configs/sama5d3_xplained_mmc_defconfig             |  7 +++-
 configs/sama5d3_xplained_nandflash_defconfig       |  7 +++-
 configs/sama5d3xek_mmc_defconfig                   |  6 ++-
 configs/sama5d3xek_nandflash_defconfig             |  6 ++-
 configs/sama5d3xek_spiflash_defconfig              |  6 ++-
 configs/sama5d4_xplained_mmc_defconfig             |  8 +++-
 configs/sama5d4_xplained_nandflash_defconfig       |  8 +++-
 configs/sama5d4_xplained_spiflash_defconfig        |  8 +++-
 configs/sama5d4ek_mmc_defconfig                    |  8 +++-
 configs/sama5d4ek_nandflash_defconfig              |  8 +++-
 configs/sama5d4ek_spiflash_defconfig               |  8 +++-
 configs/sandbox_defconfig                          | 18 +++++----
 configs/sansa_fuze_plus_defconfig                  |  4 +-
 configs/sbc405_defconfig                           |  2 +-
 configs/sbc8349_PCI_33_defconfig                   |  2 +-
 configs/sbc8349_PCI_66_defconfig                   |  2 +-
 configs/sbc8349_defconfig                          |  2 +-
 configs/sbc8548_PCI_33_PCIE_defconfig              |  2 +-
 configs/sbc8548_PCI_33_defconfig                   |  2 +-
 configs/sbc8548_PCI_66_PCIE_defconfig              |  2 +-
 configs/sbc8548_PCI_66_defconfig                   |  2 +-
 configs/sbc8548_defconfig                          |  2 +-
 configs/sbc8641d_defconfig                         |  2 +-
 configs/sc_sps_1_defconfig                         |  4 +-
 configs/scb9328_defconfig                          |  5 ++-
 configs/seaboard_defconfig                         | 11 +++++-
 configs/secomx6quq7_defconfig                      |  4 +-
 configs/sequoia_defconfig                          |  2 -
 configs/sequoia_ramboot_defconfig                  |  2 -
 configs/sh7752evb_defconfig                        | 19 +++++++++-
 configs/sh7753evb_defconfig                        | 19 +++++++++-
 configs/sh7757lcr_defconfig                        | 19 +++++++++-
 configs/sh7763rdp_defconfig                        | 19 +++++++++-
 configs/sh7785lcr_32bit_defconfig                  | 18 ++++++++-
 configs/sh7785lcr_defconfig                        | 18 ++++++++-
 configs/sheevaplug_defconfig                       |  4 +-
 configs/shmin_defconfig                            | 19 +++++++++-
 configs/silk_defconfig                             | 17 ++++++++-
 configs/smdk2410_defconfig                         |  2 +-
 configs/smdk5250_defconfig                         |  6 ++-
 configs/smdk5420_defconfig                         |  6 ++-
 configs/smdkc100_defconfig                         |  4 +-
 configs/smdkv310_defconfig                         |  9 ++++-
 configs/snapper9260_defconfig                      |  9 ++++-
 configs/snapper9g20_defconfig                      |  9 ++++-
 configs/snow_defconfig                             |  6 ++-
 configs/snowball_defconfig                         | 10 +++++
 configs/socfpga_arria5_defconfig                   |  5 ++-
 configs/socfpga_cyclone5_defconfig                 |  7 ++--
 configs/socfpga_socrates_defconfig                 |  9 +++--
 configs/socrates_defconfig                         |  3 +-
 configs/spear300_defconfig                         |  4 +-
 configs/spear300_nand_defconfig                    |  4 +-
 configs/spear300_usbtty_defconfig                  |  4 +-
 configs/spear300_usbtty_nand_defconfig             |  4 +-
 configs/spear310_defconfig                         |  4 +-
 configs/spear310_nand_defconfig                    |  4 +-
 configs/spear310_pnor_defconfig                    |  4 +-
 configs/spear310_usbtty_defconfig                  |  4 +-
 configs/spear310_usbtty_nand_defconfig             |  4 +-
 configs/spear310_usbtty_pnor_defconfig             |  4 +-
 configs/spear320_defconfig                         |  4 +-
 configs/spear320_nand_defconfig                    |  4 +-
 configs/spear320_pnor_defconfig                    |  4 +-
 configs/spear320_usbtty_defconfig                  |  4 +-
 configs/spear320_usbtty_nand_defconfig             |  4 +-
 configs/spear320_usbtty_pnor_defconfig             |  4 +-
 configs/spear600_defconfig                         |  4 +-
 configs/spear600_nand_defconfig                    |  4 +-
 configs/spear600_usbtty_defconfig                  |  4 +-
 configs/spear600_usbtty_nand_defconfig             |  4 +-
 configs/stamp9g20_defconfig                        |  7 +++-
 configs/stm32f429-discovery_defconfig              |  2 +-
 configs/stv0991_defconfig                          |  7 +++-
 configs/stxgp3_defconfig                           |  2 +-
 configs/stxssa_4M_defconfig                        |  2 +-
 configs/stxssa_defconfig                           |  2 +-
 configs/sunxi_Gemei_G9_defconfig                   |  8 ++++
 configs/suvd3_defconfig                            |  2 -
 configs/sycamore_defconfig                         |  2 -
 configs/t3corp_defconfig                           |  2 -
 configs/taihu_defconfig                            |  2 -
 configs/taishan_defconfig                          |  2 -
 configs/tao3530_defconfig                          |  6 ++-
 configs/taurus_defconfig                           |  9 ++++-
 configs/tb100_defconfig                            |  9 +++--
 configs/tbs2910_defconfig                          |  4 +-
 configs/tcm-bf518_defconfig                        |  2 +-
 configs/tcm-bf537_defconfig                        |  2 +-
 configs/tec-ng_defconfig                           | 12 +++++-
 configs/tec_defconfig                              | 11 +++++-
 configs/thuban_defconfig                           |  5 ++-
 configs/ti814x_evm_defconfig                       |  4 +-
 configs/ti816x_evm_defconfig                       |  4 +-
 configs/titanium_defconfig                         |  4 +-
 configs/tk71_defconfig                             |  4 +-
 configs/tqma6q_mba6_mmc_defconfig                  |  5 ++-
 configs/tqma6q_mba6_spi_defconfig                  |  5 ++-
 configs/tqma6s_mba6_mmc_defconfig                  |  5 ++-
 configs/tqma6s_mba6_spi_defconfig                  |  5 ++-
 configs/trats2_defconfig                           | 13 +++++--
 configs/trats_defconfig                            | 11 +++++-
 configs/tricorder_defconfig                        |  7 ++++
 configs/tricorder_flash_defconfig                  |  7 ++++
 configs/trimslice_defconfig                        | 12 +++++-
 configs/trizepsiv_defconfig                        |  2 +-
 configs/tseries_mmc_defconfig                      | 12 +++++-
 configs/tseries_nand_defconfig                     | 12 +++++-
 configs/tseries_spi_defconfig                      | 13 ++++++-
 configs/tt01_defconfig                             |  2 +-
 configs/tuge1_defconfig                            |  2 -
 configs/tuxx1_defconfig                            |  2 -
 configs/twister_defconfig                          |  4 +-
 configs/tx25_defconfig                             |  4 +-
 configs/u8500_href_defconfig                       | 10 +++++
 configs/udoo_quad_defconfig                        |  4 +-
 configs/usb_a9263_dataflash_defconfig              |  9 ++++-
 configs/usbarmory_defconfig                        |  3 +-
 configs/v38b_defconfig                             |  2 +-
 configs/v5fx30teval_defconfig                      |  4 ++
 configs/v5fx30teval_flash_defconfig                |  4 ++
 configs/vct_platinum_defconfig                     |  3 +-
 configs/vct_platinum_onenand_defconfig             |  5 ++-
 configs/vct_platinum_onenand_small_defconfig       | 13 +++++++
 configs/vct_platinum_small_defconfig               | 11 ++++++
 configs/vct_platinumavc_defconfig                  |  4 ++
 configs/vct_platinumavc_onenand_defconfig          |  6 +++
 configs/vct_platinumavc_onenand_small_defconfig    | 13 +++++++
 configs/vct_platinumavc_small_defconfig            | 11 ++++++
 configs/vct_premium_defconfig                      |  3 +-
 configs/vct_premium_onenand_defconfig              |  5 ++-
 configs/vct_premium_onenand_small_defconfig        | 13 +++++++
 configs/vct_premium_small_defconfig                | 11 ++++++
 configs/ve8313_defconfig                           |  2 +-
 configs/venice2_defconfig                          | 12 +++++-
 configs/ventana_defconfig                          | 11 +++++-
 configs/versatileab_defconfig                      | 17 ++++++++-
 configs/versatilepb_defconfig                      | 17 ++++++++-
 configs/versatileqemu_defconfig                    | 17 ++++++++-
 configs/vexpress_aemv8a_juno_defconfig             | 15 +++++++-
 configs/vexpress_aemv8a_semi_defconfig             | 16 +++++++-
 configs/vexpress_ca15_tc2_defconfig                | 15 +++++++-
 configs/vexpress_ca5x2_defconfig                   | 15 +++++++-
 configs/vexpress_ca9x4_defconfig                   | 15 +++++++-
 configs/vf610twr_defconfig                         |  4 +-
 configs/vf610twr_nand_defconfig                    |  4 +-
 configs/vision2_defconfig                          |  4 +-
 configs/vl_ma2sc_defconfig                         |  6 ++-
 configs/vl_ma2sc_ram_defconfig                     |  6 ++-
 configs/vme8349_defconfig                          |  2 +-
 configs/vpac270_nor_128_defconfig                  |  3 +-
 configs/vpac270_nor_256_defconfig                  |  3 +-
 configs/vpac270_ond_256_defconfig                  |  4 +-
 configs/walnut_defconfig                           |  2 -
 configs/wandboard_defconfig                        |  4 +-
 configs/warp_defconfig                             |  5 +++
 configs/whistler_defconfig                         | 11 +++++-
 configs/wireless_space_defconfig                   |  4 +-
 configs/woodburn_defconfig                         |  2 +-
 configs/woodburn_sd_defconfig                      |  2 +-
 configs/work_92105_defconfig                       |  4 +-
 configs/wtk_defconfig                              |  2 +-
 configs/x600_defconfig                             |  4 +-
 configs/xaeniax_defconfig                          |  2 +-
 configs/xfi3_defconfig                             |  4 +-
 configs/xilinx-ppc405-generic_defconfig            |  4 ++
 configs/xilinx-ppc405-generic_flash_defconfig      |  4 ++
 configs/xilinx-ppc440-generic_defconfig            |  4 ++
 configs/xilinx-ppc440-generic_flash_defconfig      |  4 ++
 configs/xilinx_zynqmp_defconfig                    | 21 ++++++-----
 configs/xpedite1000_defconfig                      |  2 +-
 configs/xpedite517x_defconfig                      |  2 +-
 configs/xpedite520x_defconfig                      |  2 +-
 configs/xpedite537x_defconfig                      |  2 +-
 configs/xpedite550x_defconfig                      |  2 +-
 configs/yellowstone_defconfig                      |  2 -
 configs/yosemite_defconfig                         |  2 -
 configs/yucca_defconfig                            |  2 -
 configs/zeus_defconfig                             |  2 +-
 configs/zipitz2_defconfig                          |  4 ++
 configs/zmx25_defconfig                            |  2 +-
 configs/zynq_microzed_defconfig                    |  6 ++-
 configs/zynq_picozed_defconfig                     |  4 +-
 configs/zynq_zc702_defconfig                       |  4 +-
 configs/zynq_zc706_defconfig                       |  4 +-
 configs/zynq_zc70x_defconfig                       |  6 ++-
 configs/zynq_zc770_xm010_defconfig                 |  7 +++-
 configs/zynq_zc770_xm012_defconfig                 |  4 +-
 configs/zynq_zc770_xm013_defconfig                 |  6 ++-
 configs/zynq_zed_defconfig                         |  6 ++-
 configs/zynq_zybo_defconfig                        |  6 ++-
 drivers/Kconfig                                    |  2 +-
 drivers/mtd/spi/Kconfig                            |  9 +++++
 drivers/net/Kconfig                                |  1 +
 include/config_cmd_all.h                           | 20 ----------
 include/config_cmd_default.h                       | 43 ----------------------
 include/configs/B4860QDS.h                         |  3 --
 include/configs/BSC9131RDB.h                       |  3 --
 include/configs/BSC9132QDS.h                       |  3 --
 include/configs/C29XPCIE.h                         |  3 --
 include/configs/CPCI2DP.h                          |  3 --
 include/configs/CPCI4052.h                         |  2 -
 include/configs/M5208EVBE.h                        |  5 ---
 include/configs/M52277EVB.h                        |  9 -----
 include/configs/M5235EVB.h                         |  8 ----
 include/configs/M5249EVB.h                         |  1 -
 include/configs/M5253DEMO.h                        |  6 ---
 include/configs/M5253EVBE.h                        |  5 ---
 include/configs/M5272C3.h                          |  7 ----
 include/configs/M5275EVB.h                         |  6 ---
 include/configs/M5282EVB.h                         |  4 --
 include/configs/M53017EVB.h                        |  5 ---
 include/configs/M5329EVB.h                         |  5 ---
 include/configs/M5373EVB.h                         |  5 ---
 include/configs/M54418TWR.h                        | 11 ------
 include/configs/M54451EVB.h                        | 10 -----
 include/configs/M54455EVB.h                        |  9 -----
 include/configs/M5475EVB.h                         |  5 ---
 include/configs/M5485EVB.h                         |  5 ---
 include/configs/MIP405.h                           |  2 -
 include/configs/MPC8308RDB.h                       |  3 --
 include/configs/MPC8313ERDB.h                      |  7 ----
 include/configs/MPC8315ERDB.h                      |  7 ----
 include/configs/MPC8323ERDB.h                      |  6 ---
 include/configs/MPC832XEMDS.h                      |  8 ----
 include/configs/MPC8349EMDS.h                      |  8 ----
 include/configs/MPC8349ITX.h                       |  2 -
 include/configs/MPC837XEMDS.h                      |  7 ----
 include/configs/MPC837XERDB.h                      |  7 ----
 include/configs/MPC8536DS.h                        |  3 --
 include/configs/MPC8540ADS.h                       |  8 ----
 include/configs/MPC8541CDS.h                       |  2 -
 include/configs/MPC8544DS.h                        |  2 -
 include/configs/MPC8548CDS.h                       |  2 -
 include/configs/MPC8555CDS.h                       |  2 -
 include/configs/MPC8560ADS.h                       |  8 ----
 include/configs/MPC8568MDS.h                       |  2 -
 include/configs/MPC8569MDS.h                       |  2 -
 include/configs/MPC8572DS.h                        |  2 -
 include/configs/MPC8610HPCD.h                      |  6 ---
 include/configs/MPC8641HPCN.h                      |  6 ---
 include/configs/MigoR.h                            |  6 ---
 include/configs/P1010RDB.h                         |  3 --
 include/configs/P1022DS.h                          |  3 --
 include/configs/P1023RDB.h                         |  2 -
 include/configs/P2041RDB.h                         |  3 --
 include/configs/PATI.h                             | 10 -----
 include/configs/PIP405.h                           |  2 -
 include/configs/PLU405.h                           |  2 -
 include/configs/PMC405DE.h                         |  3 --
 include/configs/PMC440.h                           |  3 --
 include/configs/T102xQDS.h                         |  3 --
 include/configs/T102xRDB.h                         |  5 ---
 include/configs/T1040QDS.h                         |  3 --
 include/configs/T104xRDB.h                         |  3 --
 include/configs/T208xQDS.h                         |  4 --
 include/configs/T208xRDB.h                         |  5 ---
 include/configs/T4240QDS.h                         |  1 -
 include/configs/T4240RDB.h                         |  3 --
 include/configs/TQM5200.h                          |  3 --
 include/configs/TQM823L.h                          |  3 --
 include/configs/TQM823M.h                          |  3 --
 include/configs/TQM834x.h                          |  8 ----
 include/configs/TQM850L.h                          |  3 --
 include/configs/TQM850M.h                          |  3 --
 include/configs/TQM855L.h                          |  3 --
 include/configs/TQM855M.h                          |  3 --
 include/configs/TQM860L.h                          |  3 --
 include/configs/TQM860M.h                          |  3 --
 include/configs/TQM862L.h                          |  3 --
 include/configs/TQM862M.h                          |  3 --
 include/configs/TQM866M.h                          |  3 --
 include/configs/TQM885D.h                          |  3 --
 include/configs/UCP1020.h                          |  4 --
 include/configs/VCMA9.h                            |  2 -
 include/configs/VOM405.h                           |  2 -
 include/configs/a3m071.h                           |  2 -
 include/configs/a4m072.h                           |  3 --
 include/configs/ac14xx.h                           |  3 --
 include/configs/adp-ag101.h                        |  2 -
 include/configs/adp-ag101p.h                       |  2 -
 include/configs/adp-ag102.h                        |  4 --
 include/configs/alpr.h                             |  6 ---
 include/configs/alt.h                              |  1 -
 include/configs/am335x_evm.h                       |  2 -
 include/configs/am3517_crane.h                     |  7 ----
 include/configs/am3517_evm.h                       |  6 ---
 include/configs/am43xx_evm.h                       |  2 -
 include/configs/amcc-common.h                      |  3 --
 include/configs/amcore.h                           |  5 ---
 include/configs/ap325rxa.h                         |  6 ---
 include/configs/ap_sh4a_4a.h                       |  4 --
 include/configs/apf27.h                            |  5 +--
 include/configs/apx4devkit.h                       |  3 --
 include/configs/arcangel4.h                        |  2 -
 include/configs/aria.h                             |  3 --
 include/configs/aristainetos-common.h              |  1 -
 include/configs/armadillo-800eva.h                 |  4 --
 include/configs/aspenite.h                         |  2 -
 include/configs/astro_mcf5373l.h                   | 10 -----
 include/configs/at91-sama5_common.h                |  4 --
 include/configs/at91rm9200ek.h                     |  3 --
 include/configs/at91sam9260ek.h                    |  8 ----
 include/configs/at91sam9261ek.h                    |  8 ----
 include/configs/at91sam9263ek.h                    |  8 ----
 include/configs/at91sam9m10g45ek.h                 |  8 ----
 include/configs/at91sam9n12ek.h                    |  4 --
 include/configs/at91sam9rlek.h                     |  8 ----
 include/configs/at91sam9x5ek.h                     |  5 ---
 include/configs/atngw100.h                         |  7 ----
 include/configs/atngw100mkii.h                     |  6 ---
 include/configs/atstk1002.h                        |  6 ---
 include/configs/axs101.h                           |  2 -
 include/configs/balloon3.h                         |  5 ---
 include/configs/baltos.h                           |  2 -
 include/configs/bav335x.h                          |  2 -
 include/configs/bcm28155_ap.h                      |  3 --
 include/configs/bcm_ep_board.h                     |  5 ---
 include/configs/beagle_x15.h                       |  3 --
 include/configs/beaver.h                           |  1 -
 include/configs/bf506f-ezkit.h                     |  3 --
 include/configs/bf518f-ezbrd.h                     |  1 -
 include/configs/bf525-ucr2.h                       |  6 ---
 include/configs/bf526-ezbrd.h                      |  1 -
 include/configs/bf527-ad7160-eval.h                |  1 -
 include/configs/bf527-ezkit.h                      |  1 -
 include/configs/bf527-sdp.h                        |  1 -
 include/configs/bf533-stamp.h                      |  1 -
 include/configs/bf537-minotaur.h                   |  7 ----
 include/configs/bf537-pnav.h                       |  1 -
 include/configs/bf537-srv1.h                       |  7 ----
 include/configs/bf537-stamp.h                      |  1 -
 include/configs/bf538f-ezkit.h                     |  1 -
 include/configs/bf548-ezkit.h                      |  1 -
 include/configs/bf561-acvilon.h                    |  2 -
 include/configs/bf609-ezkit.h                      |  3 --
 include/configs/bfin_adi_common.h                  |  9 +----
 include/configs/bg0900.h                           |  4 --
 include/configs/blackstamp.h                       |  5 ---
 include/configs/blackvme.h                         |  5 ---
 include/configs/br4.h                              |  1 -
 include/configs/bur_am335x_common.h                | 22 -----------
 include/configs/calimain.h                         |  2 -
 include/configs/cam_enc_4xx.h                      |  7 ----
 include/configs/canmb.h                            |  3 --
 include/configs/cardhu.h                           |  1 -
 include/configs/cm5200.h                           |  3 --
 include/configs/cm_fx6.h                           |  5 ---
 include/configs/cm_t35.h                           |  5 ---
 include/configs/cm_t3517.h                         |  5 ---
 include/configs/cm_t54.h                           |  1 -
 include/configs/cmi_mpc5xx.h                       | 13 -------
 include/configs/cobra5272.h                        |  4 --
 include/configs/colibri_pxa270.h                   |  6 ---
 include/configs/colibri_t20.h                      |  1 -
 include/configs/colibri_vf.h                       |  2 -
 include/configs/controlcenterd.h                   |  4 --
 include/configs/corenet_ds.h                       |  3 --
 include/configs/corvus.h                           |  7 ----
 include/configs/cpu9260.h                          |  7 ----
 include/configs/cpuat91.h                          |  6 ---
 include/configs/csb272.h                           |  2 -
 include/configs/csb472.h                           |  2 -
 include/configs/da830evm.h                         | 12 ------
 include/configs/da850evm.h                         |  9 -----
 include/configs/dalmore.h                          |  1 -
 include/configs/davinci_dm355evm.h                 |  7 ----
 include/configs/davinci_dm355leopard.h             |  7 ----
 include/configs/davinci_dm365evm.h                 |  7 ----
 include/configs/davinci_dm6467evm.h                |  6 ---
 include/configs/davinci_dvevm.h                    |  6 ---
 include/configs/davinci_schmoogie.h                |  6 ---
 include/configs/davinci_sffsdr.h                   |  6 ---
 include/configs/davinci_sonata.h                   |  6 ---
 include/configs/db-88f6820-gp.h                    |  1 -
 include/configs/db-mv784mp-gp.h                    |  1 -
 include/configs/dbau1x00.h                         | 15 --------
 include/configs/devkit3250.h                       |  2 -
 include/configs/devkit8000.h                       |  2 -
 include/configs/dig297.h                           |  8 ----
 include/configs/digsy_mtc.h                        |  2 -
 include/configs/dlvision-10g.h                     |  1 -
 include/configs/dlvision.h                         |  1 -
 include/configs/dnp5370.h                          |  7 ----
 include/configs/dns325.h                           |  1 -
 include/configs/dockstar.h                         |  1 -
 include/configs/dra7xx_evm.h                       |  3 --
 include/configs/dreamplug.h                        |  2 -
 include/configs/ea20.h                             |  9 -----
 include/configs/eb_cpu5282.h                       |  3 --
 include/configs/eb_cpux9k2.h                       |  3 --
 include/configs/ecovec.h                           |  4 --
 include/configs/edb93xx.h                          |  5 ---
 include/configs/edminiv2.h                         |  3 +-
 include/configs/embestmx6boards.h                  |  4 --
 include/configs/enbw_cmc.h                         |  6 ---
 include/configs/espt.h                             |  4 --
 include/configs/ethernut5.h                        | 19 +---------
 include/configs/exynos-common.h                    |  3 --
 include/configs/exynos4-common.h                   |  4 --
 include/configs/flea3.h                            |  3 --
 include/configs/goflexhome.h                       |  1 -
 include/configs/gose.h                             |  1 -
 include/configs/gplugd.h                           |  4 --
 include/configs/gr_cpci_ax2000.h                   |  2 -
 include/configs/gr_ep2s60.h                        |  2 -
 include/configs/gr_xc3s_1500.h                     |  2 -
 include/configs/grasshopper.h                      |  6 ---
 include/configs/grsim.h                            | 12 ------
 include/configs/grsim_leon2.h                      | 12 ------
 include/configs/guruplug.h                         |  1 -
 include/configs/gw_ventana.h                       |  3 --
 include/configs/h2200.h                            |  5 ---
 include/configs/highbank.h                         |  5 ---
 include/configs/hrcon.h                            |  2 -
 include/configs/ib62x0.h                           |  1 -
 include/configs/iconnect.h                         |  1 -
 include/configs/ids8313.h                          |  5 ---
 include/configs/ima3-mx53.h                        |  2 -
 include/configs/imx27lite-common.h                 |  1 -
 include/configs/imx31_litekit.h                    |  3 --
 include/configs/imx31_phycore.h                    |  3 --
 include/configs/inka4x0.h                          |  3 --
 include/configs/integrator-common.h                |  1 -
 include/configs/integratorap.h                     |  2 -
 include/configs/integratorcp.h                     |  2 -
 include/configs/io.h                               |  1 -
 include/configs/iocon.h                            |  1 -
 include/configs/ip04.h                             |  1 -
 include/configs/ipam390.h                          |  2 -
 include/configs/ipek01.h                           |  2 -
 include/configs/jetson-tk1.h                       |  1 -
 include/configs/jornada.h                          |  7 ----
 include/configs/jupiter.h                          |  3 --
 include/configs/km/keymile-common.h                |  3 --
 include/configs/km/km_arm.h                        |  4 --
 include/configs/km/kmp204x-common.h                |  3 --
 include/configs/koelsch.h                          |  1 -
 include/configs/ks2_evm.h                          |  2 -
 include/configs/kzm9g.h                            |  1 -
 include/configs/lacie_kw.h                         |  1 -
 include/configs/lager.h                            |  1 -
 include/configs/lp8x4x.h                           |  3 --
 include/configs/ls1021aqds.h                       | 10 -----
 include/configs/ls1021atwr.h                       | 10 -----
 include/configs/ls2085a_common.h                   | 10 -----
 include/configs/ls2085aqds.h                       |  1 -
 include/configs/ls2085ardb.h                       |  2 -
 include/configs/lsxl.h                             |  1 -
 include/configs/lwmon5.h                           |  3 --
 include/configs/m28evk.h                           |  3 --
 include/configs/m53evk.h                           |  1 -
 include/configs/malta.h                            |  7 ----
 include/configs/manroland/common.h                 |  3 --
 include/configs/maxbcm.h                           |  1 -
 include/configs/mcx.h                              |  8 ----
 include/configs/mecp5123.h                         |  3 --
 include/configs/meesc.h                            |  6 ---
 include/configs/microblaze-generic.h               | 15 +-------
 include/configs/motionpro.h                        |  2 -
 include/configs/mpc5121ads.h                       |  3 --
 include/configs/mpc8308_p1m.h                      |  2 -
 include/configs/mpr2.h                             |  3 --
 include/configs/ms7720se.h                         |  3 --
 include/configs/ms7722se.h                         |  4 --
 include/configs/ms7750se.h                         |  5 ---
 include/configs/mt_ventoux.h                       |  1 -
 include/configs/munices.h                          |  2 -
 include/configs/mv-common.h                        |  1 -
 include/configs/mv88f6281gtw_ge.h                  |  1 -
 include/configs/mx23_olinuxino.h                   |  1 -
 include/configs/mx23evk.h                          |  3 --
 include/configs/mx25pdk.h                          |  1 -
 include/configs/mx28evk.h                          |  4 --
 include/configs/mx31ads.h                          |  3 --
 include/configs/mx31pdk.h                          |  9 -----
 include/configs/mx35pdk.h                          |  3 --
 include/configs/mx51_efikamx.h                     |  7 ----
 include/configs/mx51evk.h                          |  3 --
 include/configs/mx53ard.h                          |  4 --
 include/configs/mx53evk.h                          |  4 --
 include/configs/mx53loco.h                         |  3 --
 include/configs/mx53smd.h                          |  4 --
 include/configs/mx6_common.h                       |  2 -
 include/configs/mx6sabre_common.h                  |  1 -
 include/configs/mx6slevk.h                         |  1 -
 include/configs/mx6sxsabresd.h                     |  1 -
 include/configs/nas220.h                           |  2 -
 include/configs/neo.h                              |  1 -
 include/configs/nhk8815.h                          |  6 ---
 include/configs/nios2-generic.h                    |  9 -----
 include/configs/nitrogen6x.h                       |  1 -
 include/configs/nokia_rx51.h                       |  9 -----
 include/configs/nyan-big.h                         |  1 -
 include/configs/o2d.h                              |  3 --
 include/configs/o2dnt-common.h                     |  2 -
 include/configs/o2dnt2.h                           |  3 --
 include/configs/omap3_beagle.h                     |  2 -
 include/configs/omap3_cairo.h                      |  6 ---
 include/configs/omap3_evm.h                        |  7 ----
 include/configs/omap3_igep00x0.h                   |  1 -
 include/configs/omap3_logic.h                      |  7 ----
 include/configs/omap3_mvblx.h                      |  6 ---
 include/configs/omap3_overo.h                      |  3 --
 include/configs/omap3_pandora.h                    |  7 ----
 include/configs/omap3_sdp3430.h                    |  7 ----
 include/configs/omap3_zoom1.h                      |  5 ---
 include/configs/omap4_panda.h                      |  1 -
 include/configs/omap4_sdp4430.h                    |  1 -
 include/configs/omap5_uevm.h                       |  2 -
 include/configs/omapl138_lcdk.h                    |  9 -----
 include/configs/openrd.h                           |  1 -
 include/configs/openrisc-generic.h                 |  3 --
 include/configs/origen.h                           |  1 -
 include/configs/ot1200.h                           |  1 -
 include/configs/otc570.h                           |  5 ---
 include/configs/p1_p2_rdb_pc.h                     |  8 ----
 include/configs/p1_twr.h                           |  2 -
 include/configs/p3p440.h                           |  3 --
 include/configs/palmld.h                           |  4 --
 include/configs/palmtc.h                           |  3 --
 include/configs/palmtreo680.h                      | 10 -----
 include/configs/pb1x00.h                           |  9 -----
 include/configs/pcm030.h                           |  3 --
 include/configs/pcm051.h                           |  1 -
 include/configs/pcs440ep.h                         |  2 -
 include/configs/pdm360ng.h                         |  2 -
 include/configs/peach-pi.h                         |  1 -
 include/configs/peach-pit.h                        |  1 -
 include/configs/pm9261.h                           |  7 ----
 include/configs/pm9263.h                           |  7 ----
 include/configs/pm9g45.h                           |  5 ---
 include/configs/pogo_e02.h                         |  1 -
 include/configs/porter.h                           |  1 -
 include/configs/pr1.h                              |  1 -
 include/configs/pxa255_idp.h                       |  2 -
 include/configs/qemu-mips.h                        |  4 --
 include/configs/qemu-mips64.h                      |  4 --
 include/configs/qemu-ppce500.h                     |  2 -
 include/configs/qong.h                             |  3 --
 include/configs/r0p7734.h                          |  4 --
 include/configs/r2dplus.h                          |  3 --
 include/configs/r7780mp.h                          |  4 --
 include/configs/rcar-gen2-common.h                 |  6 ---
 include/configs/rd6281a.h                          |  1 -
 include/configs/rpi-common.h                       |  4 --
 include/configs/rsk7203.h                          |  4 --
 include/configs/rsk7264.h                          |  4 --
 include/configs/rsk7269.h                          |  4 --
 include/configs/s5p_goni.h                         |  8 ----
 include/configs/sama5d3xek.h                       |  2 -
 include/configs/sama5d4_xplained.h                 |  1 -
 include/configs/sama5d4ek.h                        |  1 -
 include/configs/sandbox.h                          |  2 -
 include/configs/sansa_fuze_plus.h                  |  1 -
 include/configs/sbc405.h                           |  2 -
 include/configs/sbc8349.h                          |  8 ----
 include/configs/sbc8548.h                          |  2 -
 include/configs/sbc8641d.h                         |  7 ++--
 include/configs/sc_sps_1.h                         |  2 -
 include/configs/scb9328.h                          |  6 ---
 include/configs/sequoia.h                          |  2 +-
 include/configs/sh7752evb.h                        |  6 ---
 include/configs/sh7753evb.h                        |  6 ---
 include/configs/sh7757lcr.h                        |  6 ---
 include/configs/sh7763rdp.h                        |  4 --
 include/configs/sh7785lcr.h                        |  5 ---
 include/configs/sheevaplug.h                       |  1 -
 include/configs/shmin.h                            |  4 --
 include/configs/siemens-am33x-common.h             |  4 --
 include/configs/silk.h                             |  1 -
 include/configs/smdk2410.h                         |  2 -
 include/configs/smdk5250.h                         |  1 -
 include/configs/smdk5420.h                         |  1 -
 include/configs/smdkc100.h                         |  4 --
 include/configs/snapper9260.h                      |  8 ----
 include/configs/snow.h                             |  1 -
 include/configs/snowball.h                         | 12 ------
 include/configs/socfpga_arria5.h                   |  2 -
 include/configs/socfpga_common.h                   |  2 -
 include/configs/socfpga_cyclone5.h                 |  2 -
 include/configs/socrates.h                         |  3 --
 include/configs/spear-common.h                     |  5 ---
 include/configs/stamp9g20.h                        |  9 -----
 include/configs/stm32f429-discovery.h              |  5 ---
 include/configs/stv0991.h                          |  3 --
 include/configs/stxgp3.h                           |  7 +---
 include/configs/stxssa.h                           |  8 +---
 include/configs/sunxi-common.h                     |  6 ---
 include/configs/t4qds.h                            |  2 -
 include/configs/tam3517-common.h                   |  6 ---
 include/configs/tao3530.h                          |  7 ----
 include/configs/taurus.h                           |  9 -----
 include/configs/tb100.h                            |  2 -
 include/configs/tec-ng.h                           |  1 -
 include/configs/tegra-common.h                     | 10 -----
 include/configs/ti814x_evm.h                       |  4 --
 include/configs/ti816x_evm.h                       |  3 --
 include/configs/ti_armv7_common.h                  | 10 -----
 include/configs/ti_omap4_common.h                  |  3 --
 include/configs/ti_omap5_common.h                  |  3 --
 include/configs/tk71.h                             |  1 -
 include/configs/tqma6.h                            |  2 -
 include/configs/tricorder.h                        |  5 ---
 include/configs/trimslice.h                        |  1 -
 include/configs/trizepsiv.h                        |  3 --
 include/configs/tseries.h                          |  1 -
 include/configs/tt01.h                             |  4 --
 include/configs/tx25.h                             |  1 -
 include/configs/u8500_href.h                       | 12 ------
 include/configs/usb_a9263.h                        |  9 -----
 include/configs/usbarmory.h                        |  2 -
 include/configs/v38b.h                             |  2 -
 include/configs/vct.h                              | 16 --------
 include/configs/ve8313.h                           |  2 -
 include/configs/venice2.h                          |  1 -
 include/configs/versatile.h                        |  5 ---
 include/configs/vexpress_aemv8a.h                  | 13 -------
 include/configs/vexpress_common.h                  |  7 ----
 include/configs/vf610twr.h                         |  4 --
 include/configs/vision2.h                          |  4 --
 include/configs/vl_ma2sc.h                         |  6 ---
 include/configs/vme8349.h                          |  3 --
 include/configs/vpac270.h                          |  5 ---
 include/configs/warp.h                             |  3 --
 include/configs/wireless_space.h                   |  1 -
 include/configs/woodburn_common.h                  |  3 --
 include/configs/work_92105.h                       |  5 ---
 include/configs/x600.h                             |  6 ---
 include/configs/x86-common.h                       | 22 -----------
 include/configs/xaeniax.h                          |  3 --
 include/configs/xfi3.h                             |  1 -
 include/configs/xilinx-ppc.h                       |  3 --
 include/configs/xilinx_zynqmp.h                    |  2 -
 include/configs/xpedite1000.h                      |  4 --
 include/configs/xpedite517x.h                      |  4 --
 include/configs/xpedite520x.h                      |  4 --
 include/configs/xpedite537x.h                      |  4 --
 include/configs/xpedite550x.h                      |  4 --
 include/configs/zeus.h                             |  3 --
 include/configs/zipitz2.h                          |  4 --
 include/configs/zmx25.h                            |  1 -
 include/configs/zynq-common.h                      |  5 ---
 1548 files changed, 4020 insertions(+), 3433 deletions(-)
 delete mode 100644 include/config_cmd_default.h

-- 
1.7.11.5

[U-Boot] [PATCH 1/7] mtd: spi: Add the SPI_FLASH config to Kconfig

[Joe Hershberger]

This config needs to be available in the Kconfig to allow it to be
removed from arch defaults.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---

 drivers/mtd/spi/Kconfig | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig
index ac6d09f..40a7981 100644
--- a/drivers/mtd/spi/Kconfig
+++ b/drivers/mtd/spi/Kconfig
@@ -1,3 +1,12 @@
+config SPI_FLASH
+	bool "Enable SPI Flash support"
+	help
+	  Enable the legacy SPI flash support. This will include basic
+	  standard support for things like probing, read / write, and
+	  erasing through the MTD layer.
+
+	  If unsure, say N
+
 config DM_SPI_FLASH
 	bool "Enable Driver Model for SPI flash"
 	depends on DM && DM_SPI
-- 
1.7.11.5

[U-Boot] [PATCH 2/7] common: Fix comment for saveenv in Kconfig

[Joe Hershberger]

The help for this was simply copied from another command.

Update it to reflect the command.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---

 common/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/Kconfig b/common/Kconfig
index f6478fa..0ccdf62 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -188,7 +188,8 @@ config CMD_EDITENV
 config CMD_SAVEENV
 	bool "saveenv"
 	help
-	  Run the command in the given environment variable.
+	  Save all environment variables into the compiled-in persistent
+	  storage.
 
 endmenu
 
-- 
1.7.11.5

[U-Boot] [PATCH 3/7] common: Add the CMD_ENV_EXISTS config to Kconfig

[Joe Hershberger]

This command needs to exist in the Kconfig so that it can be moved from
the config_cmd_default.h.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---

 common/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/Kconfig b/common/Kconfig
index 0ccdf62..cb14592 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -191,6 +191,12 @@ config CMD_SAVEENV
 	  Save all environment variables into the compiled-in persistent
 	  storage.
 
+config CMD_ENV_EXISTS
+	bool "env exists"
+	help
+	  Check if a variable is defined in the environment for use in
+	  shell scripting.
+
 endmenu
 
 menu "Memory commands"
-- 
1.7.11.5

[U-Boot] [PATCH 4/7] arm: Make new baltos board not break on savedefconfig

[Joe Hershberger]

This config defined a CONS_INDEX as a config but did not define it in
any Kconfig, so savedefconfig will delete that entry. Use
CONFIG_SYS_EXTRA_OPTIONS for now until that is added to Kconfig.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---

 configs/am335x_baltos_defconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
index 679b04f..030cb51 100644
--- a/configs/am335x_baltos_defconfig
+++ b/configs/am335x_baltos_defconfig
@@ -1,7 +1,6 @@
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
-CONFIG_SYS_EXTRA_OPTIONS="NAND"
-CONFIG_CONS_INDEX=1
+CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,NAND"
 CONFIG_ARM=y
 CONFIG_TARGET_AM335X_BALTOS=y
-- 
1.7.11.5

[U-Boot] [PATCH 5/7] a3m071: Add needed dependency on LIB_RAND

[Joe Hershberger]

Boards using link-local need lib rand.

When link-local is moved to Kconfig, this dependency will be described
there.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---

 configs/a3m071_defconfig | 3 ++-
 configs/a4m2k_defconfig  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configs/a3m071_defconfig b/configs/a3m071_defconfig
index 1a052e4..c5df596 100644
--- a/configs/a3m071_defconfig
+++ b/configs/a3m071_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
+CONFIG_CMD_NET=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_A3M071=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+CONFIG_LIB_RAND=y
diff --git a/configs/a4m2k_defconfig b/configs/a4m2k_defconfig
index 6efb1fd..de47756 100644
--- a/configs/a4m2k_defconfig
+++ b/configs/a4m2k_defconfig
@@ -1,6 +1,7 @@
 CONFIG_PPC=y
+CONFIG_CMD_NET=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_A3M071=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="A4M2K"
-CONFIG_CMD_NET=y
+CONFIG_LIB_RAND=y
-- 
1.7.11.5

[U-Boot] [PATCH 6/7] Move default y configs out of arch/board Kconfig

[Joe Hershberger]

Some archs/boards specify their own default by pre-defining the config
which causes the Kconfig system to mix up the order of the configs in
the defconfigs... This will cause merge pain if allowed to proliferate.

Remove the configs that behave this way from the archs.

A few configs still remain, but that is because they only exist as
defaults and do not have a proper Kconfig entry. Those appear to be:

SPIFLASH
DISPLAY_BOARDINFO

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---

 arch/arc/Kconfig                                    |  3 ---
 arch/arm/cpu/armv7/exynos/Kconfig                   |  3 ---
 arch/arm/mach-bcm283x/Kconfig                       |  3 ---
 arch/arm/mach-tegra/Kconfig                         | 12 ------------
 arch/mips/Kconfig                                   |  3 ---
 arch/sh/Kconfig                                     |  3 ---
 arch/x86/Kconfig                                    | 15 ---------------
 board/Arcturus/ucp1020/Kconfig                      |  8 --------
 board/sunxi/Kconfig                                 | 21 ---------------------
 configs/A10-OLinuXino-Lime_defconfig                |  8 ++++++++
 configs/A10s-OLinuXino-M_defconfig                  |  8 ++++++++
 configs/A13-OLinuXinoM_defconfig                    |  8 ++++++++
 configs/A13-OLinuXino_defconfig                     |  8 ++++++++
 configs/A20-OLinuXino-Lime2_defconfig               |  8 ++++++++
 configs/A20-OLinuXino-Lime_defconfig                |  8 ++++++++
 configs/A20-OLinuXino_MICRO_defconfig               |  8 ++++++++
 configs/Ainol_AW1_defconfig                         |  6 ++++++
 configs/Ampe_A76_defconfig                          |  6 ++++++
 configs/Auxtek-T004_defconfig                       |  8 ++++++++
 configs/B4420QDS_NAND_defconfig                     |  1 +
 configs/B4420QDS_SPIFLASH_defconfig                 |  1 +
 configs/B4420QDS_defconfig                          |  1 +
 configs/B4860QDS_NAND_defconfig                     |  1 +
 configs/B4860QDS_SECURE_BOOT_defconfig              |  1 +
 configs/B4860QDS_SPIFLASH_defconfig                 |  1 +
 configs/B4860QDS_SRIO_PCIE_BOOT_defconfig           |  1 +
 configs/B4860QDS_defconfig                          |  1 +
 configs/BSC9131RDB_NAND_SYSCLK100_defconfig         |  1 +
 configs/BSC9131RDB_NAND_defconfig                   |  1 +
 configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig     |  1 +
 configs/BSC9131RDB_SPIFLASH_defconfig               |  1 +
 configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig  |  1 +
 configs/BSC9132QDS_NAND_DDRCLK100_defconfig         |  1 +
 configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig  |  1 +
 configs/BSC9132QDS_NAND_DDRCLK133_defconfig         |  1 +
 configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig   |  1 +
 configs/BSC9132QDS_NOR_DDRCLK100_defconfig          |  1 +
 configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig   |  1 +
 configs/BSC9132QDS_NOR_DDRCLK133_defconfig          |  1 +
 .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig    |  1 +
 configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig       |  1 +
 .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig    |  1 +
 configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig       |  1 +
 .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig  |  1 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig     |  1 +
 .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig  |  1 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig     |  1 +
 configs/Bananapi_defconfig                          |  8 ++++++++
 configs/Bananapro_defconfig                         |  8 ++++++++
 configs/C29XPCIE_NAND_defconfig                     |  1 +
 configs/C29XPCIE_NOR_SECBOOT_defconfig              |  1 +
 configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig         |  1 +
 configs/C29XPCIE_SPIFLASH_defconfig                 |  1 +
 configs/C29XPCIE_defconfig                          |  1 +
 configs/CPCI4052_defconfig                          |  2 +-
 configs/CSQ_CS908_defconfig                         |  8 ++++++++
 configs/Chuwi_V7_CW0825_defconfig                   |  6 ++++++
 configs/Colombus_defconfig                          |  8 ++++++++
 configs/Cubieboard2_defconfig                       |  8 ++++++++
 configs/Cubieboard_defconfig                        |  8 ++++++++
 configs/Cubietruck_defconfig                        |  8 ++++++++
 configs/Et_q8_v1_6_defconfig                        |  6 ++++++
 configs/Hummingbird_A31_defconfig                   |  8 ++++++++
 configs/Hyundai_A7HD_defconfig                      |  6 ++++++
 configs/Ippo_q8h_v1_2_a33_1024x600_defconfig        |  6 ++++++
 configs/Ippo_q8h_v1_2_defconfig                     |  6 ++++++
 configs/Ippo_q8h_v5_defconfig                       |  6 ++++++
 configs/Linksprite_pcDuino3_Nano_defconfig          |  8 ++++++++
 configs/Linksprite_pcDuino3_defconfig               |  8 ++++++++
 configs/Linksprite_pcDuino_defconfig                |  8 ++++++++
 configs/M52277EVB_defconfig                         |  1 +
 configs/M52277EVB_stmicro_defconfig                 |  1 +
 configs/M54418TWR_defconfig                         |  1 +
 configs/M54418TWR_nand_mii_defconfig                |  1 +
 configs/M54418TWR_nand_rmii_defconfig               |  1 +
 configs/M54418TWR_nand_rmii_lowfreq_defconfig       |  1 +
 configs/M54418TWR_serial_mii_defconfig              |  1 +
 configs/M54418TWR_serial_rmii_defconfig             |  1 +
 configs/M54451EVB_defconfig                         |  1 +
 configs/M54451EVB_stmicro_defconfig                 |  1 +
 configs/M54455EVB_a66_defconfig                     |  1 +
 configs/M54455EVB_defconfig                         |  1 +
 configs/M54455EVB_i66_defconfig                     |  1 +
 configs/M54455EVB_intel_defconfig                   |  1 +
 configs/M54455EVB_stm33_defconfig                   |  1 +
 configs/MK808C_defconfig                            |  8 ++++++++
 configs/MPC8536DS_36BIT_defconfig                   |  1 +
 configs/MPC8536DS_SDCARD_defconfig                  |  1 +
 configs/MPC8536DS_SPIFLASH_defconfig                |  1 +
 configs/MPC8536DS_defconfig                         |  1 +
 configs/MSI_Primo73_defconfig                       |  8 ++++++++
 configs/MSI_Primo81_defconfig                       | 16 ++++++++++++----
 configs/Marsboard_A10_defconfig                     |  8 ++++++++
 configs/Mele_A1000G_quad_defconfig                  | 18 ++++++++----------
 configs/Mele_A1000_defconfig                        |  8 ++++++++
 configs/Mele_I7_defconfig                           |  8 ++++++++
 configs/Mele_M3_defconfig                           |  8 ++++++++
 configs/Mele_M5_defconfig                           |  8 ++++++++
 configs/Mele_M9_defconfig                           | 18 ++++++++----------
 configs/Merrii_A80_Optimus_defconfig                | 17 ++++++++++++-----
 configs/MigoR_defconfig                             |  1 +
 configs/Mini-X_defconfig                            |  8 ++++++++
 configs/O2DNT2_RAMBOOT_defconfig                    |  2 +-
 configs/O2DNT2_defconfig                            |  2 +-
 configs/Orangepi_defconfig                          |  8 ++++++++
 configs/Orangepi_mini_defconfig                     |  8 ++++++++
 configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig    |  1 +
 configs/P1010RDB-PA_36BIT_NAND_defconfig            |  1 +
 configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig     |  1 +
 configs/P1010RDB-PA_36BIT_NOR_defconfig             |  1 +
 configs/P1010RDB-PA_36BIT_SDCARD_defconfig          |  1 +
 .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig    |  1 +
 configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig        |  1 +
 configs/P1010RDB-PA_NAND_SECBOOT_defconfig          |  1 +
 configs/P1010RDB-PA_NAND_defconfig                  |  1 +
 configs/P1010RDB-PA_NOR_SECBOOT_defconfig           |  1 +
 configs/P1010RDB-PA_NOR_defconfig                   |  1 +
 configs/P1010RDB-PA_SDCARD_defconfig                |  1 +
 configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig      |  1 +
 configs/P1010RDB-PA_SPIFLASH_defconfig              |  1 +
 configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig    |  1 +
 configs/P1010RDB-PB_36BIT_NAND_defconfig            |  1 +
 configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig     |  1 +
 configs/P1010RDB-PB_36BIT_NOR_defconfig             |  1 +
 configs/P1010RDB-PB_36BIT_SDCARD_defconfig          |  1 +
 .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig    |  1 +
 configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig        |  1 +
 configs/P1010RDB-PB_NAND_SECBOOT_defconfig          |  1 +
 configs/P1010RDB-PB_NAND_defconfig                  |  1 +
 configs/P1010RDB-PB_NOR_SECBOOT_defconfig           |  1 +
 configs/P1010RDB-PB_NOR_defconfig                   |  1 +
 configs/P1010RDB-PB_SDCARD_defconfig                |  1 +
 configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig      |  1 +
 configs/P1010RDB-PB_SPIFLASH_defconfig              |  1 +
 configs/P1020RDB-PC_36BIT_NAND_defconfig            |  1 +
 configs/P1020RDB-PC_36BIT_SDCARD_defconfig          |  1 +
 configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig        |  1 +
 configs/P1020RDB-PC_36BIT_defconfig                 |  1 +
 configs/P1020RDB-PC_NAND_defconfig                  |  1 +
 configs/P1020RDB-PC_SDCARD_defconfig                |  1 +
 configs/P1020RDB-PC_SPIFLASH_defconfig              |  1 +
 configs/P1020RDB-PC_defconfig                       |  1 +
 configs/P1020RDB-PD_NAND_defconfig                  |  1 +
 configs/P1020RDB-PD_SDCARD_defconfig                |  1 +
 configs/P1020RDB-PD_SPIFLASH_defconfig              |  1 +
 configs/P1020RDB-PD_defconfig                       |  1 +
 configs/P1021RDB-PC_36BIT_NAND_defconfig            |  1 +
 configs/P1021RDB-PC_36BIT_SDCARD_defconfig          |  1 +
 configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig        |  1 +
 configs/P1021RDB-PC_36BIT_defconfig                 |  1 +
 configs/P1021RDB-PC_NAND_defconfig                  |  1 +
 configs/P1021RDB-PC_SDCARD_defconfig                |  1 +
 configs/P1021RDB-PC_SPIFLASH_defconfig              |  1 +
 configs/P1021RDB-PC_defconfig                       |  1 +
 configs/P1022DS_36BIT_NAND_defconfig                |  1 +
 configs/P1022DS_36BIT_SDCARD_defconfig              |  1 +
 configs/P1022DS_36BIT_SPIFLASH_defconfig            |  1 +
 configs/P1022DS_36BIT_defconfig                     |  1 +
 configs/P1022DS_NAND_defconfig                      |  1 +
 configs/P1022DS_SDCARD_defconfig                    |  1 +
 configs/P1022DS_SPIFLASH_defconfig                  |  1 +
 configs/P1022DS_defconfig                           |  1 +
 configs/P1024RDB_36BIT_defconfig                    |  1 +
 configs/P1024RDB_NAND_defconfig                     |  1 +
 configs/P1024RDB_SDCARD_defconfig                   |  1 +
 configs/P1024RDB_SPIFLASH_defconfig                 |  1 +
 configs/P1024RDB_defconfig                          |  1 +
 configs/P1025RDB_36BIT_defconfig                    |  1 +
 configs/P1025RDB_NAND_defconfig                     |  1 +
 configs/P1025RDB_SDCARD_defconfig                   |  1 +
 configs/P1025RDB_SPIFLASH_defconfig                 |  1 +
 configs/P1025RDB_defconfig                          |  1 +
 configs/P2020RDB-PC_36BIT_NAND_defconfig            |  1 +
 configs/P2020RDB-PC_36BIT_SDCARD_defconfig          |  1 +
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig        |  1 +
 configs/P2020RDB-PC_36BIT_defconfig                 |  1 +
 configs/P2020RDB-PC_NAND_defconfig                  |  1 +
 configs/P2020RDB-PC_SDCARD_defconfig                |  1 +
 configs/P2020RDB-PC_SPIFLASH_defconfig              |  1 +
 configs/P2020RDB-PC_defconfig                       |  1 +
 configs/P2041RDB_NAND_defconfig                     |  1 +
 configs/P2041RDB_SDCARD_defconfig                   |  1 +
 configs/P2041RDB_SECURE_BOOT_defconfig              |  1 +
 configs/P2041RDB_SPIFLASH_defconfig                 |  1 +
 configs/P2041RDB_SRIO_PCIE_BOOT_defconfig           |  1 +
 configs/P2041RDB_defconfig                          |  1 +
 configs/P3041DS_NAND_defconfig                      |  1 +
 configs/P3041DS_SDCARD_defconfig                    |  1 +
 configs/P3041DS_SECURE_BOOT_defconfig               |  1 +
 configs/P3041DS_SPIFLASH_defconfig                  |  1 +
 configs/P3041DS_SRIO_PCIE_BOOT_defconfig            |  1 +
 configs/P3041DS_defconfig                           |  1 +
 configs/P4080DS_SDCARD_defconfig                    |  1 +
 configs/P4080DS_SECURE_BOOT_defconfig               |  1 +
 configs/P4080DS_SPIFLASH_defconfig                  |  1 +
 configs/P4080DS_SRIO_PCIE_BOOT_defconfig            |  1 +
 configs/P4080DS_defconfig                           |  1 +
 configs/P5020DS_NAND_defconfig                      |  1 +
 configs/P5020DS_SDCARD_defconfig                    |  1 +
 configs/P5020DS_SECURE_BOOT_defconfig               |  1 +
 configs/P5020DS_SPIFLASH_defconfig                  |  1 +
 configs/P5020DS_SRIO_PCIE_BOOT_defconfig            |  1 +
 configs/P5020DS_defconfig                           |  1 +
 configs/P5040DS_NAND_defconfig                      |  1 +
 configs/P5040DS_SDCARD_defconfig                    |  1 +
 configs/P5040DS_SECURE_BOOT_defconfig               |  1 +
 configs/P5040DS_SPIFLASH_defconfig                  |  1 +
 configs/P5040DS_defconfig                           |  1 +
 configs/PLU405_defconfig                            |  2 +-
 configs/PMC405DE_defconfig                          |  2 +-
 configs/PMC440_defconfig                            |  2 +-
 configs/T1023RDB_NAND_defconfig                     |  1 +
 configs/T1023RDB_SDCARD_defconfig                   |  1 +
 configs/T1023RDB_SECURE_BOOT_defconfig              |  1 +
 configs/T1023RDB_SPIFLASH_defconfig                 |  1 +
 configs/T1023RDB_defconfig                          |  1 +
 configs/T1024QDS_D4_SECURE_BOOT_defconfig           |  1 +
 configs/T1024QDS_NAND_defconfig                     |  1 +
 configs/T1024QDS_SDCARD_defconfig                   |  1 +
 configs/T1024QDS_SECURE_BOOT_defconfig              |  1 +
 configs/T1024QDS_SPIFLASH_defconfig                 |  1 +
 configs/T1024QDS_defconfig                          |  1 +
 configs/T1024RDB_NAND_defconfig                     |  1 +
 configs/T1024RDB_SDCARD_defconfig                   |  1 +
 configs/T1024RDB_SECURE_BOOT_defconfig              |  1 +
 configs/T1024RDB_SPIFLASH_defconfig                 |  1 +
 configs/T1024RDB_defconfig                          |  1 +
 configs/T1040QDS_D4_defconfig                       |  1 +
 configs/T1040QDS_SECURE_BOOT_defconfig              |  1 +
 configs/T1040QDS_defconfig                          |  1 +
 configs/T1040RDB_NAND_defconfig                     |  1 +
 configs/T1040RDB_SDCARD_defconfig                   |  1 +
 configs/T1040RDB_SECURE_BOOT_defconfig              |  1 +
 configs/T1040RDB_SPIFLASH_defconfig                 |  1 +
 configs/T1040RDB_defconfig                          |  1 +
 configs/T1042RDB_PI_NAND_defconfig                  |  1 +
 configs/T1042RDB_PI_SDCARD_defconfig                |  1 +
 configs/T1042RDB_PI_SPIFLASH_defconfig              |  1 +
 configs/T1042RDB_PI_defconfig                       |  1 +
 configs/T1042RDB_SECURE_BOOT_defconfig              |  1 +
 configs/T1042RDB_defconfig                          |  1 +
 configs/T2080QDS_NAND_defconfig                     |  1 +
 configs/T2080QDS_SDCARD_defconfig                   |  1 +
 configs/T2080QDS_SECURE_BOOT_defconfig              |  1 +
 configs/T2080QDS_SPIFLASH_defconfig                 |  1 +
 configs/T2080QDS_SRIO_PCIE_BOOT_defconfig           |  1 +
 configs/T2080QDS_defconfig                          |  1 +
 configs/T2080RDB_NAND_defconfig                     |  1 +
 configs/T2080RDB_SDCARD_defconfig                   |  1 +
 configs/T2080RDB_SECURE_BOOT_defconfig              |  1 +
 configs/T2080RDB_SPIFLASH_defconfig                 |  1 +
 configs/T2080RDB_SRIO_PCIE_BOOT_defconfig           |  1 +
 configs/T2080RDB_defconfig                          |  1 +
 configs/T2081QDS_NAND_defconfig                     |  1 +
 configs/T2081QDS_SDCARD_defconfig                   |  1 +
 configs/T2081QDS_SPIFLASH_defconfig                 |  1 +
 configs/T2081QDS_SRIO_PCIE_BOOT_defconfig           |  1 +
 configs/T2081QDS_defconfig                          |  1 +
 configs/T4160QDS_NAND_defconfig                     |  1 +
 configs/T4160QDS_SDCARD_defconfig                   |  1 +
 configs/T4160QDS_SECURE_BOOT_defconfig              |  1 +
 configs/T4160QDS_defconfig                          |  1 +
 configs/T4160RDB_defconfig                          |  1 +
 configs/T4240QDS_NAND_defconfig                     |  1 +
 configs/T4240QDS_SDCARD_defconfig                   |  1 +
 configs/T4240QDS_SECURE_BOOT_defconfig              |  1 +
 configs/T4240QDS_SRIO_PCIE_BOOT_defconfig           |  1 +
 configs/T4240QDS_defconfig                          |  1 +
 configs/T4240RDB_SDCARD_defconfig                   |  1 +
 configs/T4240RDB_defconfig                          |  1 +
 configs/TZX-Q8-713B7_defconfig                      |  6 ++++++
 configs/UCP1020_SPIFLASH_defconfig                  |  5 +++--
 configs/UCP1020_defconfig                           |  5 +++--
 configs/UTOO_P66_defconfig                          |  6 +++++-
 configs/Wexler_TAB7200_defconfig                    |  8 ++++++++
 configs/Wits_Pro_A20_DKT_defconfig                  |  8 ++++++++
 configs/Yones_Toptech_BD1078_defconfig              |  6 ++++++
 configs/a4m072_defconfig                            |  2 +-
 configs/alt_defconfig                               |  1 +
 configs/am335x_baltos_defconfig                     |  4 ++--
 configs/am335x_boneblack_defconfig                  |  1 +
 configs/am335x_boneblack_vboot_defconfig            |  3 ++-
 configs/am335x_evm_defconfig                        |  1 +
 configs/am335x_evm_nor_defconfig                    |  1 +
 configs/am335x_evm_norboot_defconfig                |  1 +
 configs/am335x_evm_spiboot_defconfig                |  1 +
 configs/am335x_evm_usbspl_defconfig                 |  1 +
 configs/am43xx_evm_defconfig                        |  1 +
 configs/am43xx_evm_qspiboot_defconfig               |  1 +
 configs/ap325rxa_defconfig                          |  1 +
 configs/ap_sh4a_4a_defconfig                        |  1 +
 configs/apalis_t30_defconfig                        |  4 ++++
 configs/arcangel4-be_defconfig                      |  3 ++-
 configs/arcangel4_defconfig                         |  3 ++-
 configs/aristainetos2_defconfig                     |  1 +
 configs/aristainetos_defconfig                      |  1 +
 configs/arndale_defconfig                           |  2 ++
 configs/at91sam9n12ek_mmc_defconfig                 |  1 +
 configs/at91sam9n12ek_nandflash_defconfig           |  1 +
 configs/at91sam9n12ek_spiflash_defconfig            |  1 +
 configs/at91sam9x5ek_dataflash_defconfig            |  1 +
 configs/at91sam9x5ek_mmc_defconfig                  |  1 +
 configs/at91sam9x5ek_nandflash_defconfig            |  1 +
 configs/at91sam9x5ek_spiflash_defconfig             |  1 +
 configs/atngw100_defconfig                          |  3 ++-
 configs/atngw100mkii_defconfig                      |  3 ++-
 configs/atstk1002_defconfig                         |  2 +-
 configs/axm_defconfig                               |  1 +
 configs/axs101_defconfig                            |  3 ++-
 configs/axs103_defconfig                            |  3 ++-
 configs/ba10_tv_box_defconfig                       |  8 ++++++++
 configs/beaver_defconfig                            |  5 +++++
 configs/bf518f-ezbrd_defconfig                      |  1 +
 configs/bf525-ucr2_defconfig                        |  1 +
 configs/bf526-ezbrd_defconfig                       |  1 +
 configs/bf527-ad7160-eval_defconfig                 |  1 +
 configs/bf527-ezkit-v2_defconfig                    |  1 +
 configs/bf527-ezkit_defconfig                       |  1 +
 configs/bf527-sdp_defconfig                         |  1 +
 configs/bf537-minotaur_defconfig                    |  1 +
 configs/bf537-pnav_defconfig                        |  1 +
 configs/bf537-srv1_defconfig                        |  1 +
 configs/bf537-stamp_defconfig                       |  1 +
 configs/bf548-ezkit_defconfig                       |  1 +
 configs/bf561-acvilon_defconfig                     |  1 +
 configs/bf609-ezkit_defconfig                       |  3 ++-
 configs/bg0900_defconfig                            |  1 +
 configs/birdland_bav335a_defconfig                  |  1 +
 configs/birdland_bav335b_defconfig                  |  1 +
 configs/blackstamp_defconfig                        |  1 +
 configs/blackvme_defconfig                          |  1 +
 configs/br4_defconfig                               |  1 +
 configs/calimain_defconfig                          |  2 +-
 configs/cam_enc_4xx_defconfig                       |  1 +
 configs/cardhu_defconfig                            |  5 +++++
 configs/chromebook_link_defconfig                   | 10 ++++++++--
 configs/chromebox_panther_defconfig                 | 10 ++++++++--
 configs/cm_fx6_defconfig                            |  1 +
 configs/colibri_t20_defconfig                       |  4 ++++
 configs/colibri_t30_defconfig                       |  4 ++++
 configs/colibri_vf_defconfig                        |  2 +-
 configs/colibri_vf_dtb_defconfig                    |  6 +++---
 .../controlcenterd_36BIT_SDCARD_DEVELOP_defconfig   |  1 +
 configs/controlcenterd_36BIT_SDCARD_defconfig       |  1 +
 configs/coreboot-x86_defconfig                      |  8 +++++++-
 configs/cpuat91_defconfig                           |  2 +-
 configs/cpuat91_ram_defconfig                       |  2 +-
 configs/crownbay_defconfig                          |  6 ++++++
 configs/d2net_v2_defconfig                          |  1 +
 configs/da830evm_defconfig                          |  1 +
 configs/da850_am18xxevm_defconfig                   |  1 +
 configs/da850evm_defconfig                          |  1 +
 configs/da850evm_direct_nor_defconfig               |  1 +
 configs/dalmore_defconfig                           |  5 +++++
 configs/db-88f6820-gp_defconfig                     |  1 +
 configs/db-mv784mp-gp_defconfig                     |  1 +
 configs/dbau1000_defconfig                          |  1 +
 configs/dbau1100_defconfig                          |  1 +
 configs/dbau1500_defconfig                          |  1 +
 configs/dbau1550_defconfig                          |  1 +
 configs/dbau1550_el_defconfig                       |  1 +
 configs/digsy_mtc_RAMBOOT_defconfig                 |  2 +-
 configs/digsy_mtc_defconfig                         |  2 +-
 configs/digsy_mtc_rev5_RAMBOOT_defconfig            |  2 +-
 configs/digsy_mtc_rev5_defconfig                    |  2 +-
 configs/dlvision-10g_defconfig                      |  4 ++--
 configs/dra7xx_evm_defconfig                        |  1 +
 configs/dra7xx_evm_qspiboot_defconfig               |  1 +
 configs/dra7xx_evm_uart3_defconfig                  |  1 +
 configs/draco_defconfig                             |  3 ++-
 configs/dreamplug_defconfig                         |  1 +
 configs/ea20_defconfig                              |  1 +
 configs/ecovec_defconfig                            |  1 +
 configs/espt_defconfig                              |  1 +
 configs/ethernut5_defconfig                         |  1 +
 configs/forfun_q88db_defconfig                      |  6 ++++++
 configs/ga10h_v1_1_defconfig                        |  6 ++++++
 configs/galileo_defconfig                           | 10 ++++++++--
 configs/gdppc440etx_defconfig                       |  4 ++--
 configs/gose_defconfig                              |  1 +
 configs/gplugd_defconfig                            |  1 +
 configs/grasshopper_defconfig                       |  2 +-
 configs/gwventana_defconfig                         |  3 ++-
 configs/harmony_defconfig                           |  4 ++++
 configs/highbank_defconfig                          |  2 +-
 configs/hrcon_defconfig                             |  2 +-
 configs/i12-tvbox_defconfig                         |  8 ++++++++
 configs/iNet_3F_defconfig                           |  6 ++++++
 configs/iNet_3W_defconfig                           |  6 ++++++
 configs/iNet_86VS_defconfig                         |  6 ++++++
 configs/ids8313_defconfig                           |  2 +-
 configs/ima3-mx53_defconfig                         |  1 +
 configs/inetspace_v2_defconfig                      |  1 +
 configs/intip_defconfig                             |  4 ++--
 configs/io64_defconfig                              |  4 ++--
 configs/io_defconfig                                |  4 ++--
 configs/iocon_defconfig                             |  4 ++--
 configs/ip04_defconfig                              |  1 +
 configs/jesurun_q5_defconfig                        |  8 ++++++++
 configs/jetson-tk1_defconfig                        |  5 +++++
 configs/k2e_evm_defconfig                           |  1 +
 configs/k2hk_evm_defconfig                          |  1 +
 configs/k2l_evm_defconfig                           |  1 +
 configs/km_kirkwood_128m16_defconfig                |  1 +
 configs/km_kirkwood_defconfig                       |  1 +
 configs/km_kirkwood_pci_defconfig                   |  1 +
 configs/kmcoge4_defconfig                           |  1 +
 configs/kmcoge5un_defconfig                         |  1 +
 configs/kmlion1_defconfig                           |  1 +
 configs/kmnusa_defconfig                            |  1 +
 configs/kmsugp1_defconfig                           |  1 +
 configs/kmsuv31_defconfig                           |  1 +
 configs/koelsch_defconfig                           |  1 +
 configs/lager_defconfig                             |  1 +
 configs/ls1021aqds_qspi_defconfig                   |  1 +
 configs/ls1021atwr_qspi_defconfig                   |  1 +
 configs/lschlv2_defconfig                           |  1 +
 configs/lsxhl_defconfig                             |  1 +
 configs/m28evk_defconfig                            |  1 +
 configs/malta_defconfig                             |  1 +
 configs/maltael_defconfig                           |  1 +
 configs/marsboard_defconfig                         |  1 +
 configs/maxbcm_defconfig                            |  1 +
 configs/medcom-wide_defconfig                       |  4 ++++
 configs/mgcoge3un_defconfig                         |  1 +
 configs/minnowmax_defconfig                         | 12 +++++++++---
 configs/mixtile_loftq_defconfig                     |  8 ++++++++
 configs/mk802_a10s_defconfig                        |  8 ++++++++
 configs/mk802_defconfig                             |  8 ++++++++
 configs/mk802ii_defconfig                           |  8 ++++++++
 configs/motionpro_defconfig                         |  2 +-
 configs/mpr2_defconfig                              |  1 +
 configs/ms7720se_defconfig                          |  1 +
 configs/ms7722se_defconfig                          |  1 +
 configs/ms7750se_defconfig                          |  1 +
 configs/mv88f6281gtw_ge_defconfig                   |  1 +
 configs/mx28evk_auart_console_defconfig             |  1 +
 configs/mx28evk_defconfig                           |  1 +
 configs/mx28evk_nand_defconfig                      |  1 +
 configs/mx28evk_spi_defconfig                       |  1 +
 configs/mx51_efikamx_defconfig                      |  1 +
 configs/mx51_efikasb_defconfig                      |  1 +
 configs/mx6dlsabreauto_defconfig                    |  1 +
 configs/mx6dlsabresd_defconfig                      |  1 +
 configs/mx6qsabreauto_defconfig                     |  1 +
 configs/mx6qsabrelite_defconfig                     |  1 +
 configs/mx6qsabresd_defconfig                       |  1 +
 configs/mx6sabresd_spl_defconfig                    |  1 +
 configs/mx6slevk_defconfig                          |  1 +
 configs/mx6slevk_spinor_defconfig                   |  1 +
 configs/mx6sxsabresd_defconfig                      |  1 +
 configs/mx6sxsabresd_spl_defconfig                  |  1 +
 configs/net2big_v2_defconfig                        |  1 +
 configs/netspace_lite_v2_defconfig                  |  1 +
 configs/netspace_max_v2_defconfig                   |  1 +
 configs/netspace_mini_v2_defconfig                  |  1 +
 configs/netspace_v2_defconfig                       |  1 +
 configs/nitrogen6dl2g_defconfig                     |  1 +
 configs/nitrogen6dl_defconfig                       |  1 +
 configs/nitrogen6q2g_defconfig                      |  1 +
 configs/nitrogen6q_defconfig                        |  1 +
 configs/nitrogen6s1g_defconfig                      |  1 +
 configs/nitrogen6s_defconfig                        |  1 +
 configs/nyan-big_defconfig                          | 12 ++++++++----
 configs/odroid-xu3_defconfig                        |  4 +++-
 configs/odroid_defconfig                            |  6 ++++--
 configs/omap3_mvblx_defconfig                       |  2 +-
 configs/omapl138_lcdk_defconfig                     |  1 +
 configs/origen_defconfig                            |  4 +++-
 configs/ot1200_defconfig                            |  1 +
 configs/ot1200_spl_defconfig                        |  1 +
 configs/paz00_defconfig                             |  4 ++++
 configs/pb1000_defconfig                            |  1 +
 configs/pcm051_rev1_defconfig                       |  1 +
 configs/pcm051_rev3_defconfig                       |  1 +
 configs/peach-pi_defconfig                          |  3 +++
 configs/peach-pit_defconfig                         |  3 +++
 configs/ph1_ld4_defconfig                           |  3 +--
 configs/ph1_pro4_defconfig                          |  3 +--
 configs/ph1_sld8_defconfig                          |  3 +--
 configs/plutux_defconfig                            |  4 ++++
 configs/porter_defconfig                            |  1 +
 configs/portl2_defconfig                            |  1 +
 configs/pr1_defconfig                               |  1 +
 configs/pxm2_defconfig                              |  3 ++-
 configs/qemu-x86_defconfig                          |  8 ++++++--
 configs/qemu_mips64_defconfig                       |  1 +
 configs/qemu_mips64el_defconfig                     |  1 +
 configs/qemu_mips_defconfig                         |  1 +
 configs/qemu_mipsel_defconfig                       |  1 +
 configs/r0p7734_defconfig                           |  1 +
 configs/r2dplus_defconfig                           |  1 +
 configs/r7-tv-dongle_defconfig                      |  8 ++++++++
 configs/r7780mp_defconfig                           |  1 +
 configs/riotboard_defconfig                         |  1 +
 configs/rpi_2_defconfig                             |  1 +
 configs/rpi_defconfig                               |  1 +
 configs/rsk7203_defconfig                           |  1 +
 configs/rsk7264_defconfig                           |  1 +
 configs/rsk7269_defconfig                           |  1 +
 configs/rut_defconfig                               |  3 ++-
 configs/s5pc210_universal_defconfig                 |  4 +++-
 configs/sama5d3xek_mmc_defconfig                    |  1 +
 configs/sama5d3xek_nandflash_defconfig              |  1 +
 configs/sama5d3xek_spiflash_defconfig               |  1 +
 configs/sama5d4_xplained_mmc_defconfig              |  1 +
 configs/sama5d4_xplained_nandflash_defconfig        |  1 +
 configs/sama5d4_xplained_spiflash_defconfig         |  1 +
 configs/sama5d4ek_mmc_defconfig                     |  1 +
 configs/sama5d4ek_nandflash_defconfig               |  1 +
 configs/sama5d4ek_spiflash_defconfig                |  1 +
 configs/sandbox_defconfig                           | 15 ++++++++-------
 configs/seaboard_defconfig                          |  4 ++++
 configs/sh7752evb_defconfig                         |  2 ++
 configs/sh7753evb_defconfig                         |  2 ++
 configs/sh7757lcr_defconfig                         |  2 ++
 configs/sh7763rdp_defconfig                         |  1 +
 configs/sh7785lcr_32bit_defconfig                   |  1 +
 configs/sh7785lcr_defconfig                         |  1 +
 configs/shmin_defconfig                             |  1 +
 configs/silk_defconfig                              |  1 +
 configs/smdk5250_defconfig                          |  3 +++
 configs/smdk5420_defconfig                          |  3 +++
 configs/smdkv310_defconfig                          |  2 ++
 configs/snow_defconfig                              |  3 +++
 configs/socfpga_arria5_defconfig                    |  1 +
 configs/socfpga_cyclone5_defconfig                  |  3 ++-
 configs/socfpga_socrates_defconfig                  |  5 +++--
 configs/spear300_defconfig                          |  2 +-
 configs/spear300_nand_defconfig                     |  2 +-
 configs/spear300_usbtty_defconfig                   |  2 +-
 configs/spear300_usbtty_nand_defconfig              |  2 +-
 configs/spear310_defconfig                          |  2 +-
 configs/spear310_nand_defconfig                     |  2 +-
 configs/spear310_pnor_defconfig                     |  2 +-
 configs/spear310_usbtty_defconfig                   |  2 +-
 configs/spear310_usbtty_nand_defconfig              |  2 +-
 configs/spear310_usbtty_pnor_defconfig              |  2 +-
 configs/spear320_defconfig                          |  2 +-
 configs/spear320_nand_defconfig                     |  2 +-
 configs/spear320_pnor_defconfig                     |  2 +-
 configs/spear320_usbtty_defconfig                   |  2 +-
 configs/spear320_usbtty_nand_defconfig              |  2 +-
 configs/spear320_usbtty_pnor_defconfig              |  2 +-
 configs/spear600_defconfig                          |  4 ++--
 configs/spear600_nand_defconfig                     |  2 +-
 configs/spear600_usbtty_defconfig                   |  2 +-
 configs/spear600_usbtty_nand_defconfig              |  2 +-
 configs/stv0991_defconfig                           |  4 ++--
 configs/sunxi_Gemei_G9_defconfig                    |  8 ++++++++
 configs/taurus_defconfig                            |  1 +
 configs/tb100_defconfig                             |  5 +++--
 configs/tec-ng_defconfig                            |  5 +++++
 configs/tec_defconfig                               |  4 ++++
 configs/thuban_defconfig                            |  3 ++-
 configs/tqma6q_mba6_mmc_defconfig                   |  1 +
 configs/tqma6q_mba6_spi_defconfig                   |  1 +
 configs/tqma6s_mba6_mmc_defconfig                   |  1 +
 configs/tqma6s_mba6_spi_defconfig                   |  1 +
 configs/trats2_defconfig                            |  6 ++++--
 configs/trats_defconfig                             |  4 +++-
 configs/trimslice_defconfig                         |  5 +++++
 configs/tseries_spi_defconfig                       |  1 +
 configs/vct_platinum_defconfig                      |  1 +
 configs/vct_platinum_onenand_defconfig              |  1 +
 configs/vct_platinum_onenand_small_defconfig        |  1 +
 configs/vct_platinum_small_defconfig                |  1 +
 configs/vct_platinumavc_defconfig                   |  1 +
 configs/vct_platinumavc_onenand_defconfig           |  1 +
 configs/vct_platinumavc_onenand_small_defconfig     |  1 +
 configs/vct_platinumavc_small_defconfig             |  1 +
 configs/vct_premium_defconfig                       |  1 +
 configs/vct_premium_onenand_defconfig               |  1 +
 configs/vct_premium_onenand_small_defconfig         |  1 +
 configs/vct_premium_small_defconfig                 |  1 +
 configs/venice2_defconfig                           |  5 +++++
 configs/ventana_defconfig                           |  4 ++++
 configs/vexpress_aemv8a_juno_defconfig              |  3 +++
 configs/vexpress_aemv8a_semi_defconfig              |  3 +++
 configs/vf610twr_defconfig                          |  1 +
 configs/vf610twr_nand_defconfig                     |  1 +
 configs/vision2_defconfig                           |  1 +
 configs/whistler_defconfig                          |  4 ++++
 configs/x600_defconfig                              |  4 ++--
 configs/zmx25_defconfig                             |  2 +-
 configs/zynq_microzed_defconfig                     |  2 +-
 configs/zynq_zc70x_defconfig                        |  2 +-
 configs/zynq_zc770_xm010_defconfig                  |  3 ++-
 configs/zynq_zc770_xm012_defconfig                  |  2 +-
 configs/zynq_zc770_xm013_defconfig                  |  2 +-
 configs/zynq_zed_defconfig                          |  2 +-
 configs/zynq_zybo_defconfig                         |  2 +-
 drivers/Kconfig                                     |  2 +-
 include/configs/B4860QDS.h                          |  1 -
 include/configs/BSC9131RDB.h                        |  1 -
 include/configs/BSC9132QDS.h                        |  1 -
 include/configs/C29XPCIE.h                          |  1 -
 include/configs/M52277EVB.h                         |  1 -
 include/configs/M54418TWR.h                         |  1 -
 include/configs/M54451EVB.h                         |  1 -
 include/configs/M54455EVB.h                         |  1 -
 include/configs/MPC8308RDB.h                        |  1 -
 include/configs/MPC8536DS.h                         |  1 -
 include/configs/P1010RDB.h                          |  1 -
 include/configs/P1022DS.h                           |  1 -
 include/configs/P2041RDB.h                          |  1 -
 include/configs/T102xQDS.h                          |  1 -
 include/configs/T102xRDB.h                          |  1 -
 include/configs/T1040QDS.h                          |  1 -
 include/configs/T104xRDB.h                          |  1 -
 include/configs/T208xQDS.h                          |  1 -
 include/configs/T208xRDB.h                          |  1 -
 include/configs/T4240QDS.h                          |  1 -
 include/configs/T4240RDB.h                          |  1 -
 include/configs/UCP1020.h                           |  2 --
 include/configs/alt.h                               |  1 -
 include/configs/am335x_evm.h                        |  1 -
 include/configs/am43xx_evm.h                        |  1 -
 include/configs/aristainetos-common.h               |  1 -
 include/configs/at91sam9n12ek.h                     |  1 -
 include/configs/at91sam9x5ek.h                      |  1 -
 include/configs/atngw100.h                          |  1 -
 include/configs/atngw100mkii.h                      |  1 -
 include/configs/bav335x.h                           |  1 -
 include/configs/beaver.h                            |  1 -
 include/configs/bf506f-ezkit.h                      |  1 -
 include/configs/bf518f-ezbrd.h                      |  1 -
 include/configs/bf525-ucr2.h                        |  1 -
 include/configs/bf526-ezbrd.h                       |  1 -
 include/configs/bf527-ad7160-eval.h                 |  1 -
 include/configs/bf527-ezkit.h                       |  1 -
 include/configs/bf527-sdp.h                         |  1 -
 include/configs/bf533-stamp.h                       |  1 -
 include/configs/bf537-minotaur.h                    |  1 -
 include/configs/bf537-pnav.h                        |  1 -
 include/configs/bf537-srv1.h                        |  1 -
 include/configs/bf537-stamp.h                       |  1 -
 include/configs/bf538f-ezkit.h                      |  1 -
 include/configs/bf548-ezkit.h                       |  1 -
 include/configs/bf561-acvilon.h                     |  1 -
 include/configs/bf609-ezkit.h                       |  1 -
 include/configs/bg0900.h                            |  1 -
 include/configs/blackstamp.h                        |  1 -
 include/configs/blackvme.h                          |  1 -
 include/configs/br4.h                               |  1 -
 include/configs/cam_enc_4xx.h                       |  1 -
 include/configs/cardhu.h                            |  1 -
 include/configs/cm_fx6.h                            |  1 -
 include/configs/controlcenterd.h                    |  1 -
 include/configs/corenet_ds.h                        |  1 -
 include/configs/da830evm.h                          |  1 -
 include/configs/da850evm.h                          |  1 -
 include/configs/dalmore.h                           |  1 -
 include/configs/dra7xx_evm.h                        |  1 -
 include/configs/dreamplug.h                         |  1 -
 include/configs/ea20.h                              |  1 -
 include/configs/embestmx6boards.h                   |  1 -
 include/configs/ethernut5.h                         |  1 -
 include/configs/gose.h                              |  1 -
 include/configs/gw_ventana.h                        |  3 ---
 include/configs/ima3-mx53.h                         |  1 -
 include/configs/ip04.h                              |  1 -
 include/configs/jetson-tk1.h                        |  1 -
 include/configs/km/km_arm.h                         |  1 -
 include/configs/km/kmp204x-common.h                 |  1 -
 include/configs/koelsch.h                           |  1 -
 include/configs/ks2_evm.h                           |  1 -
 include/configs/lager.h                             |  1 -
 include/configs/ls1021aqds.h                        |  1 -
 include/configs/ls1021atwr.h                        |  1 -
 include/configs/m28evk.h                            |  1 -
 include/configs/microblaze-generic.h                |  1 -
 include/configs/mv-common.h                         |  1 -
 include/configs/mx28evk.h                           |  1 -
 include/configs/mx51_efikamx.h                      |  1 -
 include/configs/mx6sabre_common.h                   |  1 -
 include/configs/mx6slevk.h                          |  1 -
 include/configs/mx6sxsabresd.h                      |  1 -
 include/configs/nitrogen6x.h                        |  1 -
 include/configs/nyan-big.h                          |  1 -
 include/configs/omapl138_lcdk.h                     |  1 -
 include/configs/ot1200.h                            |  1 -
 include/configs/p1_p2_rdb_pc.h                      |  6 ------
 include/configs/pcm051.h                            |  1 -
 include/configs/peach-pi.h                          |  1 -
 include/configs/peach-pit.h                         |  1 -
 include/configs/porter.h                            |  1 -
 include/configs/pr1.h                               |  1 -
 include/configs/sama5d3xek.h                        |  1 -
 include/configs/sama5d4_xplained.h                  |  1 -
 include/configs/sama5d4ek.h                         |  1 -
 include/configs/sandbox.h                           |  1 -
 include/configs/sh7752evb.h                         |  1 -
 include/configs/sh7753evb.h                         |  1 -
 include/configs/sh7757lcr.h                         |  1 -
 include/configs/siemens-am33x-common.h              |  1 -
 include/configs/silk.h                              |  1 -
 include/configs/smdk5250.h                          |  1 -
 include/configs/smdk5420.h                          |  1 -
 include/configs/snow.h                              |  1 -
 include/configs/socfpga_common.h                    |  2 --
 include/configs/taurus.h                            |  1 -
 include/configs/tec-ng.h                            |  1 -
 include/configs/tqma6.h                             |  1 -
 include/configs/trimslice.h                         |  1 -
 include/configs/tseries.h                           |  1 -
 include/configs/venice2.h                           |  1 -
 include/configs/vexpress_aemv8a.h                   |  3 ---
 include/configs/vf610twr.h                          |  1 -
 include/configs/vision2.h                           |  1 -
 include/configs/x86-common.h                        |  1 -
 include/configs/xilinx_zynqmp.h                     |  1 -
 include/configs/zynq-common.h                       |  1 -
 713 files changed, 1167 insertions(+), 364 deletions(-)

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 67d28d3..925e312 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -4,9 +4,6 @@ menu "ARC architecture"
 config SYS_ARCH
 	default "arc"
 
-config USE_PRIVATE_LIBGCC
-	default y
-
 config SYS_CPU
 	default "arcv1" if ISA_ARCOMPACT
 	default "arcv2" if ISA_ARCV2
diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig
index 3ca7128..4a7d82f 100644
--- a/arch/arm/cpu/armv7/exynos/Kconfig
+++ b/arch/arm/cpu/armv7/exynos/Kconfig
@@ -74,9 +74,6 @@ endchoice
 config SYS_SOC
 	default "exynos"
 
-config DM_USB
-	default y
-
 source "board/samsung/smdkv310/Kconfig"
 source "board/samsung/trats/Kconfig"
 source "board/samsung/universal_c210/Kconfig"
diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig
index 99779df..2315a13 100644
--- a/arch/arm/mach-bcm283x/Kconfig
+++ b/arch/arm/mach-bcm283x/Kconfig
@@ -15,9 +15,6 @@ config TARGET_RPI_2
 
 endchoice
 
-config PHYS_TO_BUS
-	default y
-
 config SYS_BOARD
 	default "rpi" if TARGET_RPI
 	default "rpi_2" if TARGET_RPI_2
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index f5b5ee9..54bd648 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -21,18 +21,6 @@ endchoice
 config SYS_MALLOC_F_LEN
 	default 0x1800
 
-config USE_PRIVATE_LIBGCC
-	default y
-
-config DM_USB
-	default y
-
-config SPL_DM
-	default y
-
-config SPL_DISABLE_OF_CONTROL
-	default y
-
 source "arch/arm/mach-tegra/tegra20/Kconfig"
 source "arch/arm/mach-tegra/tegra30/Kconfig"
 source "arch/arm/mach-tegra/tegra114/Kconfig"
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index feb2f68..7f7e258 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -8,9 +8,6 @@ config SYS_CPU
 	default "mips32" if CPU_MIPS32_R1 || CPU_MIPS32_R2
 	default "mips64" if CPU_MIPS64_R1 || CPU_MIPS64_R2
 
-config USE_PRIVATE_LIBGCC
-	default y
-
 choice
 	prompt "Target select"
 	optional
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 2f7a2fe..6ac22af 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -125,9 +125,6 @@ config SYS_CPU
 	default "sh3" if CPU_SH3
 	default "sh4" if CPU_SH4
 
-config USE_PRIVATE_LIBGCC
-	default y
-
 source "board/alphaproject/ap_sh4a_4a/Kconfig"
 source "board/espt/Kconfig"
 source "board/mpr2/Kconfig"
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 3506ba2..20083e6 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -4,12 +4,6 @@ menu "x86 architecture"
 config SYS_ARCH
 	default "x86"
 
-config USE_PRIVATE_LIBGCC
-	default y
-
-config SYS_VSNPRINTF
-	default y
-
 choice
 	prompt "Mainboard vendor"
 	default VENDOR_EMULATION
@@ -335,13 +329,4 @@ config PCIE_ECAM_BASE
 	  assigned to PCI devices - i.e. the memory and prefetch regions, as
 	  passed to pci_set_region().
 
-config BOOTSTAGE
-	default y
-
-config BOOTSTAGE_REPORT
-	default y
-
-config CMD_BOOTSTAGE
-	default y
-
 endmenu
diff --git a/board/Arcturus/ucp1020/Kconfig b/board/Arcturus/ucp1020/Kconfig
index feca03a..fe2c3be 100644
--- a/board/Arcturus/ucp1020/Kconfig
+++ b/board/Arcturus/ucp1020/Kconfig
@@ -12,14 +12,6 @@ config SYS_CONFIG_NAME
 	string
 	default "UCP1020"
 
-config SPI_FLASH
-	bool
-	default y
-
-config SPI_PCI
-	bool
-	default y
-
 choice
 	prompt "Target image select"
 
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index b2eca51..aa44f50 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -566,25 +566,4 @@ config GMAC_TX_DELAY
 	---help---
 	Set the GMAC Transmit Clock Delay Chain value.
 
-config SYS_MALLOC_CLEAR_ON_INIT
-	default n
-
-config NETDEVICES
-	default y
-
-config DM_ETH
-	default y
-
-config DM_SERIAL
-	default y
-
-config DM_USB
-	default y if !USB_MUSB_SUNXI
-
-config CMD_SETEXPR
-	default y
-
-config CMD_NET
-	default y
-
 endif
diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
index 971e11a..572adb8 100644
--- a/configs/A10-OLinuXino-Lime_defconfig
+++ b/configs/A10-OLinuXino-Lime_defconfig
@@ -5,5 +5,13 @@ CONFIG_DRAM_CLK=480
 CONFIG_DRAM_EMR1=4
 CONFIG_SYS_CLK_FREQ=912000000
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig
index d4953aa..a24826b 100644
--- a/configs/A10s-OLinuXino-M_defconfig
+++ b/configs/A10s-OLinuXino-M_defconfig
@@ -7,5 +7,13 @@ CONFIG_MMC1_CD_PIN="PG13"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=1
 CONFIG_USB1_VBUS_PIN="PB10"
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-olinuxino-micro"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,SUNXI_EMAC,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
index 4bee362..085bd38 100644
--- a/configs/A13-OLinuXinoM_defconfig
+++ b/configs/A13-OLinuXinoM_defconfig
@@ -11,5 +11,13 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:16,ri:209,up:22,lo
 CONFIG_VIDEO_LCD_POWER="PB10"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino-micro"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index 43d5fa1..4535ce4 100644
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -12,5 +12,13 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:16,ri:209,up:22,lo
 CONFIG_VIDEO_LCD_POWER="AXP0-0"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
index 78eee6a..7c4e005 100644
--- a/configs/A20-OLinuXino-Lime2_defconfig
+++ b/configs/A20-OLinuXino-Lime2_defconfig
@@ -6,6 +6,14 @@ 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_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
index 0b64d94..c875130 100644
--- a/configs/A20-OLinuXino-Lime_defconfig
+++ b/configs/A20-OLinuXino-Lime_defconfig
@@ -3,6 +3,14 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=480
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
index e61067d..315c7f6 100644
--- a/configs/A20-OLinuXino_MICRO_defconfig
+++ b/configs/A20-OLinuXino_MICRO_defconfig
@@ -7,6 +7,14 @@ 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_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig
index 94c5443..1f7f891 100644
--- a/configs/Ainol_AW1_defconfig
+++ b/configs/Ainol_AW1_defconfig
@@ -13,5 +13,11 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-ainol-aw1"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
diff --git a/configs/Ampe_A76_defconfig b/configs/Ampe_A76_defconfig
index 63307b8..f20cad8 100644
--- a/configs/Ampe_A76_defconfig
+++ b/configs/Ampe_A76_defconfig
@@ -12,5 +12,11 @@ CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-ampe-a76"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig
index 6e320bd..7203e01 100644
--- a/configs/Auxtek-T004_defconfig
+++ b/configs/Auxtek-T004_defconfig
@@ -4,5 +4,13 @@ CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=432
 CONFIG_USB1_VBUS_PIN="PG13"
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-auxtek-t004"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/B4420QDS_NAND_defconfig b/configs/B4420QDS_NAND_defconfig
index 5353acf..4f53a9e 100644
--- a/configs/B4420QDS_NAND_defconfig
+++ b/configs/B4420QDS_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/B4420QDS_SPIFLASH_defconfig b/configs/B4420QDS_SPIFLASH_defconfig
index 557c600..04d5ce3 100644
--- a/configs/B4420QDS_SPIFLASH_defconfig
+++ b/configs/B4420QDS_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/B4420QDS_defconfig b/configs/B4420QDS_defconfig
index cc11e03..d4b95c5 100644
--- a/configs/B4420QDS_defconfig
+++ b/configs/B4420QDS_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/B4860QDS_NAND_defconfig b/configs/B4860QDS_NAND_defconfig
index 6ae1a2e..af5e938 100644
--- a/configs/B4860QDS_NAND_defconfig
+++ b/configs/B4860QDS_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/B4860QDS_SECURE_BOOT_defconfig b/configs/B4860QDS_SECURE_BOOT_defconfig
index 5c276c3..f464d18 100644
--- a/configs/B4860QDS_SECURE_BOOT_defconfig
+++ b/configs/B4860QDS_SECURE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/B4860QDS_SPIFLASH_defconfig b/configs/B4860QDS_SPIFLASH_defconfig
index ea8101d..28157a3 100644
--- a/configs/B4860QDS_SPIFLASH_defconfig
+++ b/configs/B4860QDS_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig b/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
index 3390943..e56d265 100644
--- a/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/B4860QDS_defconfig b/configs/B4860QDS_defconfig
index 50f4948..a4c2eb6 100644
--- a/configs/B4860QDS_defconfig
+++ b/configs/B4860QDS_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
index 4ebe4a4..36b9a1f 100644
--- a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
+++ b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND,SYS_CLK_100"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9131RDB_NAND_defconfig b/configs/BSC9131RDB_NAND_defconfig
index 7360bd0..8fdc41d 100644
--- a/configs/BSC9131RDB_NAND_defconfig
+++ b/configs/BSC9131RDB_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
index b64d172..abdf794 100644
--- a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
+++ b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9131RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,SPIFLASH,SYS_CLK_100"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9131RDB_SPIFLASH_defconfig b/configs/BSC9131RDB_SPIFLASH_defconfig
index 5f4028b..8cfe843 100644
--- a/configs/BSC9131RDB_SPIFLASH_defconfig
+++ b/configs/BSC9131RDB_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9131RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
index 44a7161..d6e3fbe 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND_SECBOOT,SYS_CLK_100_DDR_100,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
index 439369f..5c5b412 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_100"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
index fcae999..3e82751 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND_SECBOOT,SYS_CLK_100_DDR_133,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
index de0f545..e57d006 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_133"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
index 68d1c41..79e3946 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_100,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
index b7052e5..2e4b37d 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_100"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
index 44ba152..bb45b73 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_133,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
index 1298b7f..48a9849 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_133"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
index 8a2c495..71f7d69 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_100,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
index 1fceceb..3a424d7 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_100"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
index f1a1ead..d1668f1 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
index d1d8381..63d59d1 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
index 2262a6c..e98df30 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
index a755f4c..28ded86 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
index 3607060..89a940a 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_133,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
index 22ed151..449ca4f 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_133"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
index 904d27d..4b6bc20 100644
--- a/configs/Bananapi_defconfig
+++ b/configs/Bananapi_defconfig
@@ -4,6 +4,14 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=432
 CONFIG_GMAC_TX_DELAY=3
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig
index 7b7556b..8833d1b 100644
--- a/configs/Bananapro_defconfig
+++ b/configs/Bananapro_defconfig
@@ -6,6 +6,14 @@ CONFIG_USB1_VBUS_PIN="PH0"
 CONFIG_USB2_VBUS_PIN="PH1"
 CONFIG_GMAC_TX_DELAY=3
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapro"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/C29XPCIE_NAND_defconfig b/configs/C29XPCIE_NAND_defconfig
index c788f60..5a993b7 100644
--- a/configs/C29XPCIE_NAND_defconfig
+++ b/configs/C29XPCIE_NAND_defconfig
@@ -6,3 +6,4 @@ CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/C29XPCIE_NOR_SECBOOT_defconfig b/configs/C29XPCIE_NOR_SECBOOT_defconfig
index 21a8947..eb43932 100644
--- a/configs/C29XPCIE_NOR_SECBOOT_defconfig
+++ b/configs/C29XPCIE_NOR_SECBOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_C29XPCIE=y
 CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
index cabe2af..20ea17e 100644
--- a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
+++ b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_C29XPCIE=y
 CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SPIFLASH,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/C29XPCIE_SPIFLASH_defconfig b/configs/C29XPCIE_SPIFLASH_defconfig
index baa97a0..ea7b9b0 100644
--- a/configs/C29XPCIE_SPIFLASH_defconfig
+++ b/configs/C29XPCIE_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_C29XPCIE=y
 CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/C29XPCIE_defconfig b/configs/C29XPCIE_defconfig
index 9fada48..7894a47 100644
--- a/configs/C29XPCIE_defconfig
+++ b/configs/C29XPCIE_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_C29XPCIE=y
 CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/CPCI4052_defconfig b/configs/CPCI4052_defconfig
index 93ab5b0..5ac0170 100644
--- a/configs/CPCI4052_defconfig
+++ b/configs/CPCI4052_defconfig
@@ -1,7 +1,7 @@
 CONFIG_PPC=y
-CONFIG_CMD_NET=y
 CONFIG_4xx=y
 CONFIG_TARGET_CPCI4052=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_NET=y
diff --git a/configs/CSQ_CS908_defconfig b/configs/CSQ_CS908_defconfig
index 850d70d..184cdeb 100644
--- a/configs/CSQ_CS908_defconfig
+++ b/configs/CSQ_CS908_defconfig
@@ -5,8 +5,16 @@ CONFIG_DRAM_CLK=432
 CONFIG_USB1_VBUS_PIN=""
 CONFIG_USB2_VBUS_PIN=""
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-cs908"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3300
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig
index 819b353..5895b7e 100644
--- a/configs/Chuwi_V7_CW0825_defconfig
+++ b/configs/Chuwi_V7_CW0825_defconfig
@@ -12,8 +12,14 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_VIDEO_LCD_PANEL_HITACHI_TX18D42VM=y
 CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-chuwi-v7-cw0825"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
 CONFIG_VIDEO_LCD_SPI_CS="PA0"
 CONFIG_VIDEO_LCD_SPI_SCLK="PA1"
 CONFIG_VIDEO_LCD_SPI_MOSI="PA2"
diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
index e6bed2d..6a64568 100644
--- a/configs/Colombus_defconfig
+++ b/configs/Colombus_defconfig
@@ -5,7 +5,15 @@ CONFIG_DRAM_CLK=240
 CONFIG_DRAM_ZQ=251
 CONFIG_USB1_VBUS_PIN=""
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-colombus"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
 CONFIG_AXP221_ALDO1_VOLT=3300
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
index e88cce4..653ec9a 100644
--- a/configs/Cubieboard2_defconfig
+++ b/configs/Cubieboard2_defconfig
@@ -4,6 +4,14 @@ 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_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
index ce9591d..7786cac 100644
--- a/configs/Cubieboard_defconfig
+++ b/configs/Cubieboard_defconfig
@@ -3,5 +3,13 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=480
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index c34ab50..1f6a8e3 100644
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -5,6 +5,14 @@ CONFIG_DRAM_CLK=432
 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_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Et_q8_v1_6_defconfig b/configs/Et_q8_v1_6_defconfig
index 4e8350f..5af232f 100644
--- a/configs/Et_q8_v1_6_defconfig
+++ b/configs/Et_q8_v1_6_defconfig
@@ -13,7 +13,13 @@ CONFIG_VIDEO_LCD_BL_EN="PH6"
 CONFIG_VIDEO_LCD_BL_PWM="PH0"
 CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-et-q8-v1.6"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig
index 015140f..2b02b2d 100644
--- a/configs/Hummingbird_A31_defconfig
+++ b/configs/Hummingbird_A31_defconfig
@@ -7,7 +7,15 @@ CONFIG_USB2_VBUS_PIN=""
 CONFIG_VIDEO_VGA_VIA_LCD=y
 CONFIG_VIDEO_VGA_EXTERNAL_DAC_EN="PH25"
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-hummingbird"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
 CONFIG_AXP221_ALDO1_VOLT=3300
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Hyundai_A7HD_defconfig b/configs/Hyundai_A7HD_defconfig
index e26f4f0..9302a06 100644
--- a/configs/Hyundai_A7HD_defconfig
+++ b/configs/Hyundai_A7HD_defconfig
@@ -14,5 +14,11 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_VIDEO_LCD_PANEL_LVDS=y
 CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-hyundai-a7hd"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
diff --git a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
index 5b1080f..7861417 100644
--- a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
+++ b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
@@ -13,7 +13,13 @@ CONFIG_VIDEO_LCD_BL_EN="PH6"
 CONFIG_VIDEO_LCD_BL_PWM="PH0"
 CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ippo-q8h-v1.2-lcd1024x600"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Ippo_q8h_v1_2_defconfig b/configs/Ippo_q8h_v1_2_defconfig
index 8d03300..3672ab9 100644
--- a/configs/Ippo_q8h_v1_2_defconfig
+++ b/configs/Ippo_q8h_v1_2_defconfig
@@ -13,7 +13,13 @@ CONFIG_VIDEO_LCD_BL_EN="PH6"
 CONFIG_VIDEO_LCD_BL_PWM="PH0"
 CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v1.2"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Ippo_q8h_v5_defconfig b/configs/Ippo_q8h_v5_defconfig
index 1a07064..2120709 100644
--- a/configs/Ippo_q8h_v5_defconfig
+++ b/configs/Ippo_q8h_v5_defconfig
@@ -13,7 +13,13 @@ CONFIG_VIDEO_LCD_BL_EN="PH6"
 CONFIG_VIDEO_LCD_BL_PWM="PH0"
 CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v5"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig
index be381ef..08a7c63 100644
--- a/configs/Linksprite_pcDuino3_Nano_defconfig
+++ b/configs/Linksprite_pcDuino3_Nano_defconfig
@@ -6,6 +6,14 @@ 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_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
index 2c846f9..b548d1d 100644
--- a/configs/Linksprite_pcDuino3_defconfig
+++ b/configs/Linksprite_pcDuino3_defconfig
@@ -4,6 +4,14 @@ 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_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Linksprite_pcDuino_defconfig b/configs/Linksprite_pcDuino_defconfig
index aed5b59..caf874a 100644
--- a/configs/Linksprite_pcDuino_defconfig
+++ b/configs/Linksprite_pcDuino_defconfig
@@ -3,5 +3,13 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=408
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-pcduino"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/M52277EVB_defconfig b/configs/M52277EVB_defconfig
index a13cc8b..730a4b8 100644
--- a/configs/M52277EVB_defconfig
+++ b/configs/M52277EVB_defconfig
@@ -1,3 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M52277EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SPANSION_BOOT,SYS_TEXT_BASE=0x00000000"
+CONFIG_SPI_FLASH=y
diff --git a/configs/M52277EVB_stmicro_defconfig b/configs/M52277EVB_stmicro_defconfig
index 65de4d5..41a4283 100644
--- a/configs/M52277EVB_stmicro_defconfig
+++ b/configs/M52277EVB_stmicro_defconfig
@@ -1,3 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M52277EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x43E00000"
+CONFIG_SPI_FLASH=y
diff --git a/configs/M54418TWR_defconfig b/configs/M54418TWR_defconfig
index 4c8876f..d84eff7 100644
--- a/configs/M54418TWR_defconfig
+++ b/configs/M54418TWR_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/M54418TWR_nand_mii_defconfig b/configs/M54418TWR_nand_mii_defconfig
index 07144d6..7f8fd55 100644
--- a/configs/M54418TWR_nand_mii_defconfig
+++ b/configs/M54418TWR_nand_mii_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/M54418TWR_nand_rmii_defconfig b/configs/M54418TWR_nand_rmii_defconfig
index 70b6958..d7dea64 100644
--- a/configs/M54418TWR_nand_rmii_defconfig
+++ b/configs/M54418TWR_nand_rmii_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/M54418TWR_nand_rmii_lowfreq_defconfig b/configs/M54418TWR_nand_rmii_lowfreq_defconfig
index 4482c41..4bf7439 100644
--- a/configs/M54418TWR_nand_rmii_lowfreq_defconfig
+++ b/configs/M54418TWR_nand_rmii_lowfreq_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,LOW_MCFCLK,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/M54418TWR_serial_mii_defconfig b/configs/M54418TWR_serial_mii_defconfig
index 6fa566e..a1ceaf3 100644
--- a/configs/M54418TWR_serial_mii_defconfig
+++ b/configs/M54418TWR_serial_mii_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/M54418TWR_serial_rmii_defconfig b/configs/M54418TWR_serial_rmii_defconfig
index 4c8876f..d84eff7 100644
--- a/configs/M54418TWR_serial_rmii_defconfig
+++ b/configs/M54418TWR_serial_rmii_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/M54451EVB_defconfig b/configs/M54451EVB_defconfig
index b7f4803..2f3d77a 100644
--- a/configs/M54451EVB_defconfig
+++ b/configs/M54451EVB_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54451EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=24000000"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/M54451EVB_stmicro_defconfig b/configs/M54451EVB_stmicro_defconfig
index 01e420e..32f17e0 100644
--- a/configs/M54451EVB_stmicro_defconfig
+++ b/configs/M54451EVB_stmicro_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54451EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x47e00000,SYS_INPUT_CLKSRC=24000000"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/M54455EVB_a66_defconfig b/configs/M54455EVB_a66_defconfig
index 95a00b8..549d8bf 100644
--- a/configs/M54455EVB_a66_defconfig
+++ b/configs/M54455EVB_a66_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54455EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=66666666"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/M54455EVB_defconfig b/configs/M54455EVB_defconfig
index 99df654..a63da60 100644
--- a/configs/M54455EVB_defconfig
+++ b/configs/M54455EVB_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54455EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=33333333"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/M54455EVB_i66_defconfig b/configs/M54455EVB_i66_defconfig
index b633a55..86c39ea 100644
--- a/configs/M54455EVB_i66_defconfig
+++ b/configs/M54455EVB_i66_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54455EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=66666666"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/M54455EVB_intel_defconfig b/configs/M54455EVB_intel_defconfig
index 6cf0006..593ddc1 100644
--- a/configs/M54455EVB_intel_defconfig
+++ b/configs/M54455EVB_intel_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54455EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=33333333"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/M54455EVB_stm33_defconfig b/configs/M54455EVB_stm33_defconfig
index c68c386..5efb472 100644
--- a/configs/M54455EVB_stm33_defconfig
+++ b/configs/M54455EVB_stm33_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54455EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_STMICRO_BOOT,CF_SBF,SYS_TEXT_BASE=0x4FE00000,SYS_INPUT_CLKSRC=33333333"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/MK808C_defconfig b/configs/MK808C_defconfig
index 88df54c..f0ee148 100644
--- a/configs/MK808C_defconfig
+++ b/configs/MK808C_defconfig
@@ -3,5 +3,13 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-mk808c"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/MPC8536DS_36BIT_defconfig b/configs/MPC8536DS_36BIT_defconfig
index 328791b..c32ae96 100644
--- a/configs/MPC8536DS_36BIT_defconfig
+++ b/configs/MPC8536DS_36BIT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_MPC8536DS=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/MPC8536DS_SDCARD_defconfig b/configs/MPC8536DS_SDCARD_defconfig
index 715ba0c..9c45cee 100644
--- a/configs/MPC8536DS_SDCARD_defconfig
+++ b/configs/MPC8536DS_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_MPC8536DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/MPC8536DS_SPIFLASH_defconfig b/configs/MPC8536DS_SPIFLASH_defconfig
index 3bd282f..98d62ac 100644
--- a/configs/MPC8536DS_SPIFLASH_defconfig
+++ b/configs/MPC8536DS_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_MPC8536DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/MPC8536DS_defconfig b/configs/MPC8536DS_defconfig
index 2aa6823..bc43218 100644
--- a/configs/MPC8536DS_defconfig
+++ b/configs/MPC8536DS_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8536DS=y
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/MSI_Primo73_defconfig b/configs/MSI_Primo73_defconfig
index 00f0796..6db1115 100644
--- a/configs/MSI_Primo73_defconfig
+++ b/configs/MSI_Primo73_defconfig
@@ -9,5 +9,13 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 # CONFIG_USB_KEYBOARD is not set
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-primo73"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig
index e6888a1..719e25a 100644
--- a/configs/MSI_Primo81_defconfig
+++ b/configs/MSI_Primo81_defconfig
@@ -3,13 +3,23 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN6I=y
 CONFIG_DRAM_CLK=360
 CONFIG_DRAM_ZQ=122
+CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE"
+CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
+CONFIG_AXP_GPIO=y
 CONFIG_VIDEO_LCD_MODE="x:768,y:1024,depth:18,pclk_khz:66000,le:56,ri:60,up:30,lo:36,hs:64,vs:50,sync:3,vmode:0"
 CONFIG_VIDEO_LCD_BL_EN="PA25"
 CONFIG_VIDEO_LCD_BL_PWM="PH13"
 CONFIG_VIDEO_LCD_PANEL_MIPI_4_LANE_513_MBPS_VIA_SSD2828=y
+CONFIG_USB_MUSB_SUNXI=y
 # CONFIG_USB_KEYBOARD is not set
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-primo81"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_VIDEO_LCD_SSD2828_TX_CLK=27
 CONFIG_VIDEO_LCD_SSD2828_RESET="PA26"
@@ -17,7 +27,5 @@ 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_AXP_GPIO=y
-CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE"
-CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
-CONFIG_USB_MUSB_SUNXI=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Marsboard_A10_defconfig b/configs/Marsboard_A10_defconfig
index 5a9703d..01758e4 100644
--- a/configs/Marsboard_A10_defconfig
+++ b/configs/Marsboard_A10_defconfig
@@ -2,5 +2,13 @@ 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_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,AHCI,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Mele_A1000G_quad_defconfig b/configs/Mele_A1000G_quad_defconfig
index 3a746c8..f55b706 100644
--- a/configs/Mele_A1000G_quad_defconfig
+++ b/configs/Mele_A1000G_quad_defconfig
@@ -1,13 +1,3 @@
-# The Mele A1000G quad is yet another Allwinnner based Android top set box
-# from Mele.
-#
-# It uses the same case as the original Mele A1000 and the same PCB as the M9,
-# the  USM sata storage slot is connected via anusb to sata bridge connected to
-# the otg controller, this renders the micro USB B receptacle non functional.
-#
-# It features an A31 SoC, 2G RAM, 16G Nand, 100Mbit ethernet, HDMI out,
-# 3 USB A receptacles, 3.5 mm jack for analog audio out, optical spdif,
-# RTL R8188EU (USB) wifi and a full size sdcard slot
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN6I=y
@@ -15,10 +5,18 @@ CONFIG_DRAM_ZQ=120
 CONFIG_USB1_VBUS_PIN="PC27"
 CONFIG_USB2_VBUS_PIN=""
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-mele-a1000g-quad"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DCDC1_VOLT=3300
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_DLDO4_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3300
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
index 6678e4c..aad71fc 100644
--- a/configs/Mele_A1000_defconfig
+++ b/configs/Mele_A1000_defconfig
@@ -3,5 +3,13 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
 CONFIG_VIDEO_VGA=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-a1000"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Mele_I7_defconfig b/configs/Mele_I7_defconfig
index bf67433..f96ee14 100644
--- a/configs/Mele_I7_defconfig
+++ b/configs/Mele_I7_defconfig
@@ -5,10 +5,18 @@ CONFIG_DRAM_ZQ=120
 CONFIG_USB1_VBUS_PIN="PC27"
 CONFIG_USB2_VBUS_PIN=""
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-i7"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DCDC1_VOLT=3300
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_DLDO4_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3300
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig
index 9c2eb86..e2869a3 100644
--- a/configs/Mele_M3_defconfig
+++ b/configs/Mele_M3_defconfig
@@ -6,6 +6,14 @@ CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_VIDEO_VGA=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m3"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig
index 5ee648b..aad12a1 100644
--- a/configs/Mele_M5_defconfig
+++ b/configs/Mele_M5_defconfig
@@ -5,6 +5,14 @@ CONFIG_DRAM_CLK=432
 CONFIG_DRAM_ZQ=122
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m5"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,USB_EHCI,STATUSLED=234"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig
index 16881fa..c3242b8 100644
--- a/configs/Mele_M9_defconfig
+++ b/configs/Mele_M9_defconfig
@@ -1,13 +1,3 @@
-# The Mele M9 is yet another Allwinnner based Android top set box from Mele.
-#
-# It uses the same PCB as the A1000G quad, but in a new case without a
-# USM sata storage slot, and the space on the PCB for the usb to sata
-# bridge connected to the otg controller is not populated, possible
-# making the micro usb otg connector functional (untested)
-#
-# It features an A31 SoC, 2G RAM, 16G Nand, 100Mbit ethernet, HDMI out,
-# 3 USB A receptacles, 3.5 mm jack for analog audio out, optical spdif,
-# micro USB B receptacle, RTL R8188EU (USB) and a full size sdcard slot
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN6I=y
@@ -15,10 +5,18 @@ CONFIG_DRAM_ZQ=120
 CONFIG_USB1_VBUS_PIN="PC27"
 CONFIG_USB2_VBUS_PIN=""
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-m9"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DCDC1_VOLT=3300
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_DLDO4_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3300
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Merrii_A80_Optimus_defconfig b/configs/Merrii_A80_Optimus_defconfig
index 6bd5273..4a0dce7 100644
--- a/configs/Merrii_A80_Optimus_defconfig
+++ b/configs/Merrii_A80_Optimus_defconfig
@@ -1,11 +1,18 @@
-CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-optimus"
-CONFIG_VIDEO=n
-CONFIG_USB_KEYBOARD=n
-CONFIG_MMC0_CD_PIN="PH18"
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN9I=y
-# these are unused atm but we must set them to something
 CONFIG_DRAM_CLK=360
 CONFIG_DRAM_ZQ=123
 CONFIG_SYS_CLK_FREQ=1008000000
+CONFIG_MMC0_CD_PIN="PH18"
+# CONFIG_VIDEO is not set
+# CONFIG_USB_KEYBOARD is not set
+CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-optimus"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/MigoR_defconfig b/configs/MigoR_defconfig
index d4953ce..e6a9660 100644
--- a/configs/MigoR_defconfig
+++ b/configs/MigoR_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_MIGOR=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig
index 918b639..4ec752b 100644
--- a/configs/Mini-X_defconfig
+++ b/configs/Mini-X_defconfig
@@ -2,5 +2,13 @@ CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mini-xplus"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/O2DNT2_RAMBOOT_defconfig b/configs/O2DNT2_RAMBOOT_defconfig
index 0e47ffe..40e238a 100644
--- a/configs/O2DNT2_RAMBOOT_defconfig
+++ b/configs/O2DNT2_RAMBOOT_defconfig
@@ -1,8 +1,8 @@
 CONFIG_PPC=y
-CONFIG_CMD_NET=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O2DNT2=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000"
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press password to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="++++++++++"
+CONFIG_CMD_NET=y
diff --git a/configs/O2DNT2_defconfig b/configs/O2DNT2_defconfig
index 3501761..6bd3cee 100644
--- a/configs/O2DNT2_defconfig
+++ b/configs/O2DNT2_defconfig
@@ -1,7 +1,7 @@
 CONFIG_PPC=y
-CONFIG_CMD_NET=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O2DNT2=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press password to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="++++++++++"
+CONFIG_CMD_NET=y
diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig
index 9d5e5dc..23b5761 100644
--- a/configs/Orangepi_defconfig
+++ b/configs/Orangepi_defconfig
@@ -7,6 +7,14 @@ CONFIG_USB2_VBUS_PIN="PH22"
 CONFIG_VIDEO_VGA=y
 CONFIG_GMAC_TX_DELAY=3
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
index 99cc600..99bb94e 100644
--- a/configs/Orangepi_mini_defconfig
+++ b/configs/Orangepi_mini_defconfig
@@ -9,6 +9,14 @@ CONFIG_USB1_VBUS_PIN="PH26"
 CONFIG_USB2_VBUS_PIN="PH22"
 CONFIG_GMAC_TX_DELAY=3
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi-mini"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
index b5e4a91..6530f07 100644
--- a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,NAND_SECBOOT,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig
index fe95616..ffb3469 100644
--- a/configs/P1010RDB-PA_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig
@@ -6,3 +6,4 @@ CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
index f96db97..f8c8c5d 100644
--- a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig
index 2e7d281..6c066aa 100644
--- a/configs/P1010RDB-PA_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
index ec52886..c0fa356 100644
--- a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
index 1b93479..5cd85f9 100644
--- a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SPIFLASH,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
index 7f8b5dd..d550a6b 100644
--- a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
index 5888af2..004fe69 100644
--- a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,NAND_SECBOOT,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig
index e6bd968..16fad87 100644
--- a/configs/P1010RDB-PA_NAND_defconfig
+++ b/configs/P1010RDB-PA_NAND_defconfig
@@ -6,3 +6,4 @@ CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
index 8a33351..e681bc3 100644
--- a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig
index f7fb973..d899655 100644
--- a/configs/P1010RDB-PA_NOR_defconfig
+++ b/configs/P1010RDB-PA_NOR_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig
index 4f3891f..2b52397 100644
--- a/configs/P1010RDB-PA_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
index bede3bd..5756bb2 100644
--- a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SPIFLASH,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig b/configs/P1010RDB-PA_SPIFLASH_defconfig
index 97e7382..124ec69 100644
--- a/configs/P1010RDB-PA_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
index 6a781c2..bd2a690 100644
--- a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,NAND_SECBOOT,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig
index ea3456b..2fca071 100644
--- a/configs/P1010RDB-PB_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig
@@ -6,3 +6,4 @@ CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
index 09dafed..0151fbe 100644
--- a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig
index f7243ac..561f036 100644
--- a/configs/P1010RDB-PB_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
index a9ea8b2..44c5c27 100644
--- a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
index 067f9ba..d3f6a35 100644
--- a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SPIFLASH,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
index 8fed202..4cbda7e 100644
--- a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
index 97c4673..3c30ea0 100644
--- a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,NAND_SECBOOT,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig
index 3e49a24..9219373 100644
--- a/configs/P1010RDB-PB_NAND_defconfig
+++ b/configs/P1010RDB-PB_NAND_defconfig
@@ -6,3 +6,4 @@ CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
index fe5ee48..277158b 100644
--- a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig
index 77a1a63..0361140 100644
--- a/configs/P1010RDB-PB_NOR_defconfig
+++ b/configs/P1010RDB-PB_NOR_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig
index 27777bc..2566f87 100644
--- a/configs/P1010RDB-PB_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
index 568934a..43c4433 100644
--- a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SPIFLASH,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig b/configs/P1010RDB-PB_SPIFLASH_defconfig
index 835f3ca..37f135c 100644
--- a/configs/P1010RDB-PB_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig b/configs/P1020RDB-PC_36BIT_NAND_defconfig
index 346a702..b112f55 100644
--- a/configs/P1020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P1020RDB-PC_36BIT_NAND_defconfig
@@ -6,3 +6,4 @@ CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
index 168c4c8..d98d923 100644
--- a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
index 8b19d32..49b7ab8 100644
--- a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PC_36BIT_defconfig b/configs/P1020RDB-PC_36BIT_defconfig
index 8aa547f..ea8a042 100644
--- a/configs/P1020RDB-PC_36BIT_defconfig
+++ b/configs/P1020RDB-PC_36BIT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PC_NAND_defconfig b/configs/P1020RDB-PC_NAND_defconfig
index 6149840..26742ff 100644
--- a/configs/P1020RDB-PC_NAND_defconfig
+++ b/configs/P1020RDB-PC_NAND_defconfig
@@ -6,3 +6,4 @@ CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PC_SDCARD_defconfig b/configs/P1020RDB-PC_SDCARD_defconfig
index 00fa45e..4df5c2b 100644
--- a/configs/P1020RDB-PC_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PC_SPIFLASH_defconfig b/configs/P1020RDB-PC_SPIFLASH_defconfig
index 1f9c90f..cb132a8 100644
--- a/configs/P1020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig
index 9c273d6..6675468 100644
--- a/configs/P1020RDB-PC_defconfig
+++ b/configs/P1020RDB-PC_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig
index 3cfa7c7..955290b 100644
--- a/configs/P1020RDB-PD_NAND_defconfig
+++ b/configs/P1020RDB-PD_NAND_defconfig
@@ -6,3 +6,4 @@ CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig
index 4d7d8a6..13a85ec 100644
--- a/configs/P1020RDB-PD_SDCARD_defconfig
+++ b/configs/P1020RDB-PD_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig b/configs/P1020RDB-PD_SPIFLASH_defconfig
index d0625ee..aaadab9 100644
--- a/configs/P1020RDB-PD_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PD_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig
index 6847d23..e2a9f7d 100644
--- a/configs/P1020RDB-PD_defconfig
+++ b/configs/P1020RDB-PD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1021RDB-PC_36BIT_NAND_defconfig b/configs/P1021RDB-PC_36BIT_NAND_defconfig
index c04b980..35dd6e0 100644
--- a/configs/P1021RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P1021RDB-PC_36BIT_NAND_defconfig
@@ -6,3 +6,4 @@ CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1021RDB-PC_36BIT_SDCARD_defconfig b/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
index d0d4d3e..702a2fd 100644
--- a/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
index 35ea741..4150b29 100644
--- a/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1021RDB-PC_36BIT_defconfig b/configs/P1021RDB-PC_36BIT_defconfig
index 69faff9..8622a42 100644
--- a/configs/P1021RDB-PC_36BIT_defconfig
+++ b/configs/P1021RDB-PC_36BIT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1021RDB-PC_NAND_defconfig b/configs/P1021RDB-PC_NAND_defconfig
index f486926..61bf58d 100644
--- a/configs/P1021RDB-PC_NAND_defconfig
+++ b/configs/P1021RDB-PC_NAND_defconfig
@@ -6,3 +6,4 @@ CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1021RDB-PC_SDCARD_defconfig b/configs/P1021RDB-PC_SDCARD_defconfig
index 4ab2f67..e9c597b 100644
--- a/configs/P1021RDB-PC_SDCARD_defconfig
+++ b/configs/P1021RDB-PC_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1021RDB-PC_SPIFLASH_defconfig b/configs/P1021RDB-PC_SPIFLASH_defconfig
index e3790e0..1fb2085 100644
--- a/configs/P1021RDB-PC_SPIFLASH_defconfig
+++ b/configs/P1021RDB-PC_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1021RDB-PC_defconfig b/configs/P1021RDB-PC_defconfig
index 6e9e829..83326ce 100644
--- a/configs/P1021RDB-PC_defconfig
+++ b/configs/P1021RDB-PC_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1022DS_36BIT_NAND_defconfig b/configs/P1022DS_36BIT_NAND_defconfig
index 02c7a0a..8e763fa 100644
--- a/configs/P1022DS_36BIT_NAND_defconfig
+++ b/configs/P1022DS_36BIT_NAND_defconfig
@@ -6,3 +6,4 @@ CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1022DS_36BIT_SDCARD_defconfig b/configs/P1022DS_36BIT_SDCARD_defconfig
index f0a065e..d6b9f09 100644
--- a/configs/P1022DS_36BIT_SDCARD_defconfig
+++ b/configs/P1022DS_36BIT_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1022DS_36BIT_SPIFLASH_defconfig b/configs/P1022DS_36BIT_SPIFLASH_defconfig
index 9c0862f..b3966ee 100644
--- a/configs/P1022DS_36BIT_SPIFLASH_defconfig
+++ b/configs/P1022DS_36BIT_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1022DS_36BIT_defconfig b/configs/P1022DS_36BIT_defconfig
index 037659f..cc7877b 100644
--- a/configs/P1022DS_36BIT_defconfig
+++ b/configs/P1022DS_36BIT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1022DS=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1022DS_NAND_defconfig b/configs/P1022DS_NAND_defconfig
index 0008c52..253b19a 100644
--- a/configs/P1022DS_NAND_defconfig
+++ b/configs/P1022DS_NAND_defconfig
@@ -6,3 +6,4 @@ CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1022DS_SDCARD_defconfig b/configs/P1022DS_SDCARD_defconfig
index 8efdd90..a959631 100644
--- a/configs/P1022DS_SDCARD_defconfig
+++ b/configs/P1022DS_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1022DS_SPIFLASH_defconfig b/configs/P1022DS_SPIFLASH_defconfig
index db2c3ab..79eba57 100644
--- a/configs/P1022DS_SPIFLASH_defconfig
+++ b/configs/P1022DS_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1022DS_defconfig b/configs/P1022DS_defconfig
index 6cf36de..0252307 100644
--- a/configs/P1022DS_defconfig
+++ b/configs/P1022DS_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1022DS=y
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1024RDB_36BIT_defconfig b/configs/P1024RDB_36BIT_defconfig
index 78066a6..fded3af 100644
--- a/configs/P1024RDB_36BIT_defconfig
+++ b/configs/P1024RDB_36BIT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,36BIT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1024RDB_NAND_defconfig b/configs/P1024RDB_NAND_defconfig
index 498f091..e12b198 100644
--- a/configs/P1024RDB_NAND_defconfig
+++ b/configs/P1024RDB_NAND_defconfig
@@ -6,3 +6,4 @@ CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1024RDB_SDCARD_defconfig b/configs/P1024RDB_SDCARD_defconfig
index 3960c40..55283d6 100644
--- a/configs/P1024RDB_SDCARD_defconfig
+++ b/configs/P1024RDB_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1024RDB_SPIFLASH_defconfig b/configs/P1024RDB_SPIFLASH_defconfig
index 7ee6054..438aa36 100644
--- a/configs/P1024RDB_SPIFLASH_defconfig
+++ b/configs/P1024RDB_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1024RDB_defconfig b/configs/P1024RDB_defconfig
index 883a562..a7cc6ef 100644
--- a/configs/P1024RDB_defconfig
+++ b/configs/P1024RDB_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1024RDB"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1025RDB_36BIT_defconfig b/configs/P1025RDB_36BIT_defconfig
index 56d46fa..90abbfe 100644
--- a/configs/P1025RDB_36BIT_defconfig
+++ b/configs/P1025RDB_36BIT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,36BIT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1025RDB_NAND_defconfig b/configs/P1025RDB_NAND_defconfig
index 7d5d4b9..b7cfe0c 100644
--- a/configs/P1025RDB_NAND_defconfig
+++ b/configs/P1025RDB_NAND_defconfig
@@ -6,3 +6,4 @@ CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1025RDB_SDCARD_defconfig b/configs/P1025RDB_SDCARD_defconfig
index 6efa5a3..9d76178 100644
--- a/configs/P1025RDB_SDCARD_defconfig
+++ b/configs/P1025RDB_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1025RDB_SPIFLASH_defconfig b/configs/P1025RDB_SPIFLASH_defconfig
index efcaed8..a0b7b2d 100644
--- a/configs/P1025RDB_SPIFLASH_defconfig
+++ b/configs/P1025RDB_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P1025RDB_defconfig b/configs/P1025RDB_defconfig
index 93c48db..9f07753 100644
--- a/configs/P1025RDB_defconfig
+++ b/configs/P1025RDB_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1025RDB"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig
index c283105..54e291c 100644
--- a/configs/P2020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig
@@ -6,3 +6,4 @@ CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
index 96d8a86..e10a36e 100644
--- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
index 501547f..44a1ca1 100644
--- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig
index 7ac1ea1..a1e23f7 100644
--- a/configs/P2020RDB-PC_36BIT_defconfig
+++ b/configs/P2020RDB-PC_36BIT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig
index 8dfdc13..1239d97 100644
--- a/configs/P2020RDB-PC_NAND_defconfig
+++ b/configs/P2020RDB-PC_NAND_defconfig
@@ -6,3 +6,4 @@ CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig
index c21b2be..d032c8a 100644
--- a/configs/P2020RDB-PC_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig
index 66c5aa8..f3d1b80 100644
--- a/configs/P2020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig
index 53696e1..957dbb5 100644
--- a/configs/P2020RDB-PC_defconfig
+++ b/configs/P2020RDB-PC_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P2041RDB_NAND_defconfig b/configs/P2041RDB_NAND_defconfig
index 3405f82..6bab740 100644
--- a/configs/P2041RDB_NAND_defconfig
+++ b/configs/P2041RDB_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P2041RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P2041RDB_SDCARD_defconfig b/configs/P2041RDB_SDCARD_defconfig
index bd4502a..13b144a 100644
--- a/configs/P2041RDB_SDCARD_defconfig
+++ b/configs/P2041RDB_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P2041RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P2041RDB_SECURE_BOOT_defconfig b/configs/P2041RDB_SECURE_BOOT_defconfig
index ed832ef..306ddad 100644
--- a/configs/P2041RDB_SECURE_BOOT_defconfig
+++ b/configs/P2041RDB_SECURE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P2041RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P2041RDB_SPIFLASH_defconfig b/configs/P2041RDB_SPIFLASH_defconfig
index 5e97cb5..8aba3e2 100644
--- a/configs/P2041RDB_SPIFLASH_defconfig
+++ b/configs/P2041RDB_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P2041RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig b/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
index 9ac10a0..68a406f 100644
--- a/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P2041RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P2041RDB_defconfig b/configs/P2041RDB_defconfig
index 3b358c9..8f0b1d4 100644
--- a/configs/P2041RDB_defconfig
+++ b/configs/P2041RDB_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P3041DS_NAND_defconfig b/configs/P3041DS_NAND_defconfig
index 5f53ea1..95eea20 100644
--- a/configs/P3041DS_NAND_defconfig
+++ b/configs/P3041DS_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P3041DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P3041DS_SDCARD_defconfig b/configs/P3041DS_SDCARD_defconfig
index 595306e..7eb7fa7 100644
--- a/configs/P3041DS_SDCARD_defconfig
+++ b/configs/P3041DS_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P3041DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P3041DS_SECURE_BOOT_defconfig b/configs/P3041DS_SECURE_BOOT_defconfig
index a1f5c14..d069b5b 100644
--- a/configs/P3041DS_SECURE_BOOT_defconfig
+++ b/configs/P3041DS_SECURE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P3041DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P3041DS_SPIFLASH_defconfig b/configs/P3041DS_SPIFLASH_defconfig
index d4b0fd9..ca99160 100644
--- a/configs/P3041DS_SPIFLASH_defconfig
+++ b/configs/P3041DS_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P3041DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P3041DS_SRIO_PCIE_BOOT_defconfig b/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
index eadcb04..6d8cec8 100644
--- a/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P3041DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P3041DS_defconfig b/configs/P3041DS_defconfig
index ffed6a7..9d567db 100644
--- a/configs/P3041DS_defconfig
+++ b/configs/P3041DS_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P4080DS_SDCARD_defconfig b/configs/P4080DS_SDCARD_defconfig
index f683c38..30eb293 100644
--- a/configs/P4080DS_SDCARD_defconfig
+++ b/configs/P4080DS_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P4080DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P4080DS_SECURE_BOOT_defconfig b/configs/P4080DS_SECURE_BOOT_defconfig
index 1d4a128..cf7d6cd 100644
--- a/configs/P4080DS_SECURE_BOOT_defconfig
+++ b/configs/P4080DS_SECURE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P4080DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P4080DS_SPIFLASH_defconfig b/configs/P4080DS_SPIFLASH_defconfig
index 5b5ca77..7004e92 100644
--- a/configs/P4080DS_SPIFLASH_defconfig
+++ b/configs/P4080DS_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P4080DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P4080DS_SRIO_PCIE_BOOT_defconfig b/configs/P4080DS_SRIO_PCIE_BOOT_defconfig
index 8443412..f363d3e 100644
--- a/configs/P4080DS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P4080DS_SRIO_PCIE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P4080DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P4080DS_defconfig b/configs/P4080DS_defconfig
index 34b6979..233efa5 100644
--- a/configs/P4080DS_defconfig
+++ b/configs/P4080DS_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P4080DS=y
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P5020DS_NAND_defconfig b/configs/P5020DS_NAND_defconfig
index 55e2e10..3f68674 100644
--- a/configs/P5020DS_NAND_defconfig
+++ b/configs/P5020DS_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P5020DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P5020DS_SDCARD_defconfig b/configs/P5020DS_SDCARD_defconfig
index 087815b..f13b634 100644
--- a/configs/P5020DS_SDCARD_defconfig
+++ b/configs/P5020DS_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P5020DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P5020DS_SECURE_BOOT_defconfig b/configs/P5020DS_SECURE_BOOT_defconfig
index adb65ae..6552ba8 100644
--- a/configs/P5020DS_SECURE_BOOT_defconfig
+++ b/configs/P5020DS_SECURE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P5020DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P5020DS_SPIFLASH_defconfig b/configs/P5020DS_SPIFLASH_defconfig
index 6e86ea0..3ba0c35 100644
--- a/configs/P5020DS_SPIFLASH_defconfig
+++ b/configs/P5020DS_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P5020DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P5020DS_SRIO_PCIE_BOOT_defconfig b/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
index 8772c7b..9106466 100644
--- a/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P5020DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P5020DS_defconfig b/configs/P5020DS_defconfig
index f4b8b3c..c4d6a2c 100644
--- a/configs/P5020DS_defconfig
+++ b/configs/P5020DS_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P5020DS=y
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P5040DS_NAND_defconfig b/configs/P5040DS_NAND_defconfig
index 9f7b45b..0a9ff2d 100644
--- a/configs/P5040DS_NAND_defconfig
+++ b/configs/P5040DS_NAND_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P5040DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P5040DS_SDCARD_defconfig b/configs/P5040DS_SDCARD_defconfig
index dd78085..cc40316 100644
--- a/configs/P5040DS_SDCARD_defconfig
+++ b/configs/P5040DS_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P5040DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P5040DS_SECURE_BOOT_defconfig b/configs/P5040DS_SECURE_BOOT_defconfig
index 2224bb2..da1e300 100644
--- a/configs/P5040DS_SECURE_BOOT_defconfig
+++ b/configs/P5040DS_SECURE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P5040DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P5040DS_SPIFLASH_defconfig b/configs/P5040DS_SPIFLASH_defconfig
index e3b7896..8fb6e78 100644
--- a/configs/P5040DS_SPIFLASH_defconfig
+++ b/configs/P5040DS_SPIFLASH_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_P5040DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/P5040DS_defconfig b/configs/P5040DS_defconfig
index d2f9c06..9b83d0b 100644
--- a/configs/P5040DS_defconfig
+++ b/configs/P5040DS_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/PLU405_defconfig b/configs/PLU405_defconfig
index f7da980..50f52a3 100644
--- a/configs/PLU405_defconfig
+++ b/configs/PLU405_defconfig
@@ -1,7 +1,7 @@
 CONFIG_PPC=y
-CONFIG_CMD_NET=y
 CONFIG_4xx=y
 CONFIG_TARGET_PLU405=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_NET=y
diff --git a/configs/PMC405DE_defconfig b/configs/PMC405DE_defconfig
index aec6b51..1246542 100644
--- a/configs/PMC405DE_defconfig
+++ b/configs/PMC405DE_defconfig
@@ -1,7 +1,7 @@
 CONFIG_PPC=y
-CONFIG_CMD_NET=y
 CONFIG_4xx=y
 CONFIG_TARGET_PMC405DE=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_NET=y
diff --git a/configs/PMC440_defconfig b/configs/PMC440_defconfig
index 44c81b3..bca6fc0 100644
--- a/configs/PMC440_defconfig
+++ b/configs/PMC440_defconfig
@@ -1,7 +1,7 @@
 CONFIG_PPC=y
-CONFIG_CMD_NET=y
 CONFIG_4xx=y
 CONFIG_TARGET_PMC440=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_NET=y
diff --git a/configs/T1023RDB_NAND_defconfig b/configs/T1023RDB_NAND_defconfig
index a1a32d5..d9f72e5 100644
--- a/configs/T1023RDB_NAND_defconfig
+++ b/configs/T1023RDB_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1023RDB_SDCARD_defconfig b/configs/T1023RDB_SDCARD_defconfig
index 93b39d6..3f8e04c 100644
--- a/configs/T1023RDB_SDCARD_defconfig
+++ b/configs/T1023RDB_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1023RDB_SECURE_BOOT_defconfig b/configs/T1023RDB_SECURE_BOOT_defconfig
index 35ac227..49979b3 100644
--- a/configs/T1023RDB_SECURE_BOOT_defconfig
+++ b/configs/T1023RDB_SECURE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1023RDB_SPIFLASH_defconfig b/configs/T1023RDB_SPIFLASH_defconfig
index 9fc6576..cb45acb 100644
--- a/configs/T1023RDB_SPIFLASH_defconfig
+++ b/configs/T1023RDB_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1023RDB_defconfig b/configs/T1023RDB_defconfig
index 7075b28..abb7c3f 100644
--- a/configs/T1023RDB_defconfig
+++ b/configs/T1023RDB_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1024QDS_D4_SECURE_BOOT_defconfig b/configs/T1024QDS_D4_SECURE_BOOT_defconfig
index 329dd15..0585b6a 100644
--- a/configs/T1024QDS_D4_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_D4_SECURE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SYS_FSL_DDR4,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1024QDS_NAND_defconfig b/configs/T1024QDS_NAND_defconfig
index 57a452a..c4ddf7a 100644
--- a/configs/T1024QDS_NAND_defconfig
+++ b/configs/T1024QDS_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1024QDS_SDCARD_defconfig b/configs/T1024QDS_SDCARD_defconfig
index 6fd626b..8e384ac 100644
--- a/configs/T1024QDS_SDCARD_defconfig
+++ b/configs/T1024QDS_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1024QDS_SECURE_BOOT_defconfig b/configs/T1024QDS_SECURE_BOOT_defconfig
index 2dc1e64..a4d594a 100644
--- a/configs/T1024QDS_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_SECURE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1024QDS_SPIFLASH_defconfig b/configs/T1024QDS_SPIFLASH_defconfig
index 89ce4eb..dc043f9 100644
--- a/configs/T1024QDS_SPIFLASH_defconfig
+++ b/configs/T1024QDS_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1024QDS_defconfig b/configs/T1024QDS_defconfig
index 61f13d3..b9f875c 100644
--- a/configs/T1024QDS_defconfig
+++ b/configs/T1024QDS_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig
index 13f7586..db1262e 100644
--- a/configs/T1024RDB_NAND_defconfig
+++ b/configs/T1024RDB_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig
index 8beb714..dd80c76 100644
--- a/configs/T1024RDB_SDCARD_defconfig
+++ b/configs/T1024RDB_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1024RDB_SECURE_BOOT_defconfig b/configs/T1024RDB_SECURE_BOOT_defconfig
index 79f68c6..5c2fe2a 100644
--- a/configs/T1024RDB_SECURE_BOOT_defconfig
+++ b/configs/T1024RDB_SECURE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig
index e323f57..9157945 100644
--- a/configs/T1024RDB_SPIFLASH_defconfig
+++ b/configs/T1024RDB_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig
index 7e69b92..ac0b8c1 100644
--- a/configs/T1024RDB_defconfig
+++ b/configs/T1024RDB_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T102XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1040QDS_D4_defconfig b/configs/T1040QDS_D4_defconfig
index bfe077a..5a80d6b 100644
--- a/configs/T1040QDS_D4_defconfig
+++ b/configs/T1040QDS_D4_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T1040QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SYS_FSL_DDR4"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1040QDS_SECURE_BOOT_defconfig b/configs/T1040QDS_SECURE_BOOT_defconfig
index 043db10..6ad6182 100644
--- a/configs/T1040QDS_SECURE_BOOT_defconfig
+++ b/configs/T1040QDS_SECURE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T1040QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1040QDS_defconfig b/configs/T1040QDS_defconfig
index fbfa5fb..dee5c36 100644
--- a/configs/T1040QDS_defconfig
+++ b/configs/T1040QDS_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T1040QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1040RDB_NAND_defconfig b/configs/T1040RDB_NAND_defconfig
index 70c0b59..3a1bb2b 100644
--- a/configs/T1040RDB_NAND_defconfig
+++ b/configs/T1040RDB_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1040RDB_SDCARD_defconfig b/configs/T1040RDB_SDCARD_defconfig
index 980189c..3247915 100644
--- a/configs/T1040RDB_SDCARD_defconfig
+++ b/configs/T1040RDB_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1040RDB_SECURE_BOOT_defconfig b/configs/T1040RDB_SECURE_BOOT_defconfig
index 2dd87ed..6faadec 100644
--- a/configs/T1040RDB_SECURE_BOOT_defconfig
+++ b/configs/T1040RDB_SECURE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT,T1040RDB"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1040RDB_SPIFLASH_defconfig b/configs/T1040RDB_SPIFLASH_defconfig
index 2efe475..3a68fe2 100644
--- a/configs/T1040RDB_SPIFLASH_defconfig
+++ b/configs/T1040RDB_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1040RDB_defconfig b/configs/T1040RDB_defconfig
index 9db5699..a348ad8 100644
--- a/configs/T1040RDB_defconfig
+++ b/configs/T1040RDB_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1042RDB_PI_NAND_defconfig b/configs/T1042RDB_PI_NAND_defconfig
index f1cebff..2944aff 100644
--- a/configs/T1042RDB_PI_NAND_defconfig
+++ b/configs/T1042RDB_PI_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1042RDB_PI_SDCARD_defconfig b/configs/T1042RDB_PI_SDCARD_defconfig
index 0d27434..8272cff 100644
--- a/configs/T1042RDB_PI_SDCARD_defconfig
+++ b/configs/T1042RDB_PI_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig
index f6589a8..8c2e6fa 100644
--- a/configs/T1042RDB_PI_SPIFLASH_defconfig
+++ b/configs/T1042RDB_PI_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1042RDB_PI_defconfig b/configs/T1042RDB_PI_defconfig
index 2b4094e..626d0fa 100644
--- a/configs/T1042RDB_PI_defconfig
+++ b/configs/T1042RDB_PI_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1042RDB_SECURE_BOOT_defconfig b/configs/T1042RDB_SECURE_BOOT_defconfig
index bed4c93..36ac136 100644
--- a/configs/T1042RDB_SECURE_BOOT_defconfig
+++ b/configs/T1042RDB_SECURE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,SECURE_BOOT,T1042RDB"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T1042RDB_defconfig b/configs/T1042RDB_defconfig
index b2387f2..6451b31 100644
--- a/configs/T1042RDB_defconfig
+++ b/configs/T1042RDB_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig
index 5ca32a6..21c6eae 100644
--- a/configs/T2080QDS_NAND_defconfig
+++ b/configs/T2080QDS_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T2080QDS_SDCARD_defconfig b/configs/T2080QDS_SDCARD_defconfig
index 0947d33..c3a5416 100644
--- a/configs/T2080QDS_SDCARD_defconfig
+++ b/configs/T2080QDS_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T2080QDS_SECURE_BOOT_defconfig b/configs/T2080QDS_SECURE_BOOT_defconfig
index 2d05aa5..1607864 100644
--- a/configs/T2080QDS_SECURE_BOOT_defconfig
+++ b/configs/T2080QDS_SECURE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T208XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig
index 82df11c..9b29955 100644
--- a/configs/T2080QDS_SPIFLASH_defconfig
+++ b/configs/T2080QDS_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
index d46934a..e208015 100644
--- a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T208XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T2080QDS_defconfig b/configs/T2080QDS_defconfig
index 0b9abc0..d85957a 100644
--- a/configs/T2080QDS_defconfig
+++ b/configs/T2080QDS_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T208XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig
index f6c386c..292ca5e 100644
--- a/configs/T2080RDB_NAND_defconfig
+++ b/configs/T2080RDB_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T2080RDB_SDCARD_defconfig b/configs/T2080RDB_SDCARD_defconfig
index ffef84d..8cbc37b 100644
--- a/configs/T2080RDB_SDCARD_defconfig
+++ b/configs/T2080RDB_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T2080RDB_SECURE_BOOT_defconfig b/configs/T2080RDB_SECURE_BOOT_defconfig
index 0c1eaf9..373d57a 100644
--- a/configs/T2080RDB_SECURE_BOOT_defconfig
+++ b/configs/T2080RDB_SECURE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T208XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig
index 84ca685..7d423d4 100644
--- a/configs/T2080RDB_SPIFLASH_defconfig
+++ b/configs/T2080RDB_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig b/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
index 9e147c7..df747c4 100644
--- a/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T208XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T2080RDB_defconfig b/configs/T2080RDB_defconfig
index 7a6f88c..598d08a 100644
--- a/configs/T2080RDB_defconfig
+++ b/configs/T2080RDB_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T208XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T2081QDS_NAND_defconfig b/configs/T2081QDS_NAND_defconfig
index 2c41e9c..c4cc522 100644
--- a/configs/T2081QDS_NAND_defconfig
+++ b/configs/T2081QDS_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T2081QDS_SDCARD_defconfig b/configs/T2081QDS_SDCARD_defconfig
index 99b74a9..b1848d5 100644
--- a/configs/T2081QDS_SDCARD_defconfig
+++ b/configs/T2081QDS_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T2081QDS_SPIFLASH_defconfig b/configs/T2081QDS_SPIFLASH_defconfig
index 6d8f16c..82cc518 100644
--- a/configs/T2081QDS_SPIFLASH_defconfig
+++ b/configs/T2081QDS_SPIFLASH_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
index 6179808..33f9989 100644
--- a/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T208XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T2081QDS_defconfig b/configs/T2081QDS_defconfig
index 55fb344..54f397c 100644
--- a/configs/T2081QDS_defconfig
+++ b/configs/T2081QDS_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T208XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T4160QDS_NAND_defconfig b/configs/T4160QDS_NAND_defconfig
index 47702ea..f06b2d9 100644
--- a/configs/T4160QDS_NAND_defconfig
+++ b/configs/T4160QDS_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T4160QDS_SDCARD_defconfig b/configs/T4160QDS_SDCARD_defconfig
index 6476375..3bca2a3 100644
--- a/configs/T4160QDS_SDCARD_defconfig
+++ b/configs/T4160QDS_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T4160QDS_SECURE_BOOT_defconfig b/configs/T4160QDS_SECURE_BOOT_defconfig
index c4ea42a..88af280 100644
--- a/configs/T4160QDS_SECURE_BOOT_defconfig
+++ b/configs/T4160QDS_SECURE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T4240QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T4160QDS_defconfig b/configs/T4160QDS_defconfig
index a2fe946..a0bfef3 100644
--- a/configs/T4160QDS_defconfig
+++ b/configs/T4160QDS_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T4240QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T4160RDB_defconfig b/configs/T4160RDB_defconfig
index c892a02..26707f4 100644
--- a/configs/T4160RDB_defconfig
+++ b/configs/T4160RDB_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T4240RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T4240QDS_NAND_defconfig b/configs/T4240QDS_NAND_defconfig
index af933e0..aa3d1c8 100644
--- a/configs/T4240QDS_NAND_defconfig
+++ b/configs/T4240QDS_NAND_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T4240QDS_SDCARD_defconfig b/configs/T4240QDS_SDCARD_defconfig
index aa98a43..6e2c7cd 100644
--- a/configs/T4240QDS_SDCARD_defconfig
+++ b/configs/T4240QDS_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T4240QDS_SECURE_BOOT_defconfig b/configs/T4240QDS_SECURE_BOOT_defconfig
index 60d205e..d49b3ca 100644
--- a/configs/T4240QDS_SECURE_BOOT_defconfig
+++ b/configs/T4240QDS_SECURE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T4240QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,SECURE_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig b/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
index 67dda4c..10a8261 100644
--- a/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T4240QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T4240QDS_defconfig b/configs/T4240QDS_defconfig
index a36e429..bd204db 100644
--- a/configs/T4240QDS_defconfig
+++ b/configs/T4240QDS_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T4240QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T4240RDB_SDCARD_defconfig b/configs/T4240RDB_SDCARD_defconfig
index 5b5b34d..1bbe564 100644
--- a/configs/T4240RDB_SDCARD_defconfig
+++ b/configs/T4240RDB_SDCARD_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/T4240RDB_defconfig b/configs/T4240RDB_defconfig
index e65c62c..932e970 100644
--- a/configs/T4240RDB_defconfig
+++ b/configs/T4240RDB_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_T4240RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/TZX-Q8-713B7_defconfig b/configs/TZX-Q8-713B7_defconfig
index c33317e..08f9153 100644
--- a/configs/TZX-Q8-713B7_defconfig
+++ b/configs/TZX-Q8-713B7_defconfig
@@ -12,5 +12,11 @@ CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-tzx-q8-713b7"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
diff --git a/configs/UCP1020_SPIFLASH_defconfig b/configs/UCP1020_SPIFLASH_defconfig
index 18691aa..779c7a3 100644
--- a/configs/UCP1020_SPIFLASH_defconfig
+++ b/configs/UCP1020_SPIFLASH_defconfig
@@ -1,9 +1,10 @@
 CONFIG_PPC=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_UCP1020=y
 CONFIG_TARGET_UCP1020_SPIFLASH=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/UCP1020_defconfig b/configs/UCP1020_defconfig
index f9f45ae..60f7aa3 100644
--- a/configs/UCP1020_defconfig
+++ b/configs/UCP1020_defconfig
@@ -1,8 +1,9 @@
 CONFIG_PPC=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_UCP1020=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/UTOO_P66_defconfig b/configs/UTOO_P66_defconfig
index 9ab2fa5..a124df7 100644
--- a/configs/UTOO_P66_defconfig
+++ b/configs/UTOO_P66_defconfig
@@ -16,7 +16,11 @@ CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_VIDEO_LCD_TL059WV5C0=y
 CONFIG_USB_MUSB_SUNXI=y
-# CONFIG_DM_SERIAL is not set
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-utoo-p66"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
diff --git a/configs/Wexler_TAB7200_defconfig b/configs/Wexler_TAB7200_defconfig
index 011e921..2df27dd 100644
--- a/configs/Wexler_TAB7200_defconfig
+++ b/configs/Wexler_TAB7200_defconfig
@@ -7,5 +7,13 @@ CONFIG_VIDEO_LCD_POWER="PH8"
 CONFIG_VIDEO_LCD_BL_EN="PH7"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wexler-tab7200"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig
index 8bdca23..b443938 100644
--- a/configs/Wits_Pro_A20_DKT_defconfig
+++ b/configs/Wits_Pro_A20_DKT_defconfig
@@ -9,6 +9,14 @@ 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_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/Yones_Toptech_BD1078_defconfig b/configs/Yones_Toptech_BD1078_defconfig
index 346e689..341748a 100644
--- a/configs/Yones_Toptech_BD1078_defconfig
+++ b/configs/Yones_Toptech_BD1078_defconfig
@@ -18,5 +18,11 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_VIDEO_LCD_PANEL_LVDS=y
 CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-yones-toptech-bd1078"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
diff --git a/configs/a4m072_defconfig b/configs/a4m072_defconfig
index c979493..3744669 100644
--- a/configs/a4m072_defconfig
+++ b/configs/a4m072_defconfig
@@ -1,7 +1,7 @@
 CONFIG_PPC=y
-CONFIG_CMD_NET=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_A4M072=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="asdfg"
+CONFIG_CMD_NET=y
diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index 0006eba..66ba1d6 100644
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
 CONFIG_RMOBILE=y
 CONFIG_TARGET_ALT=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
 CONFIG_SH_SDHI=y
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
index 030cb51..033f07a 100644
--- a/configs/am335x_baltos_defconfig
+++ b/configs/am335x_baltos_defconfig
@@ -1,6 +1,6 @@
+CONFIG_ARM=y
+CONFIG_TARGET_AM335X_BALTOS=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,NAND"
-CONFIG_ARM=y
-CONFIG_TARGET_AM335X_BALTOS=y
diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
index 07ebb17..b9a0a59 100644
--- a/configs/am335x_boneblack_defconfig
+++ b/configs/am335x_boneblack_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index 67ad959..bcdeb44 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TARGET_AM335X_EVM=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
@@ -11,3 +10,5 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT,ENABLE_VBOOT"
 CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_DISABLE_OF_CONTROL=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index f06baa6..23fed39 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="NAND"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
index c288528..3500f90 100644
--- a/configs/am335x_evm_nor_defconfig
+++ b/configs/am335x_evm_nor_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="NAND"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
index 49ea2f8..6a2ad82 100644
--- a/configs/am335x_evm_norboot_defconfig
+++ b/configs/am335x_evm_norboot_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_AM335X_EVM=y
 CONFIG_NOR=y
 CONFIG_NOR_BOOT=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
index 56e9ea1..d53c878 100644
--- a/configs/am335x_evm_spiboot_defconfig
+++ b/configs/am335x_evm_spiboot_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="SPI_BOOT"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
index 88598b0..50da93c 100644
--- a/configs/am335x_evm_usbspl_defconfig
+++ b/configs/am335x_evm_usbspl_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="NAND,SPL_USBETH_SUPPORT"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index 29a3892..6acbe88 100644
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_AM43XX_EVM=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig
index 6b06cff..7ee15c0 100644
--- a/configs/am43xx_evm_qspiboot_defconfig
+++ b/configs/am43xx_evm_qspiboot_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_AM43XX_EVM=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,QSPI,QSPI_BOOT"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/ap325rxa_defconfig b/configs/ap325rxa_defconfig
index c34d7e9..ef5964a 100644
--- a/configs/ap325rxa_defconfig
+++ b/configs/ap325rxa_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_AP325RXA=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/ap_sh4a_4a_defconfig b/configs/ap_sh4a_4a_defconfig
index 16c1132..1c6a0cc 100644
--- a/configs/ap_sh4a_4a_defconfig
+++ b/configs/ap_sh4a_4a_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_AP_SH4A_4A=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index 9ec73f2..04b03c4 100644
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -5,3 +5,7 @@ CONFIG_TARGET_APALIS_T30=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/arcangel4-be_defconfig b/configs/arcangel4-be_defconfig
index 2f9d0c8..7f0402c 100644
--- a/configs/arcangel4-be_defconfig
+++ b/configs/arcangel4-be_defconfig
@@ -2,10 +2,11 @@ CONFIG_ARC=y
 CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_TARGET_ARCANGEL4=y
 CONFIG_SYS_CLK_FREQ=70000000
-CONFIG_DM_SERIAL=y
 CONFIG_SYS_TEXT_BASE=0x81000000
 CONFIG_DEFAULT_DEVICE_TREE="arcangel4"
 CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DM=y
+CONFIG_DM_SERIAL=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/arcangel4_defconfig b/configs/arcangel4_defconfig
index f1bfba0..b3df518 100644
--- a/configs/arcangel4_defconfig
+++ b/configs/arcangel4_defconfig
@@ -1,10 +1,11 @@
 CONFIG_ARC=y
 CONFIG_TARGET_ARCANGEL4=y
 CONFIG_SYS_CLK_FREQ=70000000
-CONFIG_DM_SERIAL=y
 CONFIG_SYS_TEXT_BASE=0x81000000
 CONFIG_DEFAULT_DEVICE_TREE="arcangel4"
 CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DM=y
+CONFIG_DM_SERIAL=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
index af92f69..c3f60a1 100644
--- a/configs/aristainetos2_defconfig
+++ b/configs/aristainetos2_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_ARISTAINETOS2=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
index 306d4a8..12e09ce 100644
--- a/configs/aristainetos_defconfig
+++ b/configs/aristainetos_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_ARISTAINETOS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index 43f39f2..21a2100 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -10,3 +10,5 @@ CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig
index 463e23c..d35eec5 100644
--- a/configs/at91sam9n12ek_mmc_defconfig
+++ b/configs/at91sam9n12ek_mmc_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9N12EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_MMC"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig
index a554f83..b030f91 100644
--- a/configs/at91sam9n12ek_nandflash_defconfig
+++ b/configs/at91sam9n12ek_nandflash_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_AT91SAM9N12EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_NANDFLASH"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig
index b4bddbc..b523e8b 100644
--- a/configs/at91sam9n12ek_spiflash_defconfig
+++ b/configs/at91sam9n12ek_spiflash_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_AT91SAM9N12EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_SPIFLASH"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig
index 6662721..b3dff9c 100644
--- a/configs/at91sam9x5ek_dataflash_defconfig
+++ b/configs/at91sam9x5ek_dataflash_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_DATAFLASH"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig
index 85b2429..8a27e0c 100644
--- a/configs/at91sam9x5ek_mmc_defconfig
+++ b/configs/at91sam9x5ek_mmc_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_MMC"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig
index a1d3f2d..d0bdb27 100644
--- a/configs/at91sam9x5ek_nandflash_defconfig
+++ b/configs/at91sam9x5ek_nandflash_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig
index 27e4f18..33778a5 100644
--- a/configs/at91sam9x5ek_spiflash_defconfig
+++ b/configs/at91sam9x5ek_spiflash_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_SPIFLASH"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 03ce63b..b1bf01f 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -1,7 +1,8 @@
 CONFIG_AVR32=y
-CONFIG_CMD_NET=y
 CONFIG_TARGET_ATNGW100=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/atngw100mkii_defconfig b/configs/atngw100mkii_defconfig
index 2d1845f..b4014df 100644
--- a/configs/atngw100mkii_defconfig
+++ b/configs/atngw100mkii_defconfig
@@ -1,7 +1,8 @@
 CONFIG_AVR32=y
-CONFIG_CMD_NET=y
 CONFIG_TARGET_ATNGW100MKII=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/atstk1002_defconfig b/configs/atstk1002_defconfig
index f74060e..6f25f3b 100644
--- a/configs/atstk1002_defconfig
+++ b/configs/atstk1002_defconfig
@@ -1,7 +1,7 @@
 CONFIG_AVR32=y
-CONFIG_CMD_NET=y
 CONFIG_TARGET_ATSTK1002=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_NET=y
diff --git a/configs/axm_defconfig b/configs/axm_defconfig
index d7dd3fd..fdd26df 100644
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_TAURUS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2068,BOARD_AXM"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig
index 61c56e6..008df4b 100644
--- a/configs/axs101_defconfig
+++ b/configs/axs101_defconfig
@@ -3,7 +3,8 @@ CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARC_CACHE_LINE_SHIFT=5
 CONFIG_TARGET_AXS101=y
 CONFIG_SYS_CLK_FREQ=750000000
-CONFIG_NETDEVICES=y
 CONFIG_SYS_TEXT_BASE=0x81000000
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig
index 444a95d..3b424e2 100644
--- a/configs/axs103_defconfig
+++ b/configs/axs103_defconfig
@@ -2,7 +2,8 @@ CONFIG_ARC=y
 CONFIG_ISA_ARCV2=y
 CONFIG_TARGET_AXS101=y
 CONFIG_SYS_CLK_FREQ=50000000
-CONFIG_NETDEVICES=y
 CONFIG_SYS_TEXT_BASE=0x81000000
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig
index f2ab415..198c6f8 100644
--- a/configs/ba10_tv_box_defconfig
+++ b/configs/ba10_tv_box_defconfig
@@ -5,5 +5,13 @@ CONFIG_DRAM_CLK=384
 CONFIG_DRAM_EMR1=4
 CONFIG_USB2_VBUS_PIN="PH12"
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-ba10-tvbox"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index a73d151..6b01fe0 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -4,3 +4,8 @@ CONFIG_TEGRA30=y
 CONFIG_TARGET_BEAVER=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver"
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_SPI_FLASH=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/bf518f-ezbrd_defconfig b/configs/bf518f-ezbrd_defconfig
index 8406294..dd8a647 100644
--- a/configs/bf518f-ezbrd_defconfig
+++ b/configs/bf518f-ezbrd_defconfig
@@ -2,4 +2,5 @@ CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF518F_EZBRD=y
 CONFIG_CMD_NET=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf525-ucr2_defconfig b/configs/bf525-ucr2_defconfig
index 692e006..f1352e2 100644
--- a/configs/bf525-ucr2_defconfig
+++ b/configs/bf525-ucr2_defconfig
@@ -1,2 +1,3 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF525_UCR2=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/bf526-ezbrd_defconfig b/configs/bf526-ezbrd_defconfig
index f557db0..e5132d5 100644
--- a/configs/bf526-ezbrd_defconfig
+++ b/configs/bf526-ezbrd_defconfig
@@ -2,4 +2,5 @@ CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF526_EZBRD=y
 CONFIG_CMD_NET=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf527-ad7160-eval_defconfig b/configs/bf527-ad7160-eval_defconfig
index 47f53c9..16e6415 100644
--- a/configs/bf527-ad7160-eval_defconfig
+++ b/configs/bf527-ad7160-eval_defconfig
@@ -1,3 +1,4 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF527_AD7160_EVAL=y
+CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf527-ezkit-v2_defconfig b/configs/bf527-ezkit-v2_defconfig
index dd48d6a..5da5cd3 100644
--- a/configs/bf527-ezkit-v2_defconfig
+++ b/configs/bf527-ezkit-v2_defconfig
@@ -2,5 +2,6 @@ CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF527_EZKIT=y
 CONFIG_SYS_EXTRA_OPTIONS="BF527_EZKIT_REV_2_1"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
diff --git a/configs/bf527-ezkit_defconfig b/configs/bf527-ezkit_defconfig
index 25ef5a9..5d3cb55 100644
--- a/configs/bf527-ezkit_defconfig
+++ b/configs/bf527-ezkit_defconfig
@@ -2,4 +2,5 @@ CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF527_EZKIT=y
 CONFIG_CMD_NET=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf527-sdp_defconfig b/configs/bf527-sdp_defconfig
index 57f47e9..261109e 100644
--- a/configs/bf527-sdp_defconfig
+++ b/configs/bf527-sdp_defconfig
@@ -1,3 +1,4 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF527_SDP=y
+CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf537-minotaur_defconfig b/configs/bf537-minotaur_defconfig
index 8e4ea92..83f31d8 100644
--- a/configs/bf537-minotaur_defconfig
+++ b/configs/bf537-minotaur_defconfig
@@ -2,3 +2,4 @@ CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF537_MINOTAUR=y
 CONFIG_CMD_NET=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/bf537-pnav_defconfig b/configs/bf537-pnav_defconfig
index 405471f..7b02a21 100644
--- a/configs/bf537-pnav_defconfig
+++ b/configs/bf537-pnav_defconfig
@@ -2,3 +2,4 @@ CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF537_PNAV=y
 CONFIG_CMD_NET=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/bf537-srv1_defconfig b/configs/bf537-srv1_defconfig
index 19d6832..cd8cc3e 100644
--- a/configs/bf537-srv1_defconfig
+++ b/configs/bf537-srv1_defconfig
@@ -2,3 +2,4 @@ CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF537_SRV1=y
 CONFIG_CMD_NET=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/bf537-stamp_defconfig b/configs/bf537-stamp_defconfig
index 753bbc4..9768bd6 100644
--- a/configs/bf537-stamp_defconfig
+++ b/configs/bf537-stamp_defconfig
@@ -2,4 +2,5 @@ CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF537_STAMP=y
 CONFIG_CMD_NET=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf548-ezkit_defconfig b/configs/bf548-ezkit_defconfig
index 6bd9e9b..c09b4a0 100644
--- a/configs/bf548-ezkit_defconfig
+++ b/configs/bf548-ezkit_defconfig
@@ -1,5 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF548_EZKIT=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
diff --git a/configs/bf561-acvilon_defconfig b/configs/bf561-acvilon_defconfig
index 7a65892..ff42a8b 100644
--- a/configs/bf561-acvilon_defconfig
+++ b/configs/bf561-acvilon_defconfig
@@ -1,5 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF561_ACVILON=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
diff --git a/configs/bf609-ezkit_defconfig b/configs/bf609-ezkit_defconfig
index d8c2629..c7ceb55 100644
--- a/configs/bf609-ezkit_defconfig
+++ b/configs/bf609-ezkit_defconfig
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
-CONFIG_NETDEVICES=y
 CONFIG_TARGET_BF609_EZKIT=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_LIB_RAND=y
diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig
index 3e57959..ec4d8c0 100644
--- a/configs/bg0900_defconfig
+++ b/configs/bg0900_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_BG0900=y
 CONFIG_SPL=y
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig
index 4d79c79..a81f843 100644
--- a/configs/birdland_bav335a_defconfig
+++ b/configs/birdland_bav335a_defconfig
@@ -4,3 +4,4 @@ CONFIG_BAV_VERSION=1
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig
index f8745ee..9198955 100644
--- a/configs/birdland_bav335b_defconfig
+++ b/configs/birdland_bav335b_defconfig
@@ -4,3 +4,4 @@ CONFIG_BAV_VERSION=2
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/blackstamp_defconfig b/configs/blackstamp_defconfig
index c19a8f0..30e438f 100644
--- a/configs/blackstamp_defconfig
+++ b/configs/blackstamp_defconfig
@@ -1,3 +1,4 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BLACKSTAMP=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/blackvme_defconfig b/configs/blackvme_defconfig
index 93b5ce5..272ecd7 100644
--- a/configs/blackvme_defconfig
+++ b/configs/blackvme_defconfig
@@ -1,3 +1,4 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BLACKVME=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/br4_defconfig b/configs/br4_defconfig
index 7247b9c..573a62e 100644
--- a/configs/br4_defconfig
+++ b/configs/br4_defconfig
@@ -1,5 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BR4=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
index b1c5fa9..e1b6490 100644
--- a/configs/calimain_defconfig
+++ b/configs/calimain_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_CALIMAIN=y
-CONFIG_CMD_NET=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR="\x0b"
+CONFIG_CMD_NET=y
diff --git a/configs/cam_enc_4xx_defconfig b/configs/cam_enc_4xx_defconfig
index 261f155..a7fe71d 100644
--- a/configs/cam_enc_4xx_defconfig
+++ b/configs/cam_enc_4xx_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_CAM_ENC_4XX=y
 CONFIG_SPL=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 3f14178..37c0a6a 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -4,3 +4,8 @@ CONFIG_TEGRA30=y
 CONFIG_TARGET_CARDHU=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu"
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_SPI_FLASH=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 4f7f779..da1d489 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -3,9 +3,15 @@ CONFIG_VENDOR_GOOGLE=y
 CONFIG_DEFAULT_DEVICE_TREE="chromebook_link"
 CONFIG_TARGET_CHROMEBOOK_LINK=y
 CONFIG_HAVE_MRC=y
-CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
-CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_CMD_NET=y
+CONFIG_BOOTSTAGE=y
+CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CMD_BOOTSTAGE=y
 CONFIG_OF_CONTROL=y
 CONFIG_DM_PCI=y
+CONFIG_SPI_FLASH=y
 CONFIG_VIDEO_VESA=y
+CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
+CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_VSNPRINTF=y
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 941033f..876e7d8 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -3,9 +3,15 @@ CONFIG_VENDOR_GOOGLE=y
 CONFIG_DEFAULT_DEVICE_TREE="chromebox_panther"
 CONFIG_TARGET_CHROMEBOX_PANTHER=y
 CONFIG_HAVE_MRC=y
-CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
-CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_CMD_NET=y
+CONFIG_BOOTSTAGE=y
+CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CMD_BOOTSTAGE=y
 CONFIG_OF_CONTROL=y
 CONFIG_DM_PCI=y
+CONFIG_SPI_FLASH=y
 CONFIG_VIDEO_VESA=y
+CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
+CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_VSNPRINTF=y
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 4db785d..d0e8e04 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_CM_FX6=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index 292eccb..e1505c0 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -5,3 +5,7 @@ CONFIG_TARGET_COLIBRI_T20=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index 54d73a2..e2fda6e 100644
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -5,3 +5,7 @@ CONFIG_TARGET_COLIBRI_T30=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
index 5d4f307..e4c2f73 100644
--- a/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_TARGET_COLIBRI_VF=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND"
 CONFIG_CMD_NET=y
+CONFIG_DM=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
-CONFIG_DM=y
diff --git a/configs/colibri_vf_dtb_defconfig b/configs/colibri_vf_dtb_defconfig
index d4c8c58..5d1ea65 100644
--- a/configs/colibri_vf_dtb_defconfig
+++ b/configs/colibri_vf_dtb_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_COLIBRI_VF=y
+CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND"
+CONFIG_OF_CONTROL=y
+CONFIG_DM=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
-CONFIG_DM=y
-CONFIG_OF_CONTROL=y
-CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri"
diff --git a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
index 63b24c0..cc2fd83 100644
--- a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_CONTROLCENTERD=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD,DEVELOP"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/controlcenterd_36BIT_SDCARD_defconfig b/configs/controlcenterd_36BIT_SDCARD_defconfig
index ef64586..60d4bf5 100644
--- a/configs/controlcenterd_36BIT_SDCARD_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_CONTROLCENTERD=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 97ac1fa..cc397a8 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -1,7 +1,13 @@
 CONFIG_X86=y
 CONFIG_VENDOR_COREBOOT=y
 CONFIG_TARGET_COREBOOT=y
+CONFIG_TSC_CALIBRATION_BYPASS=y
 CONFIG_CMD_NET=y
+CONFIG_BOOTSTAGE=y
+CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CMD_BOOTSTAGE=y
 CONFIG_OF_CONTROL=y
 CONFIG_DM_PCI=y
-CONFIG_TSC_CALIBRATION_BYPASS=y
+CONFIG_SPI_FLASH=y
+CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_VSNPRINTF=y
diff --git a/configs/cpuat91_defconfig b/configs/cpuat91_defconfig
index 676e1a5..386912a 100644
--- a/configs/cpuat91_defconfig
+++ b/configs/cpuat91_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_CPUAT91=y
-CONFIG_CMD_NET=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_NET=y
diff --git a/configs/cpuat91_ram_defconfig b/configs/cpuat91_ram_defconfig
index 95e88c4..8095aee 100644
--- a/configs/cpuat91_ram_defconfig
+++ b/configs/cpuat91_ram_defconfig
@@ -1,9 +1,9 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_CPUAT91=y
-CONFIG_CMD_NET=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT"
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_NET=y
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index d3a370d..c6f9449 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -4,4 +4,10 @@ CONFIG_DEFAULT_DEVICE_TREE="crownbay"
 CONFIG_TARGET_CROWNBAY=y
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_CMD_NET=y
+CONFIG_BOOTSTAGE=y
+CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CMD_BOOTSTAGE=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPI_FLASH=y
+CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_VSNPRINTF=y
diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index a28032e..4a9053e 100644
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NET2BIG_V2=y
 CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/da830evm_defconfig b/configs/da830evm_defconfig
index 846b75c..0d91d7a 100644
--- a/configs/da830evm_defconfig
+++ b/configs/da830evm_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DA830EVM=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig
index b3def20..09ccaf2 100644
--- a/configs/da850_am18xxevm_defconfig
+++ b/configs/da850_am18xxevm_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_DA850EVM=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig
index e012763..40a0395 100644
--- a/configs/da850evm_defconfig
+++ b/configs/da850evm_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_DA850EVM=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig
index 22afff5..9a32c20 100644
--- a/configs/da850evm_direct_nor_defconfig
+++ b/configs/da850evm_direct_nor_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DA850EVM=y
 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index 67b8c9a..532e2b1 100644
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -4,3 +4,8 @@ CONFIG_TEGRA114=y
 CONFIG_TARGET_DALMORE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore"
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_SPI_FLASH=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig
index 5f53522..7726314 100644
--- a/configs/db-88f6820-gp_defconfig
+++ b/configs/db-88f6820-gp_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_DB_88F6820_GP=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig
index 637694b..6ce5cff 100644
--- a/configs/db-mv784mp-gp_defconfig
+++ b/configs/db-mv784mp-gp_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_DB_MV784MP_GP=y
 CONFIG_SPL=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/dbau1000_defconfig b/configs/dbau1000_defconfig
index fb6c4af..65d7c4b 100644
--- a/configs/dbau1000_defconfig
+++ b/configs/dbau1000_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_SYS_EXTRA_OPTIONS="DBAU1000"
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/dbau1100_defconfig b/configs/dbau1100_defconfig
index cda1332..a60096f 100644
--- a/configs/dbau1100_defconfig
+++ b/configs/dbau1100_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1100=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/dbau1500_defconfig b/configs/dbau1500_defconfig
index f6f2202..73a0116 100644
--- a/configs/dbau1500_defconfig
+++ b/configs/dbau1500_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1500=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/dbau1550_defconfig b/configs/dbau1550_defconfig
index 85875a9..864eaa8 100644
--- a/configs/dbau1550_defconfig
+++ b/configs/dbau1550_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1550=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/dbau1550_el_defconfig b/configs/dbau1550_el_defconfig
index 5b22978..07dd6b3 100644
--- a/configs/dbau1550_el_defconfig
+++ b/configs/dbau1550_el_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1550=y
 CONFIG_SYS_LITTLE_ENDIAN=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/digsy_mtc_RAMBOOT_defconfig b/configs/digsy_mtc_RAMBOOT_defconfig
index 311ac8e..85c5ed9 100644
--- a/configs/digsy_mtc_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_RAMBOOT_defconfig
@@ -1,5 +1,4 @@
 CONFIG_PPC=y
-CONFIG_CMD_NET=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_DIGSY_MTC=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000"
@@ -7,3 +6,4 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_NET=y
diff --git a/configs/digsy_mtc_defconfig b/configs/digsy_mtc_defconfig
index f4f0a6d..d1bc949 100644
--- a/configs/digsy_mtc_defconfig
+++ b/configs/digsy_mtc_defconfig
@@ -1,7 +1,7 @@
 CONFIG_PPC=y
-CONFIG_CMD_NET=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_DIGSY_MTC=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR=" "
+CONFIG_CMD_NET=y
diff --git a/configs/digsy_mtc_rev5_RAMBOOT_defconfig b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
index 554f907..63624f5 100644
--- a/configs/digsy_mtc_rev5_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
@@ -1,5 +1,4 @@
 CONFIG_PPC=y
-CONFIG_CMD_NET=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_DIGSY_MTC=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000,DIGSY_REV5"
@@ -7,3 +6,4 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_NET=y
diff --git a/configs/digsy_mtc_rev5_defconfig b/configs/digsy_mtc_rev5_defconfig
index 83b8ac2..f015603 100644
--- a/configs/digsy_mtc_rev5_defconfig
+++ b/configs/digsy_mtc_rev5_defconfig
@@ -1,5 +1,4 @@
 CONFIG_PPC=y
-CONFIG_CMD_NET=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_DIGSY_MTC=y
 CONFIG_SYS_EXTRA_OPTIONS="DIGSY_REV5"
@@ -7,3 +6,4 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_NET=y
diff --git a/configs/dlvision-10g_defconfig b/configs/dlvision-10g_defconfig
index 3687111..b58fb55 100644
--- a/configs/dlvision-10g_defconfig
+++ b/configs/dlvision-10g_defconfig
@@ -1,7 +1,7 @@
 CONFIG_PPC=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_4xx=y
 CONFIG_TARGET_DLVISION_10G=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
index 682a6cc..8a78014 100644
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_DRA7XX_EVM=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig
index 86dad88..4cc5f05 100644
--- a/configs/dra7xx_evm_qspiboot_defconfig
+++ b/configs/dra7xx_evm_qspiboot_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_DRA7XX_EVM=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,QSPI_BOOT"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig
index c4bd587..c564b32 100644
--- a/configs/dra7xx_evm_uart3_defconfig
+++ b/configs/dra7xx_evm_uart3_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_DRA7XX_EVM=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3,SPL_YMODEM_SUPPORT"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index 80cb44b..3d09367 100644
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -1,7 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_DRACO=y
-CONFIG_CMD_NET=y
 CONFIG_SPL=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
+CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig
index 0d0dfe9..2a3307c 100644
--- a/configs/dreamplug_defconfig
+++ b/configs/dreamplug_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_DREAMPLUG=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index 87c64fd..bed22c0 100644
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_EA20=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/ecovec_defconfig b/configs/ecovec_defconfig
index 5e11e44..4cdf8a3 100644
--- a/configs/ecovec_defconfig
+++ b/configs/ecovec_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_ECOVEC=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/espt_defconfig b/configs/espt_defconfig
index 150936e..95bfe9a 100644
--- a/configs/espt_defconfig
+++ b/configs/espt_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_ESPT=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index 8f18999..dddc7d7 100644
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_ETHERNUT5=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/forfun_q88db_defconfig b/configs/forfun_q88db_defconfig
index fc7ce6a..697de9c 100644
--- a/configs/forfun_q88db_defconfig
+++ b/configs/forfun_q88db_defconfig
@@ -11,5 +11,11 @@ CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-forfun-q88db"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
diff --git a/configs/ga10h_v1_1_defconfig b/configs/ga10h_v1_1_defconfig
index 67b40c2..25f4199 100644
--- a/configs/ga10h_v1_1_defconfig
+++ b/configs/ga10h_v1_1_defconfig
@@ -15,7 +15,13 @@ CONFIG_VIDEO_LCD_BL_PWM="PH0"
 CONFIG_VIDEO_LCD_PANEL_LVDS=y
 CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ga10h-v1.1"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index 5045510..f01103d 100644
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -1,10 +1,16 @@
 CONFIG_X86=y
-CONFIG_NETDEVICES=y
 CONFIG_VENDOR_INTEL=y
 CONFIG_DEFAULT_DEVICE_TREE="galileo"
 CONFIG_TARGET_GALILEO=y
+CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_CMD_NET=y
+CONFIG_BOOTSTAGE=y
+CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CMD_BOOTSTAGE=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
+CONFIG_SPI_FLASH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
-CONFIG_GENERATE_PIRQ_TABLE=y
+CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_VSNPRINTF=y
diff --git a/configs/gdppc440etx_defconfig b/configs/gdppc440etx_defconfig
index 9fe229e..81ad845 100644
--- a/configs/gdppc440etx_defconfig
+++ b/configs/gdppc440etx_defconfig
@@ -1,7 +1,7 @@
 CONFIG_PPC=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_4xx=y
 CONFIG_TARGET_GDPPC440ETX=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
diff --git a/configs/gose_defconfig b/configs/gose_defconfig
index 6d0c3ae..76b81dc 100644
--- a/configs/gose_defconfig
+++ b/configs/gose_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
 CONFIG_RMOBILE=y
 CONFIG_TARGET_GOSE=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
 CONFIG_SH_SDHI=y
diff --git a/configs/gplugd_defconfig b/configs/gplugd_defconfig
index a92b4e4..7e367a8 100644
--- a/configs/gplugd_defconfig
+++ b/configs/gplugd_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_GPLUGD=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/grasshopper_defconfig b/configs/grasshopper_defconfig
index 85b5f43..97f2915 100644
--- a/configs/grasshopper_defconfig
+++ b/configs/grasshopper_defconfig
@@ -1,7 +1,7 @@
 CONFIG_AVR32=y
-CONFIG_CMD_NET=y
 CONFIG_TARGET_GRASSHOPPER=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_NET=y
diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
index 5cfe983..dfb24b0 100644
--- a/configs/gwventana_defconfig
+++ b/configs/gwventana_defconfig
@@ -1,9 +1,10 @@
 CONFIG_ARM=y
 CONFIG_TARGET_GW_VENTANA=y
-CONFIG_SYS_MALLOC_F=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x18000000
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_DM=y
+CONFIG_DM_SERIAL=y
diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index aa556a1..74656cc 100644
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -4,3 +4,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_HARMONY=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-harmony"
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig
index ed3b7e4..ae74ba1 100644
--- a/configs/highbank_defconfig
+++ b/configs/highbank_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_HIGHBANK=y
-CONFIG_CMD_NET=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds...\nPress <s> to stop or <d> to delay\n"
 CONFIG_AUTOBOOT_KEYED_CTRLC=y
+CONFIG_CMD_NET=y
diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig
index 7707243..cf2cdc8 100644
--- a/configs/hrcon_defconfig
+++ b/configs/hrcon_defconfig
@@ -1,6 +1,6 @@
 CONFIG_PPC=y
-CONFIG_CMD_NET=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_HRCON=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_NET=y
diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
index c8ccf45..371251c 100644
--- a/configs/i12-tvbox_defconfig
+++ b/configs/i12-tvbox_defconfig
@@ -3,6 +3,14 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-i12-tvbox"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/iNet_3F_defconfig b/configs/iNet_3F_defconfig
index e807aeb..cc5db7e 100644
--- a/configs/iNet_3F_defconfig
+++ b/configs/iNet_3F_defconfig
@@ -13,5 +13,11 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_VIDEO_LCD_PANEL_LVDS=y
 CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3f"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
diff --git a/configs/iNet_3W_defconfig b/configs/iNet_3W_defconfig
index eaf7c5a..fc64fb1 100644
--- a/configs/iNet_3W_defconfig
+++ b/configs/iNet_3W_defconfig
@@ -13,5 +13,11 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3w"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
diff --git a/configs/iNet_86VS_defconfig b/configs/iNet_86VS_defconfig
index 017a87a..edf6e8b 100644
--- a/configs/iNet_86VS_defconfig
+++ b/configs/iNet_86VS_defconfig
@@ -11,5 +11,11 @@ CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-inet-86vs"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index cb795fc..9cb4d31 100644
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -1,5 +1,4 @@
 CONFIG_PPC=y
-CONFIG_CMD_NET=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_IDS8313=y
 CONFIG_FIT=y
@@ -8,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFF00000"
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Enter password - autoboot in %d seconds...\n"
 CONFIG_AUTOBOOT_DELAY_STR="ids"
+CONFIG_CMD_NET=y
diff --git a/configs/ima3-mx53_defconfig b/configs/ima3-mx53_defconfig
index 3190b71..c5679dd 100644
--- a/configs/ima3-mx53_defconfig
+++ b/configs/ima3-mx53_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_IMA3_MX53=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/esg/ima3-mx53/imximage.cfg"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index 35aabc8..716111b 100644
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/intip_defconfig b/configs/intip_defconfig
index 82ed775..06d983d 100644
--- a/configs/intip_defconfig
+++ b/configs/intip_defconfig
@@ -1,8 +1,8 @@
 CONFIG_PPC=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_4xx=y
 CONFIG_TARGET_INTIP=y
 CONFIG_SYS_EXTRA_OPTIONS="INTIB"
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
diff --git a/configs/io64_defconfig b/configs/io64_defconfig
index 3276cc4..604cd7e 100644
--- a/configs/io64_defconfig
+++ b/configs/io64_defconfig
@@ -1,7 +1,7 @@
 CONFIG_PPC=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_4xx=y
 CONFIG_TARGET_IO64=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
diff --git a/configs/io_defconfig b/configs/io_defconfig
index ad3a651..9e0afee 100644
--- a/configs/io_defconfig
+++ b/configs/io_defconfig
@@ -1,7 +1,7 @@
 CONFIG_PPC=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_4xx=y
 CONFIG_TARGET_IO=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
diff --git a/configs/iocon_defconfig b/configs/iocon_defconfig
index f966dea..e92056e 100644
--- a/configs/iocon_defconfig
+++ b/configs/iocon_defconfig
@@ -1,7 +1,7 @@
 CONFIG_PPC=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_4xx=y
 CONFIG_TARGET_IOCON=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
diff --git a/configs/ip04_defconfig b/configs/ip04_defconfig
index 22bb8b8..53e7dec 100644
--- a/configs/ip04_defconfig
+++ b/configs/ip04_defconfig
@@ -2,4 +2,5 @@ CONFIG_BLACKFIN=y
 CONFIG_TARGET_IP04=y
 CONFIG_CMD_NET=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/jesurun_q5_defconfig b/configs/jesurun_q5_defconfig
index da41bff..8c17fac 100644
--- a/configs/jesurun_q5_defconfig
+++ b/configs/jesurun_q5_defconfig
@@ -3,5 +3,13 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=312
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-jesurun-q5"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI,MACPWR=SUNXI_GPH(19)"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index dc68c6d..d7af52d 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -4,3 +4,8 @@ CONFIG_TEGRA124=y
 CONFIG_TARGET_JETSON_TK1=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1"
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_SPI_FLASH=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig
index 8dc8d69..ac72e71 100644
--- a/configs/k2e_evm_defconfig
+++ b/configs/k2e_evm_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_KEYSTONE=y
 CONFIG_TARGET_K2E_EVM=y
 CONFIG_SPL=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig
index 0976598..53e7db8 100644
--- a/configs/k2hk_evm_defconfig
+++ b/configs/k2hk_evm_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_KEYSTONE=y
 CONFIG_TARGET_K2HK_EVM=y
 CONFIG_SPL=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig
index 45c600b..ef688dd 100644
--- a/configs/k2l_evm_defconfig
+++ b/configs/k2l_evm_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_KEYSTONE=y
 CONFIG_TARGET_K2L_EVM=y
 CONFIG_SPL=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index 9768d5a..25cd351 100644
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index 5f93285..0a5c545 100644
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index 82b02ae..81b45ad 100644
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig
index bcc2cc8..4877a2d 100644
--- a/configs/kmcoge4_defconfig
+++ b/configs/kmcoge4_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KMP204X=y
 CONFIG_SYS_EXTRA_OPTIONS="KMCOGE4"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index 3484e8a..610dac8 100644
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig
index 6fa48a0..e230ad5 100644
--- a/configs/kmlion1_defconfig
+++ b/configs/kmlion1_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KMP204X=y
 CONFIG_SYS_EXTRA_OPTIONS="KMLION1"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index e40aa3f..bf4a5ea 100644
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig
index a9d23a2..ff20e9d 100644
--- a/configs/kmsugp1_defconfig
+++ b/configs/kmsugp1_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_SUGP1"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig
index 68b5178..7701e63 100644
--- a/configs/kmsuv31_defconfig
+++ b/configs/kmsuv31_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_SUV31"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig
index 6be722c..40dea22 100644
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
 CONFIG_RMOBILE=y
 CONFIG_TARGET_KOELSCH=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
 CONFIG_SH_SDHI=y
diff --git a/configs/lager_defconfig b/configs/lager_defconfig
index 6b4184c..1ee1070 100644
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
 CONFIG_RMOBILE=y
 CONFIG_TARGET_LAGER=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
 CONFIG_SH_SDHI=y
diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig
index c5372b7..3cadd7c 100644
--- a/configs/ls1021aqds_qspi_defconfig
+++ b/configs/ls1021aqds_qspi_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig
index 1ae0f9c..a3e9e66 100644
--- a/configs/ls1021atwr_qspi_defconfig
+++ b/configs/ls1021atwr_qspi_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
 CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
index 636040a..8cd8282 100644
--- a/configs/lschlv2_defconfig
+++ b/configs/lschlv2_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_LSXL=y
 CONFIG_SYS_EXTRA_OPTIONS="LSCHLV2"
 CONFIG_CMD_NET=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig
index 125fbaf..8847109 100644
--- a/configs/lsxhl_defconfig
+++ b/configs/lsxhl_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_LSXL=y
 CONFIG_SYS_EXTRA_OPTIONS="LSXHL"
 CONFIG_CMD_NET=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig
index 28af941..fb681af 100644
--- a/configs/m28evk_defconfig
+++ b/configs/m28evk_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_M28EVK=y
 CONFIG_SPL=y
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/malta_defconfig b/configs/malta_defconfig
index 29fd977..4f0c483 100644
--- a/configs/malta_defconfig
+++ b/configs/malta_defconfig
@@ -1,3 +1,4 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_MALTA=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/maltael_defconfig b/configs/maltael_defconfig
index 2935860..ac835f8 100644
--- a/configs/maltael_defconfig
+++ b/configs/maltael_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
 CONFIG_TARGET_MALTA=y
 CONFIG_SYS_LITTLE_ENDIAN=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig
index cfe6e8e..48df76b 100644
--- a/configs/marsboard_defconfig
+++ b/configs/marsboard_defconfig
@@ -4,4 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
 CONFIG_DM=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_THERMAL=y
diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig
index 23af99b..b60faa1 100644
--- a/configs/maxbcm_defconfig
+++ b/configs/maxbcm_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_MAXBCM=y
 CONFIG_SPL=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
index 664b075..a785980 100644
--- a/configs/medcom-wide_defconfig
+++ b/configs/medcom-wide_defconfig
@@ -4,3 +4,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_MEDCOM_WIDE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-medcom-wide"
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig
index 9468b41..7b5fb93 100644
--- a/configs/mgcoge3un_defconfig
+++ b/configs/mgcoge3un_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index 744aca3..c5c1f38 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -3,12 +3,18 @@ CONFIG_VENDOR_INTEL=y
 CONFIG_DEFAULT_DEVICE_TREE="minnowmax"
 CONFIG_TARGET_MINNOWMAX=y
 CONFIG_HAVE_INTEL_ME=y
-CONFIG_VIDEO_VESA=y
-CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
-CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
 CONFIG_SMP=y
 CONFIG_GENERATE_SFI_TABLE=y
 CONFIG_CMD_CPU=y
 CONFIG_CMD_NET=y
+CONFIG_BOOTSTAGE=y
+CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CMD_BOOTSTAGE=y
 CONFIG_OF_CONTROL=y
 CONFIG_CPU=y
+CONFIG_SPI_FLASH=y
+CONFIG_VIDEO_VESA=y
+CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
+CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
+CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_VSNPRINTF=y
diff --git a/configs/mixtile_loftq_defconfig b/configs/mixtile_loftq_defconfig
index 5c60634..f940bf1 100644
--- a/configs/mixtile_loftq_defconfig
+++ b/configs/mixtile_loftq_defconfig
@@ -6,7 +6,15 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_USB1_VBUS_PIN="PH24"
 CONFIG_USB2_VBUS_PIN=""
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-mixtile-loftq"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
 CONFIG_AXP221_ALDO1_VOLT=3300
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/mk802_a10s_defconfig b/configs/mk802_a10s_defconfig
index 4994936..36ad5bb 100644
--- a/configs/mk802_a10s_defconfig
+++ b/configs/mk802_a10s_defconfig
@@ -5,5 +5,13 @@ CONFIG_DRAM_CLK=432
 CONFIG_DRAM_EMR1=0
 CONFIG_USB1_VBUS_PIN="PB10"
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-mk802"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/mk802_defconfig b/configs/mk802_defconfig
index 1a9a361..a4f1b0b 100644
--- a/configs/mk802_defconfig
+++ b/configs/mk802_defconfig
@@ -3,5 +3,13 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
 CONFIG_USB2_VBUS_PIN="PH12"
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mk802"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/mk802ii_defconfig b/configs/mk802ii_defconfig
index 3850fba..641aa55 100644
--- a/configs/mk802ii_defconfig
+++ b/configs/mk802ii_defconfig
@@ -2,5 +2,13 @@ CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mk802ii"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/motionpro_defconfig b/configs/motionpro_defconfig
index eaa222e..61ffee9 100644
--- a/configs/motionpro_defconfig
+++ b/configs/motionpro_defconfig
@@ -1,7 +1,7 @@
 CONFIG_PPC=y
-CONFIG_CMD_NET=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_MOTIONPRO=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
+CONFIG_CMD_NET=y
diff --git a/configs/mpr2_defconfig b/configs/mpr2_defconfig
index c8be987..f242419 100644
--- a/configs/mpr2_defconfig
+++ b/configs/mpr2_defconfig
@@ -1,2 +1,3 @@
 CONFIG_SH=y
 CONFIG_TARGET_MPR2=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/ms7720se_defconfig b/configs/ms7720se_defconfig
index 0e3f834..58bc947 100644
--- a/configs/ms7720se_defconfig
+++ b/configs/ms7720se_defconfig
@@ -1,2 +1,3 @@
 CONFIG_SH=y
 CONFIG_TARGET_MS7720SE=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/ms7722se_defconfig b/configs/ms7722se_defconfig
index 552f449..59ea708 100644
--- a/configs/ms7722se_defconfig
+++ b/configs/ms7722se_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_MS7722SE=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/ms7750se_defconfig b/configs/ms7750se_defconfig
index c23e4c9..0a805b5 100644
--- a/configs/ms7750se_defconfig
+++ b/configs/ms7750se_defconfig
@@ -1,2 +1,3 @@
 CONFIG_SH=y
 CONFIG_TARGET_MS7750SE=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/mv88f6281gtw_ge_defconfig b/configs/mv88f6281gtw_ge_defconfig
index be9e3a0..41e8931 100644
--- a/configs/mv88f6281gtw_ge_defconfig
+++ b/configs/mv88f6281gtw_ge_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_MV88F6281GTW_GE=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig
index 174c019..7753967 100644
--- a/configs/mx28evk_auart_console_defconfig
+++ b/configs/mx28evk_auart_console_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE,ENV_IS_IN_MMC"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig
index 0f8867f..55ea267 100644
--- a/configs/mx28evk_defconfig
+++ b/configs/mx28evk_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig
index 89eda0b..ed6137c 100644
--- a/configs/mx28evk_nand_defconfig
+++ b/configs/mx28evk_nand_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_NAND"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig
index 19f088c..2fe16e3 100644
--- a/configs/mx28evk_spi_defconfig
+++ b/configs/mx28evk_spi_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_SPI_FLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/mx51_efikamx_defconfig b/configs/mx51_efikamx_defconfig
index 55dcd67..3f89bee 100644
--- a/configs/mx51_efikamx_defconfig
+++ b/configs/mx51_efikamx_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_MX51_EFIKAMX=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_mx.cfg"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/mx51_efikasb_defconfig b/configs/mx51_efikasb_defconfig
index 9958645..662aad4 100644
--- a/configs/mx51_efikasb_defconfig
+++ b/configs/mx51_efikasb_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_MX51_EFIKAMX=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_sb.cfg"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
index 7578fc8..92c1db4 100644
--- a/configs/mx6dlsabreauto_defconfig
+++ b/configs/mx6dlsabreauto_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig
index 92d77f9..5a5a8e0 100644
--- a/configs/mx6dlsabresd_defconfig
+++ b/configs/mx6dlsabresd_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_MX6SABRESD=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg,MX6DL"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
index 3d584bd..df85271 100644
--- a/configs/mx6qsabreauto_defconfig
+++ b/configs/mx6qsabreauto_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index 9ccf097..e544337 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -4,4 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
 CONFIG_DM=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_THERMAL=y
diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig
index 887a509..1508e26 100644
--- a/configs/mx6qsabresd_defconfig
+++ b/configs/mx6qsabresd_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_MX6SABRESD=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig
index a9adcdb..1f573cd 100644
--- a/configs/mx6sabresd_spl_defconfig
+++ b/configs/mx6sabresd_spl_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig
index dd623dd..ccb6e2a 100644
--- a/configs/mx6slevk_defconfig
+++ b/configs/mx6slevk_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_MX6SLEVK=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL"
 CONFIG_CMD_NET=y
 CONFIG_DM=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_THERMAL=y
diff --git a/configs/mx6slevk_spinor_defconfig b/configs/mx6slevk_spinor_defconfig
index 237c5b5..912b162 100644
--- a/configs/mx6slevk_spinor_defconfig
+++ b/configs/mx6slevk_spinor_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_MX6SLEVK=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL,SYS_BOOT_SPINOR"
 CONFIG_CMD_NET=y
 CONFIG_DM=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_THERMAL=y
diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig
index 058e3f8..4766530 100644
--- a/configs/mx6sxsabresd_defconfig
+++ b/configs/mx6sxsabresd_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_MX6SXSABRESD=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,MX6SX"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig
index 0e3159e..e499a0a 100644
--- a/configs/mx6sxsabresd_spl_defconfig
+++ b/configs/mx6sxsabresd_spl_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_MX6SXSABRESD=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SX"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index aa4bdd6..03aa0bf 100644
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NET2BIG_V2=y
 CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index b6f6fa5..7777c40 100644
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index dcb8c32..c2052ed 100644
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index 50c5f97..6508f3d 100644
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index a6495e3..4cb15b9 100644
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -3,3 +3,4 @@ CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index ec0e346..7216400 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 838a43e..805b1d8 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index a739e22..2dc8c5c 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index b4b0524..fc7e708 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index 118f605..29dc3d9 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index 3e70de9..4f13504 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index 81949e8..a040b1c 100644
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -4,10 +4,14 @@ CONFIG_TEGRA124=y
 CONFIG_TARGET_NYAN_BIG=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big"
 CONFIG_CMD_NET=y
-CONFIG_DISPLAY_PORT=y
-CONFIG_VIDEO_TEGRA124=y
-CONFIG_DM_CROS_EC=y
+CONFIG_SPL_DM=y
+CONFIG_SPI_FLASH=y
+CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_KEYB=y
-CONFIG_CMD_CROS_EC=y
+CONFIG_DISPLAY_PORT=y
+CONFIG_VIDEO_TEGRA124=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
index c9c4849..e081c73 100644
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_ODROID_XU3=y
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_CMD_NET=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index 41005c7..3cef0ec 100644
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -1,18 +1,20 @@
 CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_ODROID=y
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_PMIC_MAX77686=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_MAX77686=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_ERRNO_STR=y
diff --git a/configs/omap3_mvblx_defconfig b/configs/omap3_mvblx_defconfig
index fd3902d..05c1c46 100644
--- a/configs/omap3_mvblx_defconfig
+++ b/configs/omap3_mvblx_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_MVBLX=y
-CONFIG_CMD_NET=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR="S"
+CONFIG_CMD_NET=y
diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig
index e4b7e13..1e76735 100644
--- a/configs/omapl138_lcdk_defconfig
+++ b/configs/omapl138_lcdk_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_OMAPL138_LCDK=y
 CONFIG_SPL=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/origen_defconfig b/configs/origen_defconfig
index 657ef7e..a893660 100644
--- a/configs/origen_defconfig
+++ b/configs/origen_defconfig
@@ -1,8 +1,10 @@
 CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_ORIGEN=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen"
 CONFIG_SPL=y
 CONFIG_CMD_SETEXPR=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_DISABLE_OF_CONTROL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig
index 20f64bb..b4cce31 100644
--- a/configs/ot1200_defconfig
+++ b/configs/ot1200_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_OT1200=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx6q_4x_mt41j128.cfg,MX6Q"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig
index 810dff8..42eefb8 100644
--- a/configs/ot1200_spl_defconfig
+++ b/configs/ot1200_spl_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index 3a72b31..1dfef48 100644
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -4,3 +4,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_PAZ00=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-paz00"
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/pb1000_defconfig b/configs/pb1000_defconfig
index f1fdf7c..4b8212c 100644
--- a/configs/pb1000_defconfig
+++ b/configs/pb1000_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
 CONFIG_TARGET_PB1X00=y
 CONFIG_SYS_EXTRA_OPTIONS="PB1000"
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig
index 1ea9333..8050b42 100644
--- a/configs/pcm051_rev1_defconfig
+++ b/configs/pcm051_rev1_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_PCM051=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="REV1"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig
index a0a32f6..16f314e 100644
--- a/configs/pcm051_rev3_defconfig
+++ b/configs/pcm051_rev3_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_PCM051=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="REV3"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
index 88f5e97..a198455 100644
--- a/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@ -4,7 +4,10 @@ CONFIG_TARGET_PEACH_PI=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5800-peach-pi"
 CONFIG_SPL=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_KEYB=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index e6b5bce..a519cff 100644
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -4,7 +4,10 @@ CONFIG_TARGET_PEACH_PIT=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit"
 CONFIG_SPL=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_KEYB=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig
index 723989c..9b8c668 100644
--- a/configs/ph1_ld4_defconfig
+++ b/configs/ph1_ld4_defconfig
@@ -1,9 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
-CONFIG_SPL_DM=y
 CONFIG_MACH_PH1_LD4=y
 CONFIG_PFC_MICRO_SUPPORT_CARD=y
-CONFIG_NET=y
 CONFIG_SYS_TEXT_BASE=0x84000000
 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld4-ref"
 CONFIG_FIT=y
@@ -37,6 +35,7 @@ CONFIG_CMD_NFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SPL_DM=y
 CONFIG_NAND_DENALI=y
 CONFIG_SYS_NAND_DENALI_64BIT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig
index a2e2d4f..bf0f8f2 100644
--- a/configs/ph1_pro4_defconfig
+++ b/configs/ph1_pro4_defconfig
@@ -1,8 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
-CONFIG_SPL_DM=y
 CONFIG_PFC_MICRO_SUPPORT_CARD=y
-CONFIG_NET=y
 CONFIG_SYS_TEXT_BASE=0x84000000
 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref"
 CONFIG_FIT=y
@@ -36,6 +34,7 @@ CONFIG_CMD_NFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SPL_DM=y
 CONFIG_NAND_DENALI=y
 CONFIG_SYS_NAND_DENALI_64BIT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig
index dc59dcb..791e633 100644
--- a/configs/ph1_sld8_defconfig
+++ b/configs/ph1_sld8_defconfig
@@ -1,9 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
-CONFIG_SPL_DM=y
 CONFIG_MACH_PH1_SLD8=y
 CONFIG_PFC_MICRO_SUPPORT_CARD=y
-CONFIG_NET=y
 CONFIG_SYS_TEXT_BASE=0x84000000
 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld8-ref"
 CONFIG_FIT=y
@@ -37,6 +35,7 @@ CONFIG_CMD_NFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SPL_DM=y
 CONFIG_NAND_DENALI=y
 CONFIG_SYS_NAND_DENALI_64BIT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
index 1a9fa47..c9a3afe 100644
--- a/configs/plutux_defconfig
+++ b/configs/plutux_defconfig
@@ -4,3 +4,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_PLUTUX=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-plutux"
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/porter_defconfig b/configs/porter_defconfig
index d545b53..1ef1483 100644
--- a/configs/porter_defconfig
+++ b/configs/porter_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
 CONFIG_RMOBILE=y
 CONFIG_TARGET_PORTER=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
 CONFIG_SH_SDHI=y
diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig
index 37ced5a..e6c9730 100644
--- a/configs/portl2_defconfig
+++ b/configs/portl2_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_PORTL2"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/pr1_defconfig b/configs/pr1_defconfig
index a8eb7f3..405e494 100644
--- a/configs/pr1_defconfig
+++ b/configs/pr1_defconfig
@@ -1,5 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_PR1=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 10f2fe9..63fd450 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -1,7 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_PXM2=y
-CONFIG_CMD_NET=y
 CONFIG_SPL=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
+CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index 901cbd7..38e0fdb 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -1,10 +1,14 @@
 CONFIG_X86=y
-CONFIG_VENDOR_EMULATION=y
 CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
-CONFIG_TARGET_QEMU_X86=y
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_CMD_NET=y
+CONFIG_BOOTSTAGE=y
+CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_CMD_BOOTSTAGE=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPI_FLASH=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
+CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_VSNPRINTF=y
diff --git a/configs/qemu_mips64_defconfig b/configs/qemu_mips64_defconfig
index a96e3f7..9eceae6 100644
--- a/configs/qemu_mips64_defconfig
+++ b/configs/qemu_mips64_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
 CONFIG_TARGET_QEMU_MIPS=y
 CONFIG_CPU_MIPS64_R1=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/qemu_mips64el_defconfig b/configs/qemu_mips64el_defconfig
index 94c0610..d847757 100644
--- a/configs/qemu_mips64el_defconfig
+++ b/configs/qemu_mips64el_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_QEMU_MIPS=y
 CONFIG_SYS_LITTLE_ENDIAN=y
 CONFIG_CPU_MIPS64_R1=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/qemu_mips_defconfig b/configs/qemu_mips_defconfig
index 446d87d..714e72b 100644
--- a/configs/qemu_mips_defconfig
+++ b/configs/qemu_mips_defconfig
@@ -1,3 +1,4 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_QEMU_MIPS=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/qemu_mipsel_defconfig b/configs/qemu_mipsel_defconfig
index e0b3990..f6cb45e 100644
--- a/configs/qemu_mipsel_defconfig
+++ b/configs/qemu_mipsel_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
 CONFIG_TARGET_QEMU_MIPS=y
 CONFIG_SYS_LITTLE_ENDIAN=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/r0p7734_defconfig b/configs/r0p7734_defconfig
index caf0cb5..727c46c 100644
--- a/configs/r0p7734_defconfig
+++ b/configs/r0p7734_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_R0P7734=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig
index 6d37e26..05026bc 100644
--- a/configs/r2dplus_defconfig
+++ b/configs/r2dplus_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_R2DPLUS=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig
index bc1657d..9c124d0 100644
--- a/configs/r7-tv-dongle_defconfig
+++ b/configs/r7-tv-dongle_defconfig
@@ -4,5 +4,13 @@ CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=384
 CONFIG_USB1_VBUS_PIN="PG13"
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-r7-tv-dongle"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/r7780mp_defconfig b/configs/r7780mp_defconfig
index f32dfcb..514bd70 100644
--- a/configs/r7780mp_defconfig
+++ b/configs/r7780mp_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_R7780MP=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index 104b3e6..cbe3dea 100644
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -4,4 +4,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
 CONFIG_DM=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_THERMAL=y
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index b72d3a5..534a8a8 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_BCM283X=y
 CONFIG_TARGET_RPI_2=y
 CONFIG_CMD_NET=y
+CONFIG_PHYS_TO_BUS=y
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index fc1aef3..ccfbb8f 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_BCM283X=y
 CONFIG_TARGET_RPI=y
 CONFIG_CMD_NET=y
+CONFIG_PHYS_TO_BUS=y
diff --git a/configs/rsk7203_defconfig b/configs/rsk7203_defconfig
index c85ebba..27f9b65 100644
--- a/configs/rsk7203_defconfig
+++ b/configs/rsk7203_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_RSK7203=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/rsk7264_defconfig b/configs/rsk7264_defconfig
index 1bf5d06..701f73a 100644
--- a/configs/rsk7264_defconfig
+++ b/configs/rsk7264_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_RSK7264=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/rsk7269_defconfig b/configs/rsk7269_defconfig
index 6ddd099..ae5fe02 100644
--- a/configs/rsk7269_defconfig
+++ b/configs/rsk7269_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_RSK7269=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index 93ab514..2f125e4 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -1,7 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_RUT=y
-CONFIG_CMD_NET=y
 CONFIG_SPL=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
+CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
index 32ac86a..30d6059 100644
--- a/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@ -1,7 +1,9 @@
 CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_S5PC210_UNIVERSAL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210"
 CONFIG_CMD_SETEXPR=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_DISABLE_OF_CONTROL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig
index fd80a64..5c5841f 100644
--- a/configs/sama5d3xek_mmc_defconfig
+++ b/configs/sama5d3xek_mmc_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig
index 9157ead..d178620 100644
--- a/configs/sama5d3xek_nandflash_defconfig
+++ b/configs/sama5d3xek_nandflash_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig
index da1f3c1..ad0aedf 100644
--- a/configs/sama5d3xek_spiflash_defconfig
+++ b/configs/sama5d3xek_spiflash_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_SERIALFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig
index f5a344c..0fa5852 100644
--- a/configs/sama5d4_xplained_mmc_defconfig
+++ b/configs/sama5d4_xplained_mmc_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig
index 0e04af9..3bf4ac6 100644
--- a/configs/sama5d4_xplained_nandflash_defconfig
+++ b/configs/sama5d4_xplained_nandflash_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig
index a8cabb7..1074471 100644
--- a/configs/sama5d4_xplained_spiflash_defconfig
+++ b/configs/sama5d4_xplained_spiflash_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig
index 84c64a9..fc9e0f1 100644
--- a/configs/sama5d4ek_mmc_defconfig
+++ b/configs/sama5d4ek_mmc_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig
index 0782baf..3961654 100644
--- a/configs/sama5d4ek_nandflash_defconfig
+++ b/configs/sama5d4ek_nandflash_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig
index b5a3eb5..12857e4 100644
--- a/configs/sama5d4ek_spiflash_defconfig
+++ b/configs/sama5d4ek_spiflash_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 31fe2f9..4c2c230 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -1,27 +1,27 @@
-CONFIG_DM_USB=y
-CONFIG_NETDEVICES=y
-CONFIG_DM_ETH=y
 CONFIG_PCI=y
-CONFIG_SYS_VSNPRINTF=y
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
-CONFIG_BOOTSTAGE=y
-CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_CMD_NET=y
 CONFIG_CMD_SOUND=y
+CONFIG_BOOTSTAGE=y
+CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_HOSTFILE=y
 CONFIG_DM_PCI=y
 CONFIG_PCI_SANDBOX=y
+CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SANDBOX=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SANDBOX=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
 CONFIG_CROS_EC_KEYB=y
+CONFIG_SANDBOX_SERIAL=y
 CONFIG_TPM_TIS_SANDBOX=y
 CONFIG_SYS_I2C_SANDBOX=y
 CONFIG_SANDBOX_SPI=y
@@ -33,12 +33,13 @@ CONFIG_DM_REGULATOR_SANDBOX=y
 CONFIG_SOUND=y
 CONFIG_SOUND_SANDBOX=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_EMUL=y
 CONFIG_USB_STORAGE=y
 CONFIG_DM_RTC=y
+CONFIG_SYS_VSNPRINTF=y
 CONFIG_ERRNO_STR=y
 CONFIG_UNIT_TEST=y
 CONFIG_UT_TIME=y
 CONFIG_UT_DM=y
 CONFIG_UT_ENV=y
-CONFIG_SANDBOX_SERIAL=y
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 9c5f2bc..01cb8f7 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -4,3 +4,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_SEABOARD=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard"
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/sh7752evb_defconfig b/configs/sh7752evb_defconfig
index bbf806d..bd97913 100644
--- a/configs/sh7752evb_defconfig
+++ b/configs/sh7752evb_defconfig
@@ -2,3 +2,5 @@ CONFIG_SH=y
 CONFIG_SH_32BIT=y
 CONFIG_TARGET_SH7752EVB=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/sh7753evb_defconfig b/configs/sh7753evb_defconfig
index 536cc71..84c207a 100644
--- a/configs/sh7753evb_defconfig
+++ b/configs/sh7753evb_defconfig
@@ -1,3 +1,5 @@
 CONFIG_SH=y
 CONFIG_TARGET_SH7753EVB=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig
index 138b7b9..d22e70e 100644
--- a/configs/sh7757lcr_defconfig
+++ b/configs/sh7757lcr_defconfig
@@ -2,3 +2,5 @@ CONFIG_SH=y
 CONFIG_SH_32BIT=y
 CONFIG_TARGET_SH7757LCR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/sh7763rdp_defconfig b/configs/sh7763rdp_defconfig
index 0d65b16..21fbc6a 100644
--- a/configs/sh7763rdp_defconfig
+++ b/configs/sh7763rdp_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_SH7763RDP=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/sh7785lcr_32bit_defconfig b/configs/sh7785lcr_32bit_defconfig
index 09e85a6..a0f0640 100644
--- a/configs/sh7785lcr_32bit_defconfig
+++ b/configs/sh7785lcr_32bit_defconfig
@@ -2,3 +2,4 @@ CONFIG_SH=y
 CONFIG_SH_32BIT=y
 CONFIG_TARGET_SH7785LCR=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/sh7785lcr_defconfig b/configs/sh7785lcr_defconfig
index a48a871..0984580 100644
--- a/configs/sh7785lcr_defconfig
+++ b/configs/sh7785lcr_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_SH7785LCR=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/shmin_defconfig b/configs/shmin_defconfig
index 60725fc..8979fdd 100644
--- a/configs/shmin_defconfig
+++ b/configs/shmin_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_SHMIN=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/silk_defconfig b/configs/silk_defconfig
index 28ca83d..ed107e3 100644
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
 CONFIG_RMOBILE=y
 CONFIG_TARGET_SILK=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
 CONFIG_SH_SDHI=y
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 0602fde..9092f3b 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -5,8 +5,11 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
 CONFIG_SPL=y
 CONFIG_CMD_NET=y
 CONFIG_CMD_SOUND=y
+CONFIG_SPI_FLASH=y
 CONFIG_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index 8900525..e3d829b 100644
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -4,3 +4,6 @@ CONFIG_TARGET_SMDK5420=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420"
 CONFIG_SPL=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig
index 1479145..5d01f89 100644
--- a/configs/smdkv310_defconfig
+++ b/configs/smdkv310_defconfig
@@ -5,3 +5,5 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4210-smdkv310"
 CONFIG_SPL=y
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 6f838a9..a43e51e 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -5,6 +5,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5250-snow"
 CONFIG_SPL=y
 CONFIG_CMD_NET=y
 CONFIG_CMD_SOUND=y
+CONFIG_SPI_FLASH=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
@@ -14,3 +15,5 @@ CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig
index 473e6d3..8c5b109 100644
--- a/configs/socfpga_arria5_defconfig
+++ b/configs/socfpga_arria5_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig
index b674721..6302ec5 100644
--- a/configs/socfpga_cyclone5_defconfig
+++ b/configs/socfpga_cyclone5_defconfig
@@ -1,10 +1,11 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_TARGET_SOCFPGA_CYCLONE5=y
-CONFIG_NETDEVICES=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
 CONFIG_SPL=y
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPI_FLASH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig
index c9fcb74..cf390f3 100644
--- a/configs/socfpga_socrates_defconfig
+++ b/configs/socfpga_socrates_defconfig
@@ -1,11 +1,12 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_TARGET_SOCFPGA_CYCLONE5=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
-CONFIG_NETDEVICES=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
 CONFIG_SPL=y
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_DISABLE_OF_CONTROL=y
+CONFIG_SPI_FLASH=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear300_defconfig b/configs/spear300_defconfig
index ccd5e56..5d179b9 100644
--- a/configs/spear300_defconfig
+++ b/configs/spear300_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR300=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear300"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear300_nand_defconfig b/configs/spear300_nand_defconfig
index 47a3893..d0a62a8 100644
--- a/configs/spear300_nand_defconfig
+++ b/configs/spear300_nand_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR300=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear300,nand"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear300_usbtty_defconfig b/configs/spear300_usbtty_defconfig
index 16799e0..ae5c2b5 100644
--- a/configs/spear300_usbtty_defconfig
+++ b/configs/spear300_usbtty_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR300=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear300,usbtty"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear300_usbtty_nand_defconfig b/configs/spear300_usbtty_nand_defconfig
index 6d74951..a5020c9 100644
--- a/configs/spear300_usbtty_nand_defconfig
+++ b/configs/spear300_usbtty_nand_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR300=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear300,usbtty,nand"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_defconfig b/configs/spear310_defconfig
index 456d3d1..0e01abd 100644
--- a/configs/spear310_defconfig
+++ b/configs/spear310_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR310=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear310"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_nand_defconfig b/configs/spear310_nand_defconfig
index d5d5376..cd99e3a 100644
--- a/configs/spear310_nand_defconfig
+++ b/configs/spear310_nand_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR310=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear310,nand"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_pnor_defconfig b/configs/spear310_pnor_defconfig
index 27a7994..ef4d3a1 100644
--- a/configs/spear310_pnor_defconfig
+++ b/configs/spear310_pnor_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR310=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear310,FLASH_PNOR"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_usbtty_defconfig b/configs/spear310_usbtty_defconfig
index ce3cfca..5dea48b 100644
--- a/configs/spear310_usbtty_defconfig
+++ b/configs/spear310_usbtty_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR310=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear310,usbtty"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_usbtty_nand_defconfig b/configs/spear310_usbtty_nand_defconfig
index 601321e..c9b526c 100644
--- a/configs/spear310_usbtty_nand_defconfig
+++ b/configs/spear310_usbtty_nand_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR310=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear310,usbtty,nand"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_usbtty_pnor_defconfig b/configs/spear310_usbtty_pnor_defconfig
index 31f3420..d9d7214 100644
--- a/configs/spear310_usbtty_pnor_defconfig
+++ b/configs/spear310_usbtty_pnor_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR310=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear310,usbtty,FLASH_PNOR"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_defconfig b/configs/spear320_defconfig
index cfa7dce..db0a1cd 100644
--- a/configs/spear320_defconfig
+++ b/configs/spear320_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR320=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear320"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_nand_defconfig b/configs/spear320_nand_defconfig
index 1023111..691433b 100644
--- a/configs/spear320_nand_defconfig
+++ b/configs/spear320_nand_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR320=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear320,nand"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_pnor_defconfig b/configs/spear320_pnor_defconfig
index c8e3b4d..41fb10e 100644
--- a/configs/spear320_pnor_defconfig
+++ b/configs/spear320_pnor_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR320=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear320,FLASH_PNOR"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_usbtty_defconfig b/configs/spear320_usbtty_defconfig
index 3d3dc11..3f73df6 100644
--- a/configs/spear320_usbtty_defconfig
+++ b/configs/spear320_usbtty_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR320=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear320,usbtty"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_usbtty_nand_defconfig b/configs/spear320_usbtty_nand_defconfig
index 91bd029..8563f4c 100644
--- a/configs/spear320_usbtty_nand_defconfig
+++ b/configs/spear320_usbtty_nand_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR320=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear320,usbtty,nand"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_usbtty_pnor_defconfig b/configs/spear320_usbtty_pnor_defconfig
index 6e887a6..3980280 100644
--- a/configs/spear320_usbtty_pnor_defconfig
+++ b/configs/spear320_usbtty_pnor_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR320=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear320,usbtty,FLASH_PNOR"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear600_defconfig b/configs/spear600_defconfig
index 2d27e7a..85c484c 100644
--- a/configs/spear600_defconfig
+++ b/configs/spear600_defconfig
@@ -1,9 +1,9 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR600=y
-CONFIG_NETDEVICES=y
-CONFIG_CMD_NET=y
 CONFIG_SYS_EXTRA_OPTIONS="spear600"
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear600_nand_defconfig b/configs/spear600_nand_defconfig
index 2590edf..715d949 100644
--- a/configs/spear600_nand_defconfig
+++ b/configs/spear600_nand_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR600=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear600,nand"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear600_usbtty_defconfig b/configs/spear600_usbtty_defconfig
index fcf1ed2..6709658 100644
--- a/configs/spear600_usbtty_defconfig
+++ b/configs/spear600_usbtty_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR600=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear600,usbtty"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear600_usbtty_nand_defconfig b/configs/spear600_usbtty_nand_defconfig
index d9eaa5c..fdadae2 100644
--- a/configs/spear600_usbtty_nand_defconfig
+++ b/configs/spear600_usbtty_nand_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR600=y
-CONFIG_NETDEVICES=y
 CONFIG_SYS_EXTRA_OPTIONS="spear600,usbtty,nand"
 CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig
index f8ec5db..425bcfb 100644
--- a/configs/stv0991_defconfig
+++ b/configs/stv0991_defconfig
@@ -1,11 +1,11 @@
 CONFIG_ARM=y
 CONFIG_TARGET_STV0991=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_NETDEVICES=y
-CONFIG_CMD_NET=y
 CONFIG_DEFAULT_DEVICE_TREE="stv0991"
 CONFIG_SYS_EXTRA_OPTIONS="stv0991"
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/sunxi_Gemei_G9_defconfig b/configs/sunxi_Gemei_G9_defconfig
index 35aa847..dfd1b5d 100644
--- a/configs/sunxi_Gemei_G9_defconfig
+++ b/configs/sunxi_Gemei_G9_defconfig
@@ -9,5 +9,13 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_VIDEO_LCD_PANEL_LVDS=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-gemei-g9"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
+CONFIG_DM_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index b94f486..f02c442 100644
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_TAURUS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2067,BOARD_TAURUS"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/tb100_defconfig b/configs/tb100_defconfig
index c753197..c94118a 100644
--- a/configs/tb100_defconfig
+++ b/configs/tb100_defconfig
@@ -2,12 +2,13 @@ CONFIG_ARC=y
 CONFIG_ARC_CACHE_LINE_SHIFT=5
 CONFIG_TARGET_TB100=y
 CONFIG_SYS_CLK_FREQ=500000000
-CONFIG_NETDEVICES=y
-CONFIG_DM_SERIAL=y
 CONFIG_SYS_TEXT_BASE=0x84000000
 CONFIG_DEFAULT_DEVICE_TREE="abilis_tb100"
 CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DM=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index 317a959..99252df 100644
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -4,3 +4,8 @@ CONFIG_TEGRA30=y
 CONFIG_TARGET_TEC_NG=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-tec-ng"
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_SPI_FLASH=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/tec_defconfig b/configs/tec_defconfig
index e831b5c..d1fd04b 100644
--- a/configs/tec_defconfig
+++ b/configs/tec_defconfig
@@ -4,3 +4,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_TEC=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-tec"
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index 5fab571..7f9afc8 100644
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -1,7 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_THUBAN=y
-CONFIG_CMD_NET=y
 CONFIG_SPL=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
+CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig
index 01355b6..b8022aa 100644
--- a/configs/tqma6q_mba6_mmc_defconfig
+++ b/configs/tqma6q_mba6_mmc_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_TQMA6=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_MMC_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig
index ba24663..321ebea 100644
--- a/configs/tqma6q_mba6_spi_defconfig
+++ b/configs/tqma6q_mba6_spi_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_TQMA6=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_SPI_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig
index cbb4500..dca194a 100644
--- a/configs/tqma6s_mba6_mmc_defconfig
+++ b/configs/tqma6s_mba6_mmc_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_TQMA6=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_MMC_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig
index 805d8ab..f0c4fe9 100644
--- a/configs/tqma6s_mba6_spi_defconfig
+++ b/configs/tqma6s_mba6_spi_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_TQMA6=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_SPI_BOOT"
 CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index 52e87a1..a991645 100644
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -1,8 +1,10 @@
 CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_TRATS2=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
-# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_CMD_SETEXPR=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_DISABLE_OF_CONTROL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index 25315b3..d3aedbd 100644
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -1,7 +1,9 @@
 CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_TRATS=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats"
 CONFIG_CMD_SETEXPR=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_DISABLE_OF_CONTROL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index d58dc10..51137c3 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -4,3 +4,8 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_TRIMSLICE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-trimslice"
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_SPI_FLASH=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/tseries_spi_defconfig b/configs/tseries_spi_defconfig
index 06a296a..92d49eb 100644
--- a/configs/tseries_spi_defconfig
+++ b/configs/tseries_spi_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT"
 # CONFIG_CMD_CRC32 is not set
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/vct_platinum_defconfig b/configs/vct_platinum_defconfig
index 217b1c1..89369e2 100644
--- a/configs/vct_platinum_defconfig
+++ b/configs/vct_platinum_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
 CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUM=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig
index 8b40d58..de10b76 100644
--- a/configs/vct_platinum_onenand_defconfig
+++ b/configs/vct_platinum_onenand_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUM=y
 CONFIG_VCT_ONENAND=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig
index 4d82da9..053c825 100644
--- a/configs/vct_platinum_onenand_small_defconfig
+++ b/configs/vct_platinum_onenand_small_defconfig
@@ -4,3 +4,4 @@ CONFIG_VCT_PLATINUM=y
 CONFIG_VCT_ONENAND=y
 CONFIG_VCT_SMALL_IMAGE=y
 # CONFIG_CMD_CRC32 is not set
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_platinum_small_defconfig b/configs/vct_platinum_small_defconfig
index 5e1f4ab..69053fb 100644
--- a/configs/vct_platinum_small_defconfig
+++ b/configs/vct_platinum_small_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUM=y
 CONFIG_VCT_SMALL_IMAGE=y
 # CONFIG_CMD_CRC32 is not set
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_platinumavc_defconfig b/configs/vct_platinumavc_defconfig
index 0a5748a..32685d5 100644
--- a/configs/vct_platinumavc_defconfig
+++ b/configs/vct_platinumavc_defconfig
@@ -1,3 +1,4 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUMAVC=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig
index 289f864..eebaf2c 100644
--- a/configs/vct_platinumavc_onenand_defconfig
+++ b/configs/vct_platinumavc_onenand_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
 CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUMAVC=y
 CONFIG_VCT_ONENAND=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig
index 1b28535..9a7cc94 100644
--- a/configs/vct_platinumavc_onenand_small_defconfig
+++ b/configs/vct_platinumavc_onenand_small_defconfig
@@ -4,3 +4,4 @@ CONFIG_VCT_PLATINUMAVC=y
 CONFIG_VCT_ONENAND=y
 CONFIG_VCT_SMALL_IMAGE=y
 # CONFIG_CMD_CRC32 is not set
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_platinumavc_small_defconfig b/configs/vct_platinumavc_small_defconfig
index 54813ca..3aba19d 100644
--- a/configs/vct_platinumavc_small_defconfig
+++ b/configs/vct_platinumavc_small_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUMAVC=y
 CONFIG_VCT_SMALL_IMAGE=y
 # CONFIG_CMD_CRC32 is not set
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_premium_defconfig b/configs/vct_premium_defconfig
index 8cd8331..50108eb 100644
--- a/configs/vct_premium_defconfig
+++ b/configs/vct_premium_defconfig
@@ -2,3 +2,4 @@ CONFIG_MIPS=y
 CONFIG_TARGET_VCT=y
 CONFIG_VCT_PREMIUM=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_premium_onenand_defconfig b/configs/vct_premium_onenand_defconfig
index 5a269c6..1241630 100644
--- a/configs/vct_premium_onenand_defconfig
+++ b/configs/vct_premium_onenand_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PREMIUM=y
 CONFIG_VCT_ONENAND=y
 CONFIG_CMD_NET=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig
index f592a62..46f3dc4 100644
--- a/configs/vct_premium_onenand_small_defconfig
+++ b/configs/vct_premium_onenand_small_defconfig
@@ -4,3 +4,4 @@ CONFIG_VCT_PREMIUM=y
 CONFIG_VCT_ONENAND=y
 CONFIG_VCT_SMALL_IMAGE=y
 # CONFIG_CMD_CRC32 is not set
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_premium_small_defconfig b/configs/vct_premium_small_defconfig
index 3fb5e69..ccd06c0 100644
--- a/configs/vct_premium_small_defconfig
+++ b/configs/vct_premium_small_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PREMIUM=y
 CONFIG_VCT_SMALL_IMAGE=y
 # CONFIG_CMD_CRC32 is not set
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index 31a0ce3..3fab99c 100644
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -4,3 +4,8 @@ CONFIG_TEGRA124=y
 CONFIG_TARGET_VENICE2=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2"
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_SPI_FLASH=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index 46dca48..0a6e10f 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -4,3 +4,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_VENTANA=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-ventana"
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig
index 79a1291..cd1e6db 100644
--- a/configs/vexpress_aemv8a_juno_defconfig
+++ b/configs/vexpress_aemv8a_juno_defconfig
@@ -1,4 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VEXPRESS64_JUNO=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="vexpress64"
 CONFIG_CMD_NET=y
+CONFIG_DM=y
+CONFIG_DM_SERIAL=y
diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
index 21bfb4a..395ffa6 100644
--- a/configs/vexpress_aemv8a_semi_defconfig
+++ b/configs/vexpress_aemv8a_semi_defconfig
@@ -1,4 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VEXPRESS64_BASE_FVP=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="vexpress64"
 CONFIG_CMD_NET=y
+CONFIG_DM=y
+CONFIG_DM_SERIAL=y
diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig
index b5d97c2..3955ee0 100644
--- a/configs/vf610twr_defconfig
+++ b/configs/vf610twr_defconfig
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_I
 CONFIG_CMD_NET=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig
index b054644..98f1aa7 100644
--- a/configs/vf610twr_nand_defconfig
+++ b/configs/vf610twr_nand_defconfig
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_I
 CONFIG_CMD_NET=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/vision2_defconfig b/configs/vision2_defconfig
index 7bdfc8c..94df0d1 100644
--- a/configs/vision2_defconfig
+++ b/configs/vision2_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_VISION2=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/ttcontrol/vision2/imximage_hynix.cfg"
 CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig
index 7446a42..f7f822b 100644
--- a/configs/whistler_defconfig
+++ b/configs/whistler_defconfig
@@ -4,3 +4,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_WHISTLER=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-whistler"
 CONFIG_CMD_NET=y
+CONFIG_SPL_DM=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/x600_defconfig b/configs/x600_defconfig
index 8e22a18..f8b0340 100644
--- a/configs/x600_defconfig
+++ b/configs/x600_defconfig
@@ -1,9 +1,9 @@
 CONFIG_ARM=y
 CONFIG_TARGET_X600=y
-CONFIG_NETDEVICES=y
-CONFIG_CMD_NET=y
 CONFIG_SPL=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_CMD_NET=y
+CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/zmx25_defconfig b/configs/zmx25_defconfig
index 259d4a9..a776f6a 100644
--- a/configs/zmx25_defconfig
+++ b/configs/zmx25_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_ZMX25=y
-CONFIG_CMD_NET=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="boot in %d s\n"
 CONFIG_AUTOBOOT_DELAY_STR="delaygs"
 CONFIG_AUTOBOOT_STOP_STR="stopgs"
+CONFIG_CMD_NET=y
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index 03f4bf7..a7307cf 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -4,9 +4,9 @@ CONFIG_TARGET_ZYNQ_MICROZED=y
 CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SPL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_DISABLE_OF_CONTROL=y
diff --git a/configs/zynq_zc70x_defconfig b/configs/zynq_zc70x_defconfig
index 7377619..d3dce0f 100644
--- a/configs/zynq_zc70x_defconfig
+++ b/configs/zynq_zc70x_defconfig
@@ -1,7 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ZYNQ=y
 CONFIG_TARGET_ZYNQ_ZC70X=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SPL=y
@@ -10,3 +9,4 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_DISABLE_OF_CONTROL=y
diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
index c948ad7..69a1d8a 100644
--- a/configs/zynq_zc770_xm010_defconfig
+++ b/configs/zynq_zc770_xm010_defconfig
@@ -1,7 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ZYNQ=y
 CONFIG_TARGET_ZYNQ_ZC770=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SPL=y
@@ -11,3 +10,5 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
 CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_DISABLE_OF_CONTROL=y
+CONFIG_SPI_FLASH=y
diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig
index 3429bf9..311d686 100644
--- a/configs/zynq_zc770_xm012_defconfig
+++ b/configs/zynq_zc770_xm012_defconfig
@@ -1,7 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ZYNQ=y
 CONFIG_TARGET_ZYNQ_ZC770=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SPL=y
@@ -11,3 +10,4 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
 CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_DISABLE_OF_CONTROL=y
diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
index a435229..5c51c68 100644
--- a/configs/zynq_zc770_xm013_defconfig
+++ b/configs/zynq_zc770_xm013_defconfig
@@ -1,7 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ZYNQ=y
 CONFIG_TARGET_ZYNQ_ZC770=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SPL=y
@@ -11,3 +10,4 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
 CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_DISABLE_OF_CONTROL=y
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index 8f94d21..8637c0f 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -1,7 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ZYNQ=y
 CONFIG_TARGET_ZYNQ_ZED=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SPL=y
@@ -10,3 +9,4 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_DISABLE_OF_CONTROL=y
diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index 1849c74..fcfd543 100644
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -1,7 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ZYNQ=y
 CONFIG_TARGET_ZYNQ_ZYBO=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SPL=y
@@ -10,3 +9,4 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_DISABLE_OF_CONTROL=y
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 1f40887..c7e526c 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -57,7 +57,7 @@ source "drivers/thermal/Kconfig"
 endmenu
 
 config PHYS_TO_BUS
-	bool
+	bool "Custom physical to bus address mapping"
 	help
 	  Some SoCs use a different address map for CPU physical addresses and
 	  peripheral DMA master accesses. If yours does, select this option in
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 6b5aa1b..884e522 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -590,7 +590,6 @@ unsigned long get_board_ddr_clk(void);
  * eSPI - Enhanced SPI
  */
 #define CONFIG_FSL_ESPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SST
 #define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_SPEED         10000000
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index ec49796..e2ad557 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -279,7 +279,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_FSL_ESPI
 /* eSPI - Enhanced SPI */
 #ifdef CONFIG_FSL_ESPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_SPEED		10000000
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 65a7067..869c195 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -485,7 +485,6 @@ combinations. this should be removed later
 /* eSPI - Enhanced SPI */
 #define CONFIG_FSL_ESPI  /* SPI */
 #ifdef CONFIG_FSL_ESPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_SPEED		10000000
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index e737960..08aec84 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -432,7 +432,6 @@
 
 /* eSPI - Enhanced SPI */
 #define CONFIG_FSL_ESPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_SPI_FLASH_EON
 #define CONFIG_CMD_SF
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 04e52f2..fb5b4f5 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -140,7 +140,6 @@
 #define CONFIG_SYS_SBFHDR_SIZE		0x7
 #ifdef CONFIG_CMD_SPI
 #	define CONFIG_SYS_DSPI_CS2
-#	define CONFIG_SPI_FLASH
 #	define CONFIG_SPI_FLASH_STMICRO
 
 #	define CONFIG_SYS_DSPI_CTAR0	(DSPI_CTAR_TRSZ(7) | \
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index e40bbfd..271ea3d 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -204,7 +204,6 @@
 #define CONFIG_HARD_SPI
 #define CONFIG_SYS_SBFHDR_SIZE		0x7
 #ifdef CONFIG_CMD_SPI
-#	define CONFIG_SPI_FLASH
 #	define CONFIG_SPI_FLASH_ATMEL
 
 #	define CONFIG_SYS_DSPI_CTAR0	(DSPI_CTAR_TRSZ(7) | \
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index d26ad91..7a4a945 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -151,7 +151,6 @@
 #define CONFIG_HARD_SPI
 #define CONFIG_SYS_SBFHDR_SIZE		0x7
 #ifdef CONFIG_CMD_SPI
-#	define CONFIG_SPI_FLASH
 #	define CONFIG_SPI_FLASH_STMICRO
 
 #	define CONFIG_SYS_DSPI_CTAR0	(DSPI_CTAR_TRSZ(7) | \
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index b735a26..f503744 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -182,7 +182,6 @@
 #define CONFIG_HARD_SPI
 #define CONFIG_SYS_SBFHDR_SIZE		0x13
 #ifdef CONFIG_CMD_SPI
-#	define CONFIG_SPI_FLASH
 #	define CONFIG_SPI_FLASH_STMICRO
 
 #	define CONFIG_SYS_DSPI_CTAR0		(DSPI_CTAR_TRSZ(7) | \
diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 9b196ad..771ea1e 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -355,7 +355,6 @@
 #ifdef CONFIG_MPC8XXX_SPI
 #define CONFIG_CMD_SPI
 #define CONFIG_USE_SPIFLASH
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_CMD_SF
 #endif
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index f57afff..30d8cdc 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -50,7 +50,6 @@
 #define CONFIG_MPC8536DS	1
 
 #define CONFIG_FSL_ELBC		1	/* Has Enhanced localbus controller */
-#define CONFIG_SPI_FLASH	1	/* Has SPI Flash */
 #define CONFIG_PCI		1	/* Enable PCI/PCIE */
 #define CONFIG_PCI1		1	/* Enable PCI controller 1 */
 #define CONFIG_PCIE1		1	/* PCIE controler 1 (slot 1) */
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 37bb42b..09e670f 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -680,7 +680,6 @@ extern unsigned long get_sdram_size(void);
 #if !defined(CONFIG_NAND) || !defined(CONFIG_NAND_SECBOOT)
 /* eSPI - Enhanced SPI */
 #define CONFIG_FSL_ESPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_SPEED		10000000
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 0f5915d..78ce4c0 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -479,7 +479,6 @@
 /*
  * eSPI - Enhanced SPI
  */
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 
 #define CONFIG_HARD_SPI
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index c78a421..a510b4c 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -412,7 +412,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
  * eSPI - Enhanced SPI
  */
 #define CONFIG_FSL_ESPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_SPEED         10000000
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 0f8b614..2cad01c 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -581,7 +581,6 @@ unsigned long get_board_ddr_clk(void);
  * eSPI - Enhanced SPI
  */
 #define CONFIG_FSL_ESPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SPI_FLASH_SST
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 5ada99f..8430f97 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -575,7 +575,6 @@ unsigned long get_board_ddr_clk(void);
  * eSPI - Enhanced SPI
  */
 #define CONFIG_FSL_ESPI
-#define CONFIG_SPI_FLASH
 #if defined(CONFIG_T1024RDB)
 #define CONFIG_SPI_FLASH_STMICRO
 #elif defined(CONFIG_T1023RDB)
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 6cc4cdb..e28b8d5 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -486,7 +486,6 @@ unsigned long get_board_ddr_clk(void);
  * eSPI - Enhanced SPI
  */
 #define CONFIG_FSL_ESPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SPI_FLASH_SST
 #define CONFIG_SPI_FLASH_EON
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 262aeaf..7366457 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -516,7 +516,6 @@
  * eSPI - Enhanced SPI
  */
 #define CONFIG_FSL_ESPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SPI_FLASH_BAR
 #define CONFIG_CMD_SF
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index e80b0b5..b2d2d83 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -15,7 +15,6 @@
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_ICS307_REFCLK_HZ 25000000  /* ICS307 ref clk freq */
 #define CONFIG_MMC
-#define CONFIG_SPI_FLASH
 #define CONFIG_USB_EHCI
 #if defined(CONFIG_PPC_T2080)
 #define CONFIG_T2080QDS
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index c5db4f3..151007b 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -16,7 +16,6 @@
 #define CONFIG_T2080RDB
 #define CONFIG_ICS307_REFCLK_HZ 25000000  /* ICS307 ref clk freq */
 #define CONFIG_MMC
-#define CONFIG_SPI_FLASH
 #define CONFIG_USB_EHCI
 #define CONFIG_FSL_SATA_V2
 
diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h
index cfe6557..4edb3cb 100644
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@@ -402,7 +402,6 @@ unsigned long get_board_ddr_clk(void);
  * eSPI - Enhanced SPI
  */
 #define CONFIG_FSL_ESPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SST
 #define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_SPEED         10000000
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index e38a6f7..b2207da 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -616,7 +616,6 @@ unsigned long get_board_ddr_clk(void);
  * eSPI - Enhanced SPI
  */
 #define CONFIG_FSL_ESPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SST
 #define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_SPEED         10000000
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index b9bbe34..bc2ca66 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -47,7 +47,6 @@
 #define CONFIG_ETHPRIME		"eTSEC3"
 
 #ifndef CONFIG_SPI_FLASH
-#define CONFIG_SPI_FLASH	y
 #endif
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 
@@ -89,7 +88,6 @@
 #define CONFIG_ETHPRIME		"eTSEC1"
 
 #ifndef CONFIG_SPI_FLASH
-#define CONFIG_SPI_FLASH	y
 #endif
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 646cb61..524da42 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -43,7 +43,6 @@
 #define CONFIG_SPI
 #define CONFIG_SPI_FLASH_BAR
 #define CONFIG_SH_QSPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_SPI_FLASH_QUAD
 #define CONFIG_SYS_NO_FLASH
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index a5f1f06..4961180 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -429,7 +429,6 @@
 
 /* SPI flash. */
 #define CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_SPEED		24000000
 
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 0526bd4..4ee7931 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -201,7 +201,6 @@
 /* SPI */
 #undef CONFIG_OMAP3_SPI
 #define CONFIG_TI_QSPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_MACRONIX
 #define CONFIG_CMD_SF
 #define CONFIG_CMD_SPI
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index eb50639..dd012f1 100644
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -45,7 +45,6 @@
 #define CONFIG_PHY_MICREL
 
 #define CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_MTD
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_MXC_SPI
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index c44da1c..aec91da 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -97,7 +97,6 @@
 /* DataFlash */
 #ifdef CONFIG_CMD_SF
 #define CONFIG_ATMEL_SPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 #define CONFIG_SF_DEFAULT_SPEED		30000000
 #define CONFIG_ENV_SPI_MODE		SPI_MODE_3
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 1a481b3..c241dac 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -97,7 +97,6 @@
 /* DataFlash */
 #ifdef CONFIG_CMD_SF
 #define CONFIG_ATMEL_SPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 #define CONFIG_SF_DEFAULT_SPEED		30000000
 #endif
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index c4a6952..ac59014 100644
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -106,7 +106,6 @@
 #define CONFIG_GENERIC_MMC
 #define CONFIG_ATMEL_SPI
 
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 
 #define CONFIG_SYS_DCACHE_LINESZ		32
diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
index 868ec3a..77af772 100644
--- a/include/configs/atngw100mkii.h
+++ b/include/configs/atngw100mkii.h
@@ -125,7 +125,6 @@
 #define CONFIG_GENERIC_MMC
 #define CONFIG_ATMEL_SPI
 
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 
 #define CONFIG_SYS_DCACHE_LINESZ	32
diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index 490c53e..2e118d8 100644
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -579,7 +579,6 @@ DEFAULT_LINUX_BOOT_ENV \
 
 /* SPI flash. */
 #define CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_SPEED		24000000
 
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 84541b9..c403729 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -55,7 +55,6 @@
 /* SPI */
 #define CONFIG_TEGRA20_SLINK
 #define CONFIG_TEGRA_SLINK_CTRLS       6
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_MODE         SPI_MODE_0
 #define CONFIG_SF_DEFAULT_SPEED        24000000
diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h
index 0b66cdb..dd6cb7a 100644
--- a/include/configs/bf506f-ezkit.h
+++ b/include/configs/bf506f-ezkit.h
@@ -74,7 +74,6 @@
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
 #define CONFIG_SF_DEFAULT_SPEED	30000000
 /*
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_CMD_SF
 #define CONFIG_CMD_SPI
diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h
index 0df463f..b7ceba4 100644
--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@@ -105,7 +105,6 @@
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
 #define CONFIG_SF_DEFAULT_SPEED	30000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SST
 #define CONFIG_SPI_FLASH_STMICRO
 
diff --git a/include/configs/bf525-ucr2.h b/include/configs/bf525-ucr2.h
index 0ac3a09..d4f06f3 100644
--- a/include/configs/bf525-ucr2.h
+++ b/include/configs/bf525-ucr2.h
@@ -67,7 +67,6 @@
 
 /* support for serial flash */
 #define CONFIG_BFIN_SPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_HZ	30000000
 #define CONFIG_SPI_FLASH_EON
diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h
index 83f57cd..5767ac1 100644
--- a/include/configs/bf526-ezbrd.h
+++ b/include/configs/bf526-ezbrd.h
@@ -103,7 +103,6 @@
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
 #define CONFIG_SF_DEFAULT_SPEED	30000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SST
 
 
diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h
index c2958e8..1c5fc9e 100644
--- a/include/configs/bf527-ad7160-eval.h
+++ b/include/configs/bf527-ad7160-eval.h
@@ -89,7 +89,6 @@
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
 #define CONFIG_SF_DEFAULT_SPEED	30000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
 
diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h
index 32ac961..28b3760 100644
--- a/include/configs/bf527-ezkit.h
+++ b/include/configs/bf527-ezkit.h
@@ -101,7 +101,6 @@
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
 #define CONFIG_SF_DEFAULT_SPEED	30000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
 
diff --git a/include/configs/bf527-sdp.h b/include/configs/bf527-sdp.h
index b374ab5..51814a6 100644
--- a/include/configs/bf527-sdp.h
+++ b/include/configs/bf527-sdp.h
@@ -77,7 +77,6 @@
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
 #define CONFIG_SF_DEFAULT_SPEED	30000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ALL
 
 
diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index 322705d..4876169 100644
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -98,7 +98,6 @@
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
 /*
 #define CONFIG_SF_DEFAULT_SPEED	30000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ALL
 */
 
diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index 53b7ab5..530763d 100644
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -101,7 +101,6 @@
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
 #define CONFIG_SF_DEFAULT_SPEED	30000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
 
diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h
index 850c516..e922bd5 100644
--- a/include/configs/bf537-pnav.h
+++ b/include/configs/bf537-pnav.h
@@ -82,7 +82,6 @@
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
 #define CONFIG_SF_DEFAULT_SPEED	30000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
 
diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index 2da5d29..11338a5 100644
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -100,7 +100,6 @@
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
 #define CONFIG_SF_DEFAULT_SPEED	30000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
 
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index b5e59ff..f250cdb 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -84,7 +84,6 @@
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
 #define CONFIG_SF_DEFAULT_SPEED	30000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ALL
 
 
diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h
index 3c82bf2..b1d4f26 100644
--- a/include/configs/bf538f-ezkit.h
+++ b/include/configs/bf538f-ezkit.h
@@ -83,7 +83,6 @@
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
 /*
 #define CONFIG_SF_DEFAULT_SPEED	30000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ALL
 */
 
diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index 53f6558..c7b44ae 100644
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -92,7 +92,6 @@
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
 #define CONFIG_SF_DEFAULT_SPEED	30000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
 
diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h
index 299c4c2..6d3f690 100644
--- a/include/configs/bf561-acvilon.h
+++ b/include/configs/bf561-acvilon.h
@@ -114,7 +114,6 @@
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ		10000000
 #define CONFIG_SF_DEFAULT_SPEED		10000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 
 
diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h
index 73f3bfe..fc8378d 100644
--- a/include/configs/bf609-ezkit.h
+++ b/include/configs/bf609-ezkit.h
@@ -101,7 +101,6 @@
 #define CONFIG_BFIN_SPI6XX
 #define CONFIG_ENV_SPI_MAX_HZ	25000000
 #define CONFIG_SF_DEFAULT_SPEED	25000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ALL
 
 /*
diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h
index 7f364cd..99202b5 100644
--- a/include/configs/bg0900.h
+++ b/include/configs/bg0900.h
@@ -52,7 +52,6 @@
 
 /* SPI FLASH */
 #ifdef CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_BAR
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SF_DEFAULT_BUS		2
diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h
index ee526af..92bb573 100644
--- a/include/configs/blackstamp.h
+++ b/include/configs/blackstamp.h
@@ -219,7 +219,6 @@
 /* For the M25P64 SCK Should be Kept < 15Mhz */
 #define CONFIG_ENV_SPI_MAX_HZ	15000000
 #define CONFIG_SF_DEFAULT_SPEED	15000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
 /*
diff --git a/include/configs/blackvme.h b/include/configs/blackvme.h
index 27dccf6..ffa6969 100644
--- a/include/configs/blackvme.h
+++ b/include/configs/blackvme.h
@@ -142,7 +142,6 @@
 
 #define CONFIG_ENV_SPI_MAX_HZ	15000000
 #define CONFIG_SF_DEFAULT_SPEED	15000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
 /*
diff --git a/include/configs/br4.h b/include/configs/br4.h
index a44c18c..cbef809 100644
--- a/include/configs/br4.h
+++ b/include/configs/br4.h
@@ -82,7 +82,6 @@
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
 #define CONFIG_SF_DEFAULT_SPEED	30000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
 
diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index f8785db..7fa6fcc 100644
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -75,7 +75,6 @@
 
 /* SPI support */
 #define CONFIG_SPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_DAVINCI_SPI
 #define CONFIG_SYS_SPI_BASE		DAVINCI_SPI1_BASE
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index c76a426..96dfe07 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -58,7 +58,6 @@
 /* SPI */
 #define CONFIG_TEGRA20_SLINK
 #define CONFIG_TEGRA_SLINK_CTRLS       6
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_MODE         SPI_MODE_0
 #define CONFIG_SF_DEFAULT_SPEED        24000000
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index a3908d0..3796374 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -167,7 +167,6 @@
 /* SPI */
 #define CONFIG_SPI
 #define CONFIG_MXC_SPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 #define CONFIG_SPI_FLASH_EON
 #define CONFIG_SPI_FLASH_GIGADEVICE
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 9cab9fb..b3cb72c 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -219,7 +219,6 @@
 #define CONFIG_HARD_SPI
 #define CONFIG_FSL_ESPI
 
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
 #define CONFIG_CMD_SF
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index bf765af..cb063a4 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -408,7 +408,6 @@
  * eSPI - Enhanced SPI
  */
 #define CONFIG_FSL_ESPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_SPEED         10000000
diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index ab5226b..3505229 100644
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -123,7 +123,6 @@
 #define CONFIG_ENV_SECT_SIZE		4096
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_SPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_DAVINCI_SPI
 #define CONFIG_SYS_SPI_BASE		DAVINCI_SPI0_BASE
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 37a485b..e9a144d 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -142,7 +142,6 @@
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
 
 #define CONFIG_SPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_CMD_SF
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index e702a50..89b6f23 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -53,7 +53,6 @@
 /* SPI */
 #define CONFIG_TEGRA114_SPI
 #define CONFIG_TEGRA114_SPI_CTRLS	6
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_MODE         SPI_MODE_0
 #define CONFIG_SF_DEFAULT_SPEED        24000000
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 24fe123..63e22f1 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -123,7 +123,6 @@
 /* SPI */
 #undef	CONFIG_OMAP3_SPI
 #define CONFIG_TI_QSPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_CMD_SF
 #define CONFIG_CMD_SPI
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index ea6e5c0..5216cb5 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -73,7 +73,6 @@
 #endif
 
 #ifdef CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH		1
 #define CONFIG_HARD_SPI			1
 #define CONFIG_KIRKWOOD_SPI		1
 #define CONFIG_SPI_FLASH_MACRONIX	1
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 1e522c3..9370708 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -66,7 +66,6 @@
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
 
 #define CONFIG_SPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_DAVINCI_SPI
 #define CONFIG_SYS_SPI_BASE		DAVINCI_SPI1_BASE
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 5dfd56c..f83449f 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -68,7 +68,6 @@
 
 #define CONFIG_CMD_SF
 #ifdef CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SST
 #define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS		0
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 2b638bf..c9dac4c 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -60,7 +60,6 @@
 /* 512kB DataFlash@NPCS0 */
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS	1
 #define CONFIG_HAS_DATAFLASH
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 #define CONFIG_ATMEL_DATAFLASH_SPI
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000
diff --git a/include/configs/gose.h b/include/configs/gose.h
index 04f0383..f088649 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -44,7 +44,6 @@
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_SPI
 #define CONFIG_SH_QSPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_BAR
 #define CONFIG_SPI_FLASH_SPANSION
 
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 6b8c82d..902ec2c 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -48,11 +48,8 @@
 
 /* Driver Model */
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_DM
 #define CONFIG_DM_GPIO
-#define CONFIG_DM_SERIAL
 #define CONFIG_DM_THERMAL
-#define CONFIG_CMD_DM
 #endif
 
 /* GPIO */
diff --git a/include/configs/ima3-mx53.h b/include/configs/ima3-mx53.h
index 71ca77a..081a054 100644
--- a/include/configs/ima3-mx53.h
+++ b/include/configs/ima3-mx53.h
@@ -63,7 +63,6 @@
 #define CONFIG_DEFAULT_SPI_MODE		SPI_MODE_0
 
 /* SPI FLASH - not used for environment */
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
 #define CONFIG_SF_DEFAULT_SPEED		25000000
diff --git a/include/configs/ip04.h b/include/configs/ip04.h
index a6aed5d..dd2a618 100644
--- a/include/configs/ip04.h
+++ b/include/configs/ip04.h
@@ -91,7 +91,6 @@
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
 #define CONFIG_SF_DEFAULT_SPEED	30000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SPI_FLASH_WINBOND
 
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 606e6b4..3bbff28 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -43,7 +43,6 @@
 /* SPI */
 #define CONFIG_TEGRA114_SPI		/* Compatible w/ Tegra114 SPI */
 #define CONFIG_TEGRA114_SPI_CTRLS	6
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
 #define CONFIG_SF_DEFAULT_SPEED		24000000
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 2ed0855..851e269 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -253,7 +253,6 @@ int get_scl(void);
 
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
 /* SPI bus claim MPP configuration */
diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index 686d2f3..ed942a0 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -299,7 +299,6 @@ int get_scl(void);
  * eSPI - Enhanced SPI
  */
 #define CONFIG_FSL_ESPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_BAR	/* 4 byte-addressing */
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SPI_FLASH_SPANSION
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 61c015f..ff948f9 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -44,7 +44,6 @@
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_SPI
 #define CONFIG_SH_QSPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_BAR
 #define CONFIG_SPI_FLASH_SPANSION
 
diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h
index 036f2cb..559446a 100644
--- a/include/configs/ks2_evm.h
+++ b/include/configs/ks2_evm.h
@@ -72,7 +72,6 @@
 
 /* SPI Configuration */
 #define CONFIG_SPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_DAVINCI_SPI
 #define CONFIG_CMD_SPI
diff --git a/include/configs/lager.h b/include/configs/lager.h
index f121b9c..546863e 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -44,7 +44,6 @@
 #define CONFIG_SPI
 #define CONFIG_SPI_FLASH_BAR
 #define CONFIG_SH_QSPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_SYS_NO_FLASH
 
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index ca913b0..14c2393 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -417,7 +417,6 @@ unsigned long get_board_ddr_clk(void);
 #define FSL_QSPI_FLASH_NUM		2
 
 #define CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 #endif
 
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 6b6f2ba..0748e61 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -260,7 +260,6 @@
 #define FSL_QSPI_FLASH_NUM		2
 
 #define CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #endif
 
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index eba1b2f..ad7b996 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -127,7 +127,6 @@
 
 /* SPI FLASH */
 #ifdef CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SF_DEFAULT_BUS		2
 #define CONFIG_SF_DEFAULT_CS		0
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index db463c0..faa13e3 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -176,7 +176,6 @@
 # define CONFIG_SYS_SPI_BASE		XILINX_SPI_FLASH_BASEADDR
 # define CONFIG_XILINX_SPI		1
 # define CONFIG_SPI			1
-# define CONFIG_SPI_FLASH		1
 # define CONFIG_SPI_FLASH_STMICRO	1
 # define CONFIG_SF_DEFAULT_MODE		SPI_MODE_3
 # define CONFIG_SF_DEFAULT_SPEED	XILINX_SPI_FLASH_MAX_FREQ
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 51436da..0d7b34b 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -121,7 +121,6 @@
  * Common SPI Flash configuration
  */
 #ifdef CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH		1
 #define CONFIG_SPI_FLASH_MACRONIX	1
 #endif
 
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index bc0ae28..976192f 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -130,7 +130,6 @@
 
 /* SPI Flash */
 #ifdef CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
 #define CONFIG_SF_DEFAULT_BUS		2
 #define CONFIG_SF_DEFAULT_CS		0
 /* this may vary and depends on the installed chip */
diff --git a/include/configs/mx51_efikamx.h b/include/configs/mx51_efikamx.h
index e3386ac..3f7e4bc 100644
--- a/include/configs/mx51_efikamx.h
+++ b/include/configs/mx51_efikamx.h
@@ -93,7 +93,6 @@
 /* SPI FLASH */
 #ifdef CONFIG_CMD_SF
 
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SST
 #define CONFIG_SF_DEFAULT_CS		1
 #define CONFIG_SF_DEFAULT_MODE		(SPI_MODE_0)
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index c8c9f81..6c3c52e 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -44,7 +44,6 @@
 
 #define CONFIG_CMD_SF
 #ifdef CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS		0
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 4b5c637..a7da111 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -163,7 +163,6 @@
 
 #define CONFIG_CMD_SF
 #ifdef CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS		0
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 63ec7c6..19f9e44 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -189,7 +189,6 @@
 
 #ifdef CONFIG_FSL_QSPI
 #define CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_BAR
 #define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_SPI_FLASH_STMICRO
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index beaa119..67a3c97 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -36,7 +36,6 @@
 
 #define CONFIG_CMD_SF
 #ifdef CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SST
 #define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS  0
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index b99d762..dd549aa 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -55,7 +55,6 @@
 /* SPI */
 #define CONFIG_TEGRA114_SPI		/* Compatible w/ Tegra114 SPI */
 #define CONFIG_TEGRA114_SPI_CTRLS	6
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_MODE         SPI_MODE_0
 #define CONFIG_SF_DEFAULT_SPEED        24000000
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 91a7413..eb3184b 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -103,7 +103,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_SPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_DAVINCI_SPI
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 2bbf2b9..fb58acf 100644
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -27,7 +27,6 @@
 /* SF Configs */
 #define CONFIG_CMD_SF
 #define CONFIG_SPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SPI_FLASH_MACRONIX
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index b51379e..a585d70 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -41,7 +41,6 @@
 #define CONFIG_BOARDNAME "P1020RDB-PC"
 #define CONFIG_NAND_FSL_ELBC
 #define CONFIG_P1020
-#define CONFIG_SPI_FLASH
 #define CONFIG_VSC7385_ENET
 #define CONFIG_SLIC
 #define __SW_BOOT_MASK		0x03
@@ -70,7 +69,6 @@
 #define CONFIG_BOARDNAME "P1020RDB-PD"
 #define CONFIG_NAND_FSL_ELBC
 #define CONFIG_P1020
-#define CONFIG_SPI_FLASH
 #define CONFIG_VSC7385_ENET
 #define CONFIG_SLIC
 #define __SW_BOOT_MASK		0x03
@@ -97,7 +95,6 @@
 #define CONFIG_NAND_FSL_ELBC
 #define CONFIG_P1021
 #define CONFIG_QE
-#define CONFIG_SPI_FLASH
 #define CONFIG_VSC7385_ENET
 #define CONFIG_SYS_LBC_LBCR	0x00080000	/* Implement conversion of
 						addresses in the LBC */
@@ -133,7 +130,6 @@
 #define CONFIG_NAND_FSL_ELBC
 #define CONFIG_P1024
 #define CONFIG_SLIC
-#define CONFIG_SPI_FLASH
 #define __SW_BOOT_MASK		0xf3
 #define __SW_BOOT_NOR		0x00
 #define __SW_BOOT_SPI		0x08
@@ -148,7 +144,6 @@
 #define CONFIG_P1025
 #define CONFIG_QE
 #define CONFIG_SLIC
-#define CONFIG_SPI_FLASH
 
 #define CONFIG_SYS_LBC_LBCR	0x00080000	/* Implement conversion of
 						addresses in the LBC */
@@ -164,7 +159,6 @@
 #define CONFIG_BOARDNAME "P2020RDB-PCA"
 #define CONFIG_NAND_FSL_ELBC
 #define CONFIG_P2020
-#define CONFIG_SPI_FLASH
 #define CONFIG_VSC7385_ENET
 #define __SW_BOOT_MASK		0x03
 #define __SW_BOOT_NOR		0xc8
diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index 45c2df6..d80cf32 100644
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -97,7 +97,6 @@
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START \
 					+ (8 * 1024 * 1024))
 
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_SPEED		24000000
diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h
index e3cb09e..46699ff 100644
--- a/include/configs/peach-pi.h
+++ b/include/configs/peach-pi.h
@@ -10,7 +10,6 @@
 #define __CONFIG_PEACH_PI_H
 
 #define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SPI_FLASH
 #define CONFIG_ENV_SPI_BASE	0x12D30000
 #define FLASH_SIZE		(0x4 << 20)
 #define CONFIG_ENV_OFFSET	(FLASH_SIZE - CONFIG_BL2_SIZE)
diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
index 3ee42ef..c5c9e3a 100644
--- a/include/configs/peach-pit.h
+++ b/include/configs/peach-pit.h
@@ -10,7 +10,6 @@
 #define __CONFIG_PEACH_PIT_H
 
 #define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SPI_FLASH
 #define CONFIG_ENV_SPI_BASE	0x12D30000
 #define FLASH_SIZE		(0x4 << 20)
 #define CONFIG_ENV_OFFSET	(FLASH_SIZE - CONFIG_BL2_SIZE)
diff --git a/include/configs/porter.h b/include/configs/porter.h
index f85d39c..9367349 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -44,7 +44,6 @@
 #define CONFIG_SPI
 #define CONFIG_SPI_FLASH_BAR
 #define CONFIG_SH_QSPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_SPI_FLASH_QUAD
 #define CONFIG_SYS_NO_FLASH
diff --git a/include/configs/pr1.h b/include/configs/pr1.h
index b9253b9..3e4aab4 100644
--- a/include/configs/pr1.h
+++ b/include/configs/pr1.h
@@ -83,7 +83,6 @@
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
 #define CONFIG_SF_DEFAULT_SPEED	30000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
 
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index d933a9e..046891e 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -78,7 +78,6 @@
 
 #ifdef CONFIG_CMD_SF
 #define CONFIG_ATMEL_SPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 #define CONFIG_SF_DEFAULT_SPEED		30000000
 #endif
diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h
index 5fb621e..e06dfc9 100644
--- a/include/configs/sama5d4_xplained.h
+++ b/include/configs/sama5d4_xplained.h
@@ -40,7 +40,6 @@
 #ifdef CONFIG_CMD_SF
 #define CONFIG_ATMEL_SPI
 #define CONFIG_ATMEL_SPI0
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 #define CONFIG_SF_DEFAULT_BUS		0
 #define CONFIG_SF_DEFAULT_CS		0
diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h
index 546d7a3..eadccc1 100644
--- a/include/configs/sama5d4ek.h
+++ b/include/configs/sama5d4ek.h
@@ -40,7 +40,6 @@
 #ifdef CONFIG_CMD_SF
 #define CONFIG_ATMEL_SPI
 #define CONFIG_ATMEL_SPI0
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 #define CONFIG_SF_DEFAULT_BUS		0
 #define CONFIG_SF_DEFAULT_CS		0
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 3caa83c..01b9ddf 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -81,7 +81,6 @@
 #define CONFIG_CMD_SF
 #define CONFIG_CMD_SF_TEST
 #define CONFIG_CMD_SPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 #define CONFIG_SPI_FLASH_EON
 #define CONFIG_SPI_FLASH_GIGADEVICE
diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index d7bc751..7e8565d 100644
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -102,7 +102,6 @@
 /* SPI */
 #define CONFIG_SH_SPI			1
 #define CONFIG_SH_SPI_BASE		0xfe002000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO	1
 #define CONFIG_SPI_FLASH_MACRONIX	1
 
diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index 2124e0f..857b26f 100644
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -102,7 +102,6 @@
 /* SPI */
 #define CONFIG_SH_SPI			1
 #define CONFIG_SH_SPI_BASE		0xfe002000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO	1
 #define CONFIG_SPI_FLASH_MACRONIX	1
 
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index fd6a1df..18569bd 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -103,7 +103,6 @@
 /* SPI */
 #define CONFIG_SH_SPI			1
 #define CONFIG_SH_SPI_BASE		0xfe002000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO	1
 
 /* MMCIF */
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index ac4cf68..b61f6a0 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -102,7 +102,6 @@
 #define CONFIG_SPI
 #define CONFIG_OMAP3_SPI
 #define CONFIG_MTD_DEVICE
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_SPEED		(75000000)
diff --git a/include/configs/silk.h b/include/configs/silk.h
index ccfcede..b105f5a 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -44,7 +44,6 @@
 #define CONFIG_SPI
 #define CONFIG_SPI_FLASH_BAR
 #define CONFIG_SH_QSPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_SPI_FLASH_QUAD
 #define CONFIG_SYS_NO_FLASH
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index 08381e3..e5655fc 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -10,7 +10,6 @@
 #define __CONFIG_SMDK_H
 
 #define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SPI_FLASH
 #define CONFIG_ENV_SPI_BASE	0x12D30000
 #define FLASH_SIZE		(0x4 << 20)
 #define CONFIG_ENV_OFFSET	(FLASH_SIZE - CONFIG_BL2_SIZE)
diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index 61f582f..607877c 100644
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -10,7 +10,6 @@
 #define __CONFIG_SMDK5420_H
 
 #define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SPI_FLASH
 #define CONFIG_ENV_SPI_BASE	0x12D30000
 #define FLASH_SIZE		(0x4 << 20)
 #define CONFIG_ENV_OFFSET	(FLASH_SIZE - CONFIG_BL2_SIZE)
diff --git a/include/configs/snow.h b/include/configs/snow.h
index a2fb3f9..557f86c 100644
--- a/include/configs/snow.h
+++ b/include/configs/snow.h
@@ -10,7 +10,6 @@
 #define __CONFIG_SNOW_H
 
 #define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SPI_FLASH
 #define CONFIG_ENV_SPI_BASE	0x12D30000
 #define FLASH_SIZE		(0x4 << 20)
 #define CONFIG_ENV_OFFSET	(FLASH_SIZE - CONFIG_BL2_SIZE)
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 5ba2f6a..4c3366a 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -81,7 +81,6 @@
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_SPEED		30000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SPI_FLASH_BAR
 /*
@@ -187,7 +186,6 @@ unsigned int cm_get_l4_sp_clk_hz(void);
 #ifdef CONFIG_OF_CONTROL	/* QSPI is controlled via DT */
 #define CONFIG_CADENCE_QSPI
 /* Enable multiple SPI NOR flash manufacturers */
-#define CONFIG_SPI_FLASH		/* SPI flash subsystem */
 #define CONFIG_SPI_FLASH_STMICRO	/* Micron/Numonyx flash */
 #define CONFIG_SPI_FLASH_SPANSION	/* Spansion flash */
 #define CONFIG_SPI_FLASH_MTD
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 2cf4558..cce4b7d 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -139,7 +139,6 @@
 #define CONFIG_SPI
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
 #define CONFIG_ATMEL_SPI
 #define CONFIG_SPI_FLASH_STMICRO
 #define TAURUS_SPI_MASK (1 << 4)
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index cfee2c3..fa651c1 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -38,7 +38,6 @@
 /* SPI */
 #define CONFIG_TEGRA20_SLINK
 #define CONFIG_TEGRA_SLINK_CTRLS       6
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_MODE         SPI_MODE_0
 #define CONFIG_SF_DEFAULT_SPEED        24000000
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 00294f6..52d5ae6 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -47,7 +47,6 @@
 #define CONFIG_MXC_SPI
 
 /* SPI Flash */
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
 #define TQMA6_SPI_FLASH_SECTOR_SIZE	SZ_64K
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 848ef33..2db38e5 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -24,7 +24,6 @@
 
 /* SPI */
 #define CONFIG_TEGRA20_SFLASH
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
 #define CONFIG_CMD_SPI
diff --git a/include/configs/tseries.h b/include/configs/tseries.h
index cd8ba2b..6a1835e 100644
--- a/include/configs/tseries.h
+++ b/include/configs/tseries.h
@@ -266,7 +266,6 @@ MMCARGS
 #define CONFIG_OMAP3_SPI
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SF_DEFAULT_SPEED		24000000
 
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index bfe5298..1d9d053 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -40,7 +40,6 @@
 /* SPI */
 #define CONFIG_TEGRA114_SPI		/* Compatible w/ Tegra114 SPI */
 #define CONFIG_TEGRA114_SPI_CTRLS	6
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_MODE         SPI_MODE_0
 #define CONFIG_SF_DEFAULT_SPEED        24000000
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index b81dfce..0c86779 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -10,7 +10,6 @@
 
 /* We use generic board and device manager for v8 Versatile Express */
 #define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_DM
 
 #ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP
 #ifndef CONFIG_SEMIHOSTING
@@ -114,7 +113,6 @@
 #endif /* !CONFIG_GICV3 */
 
 /* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_F_LEN		0x2000
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (8 << 20))
 
 /* Ethernet Configuration */
@@ -130,7 +128,6 @@
 #endif
 
 /* PL011 Serial Configuration */
-#define CONFIG_DM_SERIAL
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_CONS_INDEX		0
 #define CONFIG_PL01X_SERIAL
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index dde65ed..dfe316a 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -103,7 +103,6 @@
 
 #ifdef CONFIG_FSL_QSPI
 #define CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 #define FSL_QSPI_FLASH_SIZE		(1 << 24)
 #define FSL_QSPI_FLASH_NUM		2
diff --git a/include/configs/vision2.h b/include/configs/vision2.h
index 41680c4..07cd72c 100644
--- a/include/configs/vision2.h
+++ b/include/configs/vision2.h
@@ -50,7 +50,6 @@
 #define CONFIG_FSL_SF
 #define CONFIG_CMD_SF
 
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
 /*
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 1917d87..0481cf3 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -192,7 +192,6 @@
  * FLASH configuration
  */
 #define CONFIG_ICH_SPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_MACRONIX
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SPI_FLASH_GIGADEVICE
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 880d29c..ff419c3 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -76,7 +76,6 @@
 
 /* SPI */
 #ifdef CONFIG_ZYNQ_SPI
-# define CONFIG_SPI_FLASH
 # define CONFIG_SPI_FLASH_SST
 # define CONFIG_CMD_SF
 #endif
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 1a52e7d..c7b3058 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -68,7 +68,6 @@
 
 /* SPI */
 #ifdef CONFIG_ZYNQ_SPI
-# define CONFIG_SPI_FLASH
 # define CONFIG_SPI_FLASH_SST
 # define CONFIG_CMD_SF
 #endif
-- 
1.7.11.5

[U-Boot] [PATCH 7/7] Move defaults from config_cmd_default.h to Kconfig

[Joe Hershberger]

This sets the default commands Kconfig to match
include/config_cmd_default.h commands in the common/Kconfig and removes
them from include/configs.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

---

 README                                             |  4 +-
 common/Kconfig                                     | 23 ++++++++++++
 configs/A10-OLinuXino-Lime_defconfig               |  6 +--
 configs/A10s-OLinuXino-M_defconfig                 |  6 +--
 configs/A13-OLinuXinoM_defconfig                   |  6 +--
 configs/A13-OLinuXino_defconfig                    |  6 +--
 configs/A20-OLinuXino-Lime2_defconfig              |  6 +--
 configs/A20-OLinuXino-Lime_defconfig               |  6 +--
 configs/A20-OLinuXino_MICRO_defconfig              |  6 +--
 configs/Ainol_AW1_defconfig                        |  6 +--
 configs/Ampe_A76_defconfig                         |  6 +--
 configs/Auxtek-T004_defconfig                      |  6 +--
 configs/B4420QDS_NAND_defconfig                    |  2 -
 configs/B4420QDS_SPIFLASH_defconfig                |  2 -
 configs/B4420QDS_defconfig                         |  2 -
 configs/B4860QDS_NAND_defconfig                    |  2 -
 configs/B4860QDS_SECURE_BOOT_defconfig             |  2 -
 configs/B4860QDS_SPIFLASH_defconfig                |  2 -
 configs/B4860QDS_SRIO_PCIE_BOOT_defconfig          |  4 +-
 configs/B4860QDS_defconfig                         |  2 -
 configs/BSC9131RDB_NAND_SYSCLK100_defconfig        |  4 +-
 configs/BSC9131RDB_NAND_defconfig                  |  4 +-
 configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig    |  4 +-
 configs/BSC9131RDB_SPIFLASH_defconfig              |  4 +-
 configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig |  2 -
 configs/BSC9132QDS_NAND_DDRCLK100_defconfig        |  2 -
 configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig |  2 -
 configs/BSC9132QDS_NAND_DDRCLK133_defconfig        |  2 -
 configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig  |  2 -
 configs/BSC9132QDS_NOR_DDRCLK100_defconfig         |  2 -
 configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig  |  2 -
 configs/BSC9132QDS_NOR_DDRCLK133_defconfig         |  2 -
 .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig   |  2 -
 configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig      |  2 -
 .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig   |  2 -
 configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig      |  2 -
 .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig |  2 -
 configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig    |  2 -
 .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig |  2 -
 configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig    |  2 -
 configs/Bananapi_defconfig                         |  6 +--
 configs/Bananapro_defconfig                        |  6 +--
 configs/C29XPCIE_NAND_defconfig                    |  2 -
 configs/C29XPCIE_NOR_SECBOOT_defconfig             |  2 -
 configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig        |  2 -
 configs/C29XPCIE_SPIFLASH_defconfig                |  2 -
 configs/C29XPCIE_defconfig                         |  2 -
 configs/CPCI2DP_defconfig                          |  3 ++
 configs/CPCI4052_defconfig                         |  2 +-
 configs/CSQ_CS908_defconfig                        |  6 +--
 configs/Chuwi_V7_CW0825_defconfig                  |  6 +--
 configs/Colombus_defconfig                         |  6 +--
 configs/Cubieboard2_defconfig                      |  6 +--
 configs/Cubieboard_defconfig                       |  6 +--
 configs/Cubietruck_defconfig                       |  6 +--
 configs/Et_q8_v1_6_defconfig                       |  6 +--
 configs/Hummingbird_A31_defconfig                  |  6 +--
 configs/Hyundai_A7HD_defconfig                     |  6 +--
 configs/Ippo_q8h_v1_2_a33_1024x600_defconfig       |  6 +--
 configs/Ippo_q8h_v1_2_defconfig                    |  6 +--
 configs/Ippo_q8h_v5_defconfig                      |  6 +--
 configs/Linksprite_pcDuino3_Nano_defconfig         |  6 +--
 configs/Linksprite_pcDuino3_defconfig              |  6 +--
 configs/Linksprite_pcDuino_defconfig               |  6 +--
 configs/M5208EVBE_defconfig                        |  2 +-
 configs/M52277EVB_defconfig                        |  3 ++
 configs/M52277EVB_stmicro_defconfig                |  3 ++
 configs/M5235EVB_Flash32_defconfig                 |  4 +-
 configs/M5235EVB_defconfig                         |  4 +-
 configs/M5249EVB_defconfig                         |  2 +
 configs/M5253DEMO_defconfig                        |  2 +-
 configs/M5253EVBE_defconfig                        |  2 +
 configs/M5272C3_defconfig                          |  4 +-
 configs/M5275EVB_defconfig                         |  4 +-
 configs/M5282EVB_defconfig                         |  4 +-
 configs/M53017EVB_defconfig                        |  2 +-
 configs/M5329AFEE_defconfig                        |  2 +-
 configs/M5329BFEE_defconfig                        |  2 +-
 configs/M5373EVB_defconfig                         |  2 +-
 configs/M54418TWR_defconfig                        |  6 ++-
 configs/M54418TWR_nand_mii_defconfig               |  6 ++-
 configs/M54418TWR_nand_rmii_defconfig              |  6 ++-
 configs/M54418TWR_nand_rmii_lowfreq_defconfig      |  6 ++-
 configs/M54418TWR_serial_mii_defconfig             |  6 ++-
 configs/M54418TWR_serial_rmii_defconfig            |  6 ++-
 configs/M54451EVB_defconfig                        |  4 +-
 configs/M54451EVB_stmicro_defconfig                |  4 +-
 configs/M54455EVB_a66_defconfig                    |  4 +-
 configs/M54455EVB_defconfig                        |  4 +-
 configs/M54455EVB_i66_defconfig                    |  4 +-
 configs/M54455EVB_intel_defconfig                  |  4 +-
 configs/M54455EVB_stm33_defconfig                  |  4 +-
 configs/M5475AFE_defconfig                         |  2 +-
 configs/M5475BFE_defconfig                         |  2 +-
 configs/M5475CFE_defconfig                         |  2 +-
 configs/M5475DFE_defconfig                         |  2 +-
 configs/M5475EFE_defconfig                         |  2 +-
 configs/M5475FFE_defconfig                         |  2 +-
 configs/M5475GFE_defconfig                         |  2 +-
 configs/M5485AFE_defconfig                         |  2 +-
 configs/M5485BFE_defconfig                         |  2 +-
 configs/M5485CFE_defconfig                         |  2 +-
 configs/M5485DFE_defconfig                         |  2 +-
 configs/M5485EFE_defconfig                         |  2 +-
 configs/M5485FFE_defconfig                         |  2 +-
 configs/M5485GFE_defconfig                         |  2 +-
 configs/M5485HFE_defconfig                         |  2 +-
 configs/MIP405T_defconfig                          |  2 +-
 configs/MIP405_defconfig                           |  2 +-
 configs/MK808C_defconfig                           |  6 +--
 configs/MPC8308RDB_defconfig                       |  2 +-
 configs/MPC8313ERDB_33_defconfig                   |  2 +-
 configs/MPC8313ERDB_66_defconfig                   |  2 +-
 configs/MPC8313ERDB_NAND_33_defconfig              |  2 +-
 configs/MPC8313ERDB_NAND_66_defconfig              |  2 +-
 configs/MPC8315ERDB_defconfig                      |  2 +-
 configs/MPC8323ERDB_defconfig                      |  2 +-
 configs/MPC832XEMDS_ATM_defconfig                  |  2 +-
 configs/MPC832XEMDS_HOST_33_defconfig              |  2 +-
 configs/MPC832XEMDS_HOST_66_defconfig              |  2 +-
 configs/MPC832XEMDS_SLAVE_defconfig                |  2 +-
 configs/MPC832XEMDS_defconfig                      |  2 +-
 configs/MPC8349EMDS_defconfig                      |  2 +-
 configs/MPC8349ITXGP_defconfig                     |  2 +-
 configs/MPC8349ITX_LOWBOOT_defconfig               |  2 +-
 configs/MPC8349ITX_defconfig                       |  2 +-
 configs/MPC837XEMDS_HOST_defconfig                 |  2 +-
 configs/MPC837XEMDS_defconfig                      |  2 +-
 configs/MPC837XERDB_defconfig                      |  2 +-
 configs/MPC8536DS_36BIT_defconfig                  |  2 -
 configs/MPC8536DS_SDCARD_defconfig                 |  2 -
 configs/MPC8536DS_SPIFLASH_defconfig               |  2 -
 configs/MPC8536DS_defconfig                        |  2 -
 configs/MPC8540ADS_defconfig                       |  2 -
 configs/MPC8541CDS_defconfig                       |  2 -
 configs/MPC8541CDS_legacy_defconfig                |  2 -
 configs/MPC8544DS_defconfig                        |  2 -
 configs/MPC8548CDS_36BIT_defconfig                 |  2 -
 configs/MPC8548CDS_defconfig                       |  2 -
 configs/MPC8548CDS_legacy_defconfig                |  2 -
 configs/MPC8555CDS_defconfig                       |  2 -
 configs/MPC8555CDS_legacy_defconfig                |  2 -
 configs/MPC8560ADS_defconfig                       |  2 -
 configs/MPC8568MDS_defconfig                       |  2 -
 configs/MPC8569MDS_ATM_defconfig                   |  2 -
 configs/MPC8569MDS_defconfig                       |  2 -
 configs/MPC8572DS_36BIT_defconfig                  |  2 -
 configs/MPC8572DS_defconfig                        |  2 -
 configs/MPC8610HPCD_defconfig                      |  2 +-
 configs/MPC8641HPCN_36BIT_defconfig                |  2 +-
 configs/MPC8641HPCN_defconfig                      |  2 +-
 configs/MSI_Primo73_defconfig                      |  6 +--
 configs/MSI_Primo81_defconfig                      |  6 +--
 configs/Marsboard_A10_defconfig                    |  6 +--
 configs/Mele_A1000G_quad_defconfig                 |  6 +--
 configs/Mele_A1000_defconfig                       |  6 +--
 configs/Mele_I7_defconfig                          |  6 +--
 configs/Mele_M3_defconfig                          |  6 +--
 configs/Mele_M5_defconfig                          |  6 +--
 configs/Mele_M9_defconfig                          |  6 +--
 configs/Merrii_A80_Optimus_defconfig               |  6 +--
 configs/MigoR_defconfig                            | 16 +++++++-
 configs/Mini-X_defconfig                           |  6 +--
 configs/MiniFAP_defconfig                          |  2 +-
 configs/O2D300_defconfig                           |  2 +-
 configs/O2DNT2_RAMBOOT_defconfig                   |  2 +-
 configs/O2DNT2_defconfig                           |  2 +-
 configs/O2D_defconfig                              |  2 +-
 configs/O2I_defconfig                              |  2 +-
 configs/O2MNT_O2M110_defconfig                     |  2 +-
 configs/O2MNT_O2M112_defconfig                     |  2 +-
 configs/O2MNT_O2M113_defconfig                     |  2 +-
 configs/O2MNT_defconfig                            |  2 +-
 configs/O3DNT_defconfig                            |  2 +-
 configs/Orangepi_defconfig                         |  6 +--
 configs/Orangepi_mini_defconfig                    |  6 +--
 configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig   |  2 -
 configs/P1010RDB-PA_36BIT_NAND_defconfig           |  2 -
 configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig    |  2 -
 configs/P1010RDB-PA_36BIT_NOR_defconfig            |  2 -
 configs/P1010RDB-PA_36BIT_SDCARD_defconfig         |  2 -
 .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig   |  2 -
 configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig       |  2 -
 configs/P1010RDB-PA_NAND_SECBOOT_defconfig         |  2 -
 configs/P1010RDB-PA_NAND_defconfig                 |  2 -
 configs/P1010RDB-PA_NOR_SECBOOT_defconfig          |  2 -
 configs/P1010RDB-PA_NOR_defconfig                  |  2 -
 configs/P1010RDB-PA_SDCARD_defconfig               |  2 -
 configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig     |  2 -
 configs/P1010RDB-PA_SPIFLASH_defconfig             |  2 -
 configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig   |  2 -
 configs/P1010RDB-PB_36BIT_NAND_defconfig           |  2 -
 configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig    |  2 -
 configs/P1010RDB-PB_36BIT_NOR_defconfig            |  2 -
 configs/P1010RDB-PB_36BIT_SDCARD_defconfig         |  2 -
 .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig   |  2 -
 configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig       |  2 -
 configs/P1010RDB-PB_NAND_SECBOOT_defconfig         |  2 -
 configs/P1010RDB-PB_NAND_defconfig                 |  2 -
 configs/P1010RDB-PB_NOR_SECBOOT_defconfig          |  2 -
 configs/P1010RDB-PB_NOR_defconfig                  |  2 -
 configs/P1010RDB-PB_SDCARD_defconfig               |  2 -
 configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig     |  2 -
 configs/P1010RDB-PB_SPIFLASH_defconfig             |  2 -
 configs/P1020MBG-PC_36BIT_SDCARD_defconfig         |  2 -
 configs/P1020MBG-PC_36BIT_defconfig                |  2 -
 configs/P1020MBG-PC_SDCARD_defconfig               |  2 -
 configs/P1020MBG-PC_defconfig                      |  2 -
 configs/P1020RDB-PC_36BIT_NAND_defconfig           |  2 -
 configs/P1020RDB-PC_36BIT_SDCARD_defconfig         |  2 -
 configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig       |  2 -
 configs/P1020RDB-PC_36BIT_defconfig                |  2 -
 configs/P1020RDB-PC_NAND_defconfig                 |  2 -
 configs/P1020RDB-PC_SDCARD_defconfig               |  2 -
 configs/P1020RDB-PC_SPIFLASH_defconfig             |  2 -
 configs/P1020RDB-PC_defconfig                      |  2 -
 configs/P1020RDB-PD_NAND_defconfig                 |  2 -
 configs/P1020RDB-PD_SDCARD_defconfig               |  2 -
 configs/P1020RDB-PD_SPIFLASH_defconfig             |  2 -
 configs/P1020RDB-PD_defconfig                      |  2 -
 configs/P1020UTM-PC_36BIT_SDCARD_defconfig         |  2 -
 configs/P1020UTM-PC_36BIT_defconfig                |  2 -
 configs/P1020UTM-PC_SDCARD_defconfig               |  2 -
 configs/P1020UTM-PC_defconfig                      |  2 -
 configs/P1021RDB-PC_36BIT_NAND_defconfig           |  2 -
 configs/P1021RDB-PC_36BIT_SDCARD_defconfig         |  2 -
 configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig       |  2 -
 configs/P1021RDB-PC_36BIT_defconfig                |  2 -
 configs/P1021RDB-PC_NAND_defconfig                 |  2 -
 configs/P1021RDB-PC_SDCARD_defconfig               |  2 -
 configs/P1021RDB-PC_SPIFLASH_defconfig             |  2 -
 configs/P1021RDB-PC_defconfig                      |  2 -
 configs/P1022DS_36BIT_NAND_defconfig               |  2 -
 configs/P1022DS_36BIT_SDCARD_defconfig             |  2 -
 configs/P1022DS_36BIT_SPIFLASH_defconfig           |  2 -
 configs/P1022DS_36BIT_defconfig                    |  2 -
 configs/P1022DS_NAND_defconfig                     |  2 -
 configs/P1022DS_SDCARD_defconfig                   |  2 -
 configs/P1022DS_SPIFLASH_defconfig                 |  2 -
 configs/P1022DS_defconfig                          |  2 -
 configs/P1023RDB_defconfig                         |  2 -
 configs/P1024RDB_36BIT_defconfig                   |  2 -
 configs/P1024RDB_NAND_defconfig                    |  2 -
 configs/P1024RDB_SDCARD_defconfig                  |  2 -
 configs/P1024RDB_SPIFLASH_defconfig                |  2 -
 configs/P1024RDB_defconfig                         |  2 -
 configs/P1025RDB_36BIT_defconfig                   |  2 -
 configs/P1025RDB_NAND_defconfig                    |  2 -
 configs/P1025RDB_SDCARD_defconfig                  |  2 -
 configs/P1025RDB_SPIFLASH_defconfig                |  2 -
 configs/P1025RDB_defconfig                         |  2 -
 configs/P2020RDB-PC_36BIT_NAND_defconfig           |  2 -
 configs/P2020RDB-PC_36BIT_SDCARD_defconfig         |  2 -
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig       |  2 -
 configs/P2020RDB-PC_36BIT_defconfig                |  2 -
 configs/P2020RDB-PC_NAND_defconfig                 |  2 -
 configs/P2020RDB-PC_SDCARD_defconfig               |  2 -
 configs/P2020RDB-PC_SPIFLASH_defconfig             |  2 -
 configs/P2020RDB-PC_defconfig                      |  2 -
 configs/P2041RDB_NAND_defconfig                    |  2 -
 configs/P2041RDB_SDCARD_defconfig                  |  2 -
 configs/P2041RDB_SECURE_BOOT_defconfig             |  2 -
 configs/P2041RDB_SPIFLASH_defconfig                |  2 -
 configs/P2041RDB_SRIO_PCIE_BOOT_defconfig          |  4 +-
 configs/P2041RDB_defconfig                         |  2 -
 configs/P3041DS_NAND_defconfig                     |  2 -
 configs/P3041DS_SDCARD_defconfig                   |  2 -
 configs/P3041DS_SECURE_BOOT_defconfig              |  2 -
 configs/P3041DS_SPIFLASH_defconfig                 |  2 -
 configs/P3041DS_SRIO_PCIE_BOOT_defconfig           |  4 +-
 configs/P3041DS_defconfig                          |  2 -
 configs/P4080DS_SDCARD_defconfig                   |  2 -
 configs/P4080DS_SECURE_BOOT_defconfig              |  2 -
 configs/P4080DS_SPIFLASH_defconfig                 |  2 -
 configs/P4080DS_SRIO_PCIE_BOOT_defconfig           |  4 +-
 configs/P4080DS_defconfig                          |  2 -
 configs/P5020DS_NAND_defconfig                     |  2 -
 configs/P5020DS_SDCARD_defconfig                   |  2 -
 configs/P5020DS_SECURE_BOOT_defconfig              |  2 -
 configs/P5020DS_SPIFLASH_defconfig                 |  2 -
 configs/P5020DS_SRIO_PCIE_BOOT_defconfig           |  4 +-
 configs/P5020DS_defconfig                          |  2 -
 configs/P5040DS_NAND_defconfig                     |  2 -
 configs/P5040DS_SDCARD_defconfig                   |  2 -
 configs/P5040DS_SECURE_BOOT_defconfig              |  2 -
 configs/P5040DS_SPIFLASH_defconfig                 |  2 -
 configs/P5040DS_defconfig                          |  2 -
 configs/PATI_defconfig                             | 12 ++++++
 configs/PIP405_defconfig                           |  2 +-
 configs/PLU405_defconfig                           |  2 +-
 configs/PMC405DE_defconfig                         |  2 +-
 configs/PMC440_defconfig                           |  2 +-
 configs/T1023RDB_NAND_defconfig                    |  4 +-
 configs/T1023RDB_SDCARD_defconfig                  |  4 +-
 configs/T1023RDB_SECURE_BOOT_defconfig             |  2 -
 configs/T1023RDB_SPIFLASH_defconfig                |  4 +-
 configs/T1023RDB_defconfig                         |  2 -
 configs/T1024QDS_D4_SECURE_BOOT_defconfig          |  2 -
 configs/T1024QDS_NAND_defconfig                    |  2 -
 configs/T1024QDS_SDCARD_defconfig                  |  2 -
 configs/T1024QDS_SECURE_BOOT_defconfig             |  2 -
 configs/T1024QDS_SPIFLASH_defconfig                |  2 -
 configs/T1024QDS_defconfig                         |  2 -
 configs/T1024RDB_NAND_defconfig                    |  2 -
 configs/T1024RDB_SDCARD_defconfig                  |  2 -
 configs/T1024RDB_SECURE_BOOT_defconfig             |  2 -
 configs/T1024RDB_SPIFLASH_defconfig                |  2 -
 configs/T1024RDB_defconfig                         |  2 -
 configs/T1040QDS_D4_defconfig                      |  2 -
 configs/T1040QDS_SECURE_BOOT_defconfig             |  2 -
 configs/T1040QDS_defconfig                         |  2 -
 configs/T1040RDB_NAND_defconfig                    |  2 -
 configs/T1040RDB_SDCARD_defconfig                  |  2 -
 configs/T1040RDB_SECURE_BOOT_defconfig             |  2 -
 configs/T1040RDB_SPIFLASH_defconfig                |  2 -
 configs/T1040RDB_defconfig                         |  2 -
 configs/T1042RDB_PI_NAND_defconfig                 |  2 -
 configs/T1042RDB_PI_SDCARD_defconfig               |  2 -
 configs/T1042RDB_PI_SPIFLASH_defconfig             |  2 -
 configs/T1042RDB_PI_defconfig                      |  2 -
 configs/T1042RDB_SECURE_BOOT_defconfig             |  2 -
 configs/T1042RDB_defconfig                         |  2 -
 configs/T2080QDS_NAND_defconfig                    |  2 -
 configs/T2080QDS_SDCARD_defconfig                  |  2 -
 configs/T2080QDS_SECURE_BOOT_defconfig             |  2 -
 configs/T2080QDS_SPIFLASH_defconfig                |  2 -
 configs/T2080QDS_SRIO_PCIE_BOOT_defconfig          |  4 +-
 configs/T2080QDS_defconfig                         |  2 -
 configs/T2080RDB_NAND_defconfig                    |  2 -
 configs/T2080RDB_SDCARD_defconfig                  |  2 -
 configs/T2080RDB_SECURE_BOOT_defconfig             |  2 -
 configs/T2080RDB_SPIFLASH_defconfig                |  2 -
 configs/T2080RDB_SRIO_PCIE_BOOT_defconfig          |  4 +-
 configs/T2080RDB_defconfig                         |  2 -
 configs/T2081QDS_NAND_defconfig                    |  2 -
 configs/T2081QDS_SDCARD_defconfig                  |  2 -
 configs/T2081QDS_SPIFLASH_defconfig                |  2 -
 configs/T2081QDS_SRIO_PCIE_BOOT_defconfig          |  4 +-
 configs/T2081QDS_defconfig                         |  2 -
 configs/T4160QDS_NAND_defconfig                    |  2 -
 configs/T4160QDS_SDCARD_defconfig                  |  2 -
 configs/T4160QDS_SECURE_BOOT_defconfig             |  2 -
 configs/T4160QDS_defconfig                         |  2 -
 configs/T4160RDB_defconfig                         |  2 -
 configs/T4240QDS_NAND_defconfig                    |  2 -
 configs/T4240QDS_SDCARD_defconfig                  |  2 -
 configs/T4240QDS_SECURE_BOOT_defconfig             |  2 -
 configs/T4240QDS_SRIO_PCIE_BOOT_defconfig          |  4 +-
 configs/T4240QDS_defconfig                         |  2 -
 configs/T4240RDB_SDCARD_defconfig                  |  2 -
 configs/T4240RDB_defconfig                         |  2 -
 configs/TQM5200S_HIGHBOOT_defconfig                |  2 +-
 configs/TQM5200S_defconfig                         |  2 +-
 configs/TQM5200_B_HIGHBOOT_defconfig               |  2 +-
 configs/TQM5200_B_defconfig                        |  2 +-
 configs/TQM5200_STK100_defconfig                   |  2 +-
 configs/TQM5200_defconfig                          |  2 +-
 configs/TQM823L_LCD_defconfig                      |  2 +-
 configs/TQM823L_defconfig                          |  2 +-
 configs/TQM823M_defconfig                          |  2 +-
 configs/TQM834x_defconfig                          |  2 +-
 configs/TQM850L_defconfig                          |  2 +-
 configs/TQM850M_defconfig                          |  2 +-
 configs/TQM855L_defconfig                          |  2 +-
 configs/TQM855M_defconfig                          |  2 +-
 configs/TQM860L_defconfig                          |  2 +-
 configs/TQM860M_defconfig                          |  2 +-
 configs/TQM862L_defconfig                          |  2 +-
 configs/TQM862M_defconfig                          |  2 +-
 configs/TQM866M_defconfig                          |  2 +-
 configs/TQM885D_defconfig                          |  2 +-
 configs/TTTech_defconfig                           |  2 +-
 configs/TWR-P1025_defconfig                        |  2 -
 configs/TZX-Q8-713B7_defconfig                     |  6 +--
 configs/UCP1020_SPIFLASH_defconfig                 |  2 -
 configs/UCP1020_defconfig                          |  2 -
 configs/UTOO_P66_defconfig                         |  6 +--
 configs/VCMA9_defconfig                            |  2 +-
 configs/VOM405_defconfig                           |  2 +-
 configs/Wexler_TAB7200_defconfig                   |  6 +--
 configs/Wits_Pro_A20_DKT_defconfig                 |  6 +--
 configs/Yones_Toptech_BD1078_defconfig             |  6 +--
 configs/a3m071_defconfig                           |  2 +-
 configs/a4m072_defconfig                           |  2 +-
 configs/a4m2k_defconfig                            |  2 +-
 configs/ac14xx_defconfig                           |  2 +-
 configs/acadia_defconfig                           |  2 -
 configs/adp-ag101_defconfig                        |  2 +-
 configs/adp-ag101p_defconfig                       |  2 +-
 configs/adp-ag102_defconfig                        |  4 +-
 configs/alpr_defconfig                             |  5 ++-
 configs/alt_defconfig                              | 16 +++++++-
 configs/am335x_baltos_defconfig                    |  4 ++
 configs/am335x_boneblack_defconfig                 |  4 +-
 configs/am335x_boneblack_vboot_defconfig           |  4 +-
 configs/am335x_evm_defconfig                       |  4 +-
 configs/am335x_evm_nor_defconfig                   |  3 +-
 configs/am335x_evm_norboot_defconfig               |  3 +-
 configs/am335x_evm_spiboot_defconfig               |  4 +-
 configs/am335x_evm_usbspl_defconfig                |  4 +-
 configs/am335x_igep0033_defconfig                  |  4 +-
 configs/am3517_crane_defconfig                     |  7 ++++
 configs/am3517_evm_defconfig                       |  6 ++-
 configs/am43xx_evm_defconfig                       |  4 +-
 configs/am43xx_evm_qspiboot_defconfig              |  4 +-
 configs/amcore_defconfig                           |  6 +++
 configs/ap325rxa_defconfig                         | 16 +++++++-
 configs/ap_sh4a_4a_defconfig                       | 18 ++++++++-
 configs/apalis_t30_defconfig                       |  7 +++-
 configs/apf27_defconfig                            |  4 +-
 configs/apx4devkit_defconfig                       |  4 +-
 configs/arcangel4-be_defconfig                     |  4 +-
 configs/arcangel4_defconfig                        |  4 +-
 configs/arches_defconfig                           |  2 -
 configs/aria_defconfig                             |  2 +-
 configs/aristainetos2_defconfig                    |  4 +-
 configs/aristainetos_defconfig                     |  4 +-
 configs/armadillo-800eva_defconfig                 | 18 ++++++++-
 configs/arndale_defconfig                          |  3 +-
 configs/aspenite_defconfig                         |  5 +++
 configs/astro_mcf5373l_defconfig                   |  3 ++
 configs/at91rm9200ek_defconfig                     |  3 +-
 configs/at91rm9200ek_ram_defconfig                 |  3 +-
 configs/at91sam9260ek_dataflash_cs0_defconfig      |  8 +++-
 configs/at91sam9260ek_dataflash_cs1_defconfig      |  8 +++-
 configs/at91sam9260ek_nandflash_defconfig          |  8 +++-
 configs/at91sam9261ek_dataflash_cs0_defconfig      |  8 +++-
 configs/at91sam9261ek_dataflash_cs3_defconfig      |  8 +++-
 configs/at91sam9261ek_nandflash_defconfig          |  8 +++-
 configs/at91sam9263ek_dataflash_cs0_defconfig      |  8 +++-
 configs/at91sam9263ek_dataflash_defconfig          |  8 +++-
 configs/at91sam9263ek_nandflash_defconfig          |  8 +++-
 configs/at91sam9263ek_norflash_boot_defconfig      |  8 +++-
 configs/at91sam9263ek_norflash_defconfig           |  8 +++-
 configs/at91sam9g10ek_dataflash_cs0_defconfig      |  8 +++-
 configs/at91sam9g10ek_dataflash_cs3_defconfig      |  8 +++-
 configs/at91sam9g10ek_nandflash_defconfig          |  8 +++-
 configs/at91sam9g20ek_2mmc_defconfig               |  8 +++-
 configs/at91sam9g20ek_2mmc_nandflash_defconfig     |  8 +++-
 configs/at91sam9g20ek_dataflash_cs0_defconfig      |  8 +++-
 configs/at91sam9g20ek_dataflash_cs1_defconfig      |  8 +++-
 configs/at91sam9g20ek_nandflash_defconfig          |  8 +++-
 configs/at91sam9m10g45ek_mmc_defconfig             |  8 +++-
 configs/at91sam9m10g45ek_nandflash_defconfig       |  8 +++-
 configs/at91sam9n12ek_mmc_defconfig                |  5 ++-
 configs/at91sam9n12ek_nandflash_defconfig          |  5 ++-
 configs/at91sam9n12ek_spiflash_defconfig           |  5 ++-
 configs/at91sam9rlek_dataflash_defconfig           |  9 +++++
 configs/at91sam9rlek_mmc_defconfig                 |  9 +++++
 configs/at91sam9rlek_nandflash_defconfig           |  9 +++++
 configs/at91sam9x5ek_dataflash_defconfig           |  6 ++-
 configs/at91sam9x5ek_mmc_defconfig                 |  6 ++-
 configs/at91sam9x5ek_nandflash_defconfig           |  6 ++-
 configs/at91sam9x5ek_spiflash_defconfig            |  6 ++-
 configs/at91sam9xeek_dataflash_cs0_defconfig       |  8 +++-
 configs/at91sam9xeek_dataflash_cs1_defconfig       |  8 +++-
 configs/at91sam9xeek_nandflash_defconfig           |  8 +++-
 configs/atngw100_defconfig                         |  5 ++-
 configs/atngw100mkii_defconfig                     |  4 +-
 configs/atstk1002_defconfig                        |  5 ++-
 configs/axm_defconfig                              |  8 +++-
 configs/axs101_defconfig                           |  4 +-
 configs/axs103_defconfig                           |  4 +-
 configs/ba10_tv_box_defconfig                      |  6 +--
 configs/balloon3_defconfig                         |  4 ++
 configs/bamboo_defconfig                           |  2 -
 configs/bcm11130_defconfig                         |  5 +++
 configs/bcm11130_nand_defconfig                    |  5 +++
 configs/bcm28155_ap_defconfig                      |  5 +++
 configs/bcm28155_w1d_defconfig                     |  5 +++
 configs/bcm911360_entphn-ns_defconfig              |  4 +-
 configs/bcm911360_entphn_defconfig                 |  4 +-
 configs/bcm911360k_defconfig                       |  4 +-
 configs/bcm958300k-ns_defconfig                    |  4 +-
 configs/bcm958300k_defconfig                       |  4 +-
 configs/bcm958305k_defconfig                       |  4 +-
 configs/bcm958622hr_defconfig                      |  4 +-
 configs/bct-brettl2_defconfig                      |  2 +-
 configs/beagle_x15_defconfig                       |  4 +-
 configs/beaver_defconfig                           |  7 +++-
 configs/bf506f-ezkit_defconfig                     | 21 +++++++++++
 configs/bf518f-ezbrd_defconfig                     |  2 +-
 configs/bf525-ucr2_defconfig                       |  5 +++
 configs/bf526-ezbrd_defconfig                      |  2 +-
 configs/bf527-ad7160-eval_defconfig                |  4 ++
 configs/bf527-ezkit-v2_defconfig                   |  2 +-
 configs/bf527-ezkit_defconfig                      |  2 +-
 configs/bf527-sdp_defconfig                        |  4 ++
 configs/bf533-ezkit_defconfig                      |  2 +-
 configs/bf533-stamp_defconfig                      |  2 +-
 configs/bf537-minotaur_defconfig                   |  4 +-
 configs/bf537-pnav_defconfig                       |  2 +-
 configs/bf537-srv1_defconfig                       |  4 +-
 configs/bf537-stamp_defconfig                      |  2 +-
 configs/bf538f-ezkit_defconfig                     |  2 +-
 configs/bf548-ezkit_defconfig                      |  2 +-
 configs/bf561-acvilon_defconfig                    |  4 +-
 configs/bf561-ezkit_defconfig                      |  2 +-
 configs/bf609-ezkit_defconfig                      |  2 +-
 configs/bg0900_defconfig                           |  4 +-
 configs/birdland_bav335a_defconfig                 |  4 +-
 configs/birdland_bav335b_defconfig                 |  4 +-
 configs/blackstamp_defconfig                       |  4 +-
 configs/blackvme_defconfig                         |  4 +-
 configs/br4_defconfig                              |  4 +-
 configs/bubinga_defconfig                          |  2 -
 configs/caddy2_defconfig                           |  2 +-
 configs/cairo_defconfig                            |  6 ++-
 configs/calimain_defconfig                         |  2 +-
 configs/cam5200_defconfig                          |  2 +-
 configs/cam5200_niosflash_defconfig                |  2 +-
 configs/cam_enc_4xx_defconfig                      |  5 ++-
 configs/canmb_defconfig                            |  2 +-
 configs/canyonlands_defconfig                      |  2 -
 configs/cardhu_defconfig                           |  7 +++-
 configs/cgtqmx6qeval_defconfig                     |  4 +-
 configs/charon_defconfig                           |  2 +-
 configs/chromebook_link_defconfig                  |  5 ++-
 configs/chromebox_panther_defconfig                |  5 ++-
 configs/cm-bf527_defconfig                         |  2 +-
 configs/cm-bf533_defconfig                         |  2 +-
 configs/cm-bf537e_defconfig                        |  2 +-
 configs/cm-bf537u_defconfig                        |  2 +-
 configs/cm-bf548_defconfig                         |  2 +-
 configs/cm-bf561_defconfig                         |  2 +-
 configs/cm5200_defconfig                           |  2 +-
 configs/cm_fx6_defconfig                           |  8 +++-
 configs/cm_t335_defconfig                          |  4 +-
 configs/cm_t3517_defconfig                         |  5 ++-
 configs/cm_t35_defconfig                           |  5 ++-
 configs/cm_t54_defconfig                           |  5 ++-
 configs/cmi_mpc5xx_defconfig                       |  3 ++
 configs/cobra5272_defconfig                        |  4 +-
 configs/colibri_pxa270_defconfig                   |  5 ++-
 configs/colibri_t20_defconfig                      |  7 +++-
 configs/colibri_t30_defconfig                      |  7 +++-
 configs/colibri_vf_defconfig                       |  3 +-
 configs/colibri_vf_dtb_defconfig                   |  3 ++
 .../controlcenterd_36BIT_SDCARD_DEVELOP_defconfig  |  4 +-
 configs/controlcenterd_36BIT_SDCARD_defconfig      |  4 +-
 .../controlcenterd_TRAILBLAZER_DEVELOP_defconfig   |  4 +-
 configs/controlcenterd_TRAILBLAZER_defconfig       |  4 +-
 configs/coreboot-x86_defconfig                     |  5 ++-
 configs/corvus_defconfig                           |  7 +++-
 configs/cpu9260_128M_defconfig                     |  7 +++-
 configs/cpu9260_defconfig                          |  7 +++-
 configs/cpu9260_nand_128M_defconfig                |  7 +++-
 configs/cpu9260_nand_defconfig                     |  7 +++-
 configs/cpu9G20_128M_defconfig                     |  7 +++-
 configs/cpu9G20_defconfig                          |  7 +++-
 configs/cpu9G20_nand_128M_defconfig                |  7 +++-
 configs/cpu9G20_nand_defconfig                     |  7 +++-
 configs/cpuat91_defconfig                          |  6 ++-
 configs/cpuat91_ram_defconfig                      |  6 ++-
 configs/crownbay_defconfig                         |  5 ++-
 configs/csb272_defconfig                           |  2 +-
 configs/csb472_defconfig                           |  2 +-
 configs/d2net_v2_defconfig                         |  4 +-
 configs/da830evm_defconfig                         |  5 ++-
 configs/da850_am18xxevm_defconfig                  |  4 +-
 configs/da850evm_defconfig                         |  4 +-
 configs/da850evm_direct_nor_defconfig              |  2 +-
 configs/dalmore_defconfig                          |  7 +++-
 configs/davinci_dm355evm_defconfig                 |  6 ++-
 configs/davinci_dm355leopard_defconfig             |  6 ++-
 configs/davinci_dm365evm_defconfig                 |  6 ++-
 configs/davinci_dm6467Tevm_defconfig               |  6 ++-
 configs/davinci_dm6467evm_defconfig                |  6 ++-
 configs/davinci_dvevm_defconfig                    |  6 ++-
 configs/davinci_schmoogie_defconfig                |  6 ++-
 configs/davinci_sffsdr_defconfig                   |  6 ++-
 configs/davinci_sonata_defconfig                   |  4 +-
 configs/db-88f6820-gp_defconfig                    |  4 +-
 configs/db-mv784mp-gp_defconfig                    |  4 +-
 configs/dbau1000_defconfig                         |  9 ++++-
 configs/dbau1100_defconfig                         |  9 ++++-
 configs/dbau1500_defconfig                         |  9 ++++-
 configs/dbau1550_defconfig                         |  7 +++-
 configs/dbau1550_el_defconfig                      |  7 +++-
 configs/devconcenter_defconfig                     |  2 -
 configs/devkit3250_defconfig                       |  2 +-
 configs/devkit8000_defconfig                       |  6 ++-
 configs/dig297_defconfig                           |  7 +++-
 configs/digsy_mtc_RAMBOOT_defconfig                |  2 +-
 configs/digsy_mtc_defconfig                        |  2 +-
 configs/digsy_mtc_rev5_RAMBOOT_defconfig           |  2 +-
 configs/digsy_mtc_rev5_defconfig                   |  2 +-
 configs/dlvision-10g_defconfig                     |  3 +-
 configs/dlvision_defconfig                         |  3 +-
 configs/dnp5370_defconfig                          |  2 +-
 configs/dns325_defconfig                           |  4 +-
 configs/dockstar_defconfig                         |  4 +-
 configs/dra7xx_evm_defconfig                       |  5 ++-
 configs/dra7xx_evm_qspiboot_defconfig              |  5 ++-
 configs/dra7xx_evm_uart3_defconfig                 |  5 ++-
 configs/draco_defconfig                            |  4 +-
 configs/dreamplug_defconfig                        |  4 +-
 configs/duovero_defconfig                          |  5 ++-
 configs/ea20_defconfig                             |  4 +-
 configs/eb_cpu5282_defconfig                       |  3 +-
 configs/eb_cpu5282_internal_defconfig              |  3 +-
 configs/eb_cpux9k2_defconfig                       |  2 +-
 configs/eb_cpux9k2_ram_defconfig                   |  2 +-
 configs/ebony_defconfig                            |  2 -
 configs/eco5pk_defconfig                           |  4 +-
 configs/ecovec_defconfig                           | 18 ++++++++-
 configs/edb9315a_defconfig                         |  4 +-
 configs/edminiv2_defconfig                         |  2 +-
 configs/enbw_cmc_defconfig                         |  3 +-
 configs/espt_defconfig                             | 18 ++++++++-
 configs/ethernut5_defconfig                        |  5 ++-
 configs/flea3_defconfig                            |  2 +-
 configs/fo300_defconfig                            |  2 +-
 configs/forfun_q88db_defconfig                     |  6 +--
 configs/fx12mm_defconfig                           |  4 ++
 configs/fx12mm_flash_defconfig                     |  4 ++
 configs/ga10h_v1_1_defconfig                       |  6 +--
 configs/galileo_defconfig                          |  5 ++-
 configs/gdppc440etx_defconfig                      |  2 -
 configs/glacier_defconfig                          |  2 -
 configs/glacier_ramboot_defconfig                  |  2 -
 configs/goflexhome_defconfig                       |  4 +-
 configs/gose_defconfig                             | 16 +++++++-
 configs/gplugd_defconfig                           |  5 ++-
 configs/gr_cpci_ax2000_defconfig                   |  2 +-
 configs/gr_ep2s60_defconfig                        |  2 +-
 configs/gr_xc3s_1500_defconfig                     |  2 +-
 configs/grasshopper_defconfig                      |  3 +-
 configs/grsim_defconfig                            | 11 +++++-
 configs/grsim_leon2_defconfig                      | 11 ++++++
 configs/guruplug_defconfig                         |  4 +-
 configs/gwventana_defconfig                        |  4 +-
 configs/h2200_defconfig                            | 18 ++++++++-
 configs/haleakala_defconfig                        |  2 -
 configs/harmony_defconfig                          |  7 +++-
 configs/highbank_defconfig                         |  4 +-
 configs/hrcon_defconfig                            |  2 +-
 configs/i12-tvbox_defconfig                        |  6 +--
 configs/iNet_3F_defconfig                          |  6 +--
 configs/iNet_3W_defconfig                          |  6 +--
 configs/iNet_86VS_defconfig                        |  6 +--
 configs/ib62x0_defconfig                           |  4 +-
 configs/ibf-dsp561_defconfig                       |  2 +-
 configs/icon_defconfig                             |  2 -
 configs/iconnect_defconfig                         |  4 +-
 configs/ids8313_defconfig                          |  2 +-
 configs/igep0020_defconfig                         |  4 +-
 configs/igep0020_nand_defconfig                    |  4 +-
 configs/igep0030_defconfig                         |  4 +-
 configs/igep0030_nand_defconfig                    |  4 +-
 configs/igep0032_defconfig                         |  4 +-
 configs/ima3-mx53_defconfig                        |  2 +-
 configs/imx27lite_defconfig                        |  2 +-
 configs/imx31_litekit_defconfig                    |  2 +-
 configs/imx31_phycore_defconfig                    |  2 +-
 configs/imx31_phycore_eet_defconfig                |  2 +-
 configs/inetspace_v2_defconfig                     |  4 +-
 configs/inka4x0_defconfig                          |  2 +-
 configs/integratorap_cm720t_defconfig              |  2 +-
 configs/integratorap_cm920t_defconfig              |  2 +-
 configs/integratorap_cm926ejs_defconfig            |  2 +-
 configs/integratorap_cm946es_defconfig             |  2 +-
 configs/integratorcp_cm1136_defconfig              |  2 +-
 configs/integratorcp_cm920t_defconfig              |  2 +-
 configs/integratorcp_cm926ejs_defconfig            |  2 +-
 configs/integratorcp_cm946es_defconfig             |  2 +-
 configs/intip_defconfig                            |  2 -
 configs/io64_defconfig                             |  2 -
 configs/io_defconfig                               |  3 +-
 configs/iocon_defconfig                            |  3 +-
 configs/ip04_defconfig                             |  4 +-
 configs/ipam390_defconfig                          |  4 +-
 configs/ipek01_defconfig                           |  2 +-
 configs/jesurun_q5_defconfig                       |  6 +--
 configs/jetson-tk1_defconfig                       |  7 +++-
 configs/jornada_defconfig                          |  6 +++
 configs/jupiter_defconfig                          |  2 +-
 configs/k2e_evm_defconfig                          |  4 +-
 configs/k2hk_evm_defconfig                         |  4 +-
 configs/k2l_evm_defconfig                          |  4 +-
 configs/katmai_defconfig                           |  2 -
 configs/kilauea_defconfig                          |  2 -
 configs/km_kirkwood_128m16_defconfig               |  4 +-
 configs/km_kirkwood_defconfig                      |  4 +-
 configs/km_kirkwood_pci_defconfig                  |  4 +-
 configs/kmcoge4_defconfig                          |  4 +-
 configs/kmcoge5ne_defconfig                        |  2 -
 configs/kmcoge5un_defconfig                        |  4 +-
 configs/kmeter1_defconfig                          |  2 -
 configs/kmlion1_defconfig                          |  4 +-
 configs/kmnusa_defconfig                           |  4 +-
 configs/kmopti2_defconfig                          |  2 -
 configs/kmsugp1_defconfig                          |  4 +-
 configs/kmsupx5_defconfig                          |  2 -
 configs/kmsuv31_defconfig                          |  4 +-
 configs/kmvect1_defconfig                          |  2 -
 configs/koelsch_defconfig                          | 16 +++++++-
 configs/kwb_defconfig                              | 12 +++++-
 configs/kzm9g_defconfig                            |  2 +-
 configs/lager_defconfig                            | 16 +++++++-
 configs/lcd4_lwmon5_defconfig                      |  2 +-
 configs/lp8x4x_defconfig                           |  3 +-
 configs/ls1021aqds_ddr4_nor_defconfig              |  2 +-
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig       |  2 +-
 configs/ls1021aqds_nand_defconfig                  |  2 +-
 configs/ls1021aqds_nor_SECURE_BOOT_defconfig       |  2 +-
 configs/ls1021aqds_nor_defconfig                   |  2 +-
 configs/ls1021aqds_nor_lpuart_defconfig            |  2 +-
 configs/ls1021aqds_qspi_defconfig                  |  3 +-
 configs/ls1021aqds_sdcard_defconfig                |  2 +-
 configs/ls1021atwr_nor_SECURE_BOOT_defconfig       |  2 +-
 configs/ls1021atwr_nor_defconfig                   |  2 +-
 configs/ls1021atwr_nor_lpuart_defconfig            |  2 +-
 configs/ls1021atwr_qspi_defconfig                  |  3 +-
 configs/ls1021atwr_sdcard_defconfig                |  2 +-
 configs/ls2085a_emu_D4_defconfig                   | 12 +++++-
 configs/ls2085a_emu_defconfig                      | 12 +++++-
 configs/ls2085a_simu_defconfig                     | 12 +++++-
 configs/ls2085aqds_defconfig                       |  2 +-
 configs/ls2085aqds_nand_defconfig                  |  2 +-
 configs/ls2085ardb_defconfig                       |  2 +-
 configs/ls2085ardb_nand_defconfig                  |  2 +-
 configs/lschlv2_defconfig                          |  4 +-
 configs/lsxhl_defconfig                            |  4 +-
 configs/luan_defconfig                             |  2 -
 configs/lwmon5_defconfig                           |  2 +-
 configs/m28evk_defconfig                           |  4 +-
 configs/m53evk_defconfig                           |  4 +-
 configs/magnesium_defconfig                        |  2 +-
 configs/makalu_defconfig                           |  2 -
 configs/malta_defconfig                            |  6 ++-
 configs/maltael_defconfig                          |  6 ++-
 configs/marsboard_defconfig                        |  4 +-
 configs/maxbcm_defconfig                           |  4 +-
 configs/mcx_defconfig                              |  6 ++-
 configs/mecp5123_defconfig                         |  2 +-
 configs/medcom-wide_defconfig                      |  7 +++-
 configs/meesc_dataflash_defconfig                  |  6 ++-
 configs/meesc_defconfig                            |  6 ++-
 configs/mgcoge3ne_defconfig                        |  2 -
 configs/mgcoge3un_defconfig                        |  4 +-
 configs/mgcoge_defconfig                           |  2 -
 configs/microblaze-generic_defconfig               |  2 +-
 configs/minnowmax_defconfig                        |  5 ++-
 configs/mixtile_loftq_defconfig                    |  6 +--
 configs/mk802_a10s_defconfig                       |  6 +--
 configs/mk802_defconfig                            |  6 +--
 configs/mk802ii_defconfig                          |  6 +--
 configs/ml507_defconfig                            |  4 ++
 configs/ml507_flash_defconfig                      |  4 ++
 configs/motionpro_defconfig                        |  2 +-
 configs/mpc5121ads_defconfig                       |  2 +-
 configs/mpc5121ads_rev2_defconfig                  |  2 +-
 configs/mpc8308_p1m_defconfig                      |  2 +-
 configs/mpr2_defconfig                             | 19 ++++++++++
 configs/ms7720se_defconfig                         | 19 ++++++++++
 configs/ms7722se_defconfig                         | 18 ++++++++-
 configs/ms7750se_defconfig                         | 20 ++++++++++
 configs/mt_ventoux_defconfig                       |  4 +-
 configs/munices_defconfig                          |  2 +-
 configs/mv88f6281gtw_ge_defconfig                  |  4 +-
 configs/mx23_olinuxino_defconfig                   |  4 +-
 configs/mx23evk_defconfig                          |  5 +++
 configs/mx25pdk_defconfig                          |  4 +-
 configs/mx28evk_auart_console_defconfig            |  4 +-
 configs/mx28evk_defconfig                          |  4 +-
 configs/mx28evk_nand_defconfig                     |  4 +-
 configs/mx28evk_spi_defconfig                      |  4 +-
 configs/mx31ads_defconfig                          |  2 +-
 configs/mx31pdk_defconfig                          |  3 +-
 configs/mx35pdk_defconfig                          |  2 +-
 configs/mx51_efikamx_defconfig                     |  3 +-
 configs/mx51_efikasb_defconfig                     |  3 +-
 configs/mx51evk_defconfig                          |  3 +-
 configs/mx53ard_defconfig                          |  3 +-
 configs/mx53evk_defconfig                          |  3 +-
 configs/mx53loco_defconfig                         |  3 +-
 configs/mx53smd_defconfig                          |  3 +-
 configs/mx6cuboxi_defconfig                        |  4 +-
 configs/mx6dlarm2_defconfig                        |  4 +-
 configs/mx6dlarm2_lpddr2_defconfig                 |  4 +-
 configs/mx6dlsabreauto_defconfig                   |  4 +-
 configs/mx6dlsabresd_defconfig                     |  4 +-
 configs/mx6qarm2_defconfig                         |  4 +-
 configs/mx6qarm2_lpddr2_defconfig                  |  4 +-
 configs/mx6qsabreauto_defconfig                    |  4 +-
 configs/mx6qsabrelite_defconfig                    |  4 +-
 configs/mx6qsabresd_defconfig                      |  4 +-
 configs/mx6sabresd_spl_defconfig                   |  4 +-
 configs/mx6slevk_defconfig                         |  4 +-
 configs/mx6slevk_spinor_defconfig                  |  4 +-
 configs/mx6sxsabresd_defconfig                     |  4 +-
 configs/mx6sxsabresd_spl_defconfig                 |  4 +-
 configs/nas220_defconfig                           |  4 +-
 configs/neo_defconfig                              |  3 +-
 configs/net2big_v2_defconfig                       |  4 +-
 configs/netspace_lite_v2_defconfig                 |  4 +-
 configs/netspace_max_v2_defconfig                  |  4 +-
 configs/netspace_mini_v2_defconfig                 |  4 +-
 configs/netspace_v2_defconfig                      |  4 +-
 configs/nhk8815_defconfig                          |  4 +-
 configs/nhk8815_onenand_defconfig                  |  4 +-
 configs/nios2-generic_defconfig                    |  8 +++-
 configs/nitrogen6dl2g_defconfig                    |  4 +-
 configs/nitrogen6dl_defconfig                      |  4 +-
 configs/nitrogen6q2g_defconfig                     |  4 +-
 configs/nitrogen6q_defconfig                       |  4 +-
 configs/nitrogen6s1g_defconfig                     |  4 +-
 configs/nitrogen6s_defconfig                       |  4 +-
 configs/nokia_rx51_defconfig                       |  8 ++++
 configs/novena_defconfig                           |  4 +-
 configs/nyan-big_defconfig                         |  7 +++-
 configs/ocotea_defconfig                           |  2 -
 configs/odroid-xu3_defconfig                       |  3 +-
 configs/odroid_defconfig                           |  7 +++-
 configs/omap3_beagle_defconfig                     |  4 +-
 configs/omap3_evm_defconfig                        |  6 ++-
 configs/omap3_evm_quick_mmc_defconfig              | 22 ++++++++++-
 configs/omap3_evm_quick_nand_defconfig             | 22 ++++++++++-
 configs/omap3_ha_defconfig                         |  6 ++-
 configs/omap3_logic_defconfig                      |  6 ++-
 configs/omap3_mvblx_defconfig                      |  4 +-
 configs/omap3_overo_defconfig                      |  7 +++-
 configs/omap3_pandora_defconfig                    |  7 ++++
 configs/omap3_sdp3430_defconfig                    |  4 +-
 configs/omap3_zoom1_defconfig                      |  6 ++-
 configs/omap4_panda_defconfig                      |  5 ++-
 configs/omap4_sdp4430_defconfig                    |  5 +++
 configs/omap5_uevm_defconfig                       |  4 +-
 configs/omapl138_lcdk_defconfig                    |  4 +-
 configs/openrd_base_defconfig                      |  4 +-
 configs/openrd_client_defconfig                    |  4 +-
 configs/openrd_ultimate_defconfig                  |  4 +-
 configs/openrisc-generic_defconfig                 |  4 +-
 configs/origen_defconfig                           |  7 +++-
 configs/ot1200_defconfig                           |  4 +-
 configs/ot1200_spl_defconfig                       |  4 +-
 configs/otc570_dataflash_defconfig                 |  5 ++-
 configs/otc570_defconfig                           |  5 ++-
 configs/p3p440_defconfig                           |  2 +-
 configs/palmld_defconfig                           |  4 ++
 configs/palmtc_defconfig                           |  3 ++
 configs/palmtreo680_defconfig                      |  9 +++++
 configs/paz00_defconfig                            |  7 +++-
 configs/pb1000_defconfig                           |  9 ++++-
 configs/pcm030_LOWBOOT_defconfig                   |  2 +-
 configs/pcm030_defconfig                           |  2 +-
 configs/pcm051_rev1_defconfig                      |  4 +-
 configs/pcm051_rev3_defconfig                      |  4 +-
 configs/pcs440ep_defconfig                         |  2 +-
 configs/pdm360ng_defconfig                         |  2 +-
 configs/peach-pi_defconfig                         |  3 +-
 configs/peach-pit_defconfig                        |  3 +-
 configs/pengwyn_defconfig                          |  4 +-
 configs/pepper_defconfig                           |  4 +-
 configs/ph1_ld4_defconfig                          | 22 +++--------
 configs/ph1_pro4_defconfig                         | 22 +++--------
 configs/ph1_sld8_defconfig                         | 22 +++--------
 configs/platinum_picon_defconfig                   |  4 +-
 configs/platinum_titanium_defconfig                |  4 +-
 configs/plutux_defconfig                           |  7 +++-
 configs/pm9261_defconfig                           |  7 +++-
 configs/pm9263_defconfig                           |  7 +++-
 configs/pm9g45_defconfig                           |  5 ++-
 configs/pogo_e02_defconfig                         |  4 +-
 configs/polaris_defconfig                          |  2 +-
 configs/porter_defconfig                           | 16 +++++++-
 configs/portl2_defconfig                           |  4 +-
 configs/portuxg20_defconfig                        |  7 +++-
 configs/pr1_defconfig                              |  4 +-
 configs/pxa255_idp_defconfig                       |  2 +-
 configs/pxm2_defconfig                             |  4 +-
 configs/qemu-ppce500_defconfig                     |  4 +-
 configs/qemu-x86_defconfig                         |  5 ++-
 configs/qemu_mips64_defconfig                      |  4 +-
 configs/qemu_mips64el_defconfig                    |  4 +-
 configs/qemu_mips_defconfig                        |  4 +-
 configs/qemu_mipsel_defconfig                      |  4 +-
 configs/qong_defconfig                             |  2 -
 configs/r0p7734_defconfig                          | 18 ++++++++-
 configs/r2dplus_defconfig                          |  2 +-
 configs/r7-tv-dongle_defconfig                     |  6 +--
 configs/r7780mp_defconfig                          | 18 ++++++++-
 configs/rainier_defconfig                          |  2 -
 configs/rainier_ramboot_defconfig                  |  2 -
 configs/rd6281a_defconfig                          |  4 +-
 configs/redwood_defconfig                          |  2 -
 configs/riotboard_defconfig                        |  4 +-
 configs/rpi_2_defconfig                            |  5 ++-
 configs/rpi_defconfig                              |  5 ++-
 configs/rsk7203_defconfig                          | 18 ++++++++-
 configs/rsk7264_defconfig                          |  2 +-
 configs/rsk7269_defconfig                          |  2 +-
 configs/rut_defconfig                              |  4 +-
 configs/s5p_goni_defconfig                         |  8 ++++
 configs/s5pc210_universal_defconfig                |  7 +++-
 configs/sama5d3_xplained_mmc_defconfig             |  7 +++-
 configs/sama5d3_xplained_nandflash_defconfig       |  7 +++-
 configs/sama5d3xek_mmc_defconfig                   |  5 ++-
 configs/sama5d3xek_nandflash_defconfig             |  5 ++-
 configs/sama5d3xek_spiflash_defconfig              |  5 ++-
 configs/sama5d4_xplained_mmc_defconfig             |  7 +++-
 configs/sama5d4_xplained_nandflash_defconfig       |  7 +++-
 configs/sama5d4_xplained_spiflash_defconfig        |  7 +++-
 configs/sama5d4ek_mmc_defconfig                    |  7 +++-
 configs/sama5d4ek_nandflash_defconfig              |  7 +++-
 configs/sama5d4ek_spiflash_defconfig               |  7 +++-
 configs/sandbox_defconfig                          |  5 ++-
 configs/sansa_fuze_plus_defconfig                  |  4 +-
 configs/sbc405_defconfig                           |  2 +-
 configs/sbc8349_PCI_33_defconfig                   |  2 +-
 configs/sbc8349_PCI_66_defconfig                   |  2 +-
 configs/sbc8349_defconfig                          |  2 +-
 configs/sbc8548_PCI_33_PCIE_defconfig              |  2 +-
 configs/sbc8548_PCI_33_defconfig                   |  2 +-
 configs/sbc8548_PCI_66_PCIE_defconfig              |  2 +-
 configs/sbc8548_PCI_66_defconfig                   |  2 +-
 configs/sbc8548_defconfig                          |  2 +-
 configs/sbc8641d_defconfig                         |  2 +-
 configs/sc_sps_1_defconfig                         |  4 +-
 configs/scb9328_defconfig                          |  5 ++-
 configs/seaboard_defconfig                         |  7 +++-
 configs/secomx6quq7_defconfig                      |  4 +-
 configs/sequoia_defconfig                          |  2 -
 configs/sequoia_ramboot_defconfig                  |  2 -
 configs/sh7752evb_defconfig                        | 17 ++++++++-
 configs/sh7753evb_defconfig                        | 17 ++++++++-
 configs/sh7757lcr_defconfig                        | 17 ++++++++-
 configs/sh7763rdp_defconfig                        | 18 ++++++++-
 configs/sh7785lcr_32bit_defconfig                  | 17 ++++++++-
 configs/sh7785lcr_defconfig                        | 17 ++++++++-
 configs/sheevaplug_defconfig                       |  4 +-
 configs/shmin_defconfig                            | 18 ++++++++-
 configs/silk_defconfig                             | 16 +++++++-
 configs/smdk2410_defconfig                         |  2 +-
 configs/smdk5250_defconfig                         |  3 +-
 configs/smdk5420_defconfig                         |  3 +-
 configs/smdkc100_defconfig                         |  4 +-
 configs/smdkv310_defconfig                         |  7 +++-
 configs/snapper9260_defconfig                      |  9 ++++-
 configs/snapper9g20_defconfig                      |  9 ++++-
 configs/snow_defconfig                             |  3 +-
 configs/snowball_defconfig                         | 10 +++++
 configs/socfpga_arria5_defconfig                   |  4 +-
 configs/socfpga_cyclone5_defconfig                 |  4 +-
 configs/socfpga_socrates_defconfig                 |  4 +-
 configs/socrates_defconfig                         |  3 +-
 configs/spear300_defconfig                         |  2 +-
 configs/spear300_nand_defconfig                    |  2 +-
 configs/spear300_usbtty_defconfig                  |  2 +-
 configs/spear300_usbtty_nand_defconfig             |  2 +-
 configs/spear310_defconfig                         |  2 +-
 configs/spear310_nand_defconfig                    |  2 +-
 configs/spear310_pnor_defconfig                    |  2 +-
 configs/spear310_usbtty_defconfig                  |  2 +-
 configs/spear310_usbtty_nand_defconfig             |  2 +-
 configs/spear310_usbtty_pnor_defconfig             |  2 +-
 configs/spear320_defconfig                         |  2 +-
 configs/spear320_nand_defconfig                    |  2 +-
 configs/spear320_pnor_defconfig                    |  2 +-
 configs/spear320_usbtty_defconfig                  |  2 +-
 configs/spear320_usbtty_nand_defconfig             |  2 +-
 configs/spear320_usbtty_pnor_defconfig             |  2 +-
 configs/spear600_defconfig                         |  2 +-
 configs/spear600_nand_defconfig                    |  2 +-
 configs/spear600_usbtty_defconfig                  |  2 +-
 configs/spear600_usbtty_nand_defconfig             |  2 +-
 configs/stamp9g20_defconfig                        |  7 +++-
 configs/stm32f429-discovery_defconfig              |  2 +-
 configs/stv0991_defconfig                          |  5 ++-
 configs/stxgp3_defconfig                           |  2 +-
 configs/stxssa_4M_defconfig                        |  2 +-
 configs/stxssa_defconfig                           |  2 +-
 configs/sunxi_Gemei_G9_defconfig                   |  6 +--
 configs/suvd3_defconfig                            |  2 -
 configs/sycamore_defconfig                         |  2 -
 configs/t3corp_defconfig                           |  2 -
 configs/taihu_defconfig                            |  2 -
 configs/taishan_defconfig                          |  2 -
 configs/tao3530_defconfig                          |  6 ++-
 configs/taurus_defconfig                           |  8 +++-
 configs/tb100_defconfig                            |  4 +-
 configs/tbs2910_defconfig                          |  4 +-
 configs/tcm-bf518_defconfig                        |  2 +-
 configs/tcm-bf537_defconfig                        |  2 +-
 configs/tec-ng_defconfig                           |  7 +++-
 configs/tec_defconfig                              |  7 +++-
 configs/thuban_defconfig                           |  4 +-
 configs/ti814x_evm_defconfig                       |  4 +-
 configs/ti816x_evm_defconfig                       |  4 +-
 configs/titanium_defconfig                         |  4 +-
 configs/tk71_defconfig                             |  4 +-
 configs/tqma6q_mba6_mmc_defconfig                  |  4 +-
 configs/tqma6q_mba6_spi_defconfig                  |  4 +-
 configs/tqma6s_mba6_mmc_defconfig                  |  4 +-
 configs/tqma6s_mba6_spi_defconfig                  |  4 +-
 configs/trats2_defconfig                           |  7 +++-
 configs/trats_defconfig                            |  7 +++-
 configs/tricorder_defconfig                        |  7 ++++
 configs/tricorder_flash_defconfig                  |  7 ++++
 configs/trimslice_defconfig                        |  7 +++-
 configs/trizepsiv_defconfig                        |  2 +-
 configs/tseries_mmc_defconfig                      | 12 +++++-
 configs/tseries_nand_defconfig                     | 12 +++++-
 configs/tseries_spi_defconfig                      | 12 +++++-
 configs/tt01_defconfig                             |  2 +-
 configs/tuge1_defconfig                            |  2 -
 configs/tuxx1_defconfig                            |  2 -
 configs/twister_defconfig                          |  4 +-
 configs/tx25_defconfig                             |  4 +-
 configs/u8500_href_defconfig                       | 10 +++++
 configs/udoo_quad_defconfig                        |  4 +-
 configs/usb_a9263_dataflash_defconfig              |  9 ++++-
 configs/usbarmory_defconfig                        |  3 +-
 configs/v38b_defconfig                             |  2 +-
 configs/v5fx30teval_defconfig                      |  4 ++
 configs/v5fx30teval_flash_defconfig                |  4 ++
 configs/vct_platinum_defconfig                     |  2 +-
 configs/vct_platinum_onenand_defconfig             |  4 +-
 configs/vct_platinum_onenand_small_defconfig       | 12 ++++++
 configs/vct_platinum_small_defconfig               | 10 +++++
 configs/vct_platinumavc_defconfig                  |  3 ++
 configs/vct_platinumavc_onenand_defconfig          |  5 +++
 configs/vct_platinumavc_onenand_small_defconfig    | 12 ++++++
 configs/vct_platinumavc_small_defconfig            | 10 +++++
 configs/vct_premium_defconfig                      |  2 +-
 configs/vct_premium_onenand_defconfig              |  4 +-
 configs/vct_premium_onenand_small_defconfig        | 12 ++++++
 configs/vct_premium_small_defconfig                | 10 +++++
 configs/ve8313_defconfig                           |  2 +-
 configs/venice2_defconfig                          |  7 +++-
 configs/ventana_defconfig                          |  7 +++-
 configs/versatileab_defconfig                      | 17 ++++++++-
 configs/versatilepb_defconfig                      | 17 ++++++++-
 configs/versatileqemu_defconfig                    | 17 ++++++++-
 configs/vexpress_aemv8a_juno_defconfig             | 12 +++++-
 configs/vexpress_aemv8a_semi_defconfig             | 13 ++++++-
 configs/vexpress_ca15_tc2_defconfig                | 15 +++++++-
 configs/vexpress_ca5x2_defconfig                   | 15 +++++++-
 configs/vexpress_ca9x4_defconfig                   | 15 +++++++-
 configs/vf610twr_defconfig                         |  3 +-
 configs/vf610twr_nand_defconfig                    |  3 +-
 configs/vision2_defconfig                          |  3 +-
 configs/vl_ma2sc_defconfig                         |  6 ++-
 configs/vl_ma2sc_ram_defconfig                     |  6 ++-
 configs/vme8349_defconfig                          |  2 +-
 configs/vpac270_nor_128_defconfig                  |  3 +-
 configs/vpac270_nor_256_defconfig                  |  3 +-
 configs/vpac270_ond_256_defconfig                  |  4 +-
 configs/walnut_defconfig                           |  2 -
 configs/wandboard_defconfig                        |  4 +-
 configs/warp_defconfig                             |  5 +++
 configs/whistler_defconfig                         |  7 +++-
 configs/wireless_space_defconfig                   |  4 +-
 configs/woodburn_defconfig                         |  2 +-
 configs/woodburn_sd_defconfig                      |  2 +-
 configs/work_92105_defconfig                       |  4 +-
 configs/wtk_defconfig                              |  2 +-
 configs/x600_defconfig                             |  2 +-
 configs/xaeniax_defconfig                          |  2 +-
 configs/xfi3_defconfig                             |  4 +-
 configs/xilinx-ppc405-generic_defconfig            |  4 ++
 configs/xilinx-ppc405-generic_flash_defconfig      |  4 ++
 configs/xilinx-ppc440-generic_defconfig            |  4 ++
 configs/xilinx-ppc440-generic_flash_defconfig      |  4 ++
 configs/xilinx_zynqmp_defconfig                    | 21 ++++++-----
 configs/xpedite1000_defconfig                      |  2 +-
 configs/xpedite517x_defconfig                      |  2 +-
 configs/xpedite520x_defconfig                      |  2 +-
 configs/xpedite537x_defconfig                      |  2 +-
 configs/xpedite550x_defconfig                      |  2 +-
 configs/yellowstone_defconfig                      |  2 -
 configs/yosemite_defconfig                         |  2 -
 configs/yucca_defconfig                            |  2 -
 configs/zeus_defconfig                             |  2 +-
 configs/zipitz2_defconfig                          |  4 ++
 configs/zmx25_defconfig                            |  2 +-
 configs/zynq_microzed_defconfig                    |  4 +-
 configs/zynq_picozed_defconfig                     |  4 +-
 configs/zynq_zc702_defconfig                       |  4 +-
 configs/zynq_zc706_defconfig                       |  4 +-
 configs/zynq_zc70x_defconfig                       |  4 +-
 configs/zynq_zc770_xm010_defconfig                 |  4 +-
 configs/zynq_zc770_xm012_defconfig                 |  2 +-
 configs/zynq_zc770_xm013_defconfig                 |  4 +-
 configs/zynq_zed_defconfig                         |  4 +-
 configs/zynq_zybo_defconfig                        |  4 +-
 drivers/net/Kconfig                                |  1 +
 include/config_cmd_all.h                           | 20 ----------
 include/config_cmd_default.h                       | 43 ----------------------
 include/configs/B4860QDS.h                         |  2 -
 include/configs/BSC9131RDB.h                       |  2 -
 include/configs/BSC9132QDS.h                       |  2 -
 include/configs/C29XPCIE.h                         |  2 -
 include/configs/CPCI2DP.h                          |  3 --
 include/configs/CPCI4052.h                         |  2 -
 include/configs/M5208EVBE.h                        |  5 ---
 include/configs/M52277EVB.h                        |  8 ----
 include/configs/M5235EVB.h                         |  8 ----
 include/configs/M5249EVB.h                         |  1 -
 include/configs/M5253DEMO.h                        |  6 ---
 include/configs/M5253EVBE.h                        |  5 ---
 include/configs/M5272C3.h                          |  7 ----
 include/configs/M5275EVB.h                         |  6 ---
 include/configs/M5282EVB.h                         |  4 --
 include/configs/M53017EVB.h                        |  5 ---
 include/configs/M5329EVB.h                         |  5 ---
 include/configs/M5373EVB.h                         |  5 ---
 include/configs/M54418TWR.h                        | 10 -----
 include/configs/M54451EVB.h                        |  9 -----
 include/configs/M54455EVB.h                        |  8 ----
 include/configs/M5475EVB.h                         |  5 ---
 include/configs/M5485EVB.h                         |  5 ---
 include/configs/MIP405.h                           |  2 -
 include/configs/MPC8308RDB.h                       |  2 -
 include/configs/MPC8313ERDB.h                      |  7 ----
 include/configs/MPC8315ERDB.h                      |  7 ----
 include/configs/MPC8323ERDB.h                      |  6 ---
 include/configs/MPC832XEMDS.h                      |  8 ----
 include/configs/MPC8349EMDS.h                      |  8 ----
 include/configs/MPC8349ITX.h                       |  2 -
 include/configs/MPC837XEMDS.h                      |  7 ----
 include/configs/MPC837XERDB.h                      |  7 ----
 include/configs/MPC8536DS.h                        |  2 -
 include/configs/MPC8540ADS.h                       |  8 ----
 include/configs/MPC8541CDS.h                       |  2 -
 include/configs/MPC8544DS.h                        |  2 -
 include/configs/MPC8548CDS.h                       |  2 -
 include/configs/MPC8555CDS.h                       |  2 -
 include/configs/MPC8560ADS.h                       |  8 ----
 include/configs/MPC8568MDS.h                       |  2 -
 include/configs/MPC8569MDS.h                       |  2 -
 include/configs/MPC8572DS.h                        |  2 -
 include/configs/MPC8610HPCD.h                      |  6 ---
 include/configs/MPC8641HPCN.h                      |  6 ---
 include/configs/MigoR.h                            |  6 ---
 include/configs/P1010RDB.h                         |  2 -
 include/configs/P1022DS.h                          |  2 -
 include/configs/P1023RDB.h                         |  2 -
 include/configs/P2041RDB.h                         |  2 -
 include/configs/PATI.h                             | 10 -----
 include/configs/PIP405.h                           |  2 -
 include/configs/PLU405.h                           |  2 -
 include/configs/PMC405DE.h                         |  3 --
 include/configs/PMC440.h                           |  3 --
 include/configs/T102xQDS.h                         |  2 -
 include/configs/T102xRDB.h                         |  4 --
 include/configs/T1040QDS.h                         |  2 -
 include/configs/T104xRDB.h                         |  2 -
 include/configs/T208xQDS.h                         |  3 --
 include/configs/T208xRDB.h                         |  4 --
 include/configs/T4240RDB.h                         |  2 -
 include/configs/TQM5200.h                          |  3 --
 include/configs/TQM823L.h                          |  3 --
 include/configs/TQM823M.h                          |  3 --
 include/configs/TQM834x.h                          |  8 ----
 include/configs/TQM850L.h                          |  3 --
 include/configs/TQM850M.h                          |  3 --
 include/configs/TQM855L.h                          |  3 --
 include/configs/TQM855M.h                          |  3 --
 include/configs/TQM860L.h                          |  3 --
 include/configs/TQM860M.h                          |  3 --
 include/configs/TQM862L.h                          |  3 --
 include/configs/TQM862M.h                          |  3 --
 include/configs/TQM866M.h                          |  3 --
 include/configs/TQM885D.h                          |  3 --
 include/configs/UCP1020.h                          |  2 -
 include/configs/VCMA9.h                            |  2 -
 include/configs/VOM405.h                           |  2 -
 include/configs/a3m071.h                           |  2 -
 include/configs/a4m072.h                           |  3 --
 include/configs/ac14xx.h                           |  3 --
 include/configs/adp-ag101.h                        |  2 -
 include/configs/adp-ag101p.h                       |  2 -
 include/configs/adp-ag102.h                        |  4 --
 include/configs/alpr.h                             |  6 ---
 include/configs/am335x_evm.h                       |  1 -
 include/configs/am3517_crane.h                     |  7 ----
 include/configs/am3517_evm.h                       |  6 ---
 include/configs/am43xx_evm.h                       |  1 -
 include/configs/amcc-common.h                      |  3 --
 include/configs/amcore.h                           |  5 ---
 include/configs/ap325rxa.h                         |  6 ---
 include/configs/ap_sh4a_4a.h                       |  4 --
 include/configs/apf27.h                            |  5 +--
 include/configs/apx4devkit.h                       |  3 --
 include/configs/arcangel4.h                        |  2 -
 include/configs/aria.h                             |  3 --
 include/configs/armadillo-800eva.h                 |  4 --
 include/configs/aspenite.h                         |  2 -
 include/configs/astro_mcf5373l.h                   | 10 -----
 include/configs/at91-sama5_common.h                |  4 --
 include/configs/at91rm9200ek.h                     |  3 --
 include/configs/at91sam9260ek.h                    |  8 ----
 include/configs/at91sam9261ek.h                    |  8 ----
 include/configs/at91sam9263ek.h                    |  8 ----
 include/configs/at91sam9m10g45ek.h                 |  8 ----
 include/configs/at91sam9n12ek.h                    |  3 --
 include/configs/at91sam9rlek.h                     |  8 ----
 include/configs/at91sam9x5ek.h                     |  4 --
 include/configs/atngw100.h                         |  6 ---
 include/configs/atngw100mkii.h                     |  5 ---
 include/configs/atstk1002.h                        |  6 ---
 include/configs/axs101.h                           |  2 -
 include/configs/balloon3.h                         |  5 ---
 include/configs/baltos.h                           |  2 -
 include/configs/bav335x.h                          |  1 -
 include/configs/bcm28155_ap.h                      |  3 --
 include/configs/bcm_ep_board.h                     |  5 ---
 include/configs/beagle_x15.h                       |  3 --
 include/configs/bf506f-ezkit.h                     |  2 -
 include/configs/bf525-ucr2.h                       |  5 ---
 include/configs/bf537-minotaur.h                   |  6 ---
 include/configs/bf537-srv1.h                       |  6 ---
 include/configs/bf561-acvilon.h                    |  1 -
 include/configs/bf609-ezkit.h                      |  2 -
 include/configs/bfin_adi_common.h                  |  9 +----
 include/configs/bg0900.h                           |  3 --
 include/configs/blackstamp.h                       |  4 --
 include/configs/blackvme.h                         |  4 --
 include/configs/bur_am335x_common.h                | 22 -----------
 include/configs/calimain.h                         |  2 -
 include/configs/cam_enc_4xx.h                      |  6 ---
 include/configs/canmb.h                            |  3 --
 include/configs/cm5200.h                           |  3 --
 include/configs/cm_fx6.h                           |  4 --
 include/configs/cm_t35.h                           |  5 ---
 include/configs/cm_t3517.h                         |  5 ---
 include/configs/cm_t54.h                           |  1 -
 include/configs/cmi_mpc5xx.h                       | 13 -------
 include/configs/cobra5272.h                        |  4 --
 include/configs/colibri_pxa270.h                   |  6 ---
 include/configs/colibri_t20.h                      |  1 -
 include/configs/colibri_vf.h                       |  2 -
 include/configs/controlcenterd.h                   |  3 --
 include/configs/corenet_ds.h                       |  2 -
 include/configs/corvus.h                           |  7 ----
 include/configs/cpu9260.h                          |  7 ----
 include/configs/cpuat91.h                          |  6 ---
 include/configs/csb272.h                           |  2 -
 include/configs/csb472.h                           |  2 -
 include/configs/da830evm.h                         | 11 ------
 include/configs/da850evm.h                         |  8 ----
 include/configs/davinci_dm355evm.h                 |  7 ----
 include/configs/davinci_dm355leopard.h             |  7 ----
 include/configs/davinci_dm365evm.h                 |  7 ----
 include/configs/davinci_dm6467evm.h                |  6 ---
 include/configs/davinci_dvevm.h                    |  6 ---
 include/configs/davinci_schmoogie.h                |  6 ---
 include/configs/davinci_sffsdr.h                   |  6 ---
 include/configs/davinci_sonata.h                   |  6 ---
 include/configs/db-88f6820-gp.h                    |  1 -
 include/configs/db-mv784mp-gp.h                    |  1 -
 include/configs/dbau1x00.h                         | 15 --------
 include/configs/devkit3250.h                       |  2 -
 include/configs/devkit8000.h                       |  2 -
 include/configs/dig297.h                           |  8 ----
 include/configs/digsy_mtc.h                        |  2 -
 include/configs/dlvision-10g.h                     |  1 -
 include/configs/dlvision.h                         |  1 -
 include/configs/dnp5370.h                          |  7 ----
 include/configs/dns325.h                           |  1 -
 include/configs/dockstar.h                         |  1 -
 include/configs/dra7xx_evm.h                       |  2 -
 include/configs/dreamplug.h                        |  1 -
 include/configs/ea20.h                             |  8 ----
 include/configs/eb_cpu5282.h                       |  3 --
 include/configs/eb_cpux9k2.h                       |  3 --
 include/configs/ecovec.h                           |  4 --
 include/configs/edb93xx.h                          |  5 ---
 include/configs/edminiv2.h                         |  3 +-
 include/configs/embestmx6boards.h                  |  3 --
 include/configs/enbw_cmc.h                         |  6 ---
 include/configs/espt.h                             |  4 --
 include/configs/ethernut5.h                        | 18 +--------
 include/configs/exynos-common.h                    |  3 --
 include/configs/exynos4-common.h                   |  4 --
 include/configs/flea3.h                            |  3 --
 include/configs/goflexhome.h                       |  1 -
 include/configs/gplugd.h                           |  4 --
 include/configs/gr_cpci_ax2000.h                   |  2 -
 include/configs/gr_ep2s60.h                        |  2 -
 include/configs/gr_xc3s_1500.h                     |  2 -
 include/configs/grasshopper.h                      |  6 ---
 include/configs/grsim.h                            | 12 ------
 include/configs/grsim_leon2.h                      | 12 ------
 include/configs/guruplug.h                         |  1 -
 include/configs/h2200.h                            |  5 ---
 include/configs/highbank.h                         |  5 ---
 include/configs/hrcon.h                            |  2 -
 include/configs/ib62x0.h                           |  1 -
 include/configs/iconnect.h                         |  1 -
 include/configs/ids8313.h                          |  5 ---
 include/configs/ima3-mx53.h                        |  1 -
 include/configs/imx27lite-common.h                 |  1 -
 include/configs/imx31_litekit.h                    |  3 --
 include/configs/imx31_phycore.h                    |  3 --
 include/configs/inka4x0.h                          |  3 --
 include/configs/integrator-common.h                |  1 -
 include/configs/integratorap.h                     |  2 -
 include/configs/integratorcp.h                     |  2 -
 include/configs/io.h                               |  1 -
 include/configs/iocon.h                            |  1 -
 include/configs/ipam390.h                          |  2 -
 include/configs/ipek01.h                           |  2 -
 include/configs/jornada.h                          |  7 ----
 include/configs/jupiter.h                          |  3 --
 include/configs/km/keymile-common.h                |  3 --
 include/configs/km/km_arm.h                        |  3 --
 include/configs/km/kmp204x-common.h                |  2 -
 include/configs/ks2_evm.h                          |  1 -
 include/configs/kzm9g.h                            |  1 -
 include/configs/lacie_kw.h                         |  1 -
 include/configs/lp8x4x.h                           |  3 --
 include/configs/ls1021aqds.h                       |  9 -----
 include/configs/ls1021atwr.h                       |  9 -----
 include/configs/ls2085a_common.h                   | 10 -----
 include/configs/ls2085aqds.h                       |  1 -
 include/configs/ls2085ardb.h                       |  2 -
 include/configs/lsxl.h                             |  1 -
 include/configs/lwmon5.h                           |  3 --
 include/configs/m28evk.h                           |  2 -
 include/configs/m53evk.h                           |  1 -
 include/configs/malta.h                            |  7 ----
 include/configs/manroland/common.h                 |  3 --
 include/configs/maxbcm.h                           |  1 -
 include/configs/mcx.h                              |  8 ----
 include/configs/mecp5123.h                         |  3 --
 include/configs/meesc.h                            |  6 ---
 include/configs/microblaze-generic.h               | 14 +------
 include/configs/motionpro.h                        |  2 -
 include/configs/mpc5121ads.h                       |  3 --
 include/configs/mpc8308_p1m.h                      |  2 -
 include/configs/mpr2.h                             |  3 --
 include/configs/ms7720se.h                         |  3 --
 include/configs/ms7722se.h                         |  4 --
 include/configs/ms7750se.h                         |  5 ---
 include/configs/mt_ventoux.h                       |  1 -
 include/configs/munices.h                          |  2 -
 include/configs/mv88f6281gtw_ge.h                  |  1 -
 include/configs/mx23_olinuxino.h                   |  1 -
 include/configs/mx23evk.h                          |  3 --
 include/configs/mx25pdk.h                          |  1 -
 include/configs/mx28evk.h                          |  3 --
 include/configs/mx31ads.h                          |  3 --
 include/configs/mx31pdk.h                          |  9 -----
 include/configs/mx35pdk.h                          |  3 --
 include/configs/mx51_efikamx.h                     |  6 ---
 include/configs/mx51evk.h                          |  3 --
 include/configs/mx53ard.h                          |  4 --
 include/configs/mx53evk.h                          |  4 --
 include/configs/mx53loco.h                         |  3 --
 include/configs/mx53smd.h                          |  4 --
 include/configs/mx6_common.h                       |  2 -
 include/configs/nas220.h                           |  2 -
 include/configs/neo.h                              |  1 -
 include/configs/nhk8815.h                          |  6 ---
 include/configs/nios2-generic.h                    |  9 -----
 include/configs/nokia_rx51.h                       |  9 -----
 include/configs/o2d.h                              |  3 --
 include/configs/o2dnt-common.h                     |  2 -
 include/configs/o2dnt2.h                           |  3 --
 include/configs/omap3_beagle.h                     |  2 -
 include/configs/omap3_cairo.h                      |  6 ---
 include/configs/omap3_evm.h                        |  7 ----
 include/configs/omap3_igep00x0.h                   |  1 -
 include/configs/omap3_logic.h                      |  7 ----
 include/configs/omap3_mvblx.h                      |  6 ---
 include/configs/omap3_overo.h                      |  3 --
 include/configs/omap3_pandora.h                    |  7 ----
 include/configs/omap3_sdp3430.h                    |  7 ----
 include/configs/omap3_zoom1.h                      |  5 ---
 include/configs/omap4_panda.h                      |  1 -
 include/configs/omap4_sdp4430.h                    |  1 -
 include/configs/omap5_uevm.h                       |  2 -
 include/configs/omapl138_lcdk.h                    |  8 ----
 include/configs/openrd.h                           |  1 -
 include/configs/openrisc-generic.h                 |  3 --
 include/configs/origen.h                           |  1 -
 include/configs/otc570.h                           |  5 ---
 include/configs/p1_p2_rdb_pc.h                     |  2 -
 include/configs/p1_twr.h                           |  2 -
 include/configs/p3p440.h                           |  3 --
 include/configs/palmld.h                           |  4 --
 include/configs/palmtc.h                           |  3 --
 include/configs/palmtreo680.h                      | 10 -----
 include/configs/pb1x00.h                           |  9 -----
 include/configs/pcm030.h                           |  3 --
 include/configs/pcs440ep.h                         |  2 -
 include/configs/pdm360ng.h                         |  2 -
 include/configs/pm9261.h                           |  7 ----
 include/configs/pm9263.h                           |  7 ----
 include/configs/pm9g45.h                           |  5 ---
 include/configs/pogo_e02.h                         |  1 -
 include/configs/pxa255_idp.h                       |  2 -
 include/configs/qemu-mips.h                        |  4 --
 include/configs/qemu-mips64.h                      |  4 --
 include/configs/qemu-ppce500.h                     |  2 -
 include/configs/qong.h                             |  3 --
 include/configs/r0p7734.h                          |  4 --
 include/configs/r2dplus.h                          |  3 --
 include/configs/r7780mp.h                          |  4 --
 include/configs/rcar-gen2-common.h                 |  6 ---
 include/configs/rd6281a.h                          |  1 -
 include/configs/rpi-common.h                       |  4 --
 include/configs/rsk7203.h                          |  4 --
 include/configs/rsk7264.h                          |  4 --
 include/configs/rsk7269.h                          |  4 --
 include/configs/s5p_goni.h                         |  8 ----
 include/configs/sama5d3xek.h                       |  1 -
 include/configs/sandbox.h                          |  1 -
 include/configs/sansa_fuze_plus.h                  |  1 -
 include/configs/sbc405.h                           |  2 -
 include/configs/sbc8349.h                          |  8 ----
 include/configs/sbc8548.h                          |  2 -
 include/configs/sbc8641d.h                         |  7 ++--
 include/configs/sc_sps_1.h                         |  2 -
 include/configs/scb9328.h                          |  6 ---
 include/configs/sequoia.h                          |  2 +-
 include/configs/sh7752evb.h                        |  5 ---
 include/configs/sh7753evb.h                        |  5 ---
 include/configs/sh7757lcr.h                        |  5 ---
 include/configs/sh7763rdp.h                        |  4 --
 include/configs/sh7785lcr.h                        |  5 ---
 include/configs/sheevaplug.h                       |  1 -
 include/configs/shmin.h                            |  4 --
 include/configs/siemens-am33x-common.h             |  3 --
 include/configs/smdk2410.h                         |  2 -
 include/configs/smdkc100.h                         |  4 --
 include/configs/snapper9260.h                      |  8 ----
 include/configs/snowball.h                         | 12 ------
 include/configs/socfpga_arria5.h                   |  2 -
 include/configs/socfpga_cyclone5.h                 |  2 -
 include/configs/socrates.h                         |  3 --
 include/configs/spear-common.h                     |  5 ---
 include/configs/stamp9g20.h                        |  9 -----
 include/configs/stm32f429-discovery.h              |  5 ---
 include/configs/stv0991.h                          |  3 --
 include/configs/stxgp3.h                           |  7 +---
 include/configs/stxssa.h                           |  8 +---
 include/configs/sunxi-common.h                     |  6 ---
 include/configs/t4qds.h                            |  2 -
 include/configs/tam3517-common.h                   |  6 ---
 include/configs/tao3530.h                          |  7 ----
 include/configs/taurus.h                           |  8 ----
 include/configs/tb100.h                            |  2 -
 include/configs/tegra-common.h                     | 10 -----
 include/configs/ti814x_evm.h                       |  4 --
 include/configs/ti816x_evm.h                       |  3 --
 include/configs/ti_armv7_common.h                  | 10 -----
 include/configs/ti_omap4_common.h                  |  3 --
 include/configs/ti_omap5_common.h                  |  3 --
 include/configs/tk71.h                             |  1 -
 include/configs/tqma6.h                            |  1 -
 include/configs/tricorder.h                        |  5 ---
 include/configs/trizepsiv.h                        |  3 --
 include/configs/tt01.h                             |  4 --
 include/configs/tx25.h                             |  1 -
 include/configs/u8500_href.h                       | 12 ------
 include/configs/usb_a9263.h                        |  9 -----
 include/configs/usbarmory.h                        |  2 -
 include/configs/v38b.h                             |  2 -
 include/configs/vct.h                              | 16 --------
 include/configs/ve8313.h                           |  2 -
 include/configs/versatile.h                        |  5 ---
 include/configs/vexpress_aemv8a.h                  | 10 -----
 include/configs/vexpress_common.h                  |  7 ----
 include/configs/vf610twr.h                         |  3 --
 include/configs/vision2.h                          |  3 --
 include/configs/vl_ma2sc.h                         |  6 ---
 include/configs/vme8349.h                          |  3 --
 include/configs/vpac270.h                          |  5 ---
 include/configs/warp.h                             |  3 --
 include/configs/wireless_space.h                   |  1 -
 include/configs/woodburn_common.h                  |  3 --
 include/configs/work_92105.h                       |  5 ---
 include/configs/x600.h                             |  6 ---
 include/configs/x86-common.h                       | 21 -----------
 include/configs/xaeniax.h                          |  3 --
 include/configs/xfi3.h                             |  1 -
 include/configs/xilinx-ppc.h                       |  3 --
 include/configs/xilinx_zynqmp.h                    |  1 -
 include/configs/xpedite1000.h                      |  4 --
 include/configs/xpedite517x.h                      |  4 --
 include/configs/xpedite520x.h                      |  4 --
 include/configs/xpedite537x.h                      |  4 --
 include/configs/xpedite550x.h                      |  4 --
 include/configs/zeus.h                             |  3 --
 include/configs/zipitz2.h                          |  4 --
 include/configs/zmx25.h                            |  1 -
 include/configs/zynq-common.h                      |  4 --
 1491 files changed, 3061 insertions(+), 3294 deletions(-)
 delete mode 100644 include/config_cmd_default.h

diff --git a/README b/README
index c3fa549..8109e5d 100644
--- a/README
+++ b/README
@@ -1048,9 +1048,7 @@ The following options need to be configured:
 		Monitor commands can be included or excluded
 		from the build by using the #include files
 		<config_cmd_all.h> and #undef'ing unwanted
-		commands, or using <config_cmd_default.h>
-		and augmenting with additional #define's
-		for wanted commands.
+		commands, or adding #define's for wanted commands.
 
 		The default command configuration includes all commands
 		except those marked below with a "*".
diff --git a/common/Kconfig b/common/Kconfig
index cb14592..2976cd7 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -101,11 +101,13 @@ menu "Info commands"
 
 config CMD_BDI
 	bool "bdinfo"
+	default y
 	help
 	  Print board info
 
 config CMD_CONSOLE
 	bool "coninfo"
+	default y
 	help
 	  Print console devices and information.
 
@@ -128,6 +130,7 @@ menu "Boot commands"
 
 config CMD_BOOTD
 	bool "bootd"
+	default y
 	help
 	  Run the command stored in the environment "bootcmd", i.e.
 	  "bootd" does the same thing as "run bootcmd".
@@ -146,21 +149,25 @@ config CMD_GO
 
 config CMD_RUN
 	bool "run"
+	default y
 	help
 	  Run the command in the given environment variable.
 
 config CMD_IMI
 	bool "iminfo"
+	default y
 	help
 	  Print header information for application image.
 
 config CMD_IMLS
 	bool "imls"
+	default y
 	help
 	  List all images found in flash
 
 config CMD_XIMG
 	bool "imxtract"
+	default y
 	help
 	  Extract a part of a multi-image.
 
@@ -182,17 +189,20 @@ config CMD_IMPORTENV
 
 config CMD_EDITENV
 	bool "editenv"
+	default y
 	help
 	  Edit environment variable.
 
 config CMD_SAVEENV
 	bool "saveenv"
+	default y
 	help
 	  Save all environment variables into the compiled-in persistent
 	  storage.
 
 config CMD_ENV_EXISTS
 	bool "env exists"
+	default y
 	help
 	  Check if a variable is defined in the environment for use in
 	  shell scripting.
@@ -203,6 +213,7 @@ menu "Memory commands"
 
 config CMD_MEMORY
 	bool "md, mm, nm, mw, cp, cmp, base, loop"
+	default y
 	help
 	  Memeory commands.
 	    md - memory display
@@ -270,16 +281,19 @@ config CMD_DEMO
 
 config CMD_LOADB
 	bool "loadb"
+	default y
 	help
 	  Load a binary file over serial line.
 
 config CMD_LOADS
 	bool "loads"
+	default y
 	help
 	  Load an S-Record file over serial line
 
 config CMD_FLASH
 	bool "flinfo, erase, protect"
+	default y
 	help
 	  NOR flash support.
 	    flinfo - print FLASH memory information
@@ -314,6 +328,7 @@ config CMD_USB
 
 config CMD_FPGA
 	bool "fpga"
+	default y
 	help
 	  FPGA support.
 
@@ -324,21 +339,25 @@ menu "Shell scripting commands"
 
 config CMD_ECHO
 	bool "echo"
+	default y
 	help
 	  Echo args to console
 
 config CMD_ITEST
 	bool "itest"
+	default y
 	help
 	  Return true/false on integer compare.
 
 config CMD_SOURCE
 	bool "source"
+	default y
 	help
 	  Run script from memory
 
 config CMD_SETEXPR
 	bool "setexpr"
+	default y
 	help
 	  Evaluate boolean and math expressions and store the result in an env
 	    variable.
@@ -352,6 +371,7 @@ menu "Network commands"
 config CMD_NET
 	bool "bootp, tftpboot"
         select NET
+	default y
 	help
 	  Network commands.
 	  bootp - boot image via network using BOOTP/TFTP protocol
@@ -379,6 +399,7 @@ config CMD_DHCP
 
 config CMD_NFS
 	bool "nfs"
+	default y
 	help
 	  Boot image via network using NFS protocol.
 
@@ -419,6 +440,7 @@ config CMD_TIME
 # TODO: rename to CMD_SLEEP
 config CMD_MISC
 	bool "sleep"
+	default y
 	help
 	  Delay execution for some time
 
@@ -430,6 +452,7 @@ config CMD_TIMER
 config CMD_SETGETDCR
 	bool "getdcr, setdcr, getidcr, setidcr"
 	depends on 4xx
+	default y
 	help
 	  getdcr - Get an AMCC PPC 4xx DCR's value
 	  setdcr - Set an AMCC PPC 4xx DCR's value
diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
index 572adb8..87ade90 100644
--- a/configs/A10-OLinuXino-Lime_defconfig
+++ b/configs/A10-OLinuXino-Lime_defconfig
@@ -8,10 +8,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig
index a24826b..5a450af 100644
--- a/configs/A10s-OLinuXino-M_defconfig
+++ b/configs/A10s-OLinuXino-M_defconfig
@@ -10,10 +10,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-olinuxino-micro"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,SUNXI_EMAC,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
index 085bd38..213ece6 100644
--- a/configs/A13-OLinuXinoM_defconfig
+++ b/configs/A13-OLinuXinoM_defconfig
@@ -14,10 +14,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino-micro"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index 4535ce4..d71c11c 100644
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -15,10 +15,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
index 7c4e005..6445b25 100644
--- a/configs/A20-OLinuXino-Lime2_defconfig
+++ b/configs/A20-OLinuXino-Lime2_defconfig
@@ -9,10 +9,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
index c875130..650670f 100644
--- a/configs/A20-OLinuXino-Lime_defconfig
+++ b/configs/A20-OLinuXino-Lime_defconfig
@@ -6,10 +6,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
index 315c7f6..3f92504 100644
--- a/configs/A20-OLinuXino_MICRO_defconfig
+++ b/configs/A20-OLinuXino_MICRO_defconfig
@@ -10,10 +10,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig
index 1f7f891..f94cd5a 100644
--- a/configs/Ainol_AW1_defconfig
+++ b/configs/Ainol_AW1_defconfig
@@ -16,8 +16,8 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-ainol-aw1"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
diff --git a/configs/Ampe_A76_defconfig b/configs/Ampe_A76_defconfig
index f20cad8..99aa141 100644
--- a/configs/Ampe_A76_defconfig
+++ b/configs/Ampe_A76_defconfig
@@ -15,8 +15,8 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-ampe-a76"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig
index 7203e01..016ccd9 100644
--- a/configs/Auxtek-T004_defconfig
+++ b/configs/Auxtek-T004_defconfig
@@ -7,10 +7,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-auxtek-t004"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/B4420QDS_NAND_defconfig b/configs/B4420QDS_NAND_defconfig
index 4f53a9e..0313e55 100644
--- a/configs/B4420QDS_NAND_defconfig
+++ b/configs/B4420QDS_NAND_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_B4860QDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/B4420QDS_SPIFLASH_defconfig b/configs/B4420QDS_SPIFLASH_defconfig
index 04d5ce3..6352ef9 100644
--- a/configs/B4420QDS_SPIFLASH_defconfig
+++ b/configs/B4420QDS_SPIFLASH_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/B4420QDS_defconfig b/configs/B4420QDS_defconfig
index d4b95c5..3b449de 100644
--- a/configs/B4420QDS_defconfig
+++ b/configs/B4420QDS_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/B4860QDS_NAND_defconfig b/configs/B4860QDS_NAND_defconfig
index af5e938..afa0600 100644
--- a/configs/B4860QDS_NAND_defconfig
+++ b/configs/B4860QDS_NAND_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_B4860QDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/B4860QDS_SECURE_BOOT_defconfig b/configs/B4860QDS_SECURE_BOOT_defconfig
index f464d18..a335ad3 100644
--- a/configs/B4860QDS_SECURE_BOOT_defconfig
+++ b/configs/B4860QDS_SECURE_BOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/B4860QDS_SPIFLASH_defconfig b/configs/B4860QDS_SPIFLASH_defconfig
index 28157a3..18c3d94 100644
--- a/configs/B4860QDS_SPIFLASH_defconfig
+++ b/configs/B4860QDS_SPIFLASH_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig b/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
index e56d265..01229cc 100644
--- a/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/B4860QDS_defconfig b/configs/B4860QDS_defconfig
index a4c2eb6..8f300c0 100644
--- a/configs/B4860QDS_defconfig
+++ b/configs/B4860QDS_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
index 36b9a1f..90aa865 100644
--- a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
+++ b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
@@ -3,6 +3,6 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9131RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND,SYS_CLK_100"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9131RDB_NAND_defconfig b/configs/BSC9131RDB_NAND_defconfig
index 8fdc41d..9cd68f0 100644
--- a/configs/BSC9131RDB_NAND_defconfig
+++ b/configs/BSC9131RDB_NAND_defconfig
@@ -3,6 +3,6 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9131RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
index abdf794..d90d7a0 100644
--- a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
+++ b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
@@ -2,6 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9131RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,SPIFLASH,SYS_CLK_100"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9131RDB_SPIFLASH_defconfig b/configs/BSC9131RDB_SPIFLASH_defconfig
index 8cfe843..4ba8d62 100644
--- a/configs/BSC9131RDB_SPIFLASH_defconfig
+++ b/configs/BSC9131RDB_SPIFLASH_defconfig
@@ -2,6 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9131RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
index d6e3fbe..b0153c4 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND_SECBOOT,SYS_CLK_100_DDR_100,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
index 5c5b412..066e6f7 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_100"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
index 3e82751..31bcec4 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND_SECBOOT,SYS_CLK_100_DDR_133,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
index e57d006..64952a0 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_133"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
index 79e3946..b5759fb 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_100,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
index 2e4b37d..9f30977 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_100"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
index bb45b73..7becdfe 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_133,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
index 48a9849..770c723 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_133"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
index 71f7d69..5b84924 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_100,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
index 3a424d7..365d13e 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_100"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
index d1668f1..d9e021a 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
index 63d59d1..2f52320 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
index e98df30..bea9e23 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
index 28ded86..1f7557a 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
index 89a940a..933ef77 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_133,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
index 449ca4f..3cbe89b 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_133"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
index 4b6bc20..3e186f6 100644
--- a/configs/Bananapi_defconfig
+++ b/configs/Bananapi_defconfig
@@ -7,10 +7,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig
index 8833d1b..5bd2fd6 100644
--- a/configs/Bananapro_defconfig
+++ b/configs/Bananapro_defconfig
@@ -9,10 +9,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapro"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
diff --git a/configs/C29XPCIE_NAND_defconfig b/configs/C29XPCIE_NAND_defconfig
index 5a993b7..c6f0ae4 100644
--- a/configs/C29XPCIE_NAND_defconfig
+++ b/configs/C29XPCIE_NAND_defconfig
@@ -4,6 +4,4 @@ CONFIG_TARGET_C29XPCIE=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/C29XPCIE_NOR_SECBOOT_defconfig b/configs/C29XPCIE_NOR_SECBOOT_defconfig
index eb43932..6c982dd 100644
--- a/configs/C29XPCIE_NOR_SECBOOT_defconfig
+++ b/configs/C29XPCIE_NOR_SECBOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_C29XPCIE=y
 CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
index 20ea17e..e95ff0a 100644
--- a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
+++ b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_C29XPCIE=y
 CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SPIFLASH,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/C29XPCIE_SPIFLASH_defconfig b/configs/C29XPCIE_SPIFLASH_defconfig
index ea7b9b0..29889ea 100644
--- a/configs/C29XPCIE_SPIFLASH_defconfig
+++ b/configs/C29XPCIE_SPIFLASH_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_C29XPCIE=y
 CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/C29XPCIE_defconfig b/configs/C29XPCIE_defconfig
index 7894a47..20bbe81 100644
--- a/configs/C29XPCIE_defconfig
+++ b/configs/C29XPCIE_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_C29XPCIE=y
 CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/CPCI2DP_defconfig b/configs/CPCI2DP_defconfig
index 23631e9..9f98014 100644
--- a/configs/CPCI2DP_defconfig
+++ b/configs/CPCI2DP_defconfig
@@ -1,3 +1,6 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_CPCI2DP=y
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/CPCI4052_defconfig b/configs/CPCI4052_defconfig
index 5ac0170..c4fac41 100644
--- a/configs/CPCI4052_defconfig
+++ b/configs/CPCI4052_defconfig
@@ -4,4 +4,4 @@ CONFIG_TARGET_CPCI4052=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/CSQ_CS908_defconfig b/configs/CSQ_CS908_defconfig
index 184cdeb..54f4846 100644
--- a/configs/CSQ_CS908_defconfig
+++ b/configs/CSQ_CS908_defconfig
@@ -8,10 +8,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-cs908"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig
index 5895b7e..3a2a219 100644
--- a/configs/Chuwi_V7_CW0825_defconfig
+++ b/configs/Chuwi_V7_CW0825_defconfig
@@ -15,10 +15,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-chuwi-v7-cw0825"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_VIDEO_LCD_SPI_CS="PA0"
 CONFIG_VIDEO_LCD_SPI_SCLK="PA1"
diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
index 6a64568..9d84901 100644
--- a/configs/Colombus_defconfig
+++ b/configs/Colombus_defconfig
@@ -8,10 +8,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-colombus"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_ALDO1_VOLT=3300
diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
index 653ec9a..0fbaa23 100644
--- a/configs/Cubieboard2_defconfig
+++ b/configs/Cubieboard2_defconfig
@@ -7,10 +7,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
index 7786cac..0d0051e 100644
--- a/configs/Cubieboard_defconfig
+++ b/configs/Cubieboard_defconfig
@@ -6,10 +6,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index 1f6a8e3..57a3847 100644
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -8,10 +8,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
diff --git a/configs/Et_q8_v1_6_defconfig b/configs/Et_q8_v1_6_defconfig
index 5af232f..e36895c 100644
--- a/configs/Et_q8_v1_6_defconfig
+++ b/configs/Et_q8_v1_6_defconfig
@@ -16,10 +16,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-et-q8-v1.6"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig
index 2b02b2d..02c657a 100644
--- a/configs/Hummingbird_A31_defconfig
+++ b/configs/Hummingbird_A31_defconfig
@@ -10,10 +10,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-hummingbird"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_ALDO1_VOLT=3300
diff --git a/configs/Hyundai_A7HD_defconfig b/configs/Hyundai_A7HD_defconfig
index 9302a06..7800fa2 100644
--- a/configs/Hyundai_A7HD_defconfig
+++ b/configs/Hyundai_A7HD_defconfig
@@ -17,8 +17,8 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-hyundai-a7hd"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
diff --git a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
index 7861417..63910c2 100644
--- a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
+++ b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
@@ -16,10 +16,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ippo-q8h-v1.2-lcd1024x600"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Ippo_q8h_v1_2_defconfig b/configs/Ippo_q8h_v1_2_defconfig
index 3672ab9..ab62210 100644
--- a/configs/Ippo_q8h_v1_2_defconfig
+++ b/configs/Ippo_q8h_v1_2_defconfig
@@ -16,10 +16,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v1.2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Ippo_q8h_v5_defconfig b/configs/Ippo_q8h_v5_defconfig
index 2120709..312a38c 100644
--- a/configs/Ippo_q8h_v5_defconfig
+++ b/configs/Ippo_q8h_v5_defconfig
@@ -16,10 +16,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v5"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig
index 08a7c63..04ec7ab 100644
--- a/configs/Linksprite_pcDuino3_Nano_defconfig
+++ b/configs/Linksprite_pcDuino3_Nano_defconfig
@@ -9,10 +9,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3-nano"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
index b548d1d..6d7690d 100644
--- a/configs/Linksprite_pcDuino3_defconfig
+++ b/configs/Linksprite_pcDuino3_defconfig
@@ -7,10 +7,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
diff --git a/configs/Linksprite_pcDuino_defconfig b/configs/Linksprite_pcDuino_defconfig
index caf874a..ddd162f 100644
--- a/configs/Linksprite_pcDuino_defconfig
+++ b/configs/Linksprite_pcDuino_defconfig
@@ -6,10 +6,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-pcduino"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig
index d226671..58de96b 100644
--- a/configs/M5208EVBE_defconfig
+++ b/configs/M5208EVBE_defconfig
@@ -1,3 +1,3 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5208EVBE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M52277EVB_defconfig b/configs/M52277EVB_defconfig
index 730a4b8..6a2d175 100644
--- a/configs/M52277EVB_defconfig
+++ b/configs/M52277EVB_defconfig
@@ -1,4 +1,7 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M52277EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SPANSION_BOOT,SYS_TEXT_BASE=0x00000000"
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/M52277EVB_stmicro_defconfig b/configs/M52277EVB_stmicro_defconfig
index 41a4283..1ee9c8b 100644
--- a/configs/M52277EVB_stmicro_defconfig
+++ b/configs/M52277EVB_stmicro_defconfig
@@ -1,4 +1,7 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M52277EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x43E00000"
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/M5235EVB_Flash32_defconfig b/configs/M5235EVB_Flash32_defconfig
index 86befea..5f381e2 100644
--- a/configs/M5235EVB_Flash32_defconfig
+++ b/configs/M5235EVB_Flash32_defconfig
@@ -1,4 +1,6 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5235EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="NORFLASH_PS32BIT,SYS_TEXT_BASE=0xFFC00000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig
index db574fb..3292cff 100644
--- a/configs/M5235EVB_defconfig
+++ b/configs/M5235EVB_defconfig
@@ -1,4 +1,6 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5235EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFE00000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5249EVB_defconfig b/configs/M5249EVB_defconfig
index fb29274..1467b16 100644
--- a/configs/M5249EVB_defconfig
+++ b/configs/M5249EVB_defconfig
@@ -1,2 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5249EVB=y
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig
index 4e465e0..89e7e75 100644
--- a/configs/M5253DEMO_defconfig
+++ b/configs/M5253DEMO_defconfig
@@ -1,3 +1,3 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5253DEMO=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5253EVBE_defconfig b/configs/M5253EVBE_defconfig
index 5c562fe..e337f32 100644
--- a/configs/M5253EVBE_defconfig
+++ b/configs/M5253EVBE_defconfig
@@ -1,2 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5253EVBE=y
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig
index 28daa0d..23d5468 100644
--- a/configs/M5272C3_defconfig
+++ b/configs/M5272C3_defconfig
@@ -1,3 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5272C3=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5275EVB_defconfig b/configs/M5275EVB_defconfig
index ce0e80a..f051bf1 100644
--- a/configs/M5275EVB_defconfig
+++ b/configs/M5275EVB_defconfig
@@ -1,3 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5275EVB=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5282EVB_defconfig b/configs/M5282EVB_defconfig
index d55c163..6c130e8 100644
--- a/configs/M5282EVB_defconfig
+++ b/configs/M5282EVB_defconfig
@@ -1,3 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5282EVB=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig
index 5525272..1f5bc86 100644
--- a/configs/M53017EVB_defconfig
+++ b/configs/M53017EVB_defconfig
@@ -1,3 +1,3 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M53017EVB=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig
index ea82c75..02af3a4 100644
--- a/configs/M5329AFEE_defconfig
+++ b/configs/M5329AFEE_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5329EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=0"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig
index 267144a..f757a35 100644
--- a/configs/M5329BFEE_defconfig
+++ b/configs/M5329BFEE_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5329EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig
index dfadcf2..304ca48 100644
--- a/configs/M5373EVB_defconfig
+++ b/configs/M5373EVB_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5373EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M54418TWR_defconfig b/configs/M54418TWR_defconfig
index d84eff7..9a93b3b 100644
--- a/configs/M54418TWR_defconfig
+++ b/configs/M54418TWR_defconfig
@@ -1,5 +1,9 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/M54418TWR_nand_mii_defconfig b/configs/M54418TWR_nand_mii_defconfig
index 7f8fd55..c194ea7 100644
--- a/configs/M54418TWR_nand_mii_defconfig
+++ b/configs/M54418TWR_nand_mii_defconfig
@@ -1,5 +1,9 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/M54418TWR_nand_rmii_defconfig b/configs/M54418TWR_nand_rmii_defconfig
index d7dea64..4ee35ff 100644
--- a/configs/M54418TWR_nand_rmii_defconfig
+++ b/configs/M54418TWR_nand_rmii_defconfig
@@ -1,5 +1,9 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/M54418TWR_nand_rmii_lowfreq_defconfig b/configs/M54418TWR_nand_rmii_lowfreq_defconfig
index 4bf7439..4c4b70a 100644
--- a/configs/M54418TWR_nand_rmii_lowfreq_defconfig
+++ b/configs/M54418TWR_nand_rmii_lowfreq_defconfig
@@ -1,5 +1,9 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,LOW_MCFCLK,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/M54418TWR_serial_mii_defconfig b/configs/M54418TWR_serial_mii_defconfig
index a1ceaf3..3be102c 100644
--- a/configs/M54418TWR_serial_mii_defconfig
+++ b/configs/M54418TWR_serial_mii_defconfig
@@ -1,5 +1,9 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/M54418TWR_serial_rmii_defconfig b/configs/M54418TWR_serial_rmii_defconfig
index d84eff7..9a93b3b 100644
--- a/configs/M54418TWR_serial_rmii_defconfig
+++ b/configs/M54418TWR_serial_rmii_defconfig
@@ -1,5 +1,9 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/M54451EVB_defconfig b/configs/M54451EVB_defconfig
index 2f3d77a..b35bb81 100644
--- a/configs/M54451EVB_defconfig
+++ b/configs/M54451EVB_defconfig
@@ -1,5 +1,7 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54451EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=24000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/M54451EVB_stmicro_defconfig b/configs/M54451EVB_stmicro_defconfig
index 32f17e0..9b69415 100644
--- a/configs/M54451EVB_stmicro_defconfig
+++ b/configs/M54451EVB_stmicro_defconfig
@@ -1,5 +1,7 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54451EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x47e00000,SYS_INPUT_CLKSRC=24000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/M54455EVB_a66_defconfig b/configs/M54455EVB_a66_defconfig
index 549d8bf..e82d0bd 100644
--- a/configs/M54455EVB_a66_defconfig
+++ b/configs/M54455EVB_a66_defconfig
@@ -1,5 +1,7 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54455EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=66666666"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/M54455EVB_defconfig b/configs/M54455EVB_defconfig
index a63da60..cb56586 100644
--- a/configs/M54455EVB_defconfig
+++ b/configs/M54455EVB_defconfig
@@ -1,5 +1,7 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54455EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=33333333"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/M54455EVB_i66_defconfig b/configs/M54455EVB_i66_defconfig
index 86c39ea..bc7d707 100644
--- a/configs/M54455EVB_i66_defconfig
+++ b/configs/M54455EVB_i66_defconfig
@@ -1,5 +1,7 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54455EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=66666666"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/M54455EVB_intel_defconfig b/configs/M54455EVB_intel_defconfig
index 593ddc1..cb5b4bd 100644
--- a/configs/M54455EVB_intel_defconfig
+++ b/configs/M54455EVB_intel_defconfig
@@ -1,5 +1,7 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54455EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=33333333"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/M54455EVB_stm33_defconfig b/configs/M54455EVB_stm33_defconfig
index 5efb472..a79f949 100644
--- a/configs/M54455EVB_stm33_defconfig
+++ b/configs/M54455EVB_stm33_defconfig
@@ -1,5 +1,7 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54455EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_STMICRO_BOOT,CF_SBF,SYS_TEXT_BASE=0x4FE00000,SYS_INPUT_CLKSRC=33333333"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/M5475AFE_defconfig b/configs/M5475AFE_defconfig
index 48d5cf9..343f52f 100644
--- a/configs/M5475AFE_defconfig
+++ b/configs/M5475AFE_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5475BFE_defconfig b/configs/M5475BFE_defconfig
index 4ffe19f..c9667da 100644
--- a/configs/M5475BFE_defconfig
+++ b/configs/M5475BFE_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5475CFE_defconfig b/configs/M5475CFE_defconfig
index 31d2e33..c1a9558 100644
--- a/configs/M5475CFE_defconfig
+++ b/configs/M5475CFE_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5475DFE_defconfig b/configs/M5475DFE_defconfig
index dd4b23b..d879894 100644
--- a/configs/M5475DFE_defconfig
+++ b/configs/M5475DFE_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5475EFE_defconfig b/configs/M5475EFE_defconfig
index 1c6d0a6..9b677ee 100644
--- a/configs/M5475EFE_defconfig
+++ b/configs/M5475EFE_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5475FFE_defconfig b/configs/M5475FFE_defconfig
index 6b4f0d6..4989b00 100644
--- a/configs/M5475FFE_defconfig
+++ b/configs/M5475FFE_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5475GFE_defconfig b/configs/M5475GFE_defconfig
index b65ad58..31df40e 100644
--- a/configs/M5475GFE_defconfig
+++ b/configs/M5475GFE_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=4,SYS_DRAMSZ=64"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5485AFE_defconfig b/configs/M5485AFE_defconfig
index 40c2736..5381b74 100644
--- a/configs/M5485AFE_defconfig
+++ b/configs/M5485AFE_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5485BFE_defconfig b/configs/M5485BFE_defconfig
index b3fed5a..36dcccf 100644
--- a/configs/M5485BFE_defconfig
+++ b/configs/M5485BFE_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5485CFE_defconfig b/configs/M5485CFE_defconfig
index 6685232..e5cc1e1 100644
--- a/configs/M5485CFE_defconfig
+++ b/configs/M5485CFE_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5485DFE_defconfig b/configs/M5485DFE_defconfig
index a26bc2b..fdf667a 100644
--- a/configs/M5485DFE_defconfig
+++ b/configs/M5485DFE_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5485EFE_defconfig b/configs/M5485EFE_defconfig
index f9ee78f..a5933f2 100644
--- a/configs/M5485EFE_defconfig
+++ b/configs/M5485EFE_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5485FFE_defconfig b/configs/M5485FFE_defconfig
index cbdc547..116c5cc 100644
--- a/configs/M5485FFE_defconfig
+++ b/configs/M5485FFE_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5485GFE_defconfig b/configs/M5485GFE_defconfig
index fc8837a..fd5fc1a 100644
--- a/configs/M5485GFE_defconfig
+++ b/configs/M5485GFE_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5485HFE_defconfig b/configs/M5485HFE_defconfig
index 6b0ee23..6e2768c 100644
--- a/configs/M5485HFE_defconfig
+++ b/configs/M5485HFE_defconfig
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig
index 769ed7c..22b82b1 100644
--- a/configs/MIP405T_defconfig
+++ b/configs/MIP405T_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_MIP405=y
 CONFIG_SYS_EXTRA_OPTIONS="MIP405T"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig
index 792ca2d..f25cf51 100644
--- a/configs/MIP405_defconfig
+++ b/configs/MIP405_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_MIP405=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MK808C_defconfig b/configs/MK808C_defconfig
index f0ee148..a6db139 100644
--- a/configs/MK808C_defconfig
+++ b/configs/MK808C_defconfig
@@ -6,10 +6,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-mk808c"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/MPC8308RDB_defconfig b/configs/MPC8308RDB_defconfig
index 9c8a55b..cb98324 100644
--- a/configs/MPC8308RDB_defconfig
+++ b/configs/MPC8308RDB_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8308RDB=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8313ERDB_33_defconfig b/configs/MPC8313ERDB_33_defconfig
index e8ca3cf..a984c48 100644
--- a/configs/MPC8313ERDB_33_defconfig
+++ b/configs/MPC8313ERDB_33_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8313ERDB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_33MHZ"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8313ERDB_66_defconfig b/configs/MPC8313ERDB_66_defconfig
index bc8b9c0..5b1ee7c 100644
--- a/configs/MPC8313ERDB_66_defconfig
+++ b/configs/MPC8313ERDB_66_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8313ERDB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_66MHZ"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8313ERDB_NAND_33_defconfig b/configs/MPC8313ERDB_NAND_33_defconfig
index 99de0a9..b1052ef 100644
--- a/configs/MPC8313ERDB_NAND_33_defconfig
+++ b/configs/MPC8313ERDB_NAND_33_defconfig
@@ -3,4 +3,4 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8313ERDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_33MHZ,NAND"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8313ERDB_NAND_66_defconfig b/configs/MPC8313ERDB_NAND_66_defconfig
index b4fecba..fe59fe8 100644
--- a/configs/MPC8313ERDB_NAND_66_defconfig
+++ b/configs/MPC8313ERDB_NAND_66_defconfig
@@ -3,4 +3,4 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8313ERDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_66MHZ,NAND"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig
index db8963e..e618381 100644
--- a/configs/MPC8315ERDB_defconfig
+++ b/configs/MPC8315ERDB_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8315ERDB=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8323ERDB_defconfig b/configs/MPC8323ERDB_defconfig
index 8eb6c2b..762ad5b 100644
--- a/configs/MPC8323ERDB_defconfig
+++ b/configs/MPC8323ERDB_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8323ERDB=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC832XEMDS_ATM_defconfig b/configs/MPC832XEMDS_ATM_defconfig
index 3c544be..b4b3724 100644
--- a/configs/MPC832XEMDS_ATM_defconfig
+++ b/configs/MPC832XEMDS_ATM_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC832XEMDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PQ_MDS_PIB=1,PQ_MDS_PIB_ATM=1"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC832XEMDS_HOST_33_defconfig b/configs/MPC832XEMDS_HOST_33_defconfig
index 0be0f78..9a2f338 100644
--- a/configs/MPC832XEMDS_HOST_33_defconfig
+++ b/configs/MPC832XEMDS_HOST_33_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC832XEMDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,PCI_33M,PQ_MDS_PIB=1"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC832XEMDS_HOST_66_defconfig b/configs/MPC832XEMDS_HOST_66_defconfig
index 1c8f3ab..66e4269 100644
--- a/configs/MPC832XEMDS_HOST_66_defconfig
+++ b/configs/MPC832XEMDS_HOST_66_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC832XEMDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,PCI_66M,PQ_MDS_PIB=1"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC832XEMDS_SLAVE_defconfig b/configs/MPC832XEMDS_SLAVE_defconfig
index 2c0bfab..467f220 100644
--- a/configs/MPC832XEMDS_SLAVE_defconfig
+++ b/configs/MPC832XEMDS_SLAVE_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC832XEMDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,PCISLAVE"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC832XEMDS_defconfig b/configs/MPC832XEMDS_defconfig
index 19b596b..3e24ab1 100644
--- a/configs/MPC832XEMDS_defconfig
+++ b/configs/MPC832XEMDS_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC832XEMDS=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8349EMDS_defconfig b/configs/MPC8349EMDS_defconfig
index 0035801..6a907cf 100644
--- a/configs/MPC8349EMDS_defconfig
+++ b/configs/MPC8349EMDS_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349EMDS=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8349ITXGP_defconfig b/configs/MPC8349ITXGP_defconfig
index 8ebcee2..7a43fa0 100644
--- a/configs/MPC8349ITXGP_defconfig
+++ b/configs/MPC8349ITXGP_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349ITX=y
 CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITXGP,SYS_TEXT_BASE=0xFE000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig
index 4bbf4fa..f74d42c 100644
--- a/configs/MPC8349ITX_LOWBOOT_defconfig
+++ b/configs/MPC8349ITX_LOWBOOT_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349ITX=y
 CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX,SYS_TEXT_BASE=0xFE000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8349ITX_defconfig b/configs/MPC8349ITX_defconfig
index 3f9c0c5..84c117c 100644
--- a/configs/MPC8349ITX_defconfig
+++ b/configs/MPC8349ITX_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349ITX=y
 CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC837XEMDS_HOST_defconfig b/configs/MPC837XEMDS_HOST_defconfig
index c0beec2..2e472a7 100644
--- a/configs/MPC837XEMDS_HOST_defconfig
+++ b/configs/MPC837XEMDS_HOST_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC837XEMDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC837XEMDS_defconfig b/configs/MPC837XEMDS_defconfig
index f622d35..21b4506 100644
--- a/configs/MPC837XEMDS_defconfig
+++ b/configs/MPC837XEMDS_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC837XEMDS=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig
index 49ebd3a..126d0d2 100644
--- a/configs/MPC837XERDB_defconfig
+++ b/configs/MPC837XERDB_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC837XERDB=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8536DS_36BIT_defconfig b/configs/MPC8536DS_36BIT_defconfig
index c32ae96..4b626a6 100644
--- a/configs/MPC8536DS_36BIT_defconfig
+++ b/configs/MPC8536DS_36BIT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8536DS=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/MPC8536DS_SDCARD_defconfig b/configs/MPC8536DS_SDCARD_defconfig
index 9c45cee..3b02eb8 100644
--- a/configs/MPC8536DS_SDCARD_defconfig
+++ b/configs/MPC8536DS_SDCARD_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8536DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/MPC8536DS_SPIFLASH_defconfig b/configs/MPC8536DS_SPIFLASH_defconfig
index 98d62ac..0453cd2 100644
--- a/configs/MPC8536DS_SPIFLASH_defconfig
+++ b/configs/MPC8536DS_SPIFLASH_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8536DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/MPC8536DS_defconfig b/configs/MPC8536DS_defconfig
index bc43218..ceaa9e8 100644
--- a/configs/MPC8536DS_defconfig
+++ b/configs/MPC8536DS_defconfig
@@ -1,6 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8536DS=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/MPC8540ADS_defconfig b/configs/MPC8540ADS_defconfig
index d658404..41af349 100644
--- a/configs/MPC8540ADS_defconfig
+++ b/configs/MPC8540ADS_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8540ADS=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MPC8541CDS_defconfig b/configs/MPC8541CDS_defconfig
index 34c0d06..bc9c246 100644
--- a/configs/MPC8541CDS_defconfig
+++ b/configs/MPC8541CDS_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8541CDS=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MPC8541CDS_legacy_defconfig b/configs/MPC8541CDS_legacy_defconfig
index 9860dea..55478ab 100644
--- a/configs/MPC8541CDS_legacy_defconfig
+++ b/configs/MPC8541CDS_legacy_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8541CDS=y
 CONFIG_SYS_EXTRA_OPTIONS="LEGACY"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MPC8544DS_defconfig b/configs/MPC8544DS_defconfig
index 5461b0d..faeaa94 100644
--- a/configs/MPC8544DS_defconfig
+++ b/configs/MPC8544DS_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8544DS=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MPC8548CDS_36BIT_defconfig b/configs/MPC8548CDS_36BIT_defconfig
index 2a4f825..dfe1fca 100644
--- a/configs/MPC8548CDS_36BIT_defconfig
+++ b/configs/MPC8548CDS_36BIT_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8548CDS=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MPC8548CDS_defconfig b/configs/MPC8548CDS_defconfig
index 9f214d9..ba52e94 100644
--- a/configs/MPC8548CDS_defconfig
+++ b/configs/MPC8548CDS_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8548CDS=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MPC8548CDS_legacy_defconfig b/configs/MPC8548CDS_legacy_defconfig
index bdc7aa5..69c44af 100644
--- a/configs/MPC8548CDS_legacy_defconfig
+++ b/configs/MPC8548CDS_legacy_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8548CDS=y
 CONFIG_SYS_EXTRA_OPTIONS="LEGACY"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MPC8555CDS_defconfig b/configs/MPC8555CDS_defconfig
index ba2747a..3bdbb0c 100644
--- a/configs/MPC8555CDS_defconfig
+++ b/configs/MPC8555CDS_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8555CDS=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MPC8555CDS_legacy_defconfig b/configs/MPC8555CDS_legacy_defconfig
index fdd3c10..8e53ee0 100644
--- a/configs/MPC8555CDS_legacy_defconfig
+++ b/configs/MPC8555CDS_legacy_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8555CDS=y
 CONFIG_SYS_EXTRA_OPTIONS="LEGACY"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MPC8560ADS_defconfig b/configs/MPC8560ADS_defconfig
index 4ec548f..aa84d28 100644
--- a/configs/MPC8560ADS_defconfig
+++ b/configs/MPC8560ADS_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8560ADS=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MPC8568MDS_defconfig b/configs/MPC8568MDS_defconfig
index 27cc6c4..ac0ec8c 100644
--- a/configs/MPC8568MDS_defconfig
+++ b/configs/MPC8568MDS_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8568MDS=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MPC8569MDS_ATM_defconfig b/configs/MPC8569MDS_ATM_defconfig
index 18b567e..326983d 100644
--- a/configs/MPC8569MDS_ATM_defconfig
+++ b/configs/MPC8569MDS_ATM_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8569MDS=y
 CONFIG_SYS_EXTRA_OPTIONS="ATM"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MPC8569MDS_defconfig b/configs/MPC8569MDS_defconfig
index 5dbfe76..81fb82a 100644
--- a/configs/MPC8569MDS_defconfig
+++ b/configs/MPC8569MDS_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8569MDS=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MPC8572DS_36BIT_defconfig b/configs/MPC8572DS_36BIT_defconfig
index d0b6ce8..0ce85e4 100644
--- a/configs/MPC8572DS_36BIT_defconfig
+++ b/configs/MPC8572DS_36BIT_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8572DS=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MPC8572DS_defconfig b/configs/MPC8572DS_defconfig
index 6f2178a..dde9eb2 100644
--- a/configs/MPC8572DS_defconfig
+++ b/configs/MPC8572DS_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8572DS=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/MPC8610HPCD_defconfig b/configs/MPC8610HPCD_defconfig
index ba94f54..f0e1370 100644
--- a/configs/MPC8610HPCD_defconfig
+++ b/configs/MPC8610HPCD_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC86xx=y
 CONFIG_TARGET_MPC8610HPCD=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8641HPCN_36BIT_defconfig b/configs/MPC8641HPCN_36BIT_defconfig
index 8279461..0aee7ea 100644
--- a/configs/MPC8641HPCN_36BIT_defconfig
+++ b/configs/MPC8641HPCN_36BIT_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC86xx=y
 CONFIG_TARGET_MPC8641HPCN=y
 CONFIG_SYS_EXTRA_OPTIONS="PHYS_64BIT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8641HPCN_defconfig b/configs/MPC8641HPCN_defconfig
index b4a4eb5..2bee038 100644
--- a/configs/MPC8641HPCN_defconfig
+++ b/configs/MPC8641HPCN_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC86xx=y
 CONFIG_TARGET_MPC8641HPCN=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MSI_Primo73_defconfig b/configs/MSI_Primo73_defconfig
index 6db1115..6e0d246 100644
--- a/configs/MSI_Primo73_defconfig
+++ b/configs/MSI_Primo73_defconfig
@@ -12,10 +12,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-primo73"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig
index 719e25a..258078a 100644
--- a/configs/MSI_Primo81_defconfig
+++ b/configs/MSI_Primo81_defconfig
@@ -15,10 +15,10 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-primo81"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_VIDEO_LCD_SSD2828_TX_CLK=27
diff --git a/configs/Marsboard_A10_defconfig b/configs/Marsboard_A10_defconfig
index 01758e4..ed41af6 100644
--- a/configs/Marsboard_A10_defconfig
+++ b/configs/Marsboard_A10_defconfig
@@ -5,10 +5,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-marsboard"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,AHCI,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/Mele_A1000G_quad_defconfig b/configs/Mele_A1000G_quad_defconfig
index f55b706..6e0a493 100644
--- a/configs/Mele_A1000G_quad_defconfig
+++ b/configs/Mele_A1000G_quad_defconfig
@@ -8,10 +8,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-mele-a1000g-quad"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DCDC1_VOLT=3300
diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
index aad71fc..983ffdc 100644
--- a/configs/Mele_A1000_defconfig
+++ b/configs/Mele_A1000_defconfig
@@ -6,10 +6,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-a1000"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/Mele_I7_defconfig b/configs/Mele_I7_defconfig
index f96ee14..7f083a7 100644
--- a/configs/Mele_I7_defconfig
+++ b/configs/Mele_I7_defconfig
@@ -8,10 +8,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-i7"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DCDC1_VOLT=3300
diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig
index e2869a3..73d87c3 100644
--- a/configs/Mele_M3_defconfig
+++ b/configs/Mele_M3_defconfig
@@ -9,10 +9,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m3"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig
index aad12a1..79c5901 100644
--- a/configs/Mele_M5_defconfig
+++ b/configs/Mele_M5_defconfig
@@ -8,10 +8,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m5"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,USB_EHCI,STATUSLED=234"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig
index c3242b8..e017ad7 100644
--- a/configs/Mele_M9_defconfig
+++ b/configs/Mele_M9_defconfig
@@ -8,10 +8,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-m9"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DCDC1_VOLT=3300
diff --git a/configs/Merrii_A80_Optimus_defconfig b/configs/Merrii_A80_Optimus_defconfig
index 4a0dce7..b02b1a3 100644
--- a/configs/Merrii_A80_Optimus_defconfig
+++ b/configs/Merrii_A80_Optimus_defconfig
@@ -9,10 +9,10 @@ CONFIG_MMC0_CD_PIN="PH18"
 # CONFIG_USB_KEYBOARD is not set
 CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-optimus"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/MigoR_defconfig b/configs/MigoR_defconfig
index e6a9660..3255ed2 100644
--- a/configs/MigoR_defconfig
+++ b/configs/MigoR_defconfig
@@ -1,4 +1,18 @@
 CONFIG_SH=y
 CONFIG_TARGET_MIGOR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig
index 4ec752b..da57711 100644
--- a/configs/Mini-X_defconfig
+++ b/configs/Mini-X_defconfig
@@ -5,10 +5,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mini-xplus"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/MiniFAP_defconfig b/configs/MiniFAP_defconfig
index dc6c942..1e5fd75 100644
--- a/configs/MiniFAP_defconfig
+++ b/configs/MiniFAP_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="MINIFAP"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2D300_defconfig b/configs/O2D300_defconfig
index dcf3255..db88295 100644
--- a/configs/O2D300_defconfig
+++ b/configs/O2D300_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O2D300=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2DNT2_RAMBOOT_defconfig b/configs/O2DNT2_RAMBOOT_defconfig
index 40e238a..ca54ca5 100644
--- a/configs/O2DNT2_RAMBOOT_defconfig
+++ b/configs/O2DNT2_RAMBOOT_defconfig
@@ -5,4 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000"
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press password to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="++++++++++"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2DNT2_defconfig b/configs/O2DNT2_defconfig
index 6bd3cee..a4ead75 100644
--- a/configs/O2DNT2_defconfig
+++ b/configs/O2DNT2_defconfig
@@ -4,4 +4,4 @@ CONFIG_TARGET_O2DNT2=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press password to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="++++++++++"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2D_defconfig b/configs/O2D_defconfig
index 98efde8..3248fc9 100644
--- a/configs/O2D_defconfig
+++ b/configs/O2D_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O2D=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2I_defconfig b/configs/O2I_defconfig
index 80bce5d..5d51be6 100644
--- a/configs/O2I_defconfig
+++ b/configs/O2I_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O2I=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2MNT_O2M110_defconfig b/configs/O2MNT_O2M110_defconfig
index e452f90..22e7e98 100644
--- a/configs/O2MNT_O2M110_defconfig
+++ b/configs/O2MNT_O2M110_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O2MNT=y
 CONFIG_SYS_EXTRA_OPTIONS="IFM_SENSOR_TYPE=\"O2M110\""
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2MNT_O2M112_defconfig b/configs/O2MNT_O2M112_defconfig
index a1ee009..5342719 100644
--- a/configs/O2MNT_O2M112_defconfig
+++ b/configs/O2MNT_O2M112_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O2MNT=y
 CONFIG_SYS_EXTRA_OPTIONS="IFM_SENSOR_TYPE=\"O2M112\""
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2MNT_O2M113_defconfig b/configs/O2MNT_O2M113_defconfig
index 5e8db1c..bcbb598 100644
--- a/configs/O2MNT_O2M113_defconfig
+++ b/configs/O2MNT_O2M113_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O2MNT=y
 CONFIG_SYS_EXTRA_OPTIONS="IFM_SENSOR_TYPE=\"O2M113\""
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2MNT_defconfig b/configs/O2MNT_defconfig
index d0eb289..a29f70a 100644
--- a/configs/O2MNT_defconfig
+++ b/configs/O2MNT_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O2MNT=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O3DNT_defconfig b/configs/O3DNT_defconfig
index d50879a..8411294 100644
--- a/configs/O3DNT_defconfig
+++ b/configs/O3DNT_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O3DNT=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig
index 23b5761..ba89a25 100644
--- a/configs/Orangepi_defconfig
+++ b/configs/Orangepi_defconfig
@@ -10,10 +10,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
index 99bb94e..8f03815 100644
--- a/configs/Orangepi_mini_defconfig
+++ b/configs/Orangepi_mini_defconfig
@@ -12,10 +12,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi-mini"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
diff --git a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
index 6530f07..d27fd5e 100644
--- a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,NAND_SECBOOT,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig
index ffb3469..e69f1c4 100644
--- a/configs/P1010RDB-PA_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig
@@ -4,6 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
index f8c8c5d..42f7625 100644
--- a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig
index 6c066aa..cb86d2a 100644
--- a/configs/P1010RDB-PA_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
index c0fa356..be09aab 100644
--- a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
index 5cd85f9..20136e3 100644
--- a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SPIFLASH,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
index d550a6b..8f2bbc9 100644
--- a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
index 004fe69..f760952 100644
--- a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,NAND_SECBOOT,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig
index 16fad87..d00b7d2 100644
--- a/configs/P1010RDB-PA_NAND_defconfig
+++ b/configs/P1010RDB-PA_NAND_defconfig
@@ -4,6 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
index e681bc3..0f9092b 100644
--- a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig
index d899655..643cc88 100644
--- a/configs/P1010RDB-PA_NOR_defconfig
+++ b/configs/P1010RDB-PA_NOR_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig
index 2b52397..88044b1 100644
--- a/configs/P1010RDB-PA_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
index 5756bb2..7ded62b 100644
--- a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SPIFLASH,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig b/configs/P1010RDB-PA_SPIFLASH_defconfig
index 124ec69..7da4565 100644
--- a/configs/P1010RDB-PA_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
index bd2a690..286f8da 100644
--- a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,NAND_SECBOOT,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig
index 2fca071..385265d 100644
--- a/configs/P1010RDB-PB_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig
@@ -4,6 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
index 0151fbe..93e7f89 100644
--- a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig
index 561f036..9176139 100644
--- a/configs/P1010RDB-PB_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
index 44c5c27..fd1d4df 100644
--- a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
index d3f6a35..a0d7bac 100644
--- a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SPIFLASH,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
index 4cbda7e..9dc5af2 100644
--- a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
index 3c30ea0..3aa2ca0 100644
--- a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,NAND_SECBOOT,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig
index 9219373..db41c51 100644
--- a/configs/P1010RDB-PB_NAND_defconfig
+++ b/configs/P1010RDB-PB_NAND_defconfig
@@ -4,6 +4,4 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
index 277158b..80836a3 100644
--- a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig
index 0361140..4ec3893 100644
--- a/configs/P1010RDB-PB_NOR_defconfig
+++ b/configs/P1010RDB-PB_NOR_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig
index 2566f87..e938614 100644
--- a/configs/P1010RDB-PB_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
index 43c4433..11f75b7 100644
--- a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SPIFLASH,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig b/configs/P1010RDB-PB_SPIFLASH_defconfig
index 37f135c..b3a30e7 100644
--- a/configs/P1010RDB-PB_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1020MBG-PC_36BIT_SDCARD_defconfig b/configs/P1020MBG-PC_36BIT_SDCARD_defconfig
index 64f77a7..59aa9be 100644
--- a/configs/P1020MBG-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020MBG-PC_36BIT_SDCARD_defconfig
@@ -3,5 +3,3 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020MBG,SDCARD,36BIT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/P1020MBG-PC_36BIT_defconfig b/configs/P1020MBG-PC_36BIT_defconfig
index c55bce6..b8d9c53 100644
--- a/configs/P1020MBG-PC_36BIT_defconfig
+++ b/configs/P1020MBG-PC_36BIT_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020MBG,36BIT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/P1020MBG-PC_SDCARD_defconfig b/configs/P1020MBG-PC_SDCARD_defconfig
index bcd3513..0e64e82 100644
--- a/configs/P1020MBG-PC_SDCARD_defconfig
+++ b/configs/P1020MBG-PC_SDCARD_defconfig
@@ -3,5 +3,3 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020MBG,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/P1020MBG-PC_defconfig b/configs/P1020MBG-PC_defconfig
index 93b125f..905b94c 100644
--- a/configs/P1020MBG-PC_defconfig
+++ b/configs/P1020MBG-PC_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020MBG"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig b/configs/P1020RDB-PC_36BIT_NAND_defconfig
index b112f55..84934a8 100644
--- a/configs/P1020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P1020RDB-PC_36BIT_NAND_defconfig
@@ -4,6 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
index d98d923..de86b76 100644
--- a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
index 49b7ab8..3ed759f 100644
--- a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PC_36BIT_defconfig b/configs/P1020RDB-PC_36BIT_defconfig
index ea8a042..ca52331 100644
--- a/configs/P1020RDB-PC_36BIT_defconfig
+++ b/configs/P1020RDB-PC_36BIT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PC_NAND_defconfig b/configs/P1020RDB-PC_NAND_defconfig
index 26742ff..8391b4b 100644
--- a/configs/P1020RDB-PC_NAND_defconfig
+++ b/configs/P1020RDB-PC_NAND_defconfig
@@ -4,6 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PC_SDCARD_defconfig b/configs/P1020RDB-PC_SDCARD_defconfig
index 4df5c2b..7411c67 100644
--- a/configs/P1020RDB-PC_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PC_SPIFLASH_defconfig b/configs/P1020RDB-PC_SPIFLASH_defconfig
index cb132a8..dc80723 100644
--- a/configs/P1020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig
index 6675468..089bfae 100644
--- a/configs/P1020RDB-PC_defconfig
+++ b/configs/P1020RDB-PC_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig
index 955290b..8f8660c 100644
--- a/configs/P1020RDB-PD_NAND_defconfig
+++ b/configs/P1020RDB-PD_NAND_defconfig
@@ -4,6 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig
index 13a85ec..959d6d3 100644
--- a/configs/P1020RDB-PD_SDCARD_defconfig
+++ b/configs/P1020RDB-PD_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig b/configs/P1020RDB-PD_SPIFLASH_defconfig
index aaadab9..df4bc85 100644
--- a/configs/P1020RDB-PD_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PD_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig
index e2a9f7d..2ebb668 100644
--- a/configs/P1020RDB-PD_defconfig
+++ b/configs/P1020RDB-PD_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1020UTM-PC_36BIT_SDCARD_defconfig b/configs/P1020UTM-PC_36BIT_SDCARD_defconfig
index 3525a2e..f94345c 100644
--- a/configs/P1020UTM-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020UTM-PC_36BIT_SDCARD_defconfig
@@ -3,5 +3,3 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020UTM,36BIT,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/P1020UTM-PC_36BIT_defconfig b/configs/P1020UTM-PC_36BIT_defconfig
index 1e014f2..ac4bbd3 100644
--- a/configs/P1020UTM-PC_36BIT_defconfig
+++ b/configs/P1020UTM-PC_36BIT_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020UTM,36BIT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/P1020UTM-PC_SDCARD_defconfig b/configs/P1020UTM-PC_SDCARD_defconfig
index 11e5803..c4cd42e 100644
--- a/configs/P1020UTM-PC_SDCARD_defconfig
+++ b/configs/P1020UTM-PC_SDCARD_defconfig
@@ -3,5 +3,3 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020UTM,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/P1020UTM-PC_defconfig b/configs/P1020UTM-PC_defconfig
index 8b4a339..aae966b 100644
--- a/configs/P1020UTM-PC_defconfig
+++ b/configs/P1020UTM-PC_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020UTM"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/P1021RDB-PC_36BIT_NAND_defconfig b/configs/P1021RDB-PC_36BIT_NAND_defconfig
index 35dd6e0..73f2f51 100644
--- a/configs/P1021RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P1021RDB-PC_36BIT_NAND_defconfig
@@ -4,6 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1021RDB-PC_36BIT_SDCARD_defconfig b/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
index 702a2fd..5befdd9 100644
--- a/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
index 4150b29..9838f09 100644
--- a/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1021RDB-PC_36BIT_defconfig b/configs/P1021RDB-PC_36BIT_defconfig
index 8622a42..5fbc7ce 100644
--- a/configs/P1021RDB-PC_36BIT_defconfig
+++ b/configs/P1021RDB-PC_36BIT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1021RDB-PC_NAND_defconfig b/configs/P1021RDB-PC_NAND_defconfig
index 61bf58d..e238e05 100644
--- a/configs/P1021RDB-PC_NAND_defconfig
+++ b/configs/P1021RDB-PC_NAND_defconfig
@@ -4,6 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1021RDB-PC_SDCARD_defconfig b/configs/P1021RDB-PC_SDCARD_defconfig
index e9c597b..a7a45ec 100644
--- a/configs/P1021RDB-PC_SDCARD_defconfig
+++ b/configs/P1021RDB-PC_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1021RDB-PC_SPIFLASH_defconfig b/configs/P1021RDB-PC_SPIFLASH_defconfig
index 1fb2085..59ef5ea 100644
--- a/configs/P1021RDB-PC_SPIFLASH_defconfig
+++ b/configs/P1021RDB-PC_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1021RDB-PC_defconfig b/configs/P1021RDB-PC_defconfig
index 83326ce..543c28d 100644
--- a/configs/P1021RDB-PC_defconfig
+++ b/configs/P1021RDB-PC_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1022DS_36BIT_NAND_defconfig b/configs/P1022DS_36BIT_NAND_defconfig
index 8e763fa..c0edafc 100644
--- a/configs/P1022DS_36BIT_NAND_defconfig
+++ b/configs/P1022DS_36BIT_NAND_defconfig
@@ -4,6 +4,4 @@ CONFIG_TARGET_P1022DS=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1022DS_36BIT_SDCARD_defconfig b/configs/P1022DS_36BIT_SDCARD_defconfig
index d6b9f09..d85530e 100644
--- a/configs/P1022DS_36BIT_SDCARD_defconfig
+++ b/configs/P1022DS_36BIT_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1022DS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1022DS_36BIT_SPIFLASH_defconfig b/configs/P1022DS_36BIT_SPIFLASH_defconfig
index b3966ee..1be12cc 100644
--- a/configs/P1022DS_36BIT_SPIFLASH_defconfig
+++ b/configs/P1022DS_36BIT_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1022DS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1022DS_36BIT_defconfig b/configs/P1022DS_36BIT_defconfig
index cc7877b..08d7a6e 100644
--- a/configs/P1022DS_36BIT_defconfig
+++ b/configs/P1022DS_36BIT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1022DS=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1022DS_NAND_defconfig b/configs/P1022DS_NAND_defconfig
index 253b19a..dbfb562 100644
--- a/configs/P1022DS_NAND_defconfig
+++ b/configs/P1022DS_NAND_defconfig
@@ -4,6 +4,4 @@ CONFIG_TARGET_P1022DS=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1022DS_SDCARD_defconfig b/configs/P1022DS_SDCARD_defconfig
index a959631..9cbcbd5 100644
--- a/configs/P1022DS_SDCARD_defconfig
+++ b/configs/P1022DS_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1022DS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1022DS_SPIFLASH_defconfig b/configs/P1022DS_SPIFLASH_defconfig
index 79eba57..98a859c 100644
--- a/configs/P1022DS_SPIFLASH_defconfig
+++ b/configs/P1022DS_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1022DS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1022DS_defconfig b/configs/P1022DS_defconfig
index 0252307..69a25f7 100644
--- a/configs/P1022DS_defconfig
+++ b/configs/P1022DS_defconfig
@@ -1,6 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1022DS=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1023RDB_defconfig b/configs/P1023RDB_defconfig
index fa8baa1..fc15e4b 100644
--- a/configs/P1023RDB_defconfig
+++ b/configs/P1023RDB_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1023RDB=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/P1024RDB_36BIT_defconfig b/configs/P1024RDB_36BIT_defconfig
index fded3af..207d3de 100644
--- a/configs/P1024RDB_36BIT_defconfig
+++ b/configs/P1024RDB_36BIT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,36BIT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1024RDB_NAND_defconfig b/configs/P1024RDB_NAND_defconfig
index e12b198..f69257c 100644
--- a/configs/P1024RDB_NAND_defconfig
+++ b/configs/P1024RDB_NAND_defconfig
@@ -4,6 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1024RDB_SDCARD_defconfig b/configs/P1024RDB_SDCARD_defconfig
index 55283d6..d847a0a 100644
--- a/configs/P1024RDB_SDCARD_defconfig
+++ b/configs/P1024RDB_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1024RDB_SPIFLASH_defconfig b/configs/P1024RDB_SPIFLASH_defconfig
index 438aa36..c22bfe1 100644
--- a/configs/P1024RDB_SPIFLASH_defconfig
+++ b/configs/P1024RDB_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1024RDB_defconfig b/configs/P1024RDB_defconfig
index a7cc6ef..21a84e3 100644
--- a/configs/P1024RDB_defconfig
+++ b/configs/P1024RDB_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1024RDB"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1025RDB_36BIT_defconfig b/configs/P1025RDB_36BIT_defconfig
index 90abbfe..302d6e8 100644
--- a/configs/P1025RDB_36BIT_defconfig
+++ b/configs/P1025RDB_36BIT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,36BIT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1025RDB_NAND_defconfig b/configs/P1025RDB_NAND_defconfig
index b7cfe0c..616225e 100644
--- a/configs/P1025RDB_NAND_defconfig
+++ b/configs/P1025RDB_NAND_defconfig
@@ -4,6 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1025RDB_SDCARD_defconfig b/configs/P1025RDB_SDCARD_defconfig
index 9d76178..1ba3880 100644
--- a/configs/P1025RDB_SDCARD_defconfig
+++ b/configs/P1025RDB_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1025RDB_SPIFLASH_defconfig b/configs/P1025RDB_SPIFLASH_defconfig
index a0b7b2d..df648aa 100644
--- a/configs/P1025RDB_SPIFLASH_defconfig
+++ b/configs/P1025RDB_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P1025RDB_defconfig b/configs/P1025RDB_defconfig
index 9f07753..a0d1a2c 100644
--- a/configs/P1025RDB_defconfig
+++ b/configs/P1025RDB_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1025RDB"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig
index 54e291c..2c4bea3 100644
--- a/configs/P2020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig
@@ -4,6 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
index e10a36e..9d110db 100644
--- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
index 44a1ca1..c41bbf9 100644
--- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig
index a1e23f7..8ae1928 100644
--- a/configs/P2020RDB-PC_36BIT_defconfig
+++ b/configs/P2020RDB-PC_36BIT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig
index 1239d97..4492e09 100644
--- a/configs/P2020RDB-PC_NAND_defconfig
+++ b/configs/P2020RDB-PC_NAND_defconfig
@@ -4,6 +4,4 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig
index d032c8a..95f3d91 100644
--- a/configs/P2020RDB-PC_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig
index f3d1b80..d6f0548 100644
--- a/configs/P2020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig
index 957dbb5..f871019 100644
--- a/configs/P2020RDB-PC_defconfig
+++ b/configs/P2020RDB-PC_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P2041RDB_NAND_defconfig b/configs/P2041RDB_NAND_defconfig
index 6bab740..028235a 100644
--- a/configs/P2041RDB_NAND_defconfig
+++ b/configs/P2041RDB_NAND_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P2041RDB_SDCARD_defconfig b/configs/P2041RDB_SDCARD_defconfig
index 13b144a..ac1d678 100644
--- a/configs/P2041RDB_SDCARD_defconfig
+++ b/configs/P2041RDB_SDCARD_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P2041RDB_SECURE_BOOT_defconfig b/configs/P2041RDB_SECURE_BOOT_defconfig
index 306ddad..d0facae 100644
--- a/configs/P2041RDB_SECURE_BOOT_defconfig
+++ b/configs/P2041RDB_SECURE_BOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P2041RDB_SPIFLASH_defconfig b/configs/P2041RDB_SPIFLASH_defconfig
index 8aba3e2..30953a7 100644
--- a/configs/P2041RDB_SPIFLASH_defconfig
+++ b/configs/P2041RDB_SPIFLASH_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig b/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
index 68a406f..74abe7d 100644
--- a/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/P2041RDB_defconfig b/configs/P2041RDB_defconfig
index 8f0b1d4..b4b1489 100644
--- a/configs/P2041RDB_defconfig
+++ b/configs/P2041RDB_defconfig
@@ -1,6 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P3041DS_NAND_defconfig b/configs/P3041DS_NAND_defconfig
index 95eea20..a076390 100644
--- a/configs/P3041DS_NAND_defconfig
+++ b/configs/P3041DS_NAND_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P3041DS_SDCARD_defconfig b/configs/P3041DS_SDCARD_defconfig
index 7eb7fa7..c16dc96 100644
--- a/configs/P3041DS_SDCARD_defconfig
+++ b/configs/P3041DS_SDCARD_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P3041DS_SECURE_BOOT_defconfig b/configs/P3041DS_SECURE_BOOT_defconfig
index d069b5b..7c76951 100644
--- a/configs/P3041DS_SECURE_BOOT_defconfig
+++ b/configs/P3041DS_SECURE_BOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P3041DS_SPIFLASH_defconfig b/configs/P3041DS_SPIFLASH_defconfig
index ca99160..26e45f6 100644
--- a/configs/P3041DS_SPIFLASH_defconfig
+++ b/configs/P3041DS_SPIFLASH_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P3041DS_SRIO_PCIE_BOOT_defconfig b/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
index 6d8cec8..71db82d 100644
--- a/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/P3041DS_defconfig b/configs/P3041DS_defconfig
index 9d567db..0879537 100644
--- a/configs/P3041DS_defconfig
+++ b/configs/P3041DS_defconfig
@@ -1,6 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P4080DS_SDCARD_defconfig b/configs/P4080DS_SDCARD_defconfig
index 30eb293..1e8bbf7 100644
--- a/configs/P4080DS_SDCARD_defconfig
+++ b/configs/P4080DS_SDCARD_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P4080DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P4080DS_SECURE_BOOT_defconfig b/configs/P4080DS_SECURE_BOOT_defconfig
index cf7d6cd..33a9fd6 100644
--- a/configs/P4080DS_SECURE_BOOT_defconfig
+++ b/configs/P4080DS_SECURE_BOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P4080DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P4080DS_SPIFLASH_defconfig b/configs/P4080DS_SPIFLASH_defconfig
index 7004e92..e55be85 100644
--- a/configs/P4080DS_SPIFLASH_defconfig
+++ b/configs/P4080DS_SPIFLASH_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P4080DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P4080DS_SRIO_PCIE_BOOT_defconfig b/configs/P4080DS_SRIO_PCIE_BOOT_defconfig
index f363d3e..b3f6b69 100644
--- a/configs/P4080DS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P4080DS_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P4080DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/P4080DS_defconfig b/configs/P4080DS_defconfig
index 233efa5..5e5cea9 100644
--- a/configs/P4080DS_defconfig
+++ b/configs/P4080DS_defconfig
@@ -1,6 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P4080DS=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P5020DS_NAND_defconfig b/configs/P5020DS_NAND_defconfig
index 3f68674..a071029 100644
--- a/configs/P5020DS_NAND_defconfig
+++ b/configs/P5020DS_NAND_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5020DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P5020DS_SDCARD_defconfig b/configs/P5020DS_SDCARD_defconfig
index f13b634..5431491 100644
--- a/configs/P5020DS_SDCARD_defconfig
+++ b/configs/P5020DS_SDCARD_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5020DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P5020DS_SECURE_BOOT_defconfig b/configs/P5020DS_SECURE_BOOT_defconfig
index 6552ba8..26a418a 100644
--- a/configs/P5020DS_SECURE_BOOT_defconfig
+++ b/configs/P5020DS_SECURE_BOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5020DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P5020DS_SPIFLASH_defconfig b/configs/P5020DS_SPIFLASH_defconfig
index 3ba0c35..65f0708 100644
--- a/configs/P5020DS_SPIFLASH_defconfig
+++ b/configs/P5020DS_SPIFLASH_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5020DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P5020DS_SRIO_PCIE_BOOT_defconfig b/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
index 9106466..66b7d6f 100644
--- a/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5020DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/P5020DS_defconfig b/configs/P5020DS_defconfig
index c4d6a2c..a6d8839 100644
--- a/configs/P5020DS_defconfig
+++ b/configs/P5020DS_defconfig
@@ -1,6 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5020DS=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P5040DS_NAND_defconfig b/configs/P5040DS_NAND_defconfig
index 0a9ff2d..0d61782 100644
--- a/configs/P5040DS_NAND_defconfig
+++ b/configs/P5040DS_NAND_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P5040DS_SDCARD_defconfig b/configs/P5040DS_SDCARD_defconfig
index cc40316..498fe51 100644
--- a/configs/P5040DS_SDCARD_defconfig
+++ b/configs/P5040DS_SDCARD_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P5040DS_SECURE_BOOT_defconfig b/configs/P5040DS_SECURE_BOOT_defconfig
index da1e300..54d9b80 100644
--- a/configs/P5040DS_SECURE_BOOT_defconfig
+++ b/configs/P5040DS_SECURE_BOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P5040DS_SPIFLASH_defconfig b/configs/P5040DS_SPIFLASH_defconfig
index 8fb6e78..9a37c0e 100644
--- a/configs/P5040DS_SPIFLASH_defconfig
+++ b/configs/P5040DS_SPIFLASH_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/P5040DS_defconfig b/configs/P5040DS_defconfig
index 9b83d0b..6df742e 100644
--- a/configs/P5040DS_defconfig
+++ b/configs/P5040DS_defconfig
@@ -1,6 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/PATI_defconfig b/configs/PATI_defconfig
index 14ca871..da8525e 100644
--- a/configs/PATI_defconfig
+++ b/configs/PATI_defconfig
@@ -1,3 +1,15 @@
 CONFIG_PPC=y
 CONFIG_5xx=y
 CONFIG_TARGET_PATI=y
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig
index 1aec3cb..ced7d1a 100644
--- a/configs/PIP405_defconfig
+++ b/configs/PIP405_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_PIP405=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/PLU405_defconfig b/configs/PLU405_defconfig
index 50f52a3..a691e24 100644
--- a/configs/PLU405_defconfig
+++ b/configs/PLU405_defconfig
@@ -4,4 +4,4 @@ CONFIG_TARGET_PLU405=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/PMC405DE_defconfig b/configs/PMC405DE_defconfig
index 1246542..37b2d23 100644
--- a/configs/PMC405DE_defconfig
+++ b/configs/PMC405DE_defconfig
@@ -4,4 +4,4 @@ CONFIG_TARGET_PMC405DE=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/PMC440_defconfig b/configs/PMC440_defconfig
index bca6fc0..96ff54c 100644
--- a/configs/PMC440_defconfig
+++ b/configs/PMC440_defconfig
@@ -4,4 +4,4 @@ CONFIG_TARGET_PMC440=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/T1023RDB_NAND_defconfig b/configs/T1023RDB_NAND_defconfig
index d9f72e5..3ee42d6 100644
--- a/configs/T1023RDB_NAND_defconfig
+++ b/configs/T1023RDB_NAND_defconfig
@@ -3,6 +3,6 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1023RDB_SDCARD_defconfig b/configs/T1023RDB_SDCARD_defconfig
index 3f8e04c..ed67945 100644
--- a/configs/T1023RDB_SDCARD_defconfig
+++ b/configs/T1023RDB_SDCARD_defconfig
@@ -3,6 +3,6 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1023RDB_SECURE_BOOT_defconfig b/configs/T1023RDB_SECURE_BOOT_defconfig
index 49979b3..76e3e91 100644
--- a/configs/T1023RDB_SECURE_BOOT_defconfig
+++ b/configs/T1023RDB_SECURE_BOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1023RDB_SPIFLASH_defconfig b/configs/T1023RDB_SPIFLASH_defconfig
index cb45acb..e7f4525 100644
--- a/configs/T1023RDB_SPIFLASH_defconfig
+++ b/configs/T1023RDB_SPIFLASH_defconfig
@@ -3,6 +3,6 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1023RDB_defconfig b/configs/T1023RDB_defconfig
index abb7c3f..8ff03a5 100644
--- a/configs/T1023RDB_defconfig
+++ b/configs/T1023RDB_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1024QDS_D4_SECURE_BOOT_defconfig b/configs/T1024QDS_D4_SECURE_BOOT_defconfig
index 0585b6a..06a9619 100644
--- a/configs/T1024QDS_D4_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_D4_SECURE_BOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SYS_FSL_DDR4,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1024QDS_NAND_defconfig b/configs/T1024QDS_NAND_defconfig
index c4ddf7a..c49facf 100644
--- a/configs/T1024QDS_NAND_defconfig
+++ b/configs/T1024QDS_NAND_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1024QDS_SDCARD_defconfig b/configs/T1024QDS_SDCARD_defconfig
index 8e384ac..3a3beb1 100644
--- a/configs/T1024QDS_SDCARD_defconfig
+++ b/configs/T1024QDS_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1024QDS_SECURE_BOOT_defconfig b/configs/T1024QDS_SECURE_BOOT_defconfig
index a4d594a..b0890a4 100644
--- a/configs/T1024QDS_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_SECURE_BOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1024QDS_SPIFLASH_defconfig b/configs/T1024QDS_SPIFLASH_defconfig
index dc043f9..df3ca94 100644
--- a/configs/T1024QDS_SPIFLASH_defconfig
+++ b/configs/T1024QDS_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1024QDS_defconfig b/configs/T1024QDS_defconfig
index b9f875c..93588b7 100644
--- a/configs/T1024QDS_defconfig
+++ b/configs/T1024QDS_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig
index db1262e..6f4f026 100644
--- a/configs/T1024RDB_NAND_defconfig
+++ b/configs/T1024RDB_NAND_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig
index dd80c76..53c5c8c 100644
--- a/configs/T1024RDB_SDCARD_defconfig
+++ b/configs/T1024RDB_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1024RDB_SECURE_BOOT_defconfig b/configs/T1024RDB_SECURE_BOOT_defconfig
index 5c2fe2a..65e9a5a 100644
--- a/configs/T1024RDB_SECURE_BOOT_defconfig
+++ b/configs/T1024RDB_SECURE_BOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig
index 9157945..60aee0d 100644
--- a/configs/T1024RDB_SPIFLASH_defconfig
+++ b/configs/T1024RDB_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig
index ac0b8c1..2da2ea7 100644
--- a/configs/T1024RDB_defconfig
+++ b/configs/T1024RDB_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1040QDS_D4_defconfig b/configs/T1040QDS_D4_defconfig
index 5a80d6b..31b3b10 100644
--- a/configs/T1040QDS_D4_defconfig
+++ b/configs/T1040QDS_D4_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1040QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SYS_FSL_DDR4"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1040QDS_SECURE_BOOT_defconfig b/configs/T1040QDS_SECURE_BOOT_defconfig
index 6ad6182..abb876f 100644
--- a/configs/T1040QDS_SECURE_BOOT_defconfig
+++ b/configs/T1040QDS_SECURE_BOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1040QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1040QDS_defconfig b/configs/T1040QDS_defconfig
index dee5c36..3766524 100644
--- a/configs/T1040QDS_defconfig
+++ b/configs/T1040QDS_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1040QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1040RDB_NAND_defconfig b/configs/T1040RDB_NAND_defconfig
index 3a1bb2b..d4883b8 100644
--- a/configs/T1040RDB_NAND_defconfig
+++ b/configs/T1040RDB_NAND_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1040RDB_SDCARD_defconfig b/configs/T1040RDB_SDCARD_defconfig
index 3247915..46e7c72 100644
--- a/configs/T1040RDB_SDCARD_defconfig
+++ b/configs/T1040RDB_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1040RDB_SECURE_BOOT_defconfig b/configs/T1040RDB_SECURE_BOOT_defconfig
index 6faadec..8995e89 100644
--- a/configs/T1040RDB_SECURE_BOOT_defconfig
+++ b/configs/T1040RDB_SECURE_BOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT,T1040RDB"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1040RDB_SPIFLASH_defconfig b/configs/T1040RDB_SPIFLASH_defconfig
index 3a68fe2..e0956b3 100644
--- a/configs/T1040RDB_SPIFLASH_defconfig
+++ b/configs/T1040RDB_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1040RDB_defconfig b/configs/T1040RDB_defconfig
index a348ad8..3ae358d 100644
--- a/configs/T1040RDB_defconfig
+++ b/configs/T1040RDB_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1042RDB_PI_NAND_defconfig b/configs/T1042RDB_PI_NAND_defconfig
index 2944aff..04af1b8 100644
--- a/configs/T1042RDB_PI_NAND_defconfig
+++ b/configs/T1042RDB_PI_NAND_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1042RDB_PI_SDCARD_defconfig b/configs/T1042RDB_PI_SDCARD_defconfig
index 8272cff..cf093fd 100644
--- a/configs/T1042RDB_PI_SDCARD_defconfig
+++ b/configs/T1042RDB_PI_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig
index 8c2e6fa..aba0d18 100644
--- a/configs/T1042RDB_PI_SPIFLASH_defconfig
+++ b/configs/T1042RDB_PI_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1042RDB_PI_defconfig b/configs/T1042RDB_PI_defconfig
index 626d0fa..7ad65ba 100644
--- a/configs/T1042RDB_PI_defconfig
+++ b/configs/T1042RDB_PI_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1042RDB_SECURE_BOOT_defconfig b/configs/T1042RDB_SECURE_BOOT_defconfig
index 36ac136..639fc94 100644
--- a/configs/T1042RDB_SECURE_BOOT_defconfig
+++ b/configs/T1042RDB_SECURE_BOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,SECURE_BOOT,T1042RDB"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1042RDB_defconfig b/configs/T1042RDB_defconfig
index 6451b31..670c87a 100644
--- a/configs/T1042RDB_defconfig
+++ b/configs/T1042RDB_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig
index 21c6eae..e6b1f46 100644
--- a/configs/T2080QDS_NAND_defconfig
+++ b/configs/T2080QDS_NAND_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2080QDS_SDCARD_defconfig b/configs/T2080QDS_SDCARD_defconfig
index c3a5416..d48eb87 100644
--- a/configs/T2080QDS_SDCARD_defconfig
+++ b/configs/T2080QDS_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2080QDS_SECURE_BOOT_defconfig b/configs/T2080QDS_SECURE_BOOT_defconfig
index 1607864..5f9a72b 100644
--- a/configs/T2080QDS_SECURE_BOOT_defconfig
+++ b/configs/T2080QDS_SECURE_BOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig
index 9b29955..c0251af 100644
--- a/configs/T2080QDS_SPIFLASH_defconfig
+++ b/configs/T2080QDS_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
index e208015..018ee6f 100644
--- a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2080QDS_defconfig b/configs/T2080QDS_defconfig
index d85957a..eaa0792 100644
--- a/configs/T2080QDS_defconfig
+++ b/configs/T2080QDS_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig
index 292ca5e..512d60f 100644
--- a/configs/T2080RDB_NAND_defconfig
+++ b/configs/T2080RDB_NAND_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2080RDB_SDCARD_defconfig b/configs/T2080RDB_SDCARD_defconfig
index 8cbc37b..d6fc340 100644
--- a/configs/T2080RDB_SDCARD_defconfig
+++ b/configs/T2080RDB_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2080RDB_SECURE_BOOT_defconfig b/configs/T2080RDB_SECURE_BOOT_defconfig
index 373d57a..28183f6 100644
--- a/configs/T2080RDB_SECURE_BOOT_defconfig
+++ b/configs/T2080RDB_SECURE_BOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig
index 7d423d4..9733b36 100644
--- a/configs/T2080RDB_SPIFLASH_defconfig
+++ b/configs/T2080RDB_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig b/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
index df747c4..56e5ce1 100644
--- a/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2080RDB_defconfig b/configs/T2080RDB_defconfig
index 598d08a..2475ce3 100644
--- a/configs/T2080RDB_defconfig
+++ b/configs/T2080RDB_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2081QDS_NAND_defconfig b/configs/T2081QDS_NAND_defconfig
index c4cc522..591b700 100644
--- a/configs/T2081QDS_NAND_defconfig
+++ b/configs/T2081QDS_NAND_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2081QDS_SDCARD_defconfig b/configs/T2081QDS_SDCARD_defconfig
index b1848d5..45c7bca 100644
--- a/configs/T2081QDS_SDCARD_defconfig
+++ b/configs/T2081QDS_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2081QDS_SPIFLASH_defconfig b/configs/T2081QDS_SPIFLASH_defconfig
index 82cc518..2784df6 100644
--- a/configs/T2081QDS_SPIFLASH_defconfig
+++ b/configs/T2081QDS_SPIFLASH_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
index 33f9989..55fd6cc 100644
--- a/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2081QDS_defconfig b/configs/T2081QDS_defconfig
index 54f397c..5942524 100644
--- a/configs/T2081QDS_defconfig
+++ b/configs/T2081QDS_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T4160QDS_NAND_defconfig b/configs/T4160QDS_NAND_defconfig
index f06b2d9..16cda07 100644
--- a/configs/T4160QDS_NAND_defconfig
+++ b/configs/T4160QDS_NAND_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T4160QDS_SDCARD_defconfig b/configs/T4160QDS_SDCARD_defconfig
index 3bca2a3..d23c887 100644
--- a/configs/T4160QDS_SDCARD_defconfig
+++ b/configs/T4160QDS_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T4160QDS_SECURE_BOOT_defconfig b/configs/T4160QDS_SECURE_BOOT_defconfig
index 88af280..0fe99d2 100644
--- a/configs/T4160QDS_SECURE_BOOT_defconfig
+++ b/configs/T4160QDS_SECURE_BOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T4160QDS_defconfig b/configs/T4160QDS_defconfig
index a0bfef3..bab1712 100644
--- a/configs/T4160QDS_defconfig
+++ b/configs/T4160QDS_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T4160RDB_defconfig b/configs/T4160RDB_defconfig
index 26707f4..9ca984c 100644
--- a/configs/T4160RDB_defconfig
+++ b/configs/T4160RDB_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T4240QDS_NAND_defconfig b/configs/T4240QDS_NAND_defconfig
index aa3d1c8..130a614 100644
--- a/configs/T4240QDS_NAND_defconfig
+++ b/configs/T4240QDS_NAND_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T4240QDS_SDCARD_defconfig b/configs/T4240QDS_SDCARD_defconfig
index 6e2c7cd..8eb5577 100644
--- a/configs/T4240QDS_SDCARD_defconfig
+++ b/configs/T4240QDS_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T4240QDS_SECURE_BOOT_defconfig b/configs/T4240QDS_SECURE_BOOT_defconfig
index d49b3ca..d983e9a 100644
--- a/configs/T4240QDS_SECURE_BOOT_defconfig
+++ b/configs/T4240QDS_SECURE_BOOT_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,SECURE_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig b/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
index 10a8261..edd083a 100644
--- a/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/T4240QDS_defconfig b/configs/T4240QDS_defconfig
index bd204db..cd9df0f 100644
--- a/configs/T4240QDS_defconfig
+++ b/configs/T4240QDS_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T4240RDB_SDCARD_defconfig b/configs/T4240RDB_SDCARD_defconfig
index 1bbe564..09f8f65 100644
--- a/configs/T4240RDB_SDCARD_defconfig
+++ b/configs/T4240RDB_SDCARD_defconfig
@@ -3,6 +3,4 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/T4240RDB_defconfig b/configs/T4240RDB_defconfig
index 932e970..e1abd8a 100644
--- a/configs/T4240RDB_defconfig
+++ b/configs/T4240RDB_defconfig
@@ -2,6 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/TQM5200S_HIGHBOOT_defconfig b/configs/TQM5200S_HIGHBOOT_defconfig
index e81759a..4c38482 100644
--- a/configs/TQM5200S_HIGHBOOT_defconfig
+++ b/configs/TQM5200S_HIGHBOOT_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="TQM5200_B,TQM5200S,SYS_TEXT_BASE=0xFFF00000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM5200S_defconfig b/configs/TQM5200S_defconfig
index 4bae198..a01bd39 100644
--- a/configs/TQM5200S_defconfig
+++ b/configs/TQM5200S_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="TQM5200_B,TQM5200S"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM5200_B_HIGHBOOT_defconfig b/configs/TQM5200_B_HIGHBOOT_defconfig
index 5c64746..dac1eef 100644
--- a/configs/TQM5200_B_HIGHBOOT_defconfig
+++ b/configs/TQM5200_B_HIGHBOOT_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="TQM5200_B,SYS_TEXT_BASE=0xFFF00000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM5200_B_defconfig b/configs/TQM5200_B_defconfig
index 331dcab..8417ce2 100644
--- a/configs/TQM5200_B_defconfig
+++ b/configs/TQM5200_B_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="TQM5200_B"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM5200_STK100_defconfig b/configs/TQM5200_STK100_defconfig
index e384834..9e381f4 100644
--- a/configs/TQM5200_STK100_defconfig
+++ b/configs/TQM5200_STK100_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="STK52XX_REV100"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM5200_defconfig b/configs/TQM5200_defconfig
index 6a4d25e..d82a5be 100644
--- a/configs/TQM5200_defconfig
+++ b/configs/TQM5200_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM823L_LCD_defconfig b/configs/TQM823L_LCD_defconfig
index 94bda12..ebe9bdf 100644
--- a/configs/TQM823L_LCD_defconfig
+++ b/configs/TQM823L_LCD_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM823L=y
 CONFIG_SYS_EXTRA_OPTIONS="LCD,NEC_NL6448BC20"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM823L_defconfig b/configs/TQM823L_defconfig
index 96e16c6..05e69c3 100644
--- a/configs/TQM823L_defconfig
+++ b/configs/TQM823L_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM823L=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM823M_defconfig b/configs/TQM823M_defconfig
index b4bd8e9..4c9ead8 100644
--- a/configs/TQM823M_defconfig
+++ b/configs/TQM823M_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM823M=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig
index d2c4bd5..c980d95 100644
--- a/configs/TQM834x_defconfig
+++ b/configs/TQM834x_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_TQM834X=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM850L_defconfig b/configs/TQM850L_defconfig
index 06cc72c..47c4070 100644
--- a/configs/TQM850L_defconfig
+++ b/configs/TQM850L_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM850L=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM850M_defconfig b/configs/TQM850M_defconfig
index 5f8d89d..e4784b5 100644
--- a/configs/TQM850M_defconfig
+++ b/configs/TQM850M_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM850M=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM855L_defconfig b/configs/TQM855L_defconfig
index 6858682..e0b03af 100644
--- a/configs/TQM855L_defconfig
+++ b/configs/TQM855L_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM855L=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM855M_defconfig b/configs/TQM855M_defconfig
index 460f91b..32496bf 100644
--- a/configs/TQM855M_defconfig
+++ b/configs/TQM855M_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM855M=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM860L_defconfig b/configs/TQM860L_defconfig
index 2178a1a..b83a07b 100644
--- a/configs/TQM860L_defconfig
+++ b/configs/TQM860L_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM860L=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM860M_defconfig b/configs/TQM860M_defconfig
index d262d6f..d95ad79 100644
--- a/configs/TQM860M_defconfig
+++ b/configs/TQM860M_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM860M=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM862L_defconfig b/configs/TQM862L_defconfig
index b85f6be..75c8801 100644
--- a/configs/TQM862L_defconfig
+++ b/configs/TQM862L_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM862L=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM862M_defconfig b/configs/TQM862M_defconfig
index 81fba41..d5f8222 100644
--- a/configs/TQM862M_defconfig
+++ b/configs/TQM862M_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM862M=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM866M_defconfig b/configs/TQM866M_defconfig
index c644f87..74f12e2 100644
--- a/configs/TQM866M_defconfig
+++ b/configs/TQM866M_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM866M=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM885D_defconfig b/configs/TQM885D_defconfig
index a1a2fbb..bcad969 100644
--- a/configs/TQM885D_defconfig
+++ b/configs/TQM885D_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM885D=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TTTech_defconfig b/configs/TTTech_defconfig
index cec9f2d..d239a73 100644
--- a/configs/TTTech_defconfig
+++ b/configs/TTTech_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM823L=y
 CONFIG_SYS_EXTRA_OPTIONS="LCD,SHARP_LQ104V7DS01"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TWR-P1025_defconfig b/configs/TWR-P1025_defconfig
index 1456929..c86900a 100644
--- a/configs/TWR-P1025_defconfig
+++ b/configs/TWR-P1025_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="TWR_P1025"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/TZX-Q8-713B7_defconfig b/configs/TZX-Q8-713B7_defconfig
index 08f9153..68961fc 100644
--- a/configs/TZX-Q8-713B7_defconfig
+++ b/configs/TZX-Q8-713B7_defconfig
@@ -15,8 +15,8 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-tzx-q8-713b7"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
diff --git a/configs/UCP1020_SPIFLASH_defconfig b/configs/UCP1020_SPIFLASH_defconfig
index 779c7a3..9e41048 100644
--- a/configs/UCP1020_SPIFLASH_defconfig
+++ b/configs/UCP1020_SPIFLASH_defconfig
@@ -5,6 +5,4 @@ CONFIG_TARGET_UCP1020_SPIFLASH=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/UCP1020_defconfig b/configs/UCP1020_defconfig
index 60f7aa3..010b15f 100644
--- a/configs/UCP1020_defconfig
+++ b/configs/UCP1020_defconfig
@@ -4,6 +4,4 @@ CONFIG_TARGET_UCP1020=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/UTOO_P66_defconfig b/configs/UTOO_P66_defconfig
index a124df7..c3b13b7 100644
--- a/configs/UTOO_P66_defconfig
+++ b/configs/UTOO_P66_defconfig
@@ -20,7 +20,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-utoo-p66"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
diff --git a/configs/VCMA9_defconfig b/configs/VCMA9_defconfig
index 3cc4185..8885f1a 100644
--- a/configs/VCMA9_defconfig
+++ b/configs/VCMA9_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VCMA9=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/VOM405_defconfig b/configs/VOM405_defconfig
index e439997..ba3ade0 100644
--- a/configs/VOM405_defconfig
+++ b/configs/VOM405_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_VOM405=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/Wexler_TAB7200_defconfig b/configs/Wexler_TAB7200_defconfig
index 2df27dd..d9180c7 100644
--- a/configs/Wexler_TAB7200_defconfig
+++ b/configs/Wexler_TAB7200_defconfig
@@ -10,10 +10,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wexler-tab7200"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig
index b443938..bb8dd29 100644
--- a/configs/Wits_Pro_A20_DKT_defconfig
+++ b/configs/Wits_Pro_A20_DKT_defconfig
@@ -12,10 +12,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wits-pro-a20-dkt"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
diff --git a/configs/Yones_Toptech_BD1078_defconfig b/configs/Yones_Toptech_BD1078_defconfig
index 341748a..aab580e 100644
--- a/configs/Yones_Toptech_BD1078_defconfig
+++ b/configs/Yones_Toptech_BD1078_defconfig
@@ -21,8 +21,8 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-yones-toptech-bd1078"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
diff --git a/configs/a3m071_defconfig b/configs/a3m071_defconfig
index c5df596..3a6188e 100644
--- a/configs/a3m071_defconfig
+++ b/configs/a3m071_defconfig
@@ -1,6 +1,6 @@
 CONFIG_PPC=y
-CONFIG_CMD_NET=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_A3M071=y
 CONFIG_SPL=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_LIB_RAND=y
diff --git a/configs/a4m072_defconfig b/configs/a4m072_defconfig
index 3744669..4a02293 100644
--- a/configs/a4m072_defconfig
+++ b/configs/a4m072_defconfig
@@ -4,4 +4,4 @@ CONFIG_TARGET_A4M072=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="asdfg"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/a4m2k_defconfig b/configs/a4m2k_defconfig
index de47756..22db933 100644
--- a/configs/a4m2k_defconfig
+++ b/configs/a4m2k_defconfig
@@ -1,7 +1,7 @@
 CONFIG_PPC=y
-CONFIG_CMD_NET=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_A3M071=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="A4M2K"
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_LIB_RAND=y
diff --git a/configs/ac14xx_defconfig b/configs/ac14xx_defconfig
index 121883f..37fb0e0 100644
--- a/configs/ac14xx_defconfig
+++ b/configs/ac14xx_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC512X=y
 CONFIG_TARGET_AC14XX=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/acadia_defconfig b/configs/acadia_defconfig
index e869b26..26221ce 100644
--- a/configs/acadia_defconfig
+++ b/configs/acadia_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_ACADIA=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/adp-ag101_defconfig b/configs/adp-ag101_defconfig
index 39a0510..e550f71 100644
--- a/configs/adp-ag101_defconfig
+++ b/configs/adp-ag101_defconfig
@@ -1,3 +1,3 @@
 CONFIG_NDS32=y
 CONFIG_TARGET_ADP_AG101=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig
index 7ef93b3..740cb57 100644
--- a/configs/adp-ag101p_defconfig
+++ b/configs/adp-ag101p_defconfig
@@ -1,3 +1,3 @@
 CONFIG_NDS32=y
 CONFIG_TARGET_ADP_AG101P=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/adp-ag102_defconfig b/configs/adp-ag102_defconfig
index 217016b..721f61d 100644
--- a/configs/adp-ag102_defconfig
+++ b/configs/adp-ag102_defconfig
@@ -1,3 +1,5 @@
 CONFIG_NDS32=y
 CONFIG_TARGET_ADP_AG102=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/alpr_defconfig b/configs/alpr_defconfig
index 6865410..b7cd74d 100644
--- a/configs/alpr_defconfig
+++ b/configs/alpr_defconfig
@@ -1,4 +1,7 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_ALPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index 66ba1d6..f4fea7f 100644
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@@ -1,6 +1,20 @@
 CONFIG_ARM=y
 CONFIG_RMOBILE=y
 CONFIG_TARGET_ALT=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SH_SDHI=y
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
index 033f07a..d3767b0 100644
--- a/configs/am335x_baltos_defconfig
+++ b/configs/am335x_baltos_defconfig
@@ -4,3 +4,7 @@ CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,NAND"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
index b9a0a59..60339c8 100644
--- a/configs/am335x_boneblack_defconfig
+++ b/configs/am335x_boneblack_defconfig
@@ -4,5 +4,7 @@ CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index bcdeb44..b141255 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -8,7 +8,9 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT,ENABLE_VBOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index 23fed39..96599c6 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -4,5 +4,7 @@ CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="NAND"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
index 3500f90..6a39041 100644
--- a/configs/am335x_evm_nor_defconfig
+++ b/configs/am335x_evm_nor_defconfig
@@ -5,5 +5,6 @@ CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="NAND"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
index 6a2ad82..9fdffca 100644
--- a/configs/am335x_evm_norboot_defconfig
+++ b/configs/am335x_evm_norboot_defconfig
@@ -2,5 +2,6 @@ CONFIG_ARM=y
 CONFIG_TARGET_AM335X_EVM=y
 CONFIG_NOR=y
 CONFIG_NOR_BOOT=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
index d53c878..bbeb3c9 100644
--- a/configs/am335x_evm_spiboot_defconfig
+++ b/configs/am335x_evm_spiboot_defconfig
@@ -4,5 +4,7 @@ CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="SPI_BOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
index 50da93c..c6109f1 100644
--- a/configs/am335x_evm_usbspl_defconfig
+++ b/configs/am335x_evm_usbspl_defconfig
@@ -4,5 +4,7 @@ CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="NAND,SPL_USBETH_SUPPORT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig
index 3d8d285..a31982a 100644
--- a/configs/am335x_igep0033_defconfig
+++ b/configs/am335x_igep0033_defconfig
@@ -3,4 +3,6 @@ CONFIG_TARGET_AM335X_IGEP0033=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig
index abdd345..a44ffe7 100644
--- a/configs/am3517_crane_defconfig
+++ b/configs/am3517_crane_defconfig
@@ -2,3 +2,10 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_AM3517_CRANE=y
 CONFIG_SPL=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
index 3b71cc6..4589b30 100644
--- a/configs/am3517_evm_defconfig
+++ b/configs/am3517_evm_defconfig
@@ -2,4 +2,8 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_AM3517_EVM=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index 6acbe88..407d67c 100644
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -2,5 +2,7 @@ CONFIG_ARM=y
 CONFIG_TARGET_AM43XX_EVM=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig
index 7ee15c0..ff0109f 100644
--- a/configs/am43xx_evm_qspiboot_defconfig
+++ b/configs/am43xx_evm_qspiboot_defconfig
@@ -1,5 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_AM43XX_EVM=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,QSPI,QSPI_BOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig
index 705c400..47c4f3d 100644
--- a/configs/amcore_defconfig
+++ b/configs/amcore_defconfig
@@ -1,2 +1,8 @@
 CONFIG_M68K=y
 CONFIG_TARGET_AMCORE=y
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/ap325rxa_defconfig b/configs/ap325rxa_defconfig
index ef5964a..8c22020 100644
--- a/configs/ap325rxa_defconfig
+++ b/configs/ap325rxa_defconfig
@@ -1,4 +1,18 @@
 CONFIG_SH=y
 CONFIG_TARGET_AP325RXA=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/ap_sh4a_4a_defconfig b/configs/ap_sh4a_4a_defconfig
index 1c6a0cc..51d5f9e 100644
--- a/configs/ap_sh4a_4a_defconfig
+++ b/configs/ap_sh4a_4a_defconfig
@@ -1,4 +1,20 @@
 CONFIG_SH=y
 CONFIG_TARGET_AP_SH4A_4A=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index 04b03c4..fa9f365 100644
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -3,8 +3,11 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA30=y
 CONFIG_TARGET_APALIS_T30=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
index 231ef6d..854a2b7 100644
--- a/configs/apf27_defconfig
+++ b/configs/apf27_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TARGET_APF27=y
 CONFIG_SPL=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
diff --git a/configs/apx4devkit_defconfig b/configs/apx4devkit_defconfig
index e88794a..5727929 100644
--- a/configs/apx4devkit_defconfig
+++ b/configs/apx4devkit_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_APX4DEVKIT=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/arcangel4-be_defconfig b/configs/arcangel4-be_defconfig
index 7f0402c..7335aac 100644
--- a/configs/arcangel4-be_defconfig
+++ b/configs/arcangel4-be_defconfig
@@ -4,7 +4,9 @@ CONFIG_TARGET_ARCANGEL4=y
 CONFIG_SYS_CLK_FREQ=70000000
 CONFIG_SYS_TEXT_BASE=0x81000000
 CONFIG_DEFAULT_DEVICE_TREE="arcangel4"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DM=y
diff --git a/configs/arcangel4_defconfig b/configs/arcangel4_defconfig
index b3df518..5683b81 100644
--- a/configs/arcangel4_defconfig
+++ b/configs/arcangel4_defconfig
@@ -3,7 +3,9 @@ CONFIG_TARGET_ARCANGEL4=y
 CONFIG_SYS_CLK_FREQ=70000000
 CONFIG_SYS_TEXT_BASE=0x81000000
 CONFIG_DEFAULT_DEVICE_TREE="arcangel4"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DM=y
diff --git a/configs/arches_defconfig b/configs/arches_defconfig
index c55357b..f979a64 100644
--- a/configs/arches_defconfig
+++ b/configs/arches_defconfig
@@ -3,7 +3,5 @@ CONFIG_4xx=y
 CONFIG_TARGET_CANYONLANDS=y
 CONFIG_ARCHES=y
 CONFIG_DEFAULT_DEVICE_TREE="arches"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
diff --git a/configs/aria_defconfig b/configs/aria_defconfig
index 85d673d..1c073bf 100644
--- a/configs/aria_defconfig
+++ b/configs/aria_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC512X=y
 CONFIG_TARGET_ARIA=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
index c3f60a1..e676f0e 100644
--- a/configs/aristainetos2_defconfig
+++ b/configs/aristainetos2_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_ARISTAINETOS2=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
index 12e09ce..f5b0b6b 100644
--- a/configs/aristainetos_defconfig
+++ b/configs/aristainetos_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_ARISTAINETOS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig
index e859281..240d72d 100644
--- a/configs/armadillo-800eva_defconfig
+++ b/configs/armadillo-800eva_defconfig
@@ -1,4 +1,20 @@
 CONFIG_ARM=y
 CONFIG_RMOBILE=y
 CONFIG_TARGET_ARMADILLO_800EVA=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index 21a2100..aa489cf 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -3,7 +3,8 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_ARNDALE=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_SOUND=y
 CONFIG_SOUND=y
 CONFIG_I2S=y
diff --git a/configs/aspenite_defconfig b/configs/aspenite_defconfig
index 0b341d6..c606244 100644
--- a/configs/aspenite_defconfig
+++ b/configs/aspenite_defconfig
@@ -1,2 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_ASPENITE=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig
index 6807aee..f394f4d 100644
--- a/configs/astro_mcf5373l_defconfig
+++ b/configs/astro_mcf5373l_defconfig
@@ -1,2 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_ASTRO_MCF5373L=y
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/at91rm9200ek_defconfig b/configs/at91rm9200ek_defconfig
index 932a48f..74d4f3a 100644
--- a/configs/at91rm9200ek_defconfig
+++ b/configs/at91rm9200ek_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91RM9200EK=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91rm9200ek_ram_defconfig b/configs/at91rm9200ek_ram_defconfig
index 44b6fb9..f499453 100644
--- a/configs/at91rm9200ek_ram_defconfig
+++ b/configs/at91rm9200ek_ram_defconfig
@@ -2,4 +2,5 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91RM9200EK=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig
index 5f629b6..96c5eee 100644
--- a/configs/at91sam9260ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs0_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS0"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig
index 05a4d2d..6330c3e 100644
--- a/configs/at91sam9260ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs1_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS1"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig
index 883d363..ae2defd 100644
--- a/configs/at91sam9260ek_nandflash_defconfig
+++ b/configs/at91sam9260ek_nandflash_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_NANDFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
index e465319..838b235 100644
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS0"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig
index 883fe86..6104479 100644
--- a/configs/at91sam9261ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS3"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig
index 9c0dc1a..4015c9f 100644
--- a/configs/at91sam9261ek_nandflash_defconfig
+++ b/configs/at91sam9261ek_nandflash_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_NANDFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig
index fac7637..d9003ff 100644
--- a/configs/at91sam9263ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig
index fac7637..d9003ff 100644
--- a/configs/at91sam9263ek_dataflash_defconfig
+++ b/configs/at91sam9263ek_dataflash_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig
index 4486957..600c5dd 100644
--- a/configs/at91sam9263ek_nandflash_defconfig
+++ b/configs/at91sam9263ek_nandflash_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig
index 6bc4f40..2e34b79 100644
--- a/configs/at91sam9263ek_norflash_boot_defconfig
+++ b/configs/at91sam9263ek_norflash_boot_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_BOOT_NORFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig
index 1b37f4e..f72ed85 100644
--- a/configs/at91sam9263ek_norflash_defconfig
+++ b/configs/at91sam9263ek_norflash_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NORFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig
index 3cb93e9..5f8d803 100644
--- a/configs/at91sam9g10ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS0"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig
index 2c1d9f6..3ed763e 100644
--- a/configs/at91sam9g10ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS3"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig
index 06fb78f..c27e39a 100644
--- a/configs/at91sam9g10ek_nandflash_defconfig
+++ b/configs/at91sam9g10ek_nandflash_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_NANDFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig
index d3197b4..d58de8e 100644
--- a/configs/at91sam9g20ek_2mmc_defconfig
+++ b/configs/at91sam9g20ek_2mmc_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_MMC"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
index 8d08dc1..4b28839 100644
--- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig
+++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig
index 62b8ed3..ee86dad 100644
--- a/configs/at91sam9g20ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS0"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig
index dba8f77..39d4b09 100644
--- a/configs/at91sam9g20ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS1"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig
index e1b99d3..d636485 100644
--- a/configs/at91sam9g20ek_nandflash_defconfig
+++ b/configs/at91sam9g20ek_nandflash_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig
index a9ab01a..1472d20 100644
--- a/configs/at91sam9m10g45ek_mmc_defconfig
+++ b/configs/at91sam9m10g45ek_mmc_defconfig
@@ -3,4 +3,10 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9M10G45EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig
index b57f2ca..526419c 100644
--- a/configs/at91sam9m10g45ek_nandflash_defconfig
+++ b/configs/at91sam9m10g45ek_nandflash_defconfig
@@ -3,4 +3,10 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9M10G45EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig
index d35eec5..c549baf 100644
--- a/configs/at91sam9n12ek_mmc_defconfig
+++ b/configs/at91sam9n12ek_mmc_defconfig
@@ -2,5 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9N12EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_MMC"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig
index b030f91..756db2a 100644
--- a/configs/at91sam9n12ek_nandflash_defconfig
+++ b/configs/at91sam9n12ek_nandflash_defconfig
@@ -3,5 +3,8 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9N12EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_NANDFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig
index b523e8b..0430de9 100644
--- a/configs/at91sam9n12ek_spiflash_defconfig
+++ b/configs/at91sam9n12ek_spiflash_defconfig
@@ -3,5 +3,8 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9N12EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_SPIFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig
index 967d28a..c555caa 100644
--- a/configs/at91sam9rlek_dataflash_defconfig
+++ b/configs/at91sam9rlek_dataflash_defconfig
@@ -3,3 +3,12 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9RLEK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_DATAFLASH"
 CONFIG_HUSH_PARSER=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig
index 95a71df..5cb5655 100644
--- a/configs/at91sam9rlek_mmc_defconfig
+++ b/configs/at91sam9rlek_mmc_defconfig
@@ -3,3 +3,12 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9RLEK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_MMC"
 CONFIG_HUSH_PARSER=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig
index 885214d..3e3528e 100644
--- a/configs/at91sam9rlek_nandflash_defconfig
+++ b/configs/at91sam9rlek_nandflash_defconfig
@@ -3,3 +3,12 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9RLEK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_NANDFLASH"
 CONFIG_HUSH_PARSER=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig
index b3dff9c..c757fc4 100644
--- a/configs/at91sam9x5ek_dataflash_defconfig
+++ b/configs/at91sam9x5ek_dataflash_defconfig
@@ -2,5 +2,9 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_DATAFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig
index 8a27e0c..82e67f3 100644
--- a/configs/at91sam9x5ek_mmc_defconfig
+++ b/configs/at91sam9x5ek_mmc_defconfig
@@ -2,5 +2,9 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_MMC"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig
index d0bdb27..b45d8d0 100644
--- a/configs/at91sam9x5ek_nandflash_defconfig
+++ b/configs/at91sam9x5ek_nandflash_defconfig
@@ -3,5 +3,9 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig
index 33778a5..f33a2fd 100644
--- a/configs/at91sam9x5ek_spiflash_defconfig
+++ b/configs/at91sam9x5ek_spiflash_defconfig
@@ -3,5 +3,9 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_SPIFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig
index 9577c0f..585d564 100644
--- a/configs/at91sam9xeek_dataflash_cs0_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs0_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS0"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig
index d72737b..1c38777 100644
--- a/configs/at91sam9xeek_dataflash_cs1_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs1_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS1"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig
index ac88c96..5e9a080 100644
--- a/configs/at91sam9xeek_nandflash_defconfig
+++ b/configs/at91sam9xeek_nandflash_defconfig
@@ -2,4 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_NANDFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index b1bf01f..0f5be56 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -4,5 +4,8 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/atngw100mkii_defconfig b/configs/atngw100mkii_defconfig
index b4014df..b4d8d1c 100644
--- a/configs/atngw100mkii_defconfig
+++ b/configs/atngw100mkii_defconfig
@@ -4,5 +4,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/atstk1002_defconfig b/configs/atstk1002_defconfig
index 6f25f3b..bb0406e 100644
--- a/configs/atstk1002_defconfig
+++ b/configs/atstk1002_defconfig
@@ -4,4 +4,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/axm_defconfig b/configs/axm_defconfig
index fdd26df..78fcb76 100644
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -3,5 +3,11 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_TAURUS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2068,BOARD_AXM"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig
index 008df4b..04aec0b 100644
--- a/configs/axs101_defconfig
+++ b/configs/axs101_defconfig
@@ -4,7 +4,9 @@ CONFIG_ARC_CACHE_LINE_SHIFT=5
 CONFIG_TARGET_AXS101=y
 CONFIG_SYS_CLK_FREQ=750000000
 CONFIG_SYS_TEXT_BASE=0x81000000
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig
index 3b424e2..8315b61 100644
--- a/configs/axs103_defconfig
+++ b/configs/axs103_defconfig
@@ -3,7 +3,9 @@ CONFIG_ISA_ARCV2=y
 CONFIG_TARGET_AXS101=y
 CONFIG_SYS_CLK_FREQ=50000000
 CONFIG_SYS_TEXT_BASE=0x81000000
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig
index 198c6f8..c84e82e 100644
--- a/configs/ba10_tv_box_defconfig
+++ b/configs/ba10_tv_box_defconfig
@@ -8,10 +8,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-ba10-tvbox"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/balloon3_defconfig b/configs/balloon3_defconfig
index a1f4adb..bf524ce 100644
--- a/configs/balloon3_defconfig
+++ b/configs/balloon3_defconfig
@@ -1,2 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_BALLOON3=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/bamboo_defconfig b/configs/bamboo_defconfig
index 420803c..1d66807 100644
--- a/configs/bamboo_defconfig
+++ b/configs/bamboo_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_BAMBOO=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig
index ff2144f..e7a9aa6 100644
--- a/configs/bcm11130_defconfig
+++ b/configs/bcm11130_defconfig
@@ -1,3 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_BCM28155_AP=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_MMC_ENV_DEV=0"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig
index a21e623..f50ffea 100644
--- a/configs/bcm11130_nand_defconfig
+++ b/configs/bcm11130_nand_defconfig
@@ -1,3 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_BCM28155_AP=y
 CONFIG_SYS_EXTRA_OPTIONS="NAND"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig
index 0a1c592..c82383e 100644
--- a/configs/bcm28155_ap_defconfig
+++ b/configs/bcm28155_ap_defconfig
@@ -1,2 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_BCM28155_AP=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig
index 3ab05f6..bc0d8d2 100644
--- a/configs/bcm28155_w1d_defconfig
+++ b/configs/bcm28155_w1d_defconfig
@@ -1,3 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_BCM28155_AP=y
 CONFIG_SYS_EXTRA_OPTIONS="BCM_SF2_ETH,BCM_SF2_ETH_GMAC"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/bcm911360_entphn-ns_defconfig b/configs/bcm911360_entphn-ns_defconfig
index 1e23da3..4a7e1bc 100644
--- a/configs/bcm911360_entphn-ns_defconfig
+++ b/configs/bcm911360_entphn-ns_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_BCMCYGNUS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x20000000,ARMV7_NONSEC"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/bcm911360_entphn_defconfig b/configs/bcm911360_entphn_defconfig
index 86d233f..a0d291c 100644
--- a/configs/bcm911360_entphn_defconfig
+++ b/configs/bcm911360_entphn_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_BCMCYGNUS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x20000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/bcm911360k_defconfig b/configs/bcm911360k_defconfig
index a7feb86..df88a57 100644
--- a/configs/bcm911360k_defconfig
+++ b/configs/bcm911360k_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_BCMCYGNUS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/bcm958300k-ns_defconfig b/configs/bcm958300k-ns_defconfig
index 52551ad..d9105a6 100644
--- a/configs/bcm958300k-ns_defconfig
+++ b/configs/bcm958300k-ns_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_BCMCYGNUS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000,ARMV7_NONSEC"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/bcm958300k_defconfig b/configs/bcm958300k_defconfig
index a7feb86..df88a57 100644
--- a/configs/bcm958300k_defconfig
+++ b/configs/bcm958300k_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_BCMCYGNUS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/bcm958305k_defconfig b/configs/bcm958305k_defconfig
index a7feb86..df88a57 100644
--- a/configs/bcm958305k_defconfig
+++ b/configs/bcm958305k_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_BCMCYGNUS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/bcm958622hr_defconfig b/configs/bcm958622hr_defconfig
index 844a151..2272462 100644
--- a/configs/bcm958622hr_defconfig
+++ b/configs/bcm958622hr_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_BCMNSP=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x01000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/bct-brettl2_defconfig b/configs/bct-brettl2_defconfig
index b585aa7..9e6f1ee 100644
--- a/configs/bct-brettl2_defconfig
+++ b/configs/bct-brettl2_defconfig
@@ -1,5 +1,5 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BCT_BRETTL2=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/beagle_x15_defconfig b/configs/beagle_x15_defconfig
index bf224fc..3b3c027 100644
--- a/configs/beagle_x15_defconfig
+++ b/configs/beagle_x15_defconfig
@@ -3,4 +3,6 @@ CONFIG_OMAP54XX=y
 CONFIG_TARGET_BEAGLE_X15=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 6b01fe0..ad74b85 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -3,7 +3,12 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA30=y
 CONFIG_TARGET_BEAVER=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
diff --git a/configs/bf506f-ezkit_defconfig b/configs/bf506f-ezkit_defconfig
index f164e06..0decb53 100644
--- a/configs/bf506f-ezkit_defconfig
+++ b/configs/bf506f-ezkit_defconfig
@@ -1,5 +1,26 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF506F_EZKIT=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
 # CONFIG_CMD_BOOTM is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
diff --git a/configs/bf518f-ezbrd_defconfig b/configs/bf518f-ezbrd_defconfig
index dd8a647..c316914 100644
--- a/configs/bf518f-ezbrd_defconfig
+++ b/configs/bf518f-ezbrd_defconfig
@@ -1,6 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF518F_EZBRD=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf525-ucr2_defconfig b/configs/bf525-ucr2_defconfig
index f1352e2..6406f20 100644
--- a/configs/bf525-ucr2_defconfig
+++ b/configs/bf525-ucr2_defconfig
@@ -1,3 +1,8 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF525_UCR2=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/bf526-ezbrd_defconfig b/configs/bf526-ezbrd_defconfig
index e5132d5..c8dab57 100644
--- a/configs/bf526-ezbrd_defconfig
+++ b/configs/bf526-ezbrd_defconfig
@@ -1,6 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF526_EZBRD=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf527-ad7160-eval_defconfig b/configs/bf527-ad7160-eval_defconfig
index 16e6415..b03a2ac 100644
--- a/configs/bf527-ad7160-eval_defconfig
+++ b/configs/bf527-ad7160-eval_defconfig
@@ -1,4 +1,8 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF527_AD7160_EVAL=y
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf527-ezkit-v2_defconfig b/configs/bf527-ezkit-v2_defconfig
index 5da5cd3..74f352e 100644
--- a/configs/bf527-ezkit-v2_defconfig
+++ b/configs/bf527-ezkit-v2_defconfig
@@ -1,7 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF527_EZKIT=y
 CONFIG_SYS_EXTRA_OPTIONS="BF527_EZKIT_REV_2_1"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
diff --git a/configs/bf527-ezkit_defconfig b/configs/bf527-ezkit_defconfig
index 5d3cb55..2e75225 100644
--- a/configs/bf527-ezkit_defconfig
+++ b/configs/bf527-ezkit_defconfig
@@ -1,6 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF527_EZKIT=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf527-sdp_defconfig b/configs/bf527-sdp_defconfig
index 261109e..cb43de1 100644
--- a/configs/bf527-sdp_defconfig
+++ b/configs/bf527-sdp_defconfig
@@ -1,4 +1,8 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF527_SDP=y
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf533-ezkit_defconfig b/configs/bf533-ezkit_defconfig
index 04210d8..54a09aa 100644
--- a/configs/bf533-ezkit_defconfig
+++ b/configs/bf533-ezkit_defconfig
@@ -1,5 +1,5 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF533_EZKIT=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
diff --git a/configs/bf533-stamp_defconfig b/configs/bf533-stamp_defconfig
index 191e2d6..154dc26 100644
--- a/configs/bf533-stamp_defconfig
+++ b/configs/bf533-stamp_defconfig
@@ -1,5 +1,5 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF533_STAMP=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
diff --git a/configs/bf537-minotaur_defconfig b/configs/bf537-minotaur_defconfig
index 83f31d8..57e9a24 100644
--- a/configs/bf537-minotaur_defconfig
+++ b/configs/bf537-minotaur_defconfig
@@ -1,5 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF537_MINOTAUR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/bf537-pnav_defconfig b/configs/bf537-pnav_defconfig
index 7b02a21..3fa1758 100644
--- a/configs/bf537-pnav_defconfig
+++ b/configs/bf537-pnav_defconfig
@@ -1,5 +1,5 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF537_PNAV=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/bf537-srv1_defconfig b/configs/bf537-srv1_defconfig
index cd8cc3e..51022d8 100644
--- a/configs/bf537-srv1_defconfig
+++ b/configs/bf537-srv1_defconfig
@@ -1,5 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF537_SRV1=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/bf537-stamp_defconfig b/configs/bf537-stamp_defconfig
index 9768bd6..294d0d9 100644
--- a/configs/bf537-stamp_defconfig
+++ b/configs/bf537-stamp_defconfig
@@ -1,6 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF537_STAMP=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf538f-ezkit_defconfig b/configs/bf538f-ezkit_defconfig
index f8ae21b..6cb6c6b 100644
--- a/configs/bf538f-ezkit_defconfig
+++ b/configs/bf538f-ezkit_defconfig
@@ -1,5 +1,5 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF538F_EZKIT=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
diff --git a/configs/bf548-ezkit_defconfig b/configs/bf548-ezkit_defconfig
index c09b4a0..1ded34d 100644
--- a/configs/bf548-ezkit_defconfig
+++ b/configs/bf548-ezkit_defconfig
@@ -1,6 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF548_EZKIT=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
diff --git a/configs/bf561-acvilon_defconfig b/configs/bf561-acvilon_defconfig
index ff42a8b..897e44f 100644
--- a/configs/bf561-acvilon_defconfig
+++ b/configs/bf561-acvilon_defconfig
@@ -1,6 +1,8 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF561_ACVILON=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
diff --git a/configs/bf561-ezkit_defconfig b/configs/bf561-ezkit_defconfig
index e8a1ea4..fa4b611 100644
--- a/configs/bf561-ezkit_defconfig
+++ b/configs/bf561-ezkit_defconfig
@@ -1,5 +1,5 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF561_EZKIT=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
diff --git a/configs/bf609-ezkit_defconfig b/configs/bf609-ezkit_defconfig
index c7ceb55..bb5efa9 100644
--- a/configs/bf609-ezkit_defconfig
+++ b/configs/bf609-ezkit_defconfig
@@ -1,6 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF609_EZKIT=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig
index ec4d8c0..8e0fac8 100644
--- a/configs/bg0900_defconfig
+++ b/configs/bg0900_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_BG0900=y
 CONFIG_SPL=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig
index a81f843..244c770 100644
--- a/configs/birdland_bav335a_defconfig
+++ b/configs/birdland_bav335a_defconfig
@@ -3,5 +3,7 @@ CONFIG_TARGET_BAV335X=y
 CONFIG_BAV_VERSION=1
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig
index 9198955..a86b203 100644
--- a/configs/birdland_bav335b_defconfig
+++ b/configs/birdland_bav335b_defconfig
@@ -3,5 +3,7 @@ CONFIG_TARGET_BAV335X=y
 CONFIG_BAV_VERSION=2
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/blackstamp_defconfig b/configs/blackstamp_defconfig
index 30e438f..762eef3 100644
--- a/configs/blackstamp_defconfig
+++ b/configs/blackstamp_defconfig
@@ -1,4 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BLACKSTAMP=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/blackvme_defconfig b/configs/blackvme_defconfig
index 272ecd7..53f4a0d 100644
--- a/configs/blackvme_defconfig
+++ b/configs/blackvme_defconfig
@@ -1,4 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BLACKVME=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/br4_defconfig b/configs/br4_defconfig
index 573a62e..b129899 100644
--- a/configs/br4_defconfig
+++ b/configs/br4_defconfig
@@ -1,6 +1,8 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BR4=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
diff --git a/configs/bubinga_defconfig b/configs/bubinga_defconfig
index 3b15eaa..65ea4d1 100644
--- a/configs/bubinga_defconfig
+++ b/configs/bubinga_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_BUBINGA=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/caddy2_defconfig b/configs/caddy2_defconfig
index ccc27c2..35efa7f 100644
--- a/configs/caddy2_defconfig
+++ b/configs/caddy2_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_VME8349=y
 CONFIG_SYS_EXTRA_OPTIONS="CADDY2"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig
index d2d47ae..b837de3 100644
--- a/configs/cairo_defconfig
+++ b/configs/cairo_defconfig
@@ -2,4 +2,8 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_CAIRO=y
 CONFIG_SPL=y
-CONFIG_CMD_SETEXPR=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_NET is not set
diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
index e1b6490..35f73e3 100644
--- a/configs/calimain_defconfig
+++ b/configs/calimain_defconfig
@@ -3,4 +3,4 @@ CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_CALIMAIN=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR="\x0b"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cam5200_defconfig b/configs/cam5200_defconfig
index e1796e3..eda131a 100644
--- a/configs/cam5200_defconfig
+++ b/configs/cam5200_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="CAM5200,TQM5200S,TQM5200_B"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cam5200_niosflash_defconfig b/configs/cam5200_niosflash_defconfig
index c382486..aa7c70a 100644
--- a/configs/cam5200_niosflash_defconfig
+++ b/configs/cam5200_niosflash_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="CAM5200,TQM5200S,TQM5200_B,CAM5200_NIOSFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cam_enc_4xx_defconfig b/configs/cam_enc_4xx_defconfig
index a7fe71d..f7f6f12 100644
--- a/configs/cam_enc_4xx_defconfig
+++ b/configs/cam_enc_4xx_defconfig
@@ -2,5 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_CAM_ENC_4XX=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/canmb_defconfig b/configs/canmb_defconfig
index c005299..b1ec147 100644
--- a/configs/canmb_defconfig
+++ b/configs/canmb_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_CANMB=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/canyonlands_defconfig b/configs/canyonlands_defconfig
index e838a6c..09172b1 100644
--- a/configs/canyonlands_defconfig
+++ b/configs/canyonlands_defconfig
@@ -3,8 +3,6 @@ CONFIG_4xx=y
 CONFIG_TARGET_CANYONLANDS=y
 CONFIG_CANYONLANDS=y
 CONFIG_DEFAULT_DEVICE_TREE="canyonlands"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_OF_EMBED=y
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 37c0a6a..c0e98a5 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -3,7 +3,12 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA30=y
 CONFIG_TARGET_CARDHU=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
diff --git a/configs/cgtqmx6qeval_defconfig b/configs/cgtqmx6qeval_defconfig
index 58b98b7..e1eb871 100644
--- a/configs/cgtqmx6qeval_defconfig
+++ b/configs/cgtqmx6qeval_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_CGTQMX6EVAL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/congatec/cgtqmx6eval/imximage.cfg,MX6Q"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/charon_defconfig b/configs/charon_defconfig
index 250e949..d67cc55 100644
--- a/configs/charon_defconfig
+++ b/configs/charon_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_CHARON=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index da1d489..018fe91 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -3,7 +3,10 @@ CONFIG_VENDOR_GOOGLE=y
 CONFIG_DEFAULT_DEVICE_TREE="chromebook_link"
 CONFIG_TARGET_CHROMEBOOK_LINK=y
 CONFIG_HAVE_MRC=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CMD_BOOTSTAGE=y
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 876e7d8..2ac23ed 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -3,7 +3,10 @@ CONFIG_VENDOR_GOOGLE=y
 CONFIG_DEFAULT_DEVICE_TREE="chromebox_panther"
 CONFIG_TARGET_CHROMEBOX_PANTHER=y
 CONFIG_HAVE_MRC=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CMD_BOOTSTAGE=y
diff --git a/configs/cm-bf527_defconfig b/configs/cm-bf527_defconfig
index 1394c5a..88d7f08 100644
--- a/configs/cm-bf527_defconfig
+++ b/configs/cm-bf527_defconfig
@@ -1,5 +1,5 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_CM_BF527=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm-bf533_defconfig b/configs/cm-bf533_defconfig
index 89a5c0f..753ffe1 100644
--- a/configs/cm-bf533_defconfig
+++ b/configs/cm-bf533_defconfig
@@ -1,5 +1,5 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_CM_BF533=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
diff --git a/configs/cm-bf537e_defconfig b/configs/cm-bf537e_defconfig
index 0264d2f..137f19a 100644
--- a/configs/cm-bf537e_defconfig
+++ b/configs/cm-bf537e_defconfig
@@ -1,5 +1,5 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_CM_BF537E=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm-bf537u_defconfig b/configs/cm-bf537u_defconfig
index 90f5066..143b583 100644
--- a/configs/cm-bf537u_defconfig
+++ b/configs/cm-bf537u_defconfig
@@ -1,5 +1,5 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_CM_BF537U=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm-bf548_defconfig b/configs/cm-bf548_defconfig
index b9b6044..949612d 100644
--- a/configs/cm-bf548_defconfig
+++ b/configs/cm-bf548_defconfig
@@ -1,5 +1,5 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_CM_BF548=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
diff --git a/configs/cm-bf561_defconfig b/configs/cm-bf561_defconfig
index a304e57..68d4bb9 100644
--- a/configs/cm-bf561_defconfig
+++ b/configs/cm-bf561_defconfig
@@ -1,5 +1,5 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_CM_BF561=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
diff --git a/configs/cm5200_defconfig b/configs/cm5200_defconfig
index 5a44476..76c7b06 100644
--- a/configs/cm5200_defconfig
+++ b/configs/cm5200_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_CM5200=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index d0e8e04..6be5c17 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -2,5 +2,11 @@ CONFIG_ARM=y
 CONFIG_TARGET_CM_FX6=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig
index b390079..9ebd327 100644
--- a/configs/cm_t335_defconfig
+++ b/configs/cm_t335_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_CM_T335=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig
index c3d02e5..57b44ba 100644
--- a/configs/cm_t3517_defconfig
+++ b/configs/cm_t3517_defconfig
@@ -1,4 +1,7 @@
 CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_CM_T3517=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig
index bbc60ff..c8dc124 100644
--- a/configs/cm_t35_defconfig
+++ b/configs/cm_t35_defconfig
@@ -2,4 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_CM_T35=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig
index 762a216..af7c880 100644
--- a/configs/cm_t54_defconfig
+++ b/configs/cm_t54_defconfig
@@ -2,4 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP54XX=y
 CONFIG_TARGET_CM_T54=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/cmi_mpc5xx_defconfig b/configs/cmi_mpc5xx_defconfig
index 5c855b1..abebfab 100644
--- a/configs/cmi_mpc5xx_defconfig
+++ b/configs/cmi_mpc5xx_defconfig
@@ -1,3 +1,6 @@
 CONFIG_PPC=y
 CONFIG_5xx=y
 CONFIG_TARGET_CMI_MPC5XX=y
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/cobra5272_defconfig b/configs/cobra5272_defconfig
index 007e30b..2ccb80c 100644
--- a/configs/cobra5272_defconfig
+++ b/configs/cobra5272_defconfig
@@ -1,3 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_COBRA5272=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig
index de2ad14..3963a50 100644
--- a/configs/colibri_pxa270_defconfig
+++ b/configs/colibri_pxa270_defconfig
@@ -1,3 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_COLIBRI_PXA270=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index e1505c0..4e1369b 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -3,8 +3,11 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA20=y
 CONFIG_TARGET_COLIBRI_T20=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index e2fda6e..45cf20a 100644
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -3,8 +3,11 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA30=y
 CONFIG_TARGET_COLIBRI_T30=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
index e4c2f73..ffb3b4f 100644
--- a/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@ -1,7 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_COLIBRI_VF=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_DM=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
diff --git a/configs/colibri_vf_dtb_defconfig b/configs/colibri_vf_dtb_defconfig
index 5d1ea65..49f2105 100644
--- a/configs/colibri_vf_dtb_defconfig
+++ b/configs/colibri_vf_dtb_defconfig
@@ -2,6 +2,9 @@ CONFIG_ARM=y
 CONFIG_TARGET_COLIBRI_VF=y
 CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_NAND_VF610_NFC=y
diff --git a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
index cc2fd83..37ead03 100644
--- a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
@@ -2,6 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_CONTROLCENTERD=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD,DEVELOP"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/controlcenterd_36BIT_SDCARD_defconfig b/configs/controlcenterd_36BIT_SDCARD_defconfig
index 60d4bf5..7166edb 100644
--- a/configs/controlcenterd_36BIT_SDCARD_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_defconfig
@@ -2,6 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_CONTROLCENTERD=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
index f61fcf8..d99fcd4 100644
--- a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
+++ b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
@@ -3,4 +3,6 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_CONTROLCENTERD=y
 CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH,DEVELOP"
 # CONFIG_CMD_BOOTM is not set
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/controlcenterd_TRAILBLAZER_defconfig b/configs/controlcenterd_TRAILBLAZER_defconfig
index 4fc8b04..3557aea 100644
--- a/configs/controlcenterd_TRAILBLAZER_defconfig
+++ b/configs/controlcenterd_TRAILBLAZER_defconfig
@@ -3,4 +3,6 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_CONTROLCENTERD=y
 CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH"
 # CONFIG_CMD_BOOTM is not set
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index cc397a8..581df0a 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -2,7 +2,10 @@ CONFIG_X86=y
 CONFIG_VENDOR_COREBOOT=y
 CONFIG_TARGET_COREBOOT=y
 CONFIG_TSC_CALIBRATION_BYPASS=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CMD_BOOTSTAGE=y
diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
index eb11174..13afb08 100644
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -3,4 +3,9 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_CORVUS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,MACH_TYPE=2066,SYS_USE_NANDFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cpu9260_128M_defconfig b/configs/cpu9260_128M_defconfig
index 7e93b3e..f423980 100644
--- a/configs/cpu9260_128M_defconfig
+++ b/configs/cpu9260_128M_defconfig
@@ -2,4 +2,9 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_CPU9260=y
 CONFIG_SYS_EXTRA_OPTIONS="CPU9260,CPU9260_128M"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cpu9260_defconfig b/configs/cpu9260_defconfig
index a1f4398..88afe9f 100644
--- a/configs/cpu9260_defconfig
+++ b/configs/cpu9260_defconfig
@@ -2,4 +2,9 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_CPU9260=y
 CONFIG_SYS_EXTRA_OPTIONS="CPU9260"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cpu9260_nand_128M_defconfig b/configs/cpu9260_nand_128M_defconfig
index 135e1fa..f59b000 100644
--- a/configs/cpu9260_nand_128M_defconfig
+++ b/configs/cpu9260_nand_128M_defconfig
@@ -2,4 +2,9 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_CPU9260=y
 CONFIG_SYS_EXTRA_OPTIONS="CPU9260,CPU9260_128M,NANDBOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cpu9260_nand_defconfig b/configs/cpu9260_nand_defconfig
index 4aadb29..e914c2b 100644
--- a/configs/cpu9260_nand_defconfig
+++ b/configs/cpu9260_nand_defconfig
@@ -2,4 +2,9 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_CPU9260=y
 CONFIG_SYS_EXTRA_OPTIONS="CPU9260,NANDBOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cpu9G20_128M_defconfig b/configs/cpu9G20_128M_defconfig
index aa95f79..d215cc0 100644
--- a/configs/cpu9G20_128M_defconfig
+++ b/configs/cpu9G20_128M_defconfig
@@ -2,4 +2,9 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_CPU9260=y
 CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,CPU9G20_128M"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cpu9G20_defconfig b/configs/cpu9G20_defconfig
index a13f6cb..51b19f0 100644
--- a/configs/cpu9G20_defconfig
+++ b/configs/cpu9G20_defconfig
@@ -2,4 +2,9 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_CPU9260=y
 CONFIG_SYS_EXTRA_OPTIONS="CPU9G20"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cpu9G20_nand_128M_defconfig b/configs/cpu9G20_nand_128M_defconfig
index a7d473e..da4cbdd 100644
--- a/configs/cpu9G20_nand_128M_defconfig
+++ b/configs/cpu9G20_nand_128M_defconfig
@@ -2,4 +2,9 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_CPU9260=y
 CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,CPU9G20_128M,NANDBOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cpu9G20_nand_defconfig b/configs/cpu9G20_nand_defconfig
index d021c8d..b9e4b3c 100644
--- a/configs/cpu9G20_nand_defconfig
+++ b/configs/cpu9G20_nand_defconfig
@@ -2,4 +2,9 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_CPU9260=y
 CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,NANDBOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cpuat91_defconfig b/configs/cpuat91_defconfig
index 386912a..cfc62aa 100644
--- a/configs/cpuat91_defconfig
+++ b/configs/cpuat91_defconfig
@@ -5,4 +5,8 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/cpuat91_ram_defconfig b/configs/cpuat91_ram_defconfig
index 8095aee..188c2b9 100644
--- a/configs/cpuat91_ram_defconfig
+++ b/configs/cpuat91_ram_defconfig
@@ -6,4 +6,8 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index c6f9449..f3fb206 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -3,7 +3,10 @@ CONFIG_VENDOR_INTEL=y
 CONFIG_DEFAULT_DEVICE_TREE="crownbay"
 CONFIG_TARGET_CROWNBAY=y
 CONFIG_GENERATE_PIRQ_TABLE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CMD_BOOTSTAGE=y
diff --git a/configs/csb272_defconfig b/configs/csb272_defconfig
index 5ac3c19..c9cc680 100644
--- a/configs/csb272_defconfig
+++ b/configs/csb272_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_CSB272=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/csb472_defconfig b/configs/csb472_defconfig
index 7c43e57..e46b965 100644
--- a/configs/csb472_defconfig
+++ b/configs/csb472_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_CSB472=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index 4a9053e..d5f783f 100644
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -2,5 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NET2BIG_V2=y
 CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/da830evm_defconfig b/configs/da830evm_defconfig
index 0d91d7a..e0c8e25 100644
--- a/configs/da830evm_defconfig
+++ b/configs/da830evm_defconfig
@@ -1,5 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DA830EVM=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig
index 09ccaf2..ffdabab 100644
--- a/configs/da850_am18xxevm_defconfig
+++ b/configs/da850_am18xxevm_defconfig
@@ -3,5 +3,7 @@ CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DA850EVM=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig
index 40a0395..41395e3 100644
--- a/configs/da850evm_defconfig
+++ b/configs/da850evm_defconfig
@@ -3,5 +3,7 @@ CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DA850EVM=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig
index 9a32c20..a1cba1a 100644
--- a/configs/da850evm_direct_nor_defconfig
+++ b/configs/da850evm_direct_nor_defconfig
@@ -2,5 +2,5 @@ CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DA850EVM=y
 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index 532e2b1..e7443f8 100644
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -3,7 +3,12 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA114=y
 CONFIG_TARGET_DALMORE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
diff --git a/configs/davinci_dm355evm_defconfig b/configs/davinci_dm355evm_defconfig
index 874decb..f10b643 100644
--- a/configs/davinci_dm355evm_defconfig
+++ b/configs/davinci_dm355evm_defconfig
@@ -1,4 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM355EVM=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/davinci_dm355leopard_defconfig b/configs/davinci_dm355leopard_defconfig
index 2655001..7b33f6d 100644
--- a/configs/davinci_dm355leopard_defconfig
+++ b/configs/davinci_dm355leopard_defconfig
@@ -1,4 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM355LEOPARD=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/davinci_dm365evm_defconfig b/configs/davinci_dm365evm_defconfig
index b7ccfae..f139b58 100644
--- a/configs/davinci_dm365evm_defconfig
+++ b/configs/davinci_dm365evm_defconfig
@@ -1,4 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM365EVM=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/davinci_dm6467Tevm_defconfig b/configs/davinci_dm6467Tevm_defconfig
index 87bc077..3749b81 100644
--- a/configs/davinci_dm6467Tevm_defconfig
+++ b/configs/davinci_dm6467Tevm_defconfig
@@ -2,4 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM6467EVM=y
 CONFIG_SYS_EXTRA_OPTIONS="DAVINCI_DM6467TEVM,REFCLK_FREQ=33000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/davinci_dm6467evm_defconfig b/configs/davinci_dm6467evm_defconfig
index b7f94b2..2a5262a 100644
--- a/configs/davinci_dm6467evm_defconfig
+++ b/configs/davinci_dm6467evm_defconfig
@@ -2,4 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM6467EVM=y
 CONFIG_SYS_EXTRA_OPTIONS="REFCLK_FREQ=27000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/davinci_dvevm_defconfig b/configs/davinci_dvevm_defconfig
index 0ef6645..aa30d1b 100644
--- a/configs/davinci_dvevm_defconfig
+++ b/configs/davinci_dvevm_defconfig
@@ -1,4 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DVEVM=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/davinci_schmoogie_defconfig b/configs/davinci_schmoogie_defconfig
index ef7f8bb..7c11c8c 100644
--- a/configs/davinci_schmoogie_defconfig
+++ b/configs/davinci_schmoogie_defconfig
@@ -1,4 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_SCHMOOGIE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/davinci_sffsdr_defconfig b/configs/davinci_sffsdr_defconfig
index 4c1e411..7aca606 100644
--- a/configs/davinci_sffsdr_defconfig
+++ b/configs/davinci_sffsdr_defconfig
@@ -1,4 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_SFFSDR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/davinci_sonata_defconfig b/configs/davinci_sonata_defconfig
index dd90bc0..6014eee 100644
--- a/configs/davinci_sonata_defconfig
+++ b/configs/davinci_sonata_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_SONATA=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig
index 7726314..569ddfd 100644
--- a/configs/db-88f6820-gp_defconfig
+++ b/configs/db-88f6820-gp_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_DB_88F6820_GP=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig
index 6ce5cff..d11377f 100644
--- a/configs/db-mv784mp-gp_defconfig
+++ b/configs/db-mv784mp-gp_defconfig
@@ -1,5 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_DB_MV784MP_GP=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/dbau1000_defconfig b/configs/dbau1000_defconfig
index 65d7c4b..58da5b7 100644
--- a/configs/dbau1000_defconfig
+++ b/configs/dbau1000_defconfig
@@ -1,5 +1,12 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_SYS_EXTRA_OPTIONS="DBAU1000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/dbau1100_defconfig b/configs/dbau1100_defconfig
index a60096f..14aeb4c 100644
--- a/configs/dbau1100_defconfig
+++ b/configs/dbau1100_defconfig
@@ -1,5 +1,12 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1100=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/dbau1500_defconfig b/configs/dbau1500_defconfig
index 73a0116..699b968 100644
--- a/configs/dbau1500_defconfig
+++ b/configs/dbau1500_defconfig
@@ -1,5 +1,12 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1500=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/dbau1550_defconfig b/configs/dbau1550_defconfig
index 864eaa8..6b17da7 100644
--- a/configs/dbau1550_defconfig
+++ b/configs/dbau1550_defconfig
@@ -1,5 +1,10 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1550=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/dbau1550_el_defconfig b/configs/dbau1550_el_defconfig
index 07dd6b3..845bc87 100644
--- a/configs/dbau1550_el_defconfig
+++ b/configs/dbau1550_el_defconfig
@@ -2,5 +2,10 @@ CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1550=y
 CONFIG_SYS_LITTLE_ENDIAN=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/devconcenter_defconfig b/configs/devconcenter_defconfig
index 99d57ea..ecf766e 100644
--- a/configs/devconcenter_defconfig
+++ b/configs/devconcenter_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_INTIP=y
 CONFIG_SYS_EXTRA_OPTIONS="DEVCONCENTER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig
index 3da2c61..f0c4ee1 100644
--- a/configs/devkit3250_defconfig
+++ b/configs/devkit3250_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_DEVKIT3250=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
index f592124..60ead72 100644
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@ -2,4 +2,8 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_DEVKIT8000=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/dig297_defconfig b/configs/dig297_defconfig
index a50ca2b..483c20e 100644
--- a/configs/dig297_defconfig
+++ b/configs/dig297_defconfig
@@ -1,4 +1,9 @@
 CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_DIG297=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/digsy_mtc_RAMBOOT_defconfig b/configs/digsy_mtc_RAMBOOT_defconfig
index 85c5ed9..17ac961 100644
--- a/configs/digsy_mtc_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_RAMBOOT_defconfig
@@ -6,4 +6,4 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/digsy_mtc_defconfig b/configs/digsy_mtc_defconfig
index d1bc949..913ba7e 100644
--- a/configs/digsy_mtc_defconfig
+++ b/configs/digsy_mtc_defconfig
@@ -4,4 +4,4 @@ CONFIG_TARGET_DIGSY_MTC=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/digsy_mtc_rev5_RAMBOOT_defconfig b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
index 63624f5..408cff5 100644
--- a/configs/digsy_mtc_rev5_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
@@ -6,4 +6,4 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/digsy_mtc_rev5_defconfig b/configs/digsy_mtc_rev5_defconfig
index f015603..e950eb3 100644
--- a/configs/digsy_mtc_rev5_defconfig
+++ b/configs/digsy_mtc_rev5_defconfig
@@ -6,4 +6,4 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/dlvision-10g_defconfig b/configs/dlvision-10g_defconfig
index b58fb55..4ed14f8 100644
--- a/configs/dlvision-10g_defconfig
+++ b/configs/dlvision-10g_defconfig
@@ -3,5 +3,4 @@ CONFIG_4xx=y
 CONFIG_TARGET_DLVISION_10G=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_NFS is not set
diff --git a/configs/dlvision_defconfig b/configs/dlvision_defconfig
index c381757..7982c17 100644
--- a/configs/dlvision_defconfig
+++ b/configs/dlvision_defconfig
@@ -1,5 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_DLVISION=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_NFS is not set
diff --git a/configs/dnp5370_defconfig b/configs/dnp5370_defconfig
index e8aba3d..b809dfa 100644
--- a/configs/dnp5370_defconfig
+++ b/configs/dnp5370_defconfig
@@ -1,4 +1,4 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_DNP5370=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
index 8f50524..c56dc5b 100644
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_DNS325=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
index 523a3ed..40f6e0f 100644
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_DOCKSTAR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
index 8a78014..1a0e01f 100644
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -3,5 +3,8 @@ CONFIG_OMAP54XX=y
 CONFIG_TARGET_DRA7XX_EVM=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig
index 4cc5f05..90e3cf4 100644
--- a/configs/dra7xx_evm_qspiboot_defconfig
+++ b/configs/dra7xx_evm_qspiboot_defconfig
@@ -3,5 +3,8 @@ CONFIG_OMAP54XX=y
 CONFIG_TARGET_DRA7XX_EVM=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,QSPI_BOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig
index c564b32..474cada 100644
--- a/configs/dra7xx_evm_uart3_defconfig
+++ b/configs/dra7xx_evm_uart3_defconfig
@@ -3,5 +3,8 @@ CONFIG_OMAP54XX=y
 CONFIG_TARGET_DRA7XX_EVM=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3,SPL_YMODEM_SUPPORT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index 3d09367..8b177b3 100644
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -4,5 +4,7 @@ CONFIG_SPL=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig
index 2a3307c..501fbbf 100644
--- a/configs/dreamplug_defconfig
+++ b/configs/dreamplug_defconfig
@@ -1,5 +1,7 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_DREAMPLUG=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig
index 59863dd..57410d3 100644
--- a/configs/duovero_defconfig
+++ b/configs/duovero_defconfig
@@ -2,4 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP44XX=y
 CONFIG_TARGET_DUOVERO=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index bed22c0..388dfec 100644
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -1,5 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_EA20=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig
index ed9c66a..1e19d3a 100644
--- a/configs/eb_cpu5282_defconfig
+++ b/configs/eb_cpu5282_defconfig
@@ -1,4 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_EB_CPU5282=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFF000000,SYS_MONITOR_BASE=0xFF000400"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig
index 567f0b0..5af19a0 100644
--- a/configs/eb_cpu5282_internal_defconfig
+++ b/configs/eb_cpu5282_internal_defconfig
@@ -1,4 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_EB_CPU5282=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF0000000,SYS_MONITOR_BASE=0xF0000418"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/eb_cpux9k2_defconfig b/configs/eb_cpux9k2_defconfig
index e7f62c7..bff6595 100644
--- a/configs/eb_cpux9k2_defconfig
+++ b/configs/eb_cpux9k2_defconfig
@@ -1,4 +1,4 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_EB_CPUX9K2=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/eb_cpux9k2_ram_defconfig b/configs/eb_cpux9k2_ram_defconfig
index 2716774..47c2178 100644
--- a/configs/eb_cpux9k2_ram_defconfig
+++ b/configs/eb_cpux9k2_ram_defconfig
@@ -2,4 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_EB_CPUX9K2=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ebony_defconfig b/configs/ebony_defconfig
index 6165a7b..db93555 100644
--- a/configs/ebony_defconfig
+++ b/configs/ebony_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_EBONY=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig
index 44b096b..c43603b 100644
--- a/configs/eco5pk_defconfig
+++ b/configs/eco5pk_defconfig
@@ -2,4 +2,6 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_ECO5PK=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ecovec_defconfig b/configs/ecovec_defconfig
index 4cdf8a3..de4617c 100644
--- a/configs/ecovec_defconfig
+++ b/configs/ecovec_defconfig
@@ -1,4 +1,20 @@
 CONFIG_SH=y
 CONFIG_TARGET_ECOVEC=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/edb9315a_defconfig b/configs/edb9315a_defconfig
index 839efb5..452bf0d 100644
--- a/configs/edb9315a_defconfig
+++ b/configs/edb9315a_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_EDB93XX=y
 CONFIG_SYS_EXTRA_OPTIONS="MK_edb9315a"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index 510bcce..80ff33f 100644
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -2,4 +2,4 @@ CONFIG_ARM=y
 CONFIG_ORION5X=y
 CONFIG_TARGET_EDMINIV2=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/enbw_cmc_defconfig b/configs/enbw_cmc_defconfig
index d8e03c0..90249f3 100644
--- a/configs/enbw_cmc_defconfig
+++ b/configs/enbw_cmc_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_ENBW_CMC=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/espt_defconfig b/configs/espt_defconfig
index 95bfe9a..fbb712d 100644
--- a/configs/espt_defconfig
+++ b/configs/espt_defconfig
@@ -1,4 +1,20 @@
 CONFIG_SH=y
 CONFIG_TARGET_ESPT=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index dddc7d7..d2379ec 100644
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_ETHERNUT5=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/flea3_defconfig b/configs/flea3_defconfig
index 22844cc..7ea5da2 100644
--- a/configs/flea3_defconfig
+++ b/configs/flea3_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_FLEA3=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/fo300_defconfig b/configs/fo300_defconfig
index dbf0ef5..b8e5c80 100644
--- a/configs/fo300_defconfig
+++ b/configs/fo300_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="FO300"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/forfun_q88db_defconfig b/configs/forfun_q88db_defconfig
index 697de9c..85c807a 100644
--- a/configs/forfun_q88db_defconfig
+++ b/configs/forfun_q88db_defconfig
@@ -14,8 +14,8 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-forfun-q88db"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
diff --git a/configs/fx12mm_defconfig b/configs/fx12mm_defconfig
index a84dc65..1013b70 100644
--- a/configs/fx12mm_defconfig
+++ b/configs/fx12mm_defconfig
@@ -2,3 +2,7 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_FX12MM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,INIT_TLB=board/xilinx/ppc405-generic/init.o"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/fx12mm_flash_defconfig b/configs/fx12mm_flash_defconfig
index cd28f33..60eee67 100644
--- a/configs/fx12mm_flash_defconfig
+++ b/configs/fx12mm_flash_defconfig
@@ -2,3 +2,7 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_FX12MM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC,INIT_TLB=board/xilinx/ppc405-generic/init.o"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/ga10h_v1_1_defconfig b/configs/ga10h_v1_1_defconfig
index 25f4199..315627d 100644
--- a/configs/ga10h_v1_1_defconfig
+++ b/configs/ga10h_v1_1_defconfig
@@ -18,10 +18,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ga10h-v1.1"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index f01103d..1ced47e 100644
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -3,7 +3,10 @@ CONFIG_VENDOR_INTEL=y
 CONFIG_DEFAULT_DEVICE_TREE="galileo"
 CONFIG_TARGET_GALILEO=y
 CONFIG_GENERATE_PIRQ_TABLE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CMD_BOOTSTAGE=y
diff --git a/configs/gdppc440etx_defconfig b/configs/gdppc440etx_defconfig
index 81ad845..2dfebbb 100644
--- a/configs/gdppc440etx_defconfig
+++ b/configs/gdppc440etx_defconfig
@@ -3,5 +3,3 @@ CONFIG_4xx=y
 CONFIG_TARGET_GDPPC440ETX=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/glacier_defconfig b/configs/glacier_defconfig
index 926d391..d318f82 100644
--- a/configs/glacier_defconfig
+++ b/configs/glacier_defconfig
@@ -3,7 +3,5 @@ CONFIG_4xx=y
 CONFIG_TARGET_CANYONLANDS=y
 CONFIG_GLACIER=y
 CONFIG_DEFAULT_DEVICE_TREE="glacier"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
diff --git a/configs/glacier_ramboot_defconfig b/configs/glacier_ramboot_defconfig
index f4041e8..98bcaf4 100644
--- a/configs/glacier_ramboot_defconfig
+++ b/configs/glacier_ramboot_defconfig
@@ -4,7 +4,5 @@ CONFIG_TARGET_CANYONLANDS=y
 CONFIG_GLACIER=y
 CONFIG_DEFAULT_DEVICE_TREE="glacier"
 CONFIG_SYS_EXTRA_OPTIONS="SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/canyonlands/u-boot-ram.lds"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index c6c3ef7..d1b9ba1 100644
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_GOFLEXHOME=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/gose_defconfig b/configs/gose_defconfig
index 76b81dc..bece0aa 100644
--- a/configs/gose_defconfig
+++ b/configs/gose_defconfig
@@ -1,6 +1,20 @@
 CONFIG_ARM=y
 CONFIG_RMOBILE=y
 CONFIG_TARGET_GOSE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SH_SDHI=y
diff --git a/configs/gplugd_defconfig b/configs/gplugd_defconfig
index 7e367a8..ab3f760 100644
--- a/configs/gplugd_defconfig
+++ b/configs/gplugd_defconfig
@@ -1,4 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_GPLUGD=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/gr_cpci_ax2000_defconfig b/configs/gr_cpci_ax2000_defconfig
index f2fb544..f003d77 100644
--- a/configs/gr_cpci_ax2000_defconfig
+++ b/configs/gr_cpci_ax2000_defconfig
@@ -1,4 +1,4 @@
 CONFIG_SPARC=y
 CONFIG_TARGET_GR_CPCI_AX2000=y
 CONFIG_SYS_TEXT_BASE=0x00000000
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/gr_ep2s60_defconfig b/configs/gr_ep2s60_defconfig
index 7afd109..bbf1808 100644
--- a/configs/gr_ep2s60_defconfig
+++ b/configs/gr_ep2s60_defconfig
@@ -1,4 +1,4 @@
 CONFIG_SPARC=y
 CONFIG_TARGET_GR_EP2S60=y
 CONFIG_SYS_TEXT_BASE=0x00000000
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/gr_xc3s_1500_defconfig b/configs/gr_xc3s_1500_defconfig
index cac67c2..5c1442d 100644
--- a/configs/gr_xc3s_1500_defconfig
+++ b/configs/gr_xc3s_1500_defconfig
@@ -1,4 +1,4 @@
 CONFIG_SPARC=y
 CONFIG_TARGET_GR_XC3S_1500=y
 CONFIG_SYS_TEXT_BASE=0x00000000
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/grasshopper_defconfig b/configs/grasshopper_defconfig
index 97f2915..2d9c8ad 100644
--- a/configs/grasshopper_defconfig
+++ b/configs/grasshopper_defconfig
@@ -4,4 +4,5 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/grsim_defconfig b/configs/grsim_defconfig
index d114a86..b83abb6 100644
--- a/configs/grsim_defconfig
+++ b/configs/grsim_defconfig
@@ -1,4 +1,13 @@
 CONFIG_SPARC=y
 CONFIG_TARGET_GRSIM=y
 CONFIG_SYS_TEXT_BASE=0x00000000
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_MEMORY is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/grsim_leon2_defconfig b/configs/grsim_leon2_defconfig
index f28ad4a..756a786 100644
--- a/configs/grsim_leon2_defconfig
+++ b/configs/grsim_leon2_defconfig
@@ -1,3 +1,14 @@
 CONFIG_SPARC=y
 CONFIG_TARGET_GRSIM_LEON2=y
 CONFIG_SYS_TEXT_BASE=0x00000000
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_MEMORY is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig
index 8d3d8c2..20b83e3 100644
--- a/configs/guruplug_defconfig
+++ b/configs/guruplug_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_GURUPLUG=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
index dfb24b0..401f77e 100644
--- a/configs/gwventana_defconfig
+++ b/configs/gwventana_defconfig
@@ -4,7 +4,7 @@ CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x18000000
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_DM=y
 CONFIG_DM_SERIAL=y
diff --git a/configs/h2200_defconfig b/configs/h2200_defconfig
index 40c28ee..f90a4a6 100644
--- a/configs/h2200_defconfig
+++ b/configs/h2200_defconfig
@@ -1,3 +1,19 @@
 CONFIG_ARM=y
 CONFIG_TARGET_H2200=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_MEMORY is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
diff --git a/configs/haleakala_defconfig b/configs/haleakala_defconfig
index ba33749..81e3398 100644
--- a/configs/haleakala_defconfig
+++ b/configs/haleakala_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_KILAUEA=y
 CONFIG_SYS_EXTRA_OPTIONS="HALEAKALA"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index 74656cc..d88a082 100644
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -3,7 +3,12 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA20=y
 CONFIG_TARGET_HARMONY=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-harmony"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig
index ae74ba1..f7042e2 100644
--- a/configs/highbank_defconfig
+++ b/configs/highbank_defconfig
@@ -3,4 +3,6 @@ CONFIG_ARCH_HIGHBANK=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds...\nPress <s> to stop or <d> to delay\n"
 CONFIG_AUTOBOOT_KEYED_CTRLC=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig
index cf2cdc8..6b2b5d3 100644
--- a/configs/hrcon_defconfig
+++ b/configs/hrcon_defconfig
@@ -3,4 +3,4 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_HRCON=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
index 371251c..3a69422 100644
--- a/configs/i12-tvbox_defconfig
+++ b/configs/i12-tvbox_defconfig
@@ -6,10 +6,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-i12-tvbox"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
diff --git a/configs/iNet_3F_defconfig b/configs/iNet_3F_defconfig
index cc5db7e..54de300 100644
--- a/configs/iNet_3F_defconfig
+++ b/configs/iNet_3F_defconfig
@@ -16,8 +16,8 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3f"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
diff --git a/configs/iNet_3W_defconfig b/configs/iNet_3W_defconfig
index fc64fb1..e1beac8 100644
--- a/configs/iNet_3W_defconfig
+++ b/configs/iNet_3W_defconfig
@@ -16,8 +16,8 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3w"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
diff --git a/configs/iNet_86VS_defconfig b/configs/iNet_86VS_defconfig
index edf6e8b..627e211 100644
--- a/configs/iNet_86VS_defconfig
+++ b/configs/iNet_86VS_defconfig
@@ -14,8 +14,8 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-inet-86vs"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
index ea4756f..e418d8f 100644
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_IB62X0=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ibf-dsp561_defconfig b/configs/ibf-dsp561_defconfig
index 15f24bb..e654a4b 100644
--- a/configs/ibf-dsp561_defconfig
+++ b/configs/ibf-dsp561_defconfig
@@ -1,4 +1,4 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_IBF_DSP561=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_LIB_RAND=y
diff --git a/configs/icon_defconfig b/configs/icon_defconfig
index e4ca30a..771a093 100644
--- a/configs/icon_defconfig
+++ b/configs/icon_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_ICON=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
index a96b810..49d4fa0 100644
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_ICONNECT=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index 9cb4d31..821c6fa 100644
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -7,4 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFF00000"
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Enter password - autoboot in %d seconds...\n"
 CONFIG_AUTOBOOT_DELAY_STR="ids"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig
index fc8d9c1..e45e83c 100644
--- a/configs/igep0020_defconfig
+++ b/configs/igep0020_defconfig
@@ -3,4 +3,6 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_IGEP00X0=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/igep0020_nand_defconfig b/configs/igep0020_nand_defconfig
index bf3581d9..75fabef 100644
--- a/configs/igep0020_nand_defconfig
+++ b/configs/igep0020_nand_defconfig
@@ -3,4 +3,6 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_IGEP00X0=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig
index cd9753d..1bb7a6f 100644
--- a/configs/igep0030_defconfig
+++ b/configs/igep0030_defconfig
@@ -3,4 +3,6 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_IGEP00X0=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig
index 8bdd1eb..ed01766 100644
--- a/configs/igep0030_nand_defconfig
+++ b/configs/igep0030_nand_defconfig
@@ -3,4 +3,6 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_IGEP00X0=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index ded479a..bfa15d7 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -3,4 +3,6 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_IGEP00X0=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ima3-mx53_defconfig b/configs/ima3-mx53_defconfig
index c5679dd..ef15127 100644
--- a/configs/ima3-mx53_defconfig
+++ b/configs/ima3-mx53_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TARGET_IMA3_MX53=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/esg/ima3-mx53/imximage.cfg"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/imx27lite_defconfig b/configs/imx27lite_defconfig
index b83cd24..b02955d 100644
--- a/configs/imx27lite_defconfig
+++ b/configs/imx27lite_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_IMX27LITE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/imx31_litekit_defconfig b/configs/imx31_litekit_defconfig
index 8373c04..b197935 100644
--- a/configs/imx31_litekit_defconfig
+++ b/configs/imx31_litekit_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_IMX31_LITEKIT=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/imx31_phycore_defconfig b/configs/imx31_phycore_defconfig
index a388ea7..161a604 100644
--- a/configs/imx31_phycore_defconfig
+++ b/configs/imx31_phycore_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_IMX31_PHYCORE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/imx31_phycore_eet_defconfig b/configs/imx31_phycore_eet_defconfig
index b4d37fd..445c040 100644
--- a/configs/imx31_phycore_eet_defconfig
+++ b/configs/imx31_phycore_eet_defconfig
@@ -1,4 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_IMX31_PHYCORE=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX31_PHYCORE_EET"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index 716111b..f314059 100644
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -2,5 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/inka4x0_defconfig b/configs/inka4x0_defconfig
index 2c3b9e0..4c1016a 100644
--- a/configs/inka4x0_defconfig
+++ b/configs/inka4x0_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_INKA4X0=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/integratorap_cm720t_defconfig b/configs/integratorap_cm720t_defconfig
index fccbb3f..369add7 100644
--- a/configs/integratorap_cm720t_defconfig
+++ b/configs/integratorap_cm720t_defconfig
@@ -2,4 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_AP=y
 CONFIG_CM720T=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/integratorap_cm920t_defconfig b/configs/integratorap_cm920t_defconfig
index f2e1fcb..aa27cbd 100644
--- a/configs/integratorap_cm920t_defconfig
+++ b/configs/integratorap_cm920t_defconfig
@@ -2,4 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_AP=y
 CONFIG_CM920T=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig
index 060c18c..8155b67 100644
--- a/configs/integratorap_cm926ejs_defconfig
+++ b/configs/integratorap_cm926ejs_defconfig
@@ -2,4 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_AP=y
 CONFIG_CM926EJ_S=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig
index dc933c5..b3b5edf 100644
--- a/configs/integratorap_cm946es_defconfig
+++ b/configs/integratorap_cm946es_defconfig
@@ -2,4 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_AP=y
 CONFIG_CM946ES=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig
index 5635cb14..5ab7c27 100644
--- a/configs/integratorcp_cm1136_defconfig
+++ b/configs/integratorcp_cm1136_defconfig
@@ -2,4 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM1136=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig
index 25041ff..d0ed78d 100644
--- a/configs/integratorcp_cm920t_defconfig
+++ b/configs/integratorcp_cm920t_defconfig
@@ -2,4 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM920T=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig
index 5c82326..9aa8602 100644
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -2,4 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM926EJ_S=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig
index cd4c94a..ef9d7d6 100644
--- a/configs/integratorcp_cm946es_defconfig
+++ b/configs/integratorcp_cm946es_defconfig
@@ -2,4 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM946ES=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/intip_defconfig b/configs/intip_defconfig
index 06d983d..898f544 100644
--- a/configs/intip_defconfig
+++ b/configs/intip_defconfig
@@ -4,5 +4,3 @@ CONFIG_TARGET_INTIP=y
 CONFIG_SYS_EXTRA_OPTIONS="INTIB"
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/io64_defconfig b/configs/io64_defconfig
index 604cd7e..52829da 100644
--- a/configs/io64_defconfig
+++ b/configs/io64_defconfig
@@ -3,5 +3,3 @@ CONFIG_4xx=y
 CONFIG_TARGET_IO64=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/io_defconfig b/configs/io_defconfig
index 9e0afee..722d95a 100644
--- a/configs/io_defconfig
+++ b/configs/io_defconfig
@@ -3,5 +3,4 @@ CONFIG_4xx=y
 CONFIG_TARGET_IO=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_NFS is not set
diff --git a/configs/iocon_defconfig b/configs/iocon_defconfig
index e92056e..89e5cf5 100644
--- a/configs/iocon_defconfig
+++ b/configs/iocon_defconfig
@@ -3,5 +3,4 @@ CONFIG_4xx=y
 CONFIG_TARGET_IOCON=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_NFS is not set
diff --git a/configs/ip04_defconfig b/configs/ip04_defconfig
index 53e7dec..0b6de77 100644
--- a/configs/ip04_defconfig
+++ b/configs/ip04_defconfig
@@ -1,6 +1,8 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_IP04=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig
index 8233677..c053b38 100644
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@@ -2,4 +2,6 @@ CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_IPAM390=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ipek01_defconfig b/configs/ipek01_defconfig
index 099bf64..c8ddbc5 100644
--- a/configs/ipek01_defconfig
+++ b/configs/ipek01_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_IPEK01=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/jesurun_q5_defconfig b/configs/jesurun_q5_defconfig
index 8c17fac..4b09a33 100644
--- a/configs/jesurun_q5_defconfig
+++ b/configs/jesurun_q5_defconfig
@@ -6,10 +6,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-jesurun-q5"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI,MACPWR=SUNXI_GPH(19)"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index d7af52d..7085469 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -3,7 +3,12 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA124=y
 CONFIG_TARGET_JETSON_TK1=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
diff --git a/configs/jornada_defconfig b/configs/jornada_defconfig
index ad1c338..735c75f 100644
--- a/configs/jornada_defconfig
+++ b/configs/jornada_defconfig
@@ -1,2 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_JORNADA=y
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
diff --git a/configs/jupiter_defconfig b/configs/jupiter_defconfig
index 02c63e1..a3c259f 100644
--- a/configs/jupiter_defconfig
+++ b/configs/jupiter_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_JUPITER=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig
index ac72e71..f422886 100644
--- a/configs/k2e_evm_defconfig
+++ b/configs/k2e_evm_defconfig
@@ -2,5 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_KEYSTONE=y
 CONFIG_TARGET_K2E_EVM=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig
index 53e7db8..297183f 100644
--- a/configs/k2hk_evm_defconfig
+++ b/configs/k2hk_evm_defconfig
@@ -2,5 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_KEYSTONE=y
 CONFIG_TARGET_K2HK_EVM=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig
index ef688dd..7aa538d 100644
--- a/configs/k2l_evm_defconfig
+++ b/configs/k2l_evm_defconfig
@@ -2,5 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_KEYSTONE=y
 CONFIG_TARGET_K2L_EVM=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/katmai_defconfig b/configs/katmai_defconfig
index 7821e19..8492314 100644
--- a/configs/katmai_defconfig
+++ b/configs/katmai_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_KATMAI=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/kilauea_defconfig b/configs/kilauea_defconfig
index 2ef0f56..0054cc6 100644
--- a/configs/kilauea_defconfig
+++ b/configs/kilauea_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_KILAUEA=y
 CONFIG_SYS_EXTRA_OPTIONS="KILAUEA"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index 25cd351..b903f6e 100644
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index 0a5c545..7fc1112 100644
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index 81b45ad..a310fb7 100644
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig
index 4877a2d..aa0e004 100644
--- a/configs/kmcoge4_defconfig
+++ b/configs/kmcoge4_defconfig
@@ -2,6 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_KMP204X=y
 CONFIG_SYS_EXTRA_OPTIONS="KMCOGE4"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index bd7b8f9..a8b5275 100644
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_KM8360=y
 CONFIG_SYS_EXTRA_OPTIONS="KMCOGE5NE"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index 610dac8..95c61f1 100644
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig
index 2b04d33..3374ab0 100644
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_KM8360=y
 CONFIG_SYS_EXTRA_OPTIONS="KMETER1"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig
index e230ad5..48fe188 100644
--- a/configs/kmlion1_defconfig
+++ b/configs/kmlion1_defconfig
@@ -2,6 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_KMP204X=y
 CONFIG_SYS_EXTRA_OPTIONS="KMLION1"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index bf4a5ea..158fe39 100644
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig
index d24e147..11c53b5 100644
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_SYS_EXTRA_OPTIONS="KMOPTI2"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig
index ff20e9d..d754ac0 100644
--- a/configs/kmsugp1_defconfig
+++ b/configs/kmsugp1_defconfig
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_SUGP1"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig
index 78c19fb..fd4bb9a 100644
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_SYS_EXTRA_OPTIONS="KMSUPX5"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig
index 7701e63..5f56925 100644
--- a/configs/kmsuv31_defconfig
+++ b/configs/kmsuv31_defconfig
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_SUV31"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig
index de74080..512d12c 100644
--- a/configs/kmvect1_defconfig
+++ b/configs/kmvect1_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_SUVD3=y
 CONFIG_SYS_EXTRA_OPTIONS="KMVECT1"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig
index 40dea22..13c8310 100644
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@@ -1,6 +1,20 @@
 CONFIG_ARM=y
 CONFIG_RMOBILE=y
 CONFIG_TARGET_KOELSCH=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SH_SDHI=y
diff --git a/configs/kwb_defconfig b/configs/kwb_defconfig
index 9b07084..5bca811 100644
--- a/configs/kwb_defconfig
+++ b/configs/kwb_defconfig
@@ -2,5 +2,15 @@ CONFIG_ARM=y
 CONFIG_TARGET_KWB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
 # CONFIG_CMD_CRC32 is not set
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig
index 91a0437..3df79d4 100644
--- a/configs/kzm9g_defconfig
+++ b/configs/kzm9g_defconfig
@@ -1,4 +1,4 @@
 CONFIG_ARM=y
 CONFIG_RMOBILE=y
 CONFIG_TARGET_KZM9G=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/lager_defconfig b/configs/lager_defconfig
index 1ee1070..3805fcb 100644
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@@ -1,6 +1,20 @@
 CONFIG_ARM=y
 CONFIG_RMOBILE=y
 CONFIG_TARGET_LAGER=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SH_SDHI=y
diff --git a/configs/lcd4_lwmon5_defconfig b/configs/lcd4_lwmon5_defconfig
index 786b458..b911dbd 100644
--- a/configs/lcd4_lwmon5_defconfig
+++ b/configs/lcd4_lwmon5_defconfig
@@ -3,4 +3,4 @@ CONFIG_4xx=y
 CONFIG_TARGET_LWMON5=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="LCD4_LWMON5"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/lp8x4x_defconfig b/configs/lp8x4x_defconfig
index af02d37..63bbcca 100644
--- a/configs/lp8x4x_defconfig
+++ b/configs/lp8x4x_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LP8X4X=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls1021aqds_ddr4_nor_defconfig b/configs/ls1021aqds_ddr4_nor_defconfig
index 8d78c7f..8c6a5c4 100644
--- a/configs/ls1021aqds_ddr4_nor_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_defconfig
@@ -1,4 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
index 1d76b65..efcef64 100644
--- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig
@@ -1,4 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,LPUART"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls1021aqds_nand_defconfig b/configs/ls1021aqds_nand_defconfig
index b5b77b9..d3a12b1 100644
--- a/configs/ls1021aqds_nand_defconfig
+++ b/configs/ls1021aqds_nand_defconfig
@@ -2,4 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND_BOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
index 6f1b602..045878f 100644
--- a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
@@ -1,4 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig
index 6c7ea6f..f28cfb3 100644
--- a/configs/ls1021aqds_nor_defconfig
+++ b/configs/ls1021aqds_nor_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig
index e586215..081e618 100644
--- a/configs/ls1021aqds_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_nor_lpuart_defconfig
@@ -1,4 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="LPUART"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig
index 3cadd7c..1db9129 100644
--- a/configs/ls1021aqds_qspi_defconfig
+++ b/configs/ls1021aqds_qspi_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/ls1021aqds_sdcard_defconfig b/configs/ls1021aqds_sdcard_defconfig
index d131834..e1b4854 100644
--- a/configs/ls1021aqds_sdcard_defconfig
+++ b/configs/ls1021aqds_sdcard_defconfig
@@ -2,4 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
index 867f3d3..f51f2fd 100644
--- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
@@ -1,4 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig
index 3b31375..939be78 100644
--- a/configs/ls1021atwr_nor_defconfig
+++ b/configs/ls1021atwr_nor_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls1021atwr_nor_lpuart_defconfig b/configs/ls1021atwr_nor_lpuart_defconfig
index 4cfda5f..8f34613 100644
--- a/configs/ls1021atwr_nor_lpuart_defconfig
+++ b/configs/ls1021atwr_nor_lpuart_defconfig
@@ -1,4 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
 CONFIG_SYS_EXTRA_OPTIONS="LPUART"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig
index a3e9e66..9eb88b3 100644
--- a/configs/ls1021atwr_qspi_defconfig
+++ b/configs/ls1021atwr_qspi_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
 CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/ls1021atwr_sdcard_defconfig b/configs/ls1021atwr_sdcard_defconfig
index 769f7f5..cfc7b524 100644
--- a/configs/ls1021atwr_sdcard_defconfig
+++ b/configs/ls1021atwr_sdcard_defconfig
@@ -2,4 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls2085a_emu_D4_defconfig b/configs/ls2085a_emu_D4_defconfig
index f0e9c59..9c82e17 100644
--- a/configs/ls2085a_emu_D4_defconfig
+++ b/configs/ls2085a_emu_D4_defconfig
@@ -1,4 +1,14 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS2085A_EMU=y
 CONFIG_SYS_EXTRA_OPTIONS="EMU,SYS_FSL_DDR4"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
diff --git a/configs/ls2085a_emu_defconfig b/configs/ls2085a_emu_defconfig
index 27c58a7..fa4a44e 100644
--- a/configs/ls2085a_emu_defconfig
+++ b/configs/ls2085a_emu_defconfig
@@ -1,4 +1,14 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS2085A_EMU=y
 CONFIG_SYS_EXTRA_OPTIONS="EMU"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
diff --git a/configs/ls2085a_simu_defconfig b/configs/ls2085a_simu_defconfig
index b3d861b..de9776d 100644
--- a/configs/ls2085a_simu_defconfig
+++ b/configs/ls2085a_simu_defconfig
@@ -1,4 +1,14 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS2085A_SIMU=y
 CONFIG_SYS_EXTRA_OPTIONS="SIMU"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
diff --git a/configs/ls2085aqds_defconfig b/configs/ls2085aqds_defconfig
index 9dacd21..fd208b18 100644
--- a/configs/ls2085aqds_defconfig
+++ b/configs/ls2085aqds_defconfig
@@ -1,4 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS2085AQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls2085aqds_nand_defconfig b/configs/ls2085aqds_nand_defconfig
index fb123bd..b9dd651 100644
--- a/configs/ls2085aqds_nand_defconfig
+++ b/configs/ls2085aqds_nand_defconfig
@@ -2,4 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_LS2085AQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,NAND"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls2085ardb_defconfig b/configs/ls2085ardb_defconfig
index 0e3c518..308e935 100644
--- a/configs/ls2085ardb_defconfig
+++ b/configs/ls2085ardb_defconfig
@@ -1,4 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS2085ARDB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls2085ardb_nand_defconfig b/configs/ls2085ardb_nand_defconfig
index 02747ae..8539307 100644
--- a/configs/ls2085ardb_nand_defconfig
+++ b/configs/ls2085ardb_nand_defconfig
@@ -2,4 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_LS2085ARDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,NAND"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
index 8cd8282..a086de8 100644
--- a/configs/lschlv2_defconfig
+++ b/configs/lschlv2_defconfig
@@ -2,6 +2,8 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_LSXL=y
 CONFIG_SYS_EXTRA_OPTIONS="LSCHLV2"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig
index 8847109..7d48abd 100644
--- a/configs/lsxhl_defconfig
+++ b/configs/lsxhl_defconfig
@@ -2,6 +2,8 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_LSXL=y
 CONFIG_SYS_EXTRA_OPTIONS="LSXHL"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/luan_defconfig b/configs/luan_defconfig
index 82c9b3a..d42b4a9 100644
--- a/configs/luan_defconfig
+++ b/configs/luan_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_LUAN=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/lwmon5_defconfig b/configs/lwmon5_defconfig
index e65a8d5..0a6da68 100644
--- a/configs/lwmon5_defconfig
+++ b/configs/lwmon5_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_LWMON5=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig
index fb681af..03ced33 100644
--- a/configs/m28evk_defconfig
+++ b/configs/m28evk_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_M28EVK=y
 CONFIG_SPL=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/m53evk_defconfig b/configs/m53evk_defconfig
index 0a40f18..b5e72ef 100644
--- a/configs/m53evk_defconfig
+++ b/configs/m53evk_defconfig
@@ -2,5 +2,5 @@ CONFIG_ARM=y
 CONFIG_TARGET_M53EVK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/denx/m53evk/imximage.cfg"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
diff --git a/configs/magnesium_defconfig b/configs/magnesium_defconfig
index 4969603..2fa6589 100644
--- a/configs/magnesium_defconfig
+++ b/configs/magnesium_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MAGNESIUM=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/makalu_defconfig b/configs/makalu_defconfig
index 094ff47..ed9b82d 100644
--- a/configs/makalu_defconfig
+++ b/configs/makalu_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_MAKALU=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/malta_defconfig b/configs/malta_defconfig
index 4f0c483..3056c48 100644
--- a/configs/malta_defconfig
+++ b/configs/malta_defconfig
@@ -1,4 +1,8 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_MALTA=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/maltael_defconfig b/configs/maltael_defconfig
index ac835f8..858a852 100644
--- a/configs/maltael_defconfig
+++ b/configs/maltael_defconfig
@@ -1,5 +1,9 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_MALTA=y
 CONFIG_SYS_LITTLE_ENDIAN=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig
index 48df76b..5ea278f 100644
--- a/configs/marsboard_defconfig
+++ b/configs/marsboard_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_EMBESTMX6BOARDS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,ENV_IS_IN_SPI_FLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_THERMAL=y
diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig
index b60faa1..c5b3b67 100644
--- a/configs/maxbcm_defconfig
+++ b/configs/maxbcm_defconfig
@@ -1,5 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MAXBCM=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig
index 28d1953..1d3e978 100644
--- a/configs/mcx_defconfig
+++ b/configs/mcx_defconfig
@@ -2,4 +2,8 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_MCX=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mecp5123_defconfig b/configs/mecp5123_defconfig
index 55ac810..1957f0b 100644
--- a/configs/mecp5123_defconfig
+++ b/configs/mecp5123_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC512X=y
 CONFIG_TARGET_MECP5123=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
index a785980..bb33542 100644
--- a/configs/medcom-wide_defconfig
+++ b/configs/medcom-wide_defconfig
@@ -3,7 +3,12 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA20=y
 CONFIG_TARGET_MEDCOM_WIDE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-medcom-wide"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/meesc_dataflash_defconfig b/configs/meesc_dataflash_defconfig
index 4db6744..e4f7cce 100644
--- a/configs/meesc_dataflash_defconfig
+++ b/configs/meesc_dataflash_defconfig
@@ -2,4 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_MEESC=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/meesc_defconfig b/configs/meesc_defconfig
index 0f4dbb0..7d1fe7b 100644
--- a/configs/meesc_defconfig
+++ b/configs/meesc_defconfig
@@ -2,4 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_MEESC=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mgcoge3ne_defconfig b/configs/mgcoge3ne_defconfig
index 4acfa5f..7b795f5 100644
--- a/configs/mgcoge3ne_defconfig
+++ b/configs/mgcoge3ne_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC8260=y
 CONFIG_TARGET_KM82XX=y
 CONFIG_SYS_EXTRA_OPTIONS="MGCOGE3NE"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig
index 7b5fb93..cd5f358 100644
--- a/configs/mgcoge3un_defconfig
+++ b/configs/mgcoge3un_defconfig
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/mgcoge_defconfig b/configs/mgcoge_defconfig
index 13d56b9..1fb8dfd 100644
--- a/configs/mgcoge_defconfig
+++ b/configs/mgcoge_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC8260=y
 CONFIG_TARGET_KM82XX=y
 CONFIG_SYS_EXTRA_OPTIONS="MGCOGE"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 1e4cf7b..8355c67 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -2,7 +2,7 @@ CONFIG_MICROBLAZE=y
 CONFIG_TARGET_MICROBLAZE_GENERIC=y
 CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic"
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_OF_EMBED=y
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index c5c1f38..e0a9216 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -6,7 +6,10 @@ CONFIG_HAVE_INTEL_ME=y
 CONFIG_SMP=y
 CONFIG_GENERATE_SFI_TABLE=y
 CONFIG_CMD_CPU=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CMD_BOOTSTAGE=y
diff --git a/configs/mixtile_loftq_defconfig b/configs/mixtile_loftq_defconfig
index f940bf1..a8c497c 100644
--- a/configs/mixtile_loftq_defconfig
+++ b/configs/mixtile_loftq_defconfig
@@ -9,10 +9,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-mixtile-loftq"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_DM_SERIAL=y
 CONFIG_AXP221_ALDO1_VOLT=3300
diff --git a/configs/mk802_a10s_defconfig b/configs/mk802_a10s_defconfig
index 36ad5bb..dc78fa4 100644
--- a/configs/mk802_a10s_defconfig
+++ b/configs/mk802_a10s_defconfig
@@ -8,10 +8,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-mk802"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/mk802_defconfig b/configs/mk802_defconfig
index a4f1b0b..31bde00 100644
--- a/configs/mk802_defconfig
+++ b/configs/mk802_defconfig
@@ -6,10 +6,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mk802"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/mk802ii_defconfig b/configs/mk802ii_defconfig
index 641aa55..ffa7891 100644
--- a/configs/mk802ii_defconfig
+++ b/configs/mk802ii_defconfig
@@ -5,10 +5,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mk802ii"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/ml507_defconfig b/configs/ml507_defconfig
index cbd37b3..3f66c86 100644
--- a/configs/ml507_defconfig
+++ b/configs/ml507_defconfig
@@ -2,3 +2,7 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_ML507=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1,INIT_TLB=board/xilinx/ppc440-generic/init.o"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/ml507_flash_defconfig b/configs/ml507_flash_defconfig
index fba47ef..442e0ce 100644
--- a/configs/ml507_flash_defconfig
+++ b/configs/ml507_flash_defconfig
@@ -2,3 +2,7 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_ML507=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC,INIT_TLB=board/xilinx/ppc440-generic/init.o"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/motionpro_defconfig b/configs/motionpro_defconfig
index 61ffee9..4d3f909 100644
--- a/configs/motionpro_defconfig
+++ b/configs/motionpro_defconfig
@@ -4,4 +4,4 @@ CONFIG_TARGET_MOTIONPRO=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mpc5121ads_defconfig b/configs/mpc5121ads_defconfig
index c9ce78c..e5fe27f 100644
--- a/configs/mpc5121ads_defconfig
+++ b/configs/mpc5121ads_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC512X=y
 CONFIG_TARGET_MPC5121ADS=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mpc5121ads_rev2_defconfig b/configs/mpc5121ads_rev2_defconfig
index b9cbb3b..3562353 100644
--- a/configs/mpc5121ads_rev2_defconfig
+++ b/configs/mpc5121ads_rev2_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC512X=y
 CONFIG_TARGET_MPC5121ADS=y
 CONFIG_SYS_EXTRA_OPTIONS="MPC5121ADS_REV2"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mpc8308_p1m_defconfig b/configs/mpc8308_p1m_defconfig
index f0b2bc4..8c67eab 100644
--- a/configs/mpc8308_p1m_defconfig
+++ b/configs/mpc8308_p1m_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8308_P1M=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mpr2_defconfig b/configs/mpr2_defconfig
index f242419..6a832c7 100644
--- a/configs/mpr2_defconfig
+++ b/configs/mpr2_defconfig
@@ -1,3 +1,22 @@
 CONFIG_SH=y
 CONFIG_TARGET_MPR2=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/ms7720se_defconfig b/configs/ms7720se_defconfig
index 58bc947..55d480a 100644
--- a/configs/ms7720se_defconfig
+++ b/configs/ms7720se_defconfig
@@ -1,3 +1,22 @@
 CONFIG_SH=y
 CONFIG_TARGET_MS7720SE=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/ms7722se_defconfig b/configs/ms7722se_defconfig
index 59ea708..911f3dc 100644
--- a/configs/ms7722se_defconfig
+++ b/configs/ms7722se_defconfig
@@ -1,4 +1,20 @@
 CONFIG_SH=y
 CONFIG_TARGET_MS7722SE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/ms7750se_defconfig b/configs/ms7750se_defconfig
index 0a805b5..fb7932a 100644
--- a/configs/ms7750se_defconfig
+++ b/configs/ms7750se_defconfig
@@ -1,3 +1,23 @@
 CONFIG_SH=y
 CONFIG_TARGET_MS7750SE=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_MEMORY is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
index 2f078c4..0a6b7d6 100644
--- a/configs/mt_ventoux_defconfig
+++ b/configs/mt_ventoux_defconfig
@@ -2,4 +2,6 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_MT_VENTOUX=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/munices_defconfig b/configs/munices_defconfig
index a64b3e8..1c0309a 100644
--- a/configs/munices_defconfig
+++ b/configs/munices_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_MUNICES=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mv88f6281gtw_ge_defconfig b/configs/mv88f6281gtw_ge_defconfig
index 41e8931..8988734 100644
--- a/configs/mv88f6281gtw_ge_defconfig
+++ b/configs/mv88f6281gtw_ge_defconfig
@@ -1,5 +1,7 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_MV88F6281GTW_GE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/mx23_olinuxino_defconfig b/configs/mx23_olinuxino_defconfig
index 7103e30..9e02334 100644
--- a/configs/mx23_olinuxino_defconfig
+++ b/configs/mx23_olinuxino_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX23_OLINUXINO=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mx23evk_defconfig b/configs/mx23evk_defconfig
index c386bba..2f4b91b 100644
--- a/configs/mx23evk_defconfig
+++ b/configs/mx23evk_defconfig
@@ -1,3 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX23EVK=y
 CONFIG_SPL=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/mx25pdk_defconfig b/configs/mx25pdk_defconfig
index cf55b9f..79edf33 100644
--- a/configs/mx25pdk_defconfig
+++ b/configs/mx25pdk_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX25PDK=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx25pdk/imximage.cfg"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig
index 7753967..9000787 100644
--- a/configs/mx28evk_auart_console_defconfig
+++ b/configs/mx28evk_auart_console_defconfig
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_TARGET_MX28EVK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE,ENV_IS_IN_MMC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig
index 55ea267..6d3cbb8 100644
--- a/configs/mx28evk_defconfig
+++ b/configs/mx28evk_defconfig
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_TARGET_MX28EVK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig
index ed6137c..ee4536d 100644
--- a/configs/mx28evk_nand_defconfig
+++ b/configs/mx28evk_nand_defconfig
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_TARGET_MX28EVK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig
index 2fe16e3..88bfb43 100644
--- a/configs/mx28evk_spi_defconfig
+++ b/configs/mx28evk_spi_defconfig
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_TARGET_MX28EVK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_SPI_FLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/mx31ads_defconfig b/configs/mx31ads_defconfig
index 096028c..20cadde 100644
--- a/configs/mx31ads_defconfig
+++ b/configs/mx31ads_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX31ADS=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mx31pdk_defconfig b/configs/mx31pdk_defconfig
index 7f35233..dd6a7b9 100644
--- a/configs/mx31pdk_defconfig
+++ b/configs/mx31pdk_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX31PDK=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mx35pdk_defconfig b/configs/mx35pdk_defconfig
index 992cd1d..c13e9f2 100644
--- a/configs/mx35pdk_defconfig
+++ b/configs/mx35pdk_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX35PDK=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mx51_efikamx_defconfig b/configs/mx51_efikamx_defconfig
index 3f89bee..9c0deb1 100644
--- a/configs/mx51_efikamx_defconfig
+++ b/configs/mx51_efikamx_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX51_EFIKAMX=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_mx.cfg"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/mx51_efikasb_defconfig b/configs/mx51_efikasb_defconfig
index 662aad4..1bc7c00 100644
--- a/configs/mx51_efikasb_defconfig
+++ b/configs/mx51_efikasb_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX51_EFIKAMX=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_sb.cfg"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig
index e208a44..f2c3743 100644
--- a/configs/mx51evk_defconfig
+++ b/configs/mx51evk_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX51EVK=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx51evk/imximage.cfg"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mx53ard_defconfig b/configs/mx53ard_defconfig
index 85fbaf6..8f233c9 100644
--- a/configs/mx53ard_defconfig
+++ b/configs/mx53ard_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX53ARD=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53ard/imximage_dd3.cfg"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
diff --git a/configs/mx53evk_defconfig b/configs/mx53evk_defconfig
index fa07df4..958a7d8 100644
--- a/configs/mx53evk_defconfig
+++ b/configs/mx53evk_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX53EVK=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53evk/imximage.cfg"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig
index e23fce8..1badd4e 100644
--- a/configs/mx53loco_defconfig
+++ b/configs/mx53loco_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX53LOCO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53loco/imximage.cfg"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mx53smd_defconfig b/configs/mx53smd_defconfig
index 9707964..2fdd374 100644
--- a/configs/mx53smd_defconfig
+++ b/configs/mx53smd_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX53SMD=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53smd/imximage.cfg"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig
index 12899d6..27fe22e 100644
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_TARGET_MX6CUBOXI=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_DM=y
 CONFIG_DM_THERMAL=y
diff --git a/configs/mx6dlarm2_defconfig b/configs/mx6dlarm2_defconfig
index 4324ccf..6c1ba33 100644
--- a/configs/mx6dlarm2_defconfig
+++ b/configs/mx6dlarm2_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX6QARM2=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,DDR_MB=2048"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mx6dlarm2_lpddr2_defconfig b/configs/mx6dlarm2_lpddr2_defconfig
index 7681814..4624a09 100644
--- a/configs/mx6dlarm2_lpddr2_defconfig
+++ b/configs/mx6dlarm2_lpddr2_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX6QARM2=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,MX6DL_LPDDR2,DDR_MB=512"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
index 92c1db4..756e5db 100644
--- a/configs/mx6dlsabreauto_defconfig
+++ b/configs/mx6dlsabreauto_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig
index 5a5a8e0..de99998 100644
--- a/configs/mx6dlsabresd_defconfig
+++ b/configs/mx6dlsabresd_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX6SABRESD=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg,MX6DL"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/mx6qarm2_defconfig b/configs/mx6qarm2_defconfig
index 51ab7e3..42dbded 100644
--- a/configs/mx6qarm2_defconfig
+++ b/configs/mx6qarm2_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX6QARM2=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,DDR_MB=2048"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mx6qarm2_lpddr2_defconfig b/configs/mx6qarm2_lpddr2_defconfig
index c590c39..5f9105f 100644
--- a/configs/mx6qarm2_lpddr2_defconfig
+++ b/configs/mx6qarm2_lpddr2_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX6QARM2=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,MX6DQ_LPDDR2,DDR_MB=512"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
index df85271..9343bcc 100644
--- a/configs/mx6qsabreauto_defconfig
+++ b/configs/mx6qsabreauto_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index e544337..427fbee 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_THERMAL=y
diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig
index 1508e26..732c1dc 100644
--- a/configs/mx6qsabresd_defconfig
+++ b/configs/mx6qsabresd_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX6SABRESD=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig
index 1f573cd..d93a40d 100644
--- a/configs/mx6sabresd_spl_defconfig
+++ b/configs/mx6sabresd_spl_defconfig
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_TARGET_MX6SABRESD=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig
index ccb6e2a..dcc3296 100644
--- a/configs/mx6slevk_defconfig
+++ b/configs/mx6slevk_defconfig
@@ -1,7 +1,9 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX6SLEVK=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_THERMAL=y
diff --git a/configs/mx6slevk_spinor_defconfig b/configs/mx6slevk_spinor_defconfig
index 912b162..964a147 100644
--- a/configs/mx6slevk_spinor_defconfig
+++ b/configs/mx6slevk_spinor_defconfig
@@ -1,7 +1,9 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX6SLEVK=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL,SYS_BOOT_SPINOR"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_THERMAL=y
diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig
index 4766530..e355ba5 100644
--- a/configs/mx6sxsabresd_defconfig
+++ b/configs/mx6sxsabresd_defconfig
@@ -1,5 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_MX6SXSABRESD=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,MX6SX"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig
index e499a0a..df34894 100644
--- a/configs/mx6sxsabresd_spl_defconfig
+++ b/configs/mx6sxsabresd_spl_defconfig
@@ -2,5 +2,7 @@ CONFIG_ARM=y
 CONFIG_TARGET_MX6SXSABRESD=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SX"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index 17a64c7..47e5911 100644
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NAS220=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/neo_defconfig b/configs/neo_defconfig
index 094a53d..77eefe9 100644
--- a/configs/neo_defconfig
+++ b/configs/neo_defconfig
@@ -1,5 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_NEO=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_NFS is not set
diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index 03aa0bf..09df520 100644
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -2,5 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NET2BIG_V2=y
 CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index 7777c40..862a9ae 100644
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -2,5 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index c2052ed..1829995 100644
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -2,5 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index 6508f3d..35cb154 100644
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -2,5 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index 4cb15b9..a13452b 100644
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -2,5 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/nhk8815_defconfig b/configs/nhk8815_defconfig
index 3d46043..f9fac6f 100644
--- a/configs/nhk8815_defconfig
+++ b/configs/nhk8815_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_NOMADIK=y
 CONFIG_NOMADIK_NHK8815=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/nhk8815_onenand_defconfig b/configs/nhk8815_onenand_defconfig
index 7cc957f..c01559d 100644
--- a/configs/nhk8815_onenand_defconfig
+++ b/configs/nhk8815_onenand_defconfig
@@ -2,4 +2,6 @@ CONFIG_ARM=y
 CONFIG_ARCH_NOMADIK=y
 CONFIG_NOMADIK_NHK8815=y
 CONFIG_SYS_EXTRA_OPTIONS="BOOT_ONENAND"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/nios2-generic_defconfig b/configs/nios2-generic_defconfig
index 4ff0611..573a084 100644
--- a/configs/nios2-generic_defconfig
+++ b/configs/nios2-generic_defconfig
@@ -1,3 +1,9 @@
 CONFIG_NIOS2=y
 CONFIG_TARGET_NIOS2_GENERIC=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index 7216400..6cbc0e3 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 805b1d8..055266c 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index 2dc8c5c..7b5ccc7 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index fc7e708..5cc245e 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index 29dc3d9..b613a49 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index 4f13504..b7cd09a 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index 3aff2e6..c40dadf 100644
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -2,3 +2,11 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_NOKIA_RX51=y
 CONFIG_AUTOBOOT_KEYED=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index ccc0055..aca98b7 100644
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -2,5 +2,5 @@ CONFIG_ARM=y
 CONFIG_TARGET_KOSAGI_NOVENA=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index a040b1c..79b74a7 100644
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -3,7 +3,12 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA124=y
 CONFIG_TARGET_NYAN_BIG=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_CMD_CROS_EC=y
diff --git a/configs/ocotea_defconfig b/configs/ocotea_defconfig
index 864aefb..34518cd 100644
--- a/configs/ocotea_defconfig
+++ b/configs/ocotea_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_OCOTEA=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
index e081c73..2b960d5 100644
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_ODROID_XU3=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index 3cef0ec..3104f88 100644
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -3,8 +3,11 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_ODROID=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_OF_CONTROL=y
diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
index e5b1f3a..dde076a 100644
--- a/configs/omap3_beagle_defconfig
+++ b/configs/omap3_beagle_defconfig
@@ -3,5 +3,5 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_BEAGLE=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="NAND"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index d48cfc2..65b6f6a 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -2,4 +2,8 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_EVM=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/omap3_evm_quick_mmc_defconfig b/configs/omap3_evm_quick_mmc_defconfig
index 7d0a973..527b465 100644
--- a/configs/omap3_evm_quick_mmc_defconfig
+++ b/configs/omap3_evm_quick_mmc_defconfig
@@ -2,4 +2,24 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_EVM_QUICK_MMC=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_MEMORY is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
diff --git a/configs/omap3_evm_quick_nand_defconfig b/configs/omap3_evm_quick_nand_defconfig
index 6dec5cd..e3278b5 100644
--- a/configs/omap3_evm_quick_nand_defconfig
+++ b/configs/omap3_evm_quick_nand_defconfig
@@ -2,4 +2,24 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_EVM_QUICK_NAND=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_MEMORY is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig
index 3d596a7..f22b50e 100644
--- a/configs/omap3_ha_defconfig
+++ b/configs/omap3_ha_defconfig
@@ -3,4 +3,8 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_TAO3530=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BOARD_OMAP3_HA"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index c9fdda8..b11d2e4 100644
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -1,5 +1,7 @@
 CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_LOGIC=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
diff --git a/configs/omap3_mvblx_defconfig b/configs/omap3_mvblx_defconfig
index 05c1c46..415b02e 100644
--- a/configs/omap3_mvblx_defconfig
+++ b/configs/omap3_mvblx_defconfig
@@ -3,4 +3,6 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_MVBLX=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR="S"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig
index 9416bce..8d55590 100644
--- a/configs/omap3_overo_defconfig
+++ b/configs/omap3_overo_defconfig
@@ -2,4 +2,9 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_OVERO=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig
index bf28537..f18a520 100644
--- a/configs/omap3_pandora_defconfig
+++ b/configs/omap3_pandora_defconfig
@@ -1,3 +1,10 @@
 CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_PANDORA=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/omap3_sdp3430_defconfig b/configs/omap3_sdp3430_defconfig
index 846fd1a..df9e709 100644
--- a/configs/omap3_sdp3430_defconfig
+++ b/configs/omap3_sdp3430_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_SDP3430=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig
index ba05d08..9efd6de 100644
--- a/configs/omap3_zoom1_defconfig
+++ b/configs/omap3_zoom1_defconfig
@@ -1,4 +1,8 @@
 CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_ZOOM1=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig
index ec6a63a..1be285d 100644
--- a/configs/omap4_panda_defconfig
+++ b/configs/omap4_panda_defconfig
@@ -2,4 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP44XX=y
 CONFIG_TARGET_OMAP4_PANDA=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig
index 0598136..b369d1d 100644
--- a/configs/omap4_sdp4430_defconfig
+++ b/configs/omap4_sdp4430_defconfig
@@ -2,3 +2,8 @@ CONFIG_ARM=y
 CONFIG_OMAP44XX=y
 CONFIG_TARGET_OMAP4_SDP4430=y
 CONFIG_SPL=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig
index d2ad480..15221ad 100644
--- a/configs/omap5_uevm_defconfig
+++ b/configs/omap5_uevm_defconfig
@@ -2,4 +2,6 @@ CONFIG_ARM=y
 CONFIG_OMAP54XX=y
 CONFIG_TARGET_OMAP5_UEVM=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig
index 1e76735..a49be95 100644
--- a/configs/omapl138_lcdk_defconfig
+++ b/configs/omapl138_lcdk_defconfig
@@ -2,5 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_OMAPL138_LCDK=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig
index a620e61..1686139 100644
--- a/configs/openrd_base_defconfig
+++ b/configs/openrd_base_defconfig
@@ -2,4 +2,6 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_OPENRD=y
 CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_BASE"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig
index 4a49663..c342315 100644
--- a/configs/openrd_client_defconfig
+++ b/configs/openrd_client_defconfig
@@ -2,4 +2,6 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_OPENRD=y
 CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_CLIENT"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig
index a81b382..530ba4d 100644
--- a/configs/openrd_ultimate_defconfig
+++ b/configs/openrd_ultimate_defconfig
@@ -2,4 +2,6 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_OPENRD=y
 CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_ULTIMATE"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/openrisc-generic_defconfig b/configs/openrisc-generic_defconfig
index fb4024a..54cd832 100644
--- a/configs/openrisc-generic_defconfig
+++ b/configs/openrisc-generic_defconfig
@@ -1,3 +1,5 @@
 CONFIG_OPENRISC=y
 CONFIG_TARGET_OPENRISC_GENERIC=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/origen_defconfig b/configs/origen_defconfig
index a893660..6961978 100644
--- a/configs/origen_defconfig
+++ b/configs/origen_defconfig
@@ -3,7 +3,12 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_ORIGEN=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen"
 CONFIG_SPL=y
-CONFIG_CMD_SETEXPR=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_USB=y
diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig
index b4cce31..ea78934 100644
--- a/configs/ot1200_defconfig
+++ b/configs/ot1200_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_OT1200=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx6q_4x_mt41j128.cfg,MX6Q"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig
index 42eefb8..3c7346b 100644
--- a/configs/ot1200_spl_defconfig
+++ b/configs/ot1200_spl_defconfig
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_TARGET_OT1200=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/otc570_dataflash_defconfig b/configs/otc570_dataflash_defconfig
index ffa756c..c5ff59a 100644
--- a/configs/otc570_dataflash_defconfig
+++ b/configs/otc570_dataflash_defconfig
@@ -2,4 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_OTC570=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/otc570_defconfig b/configs/otc570_defconfig
index e1f666bd..8cc55ee 100644
--- a/configs/otc570_defconfig
+++ b/configs/otc570_defconfig
@@ -2,4 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_OTC570=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/p3p440_defconfig b/configs/p3p440_defconfig
index 2b1a02e..84e683b 100644
--- a/configs/p3p440_defconfig
+++ b/configs/p3p440_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_P3P440=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/palmld_defconfig b/configs/palmld_defconfig
index 599acc3..8bf6c53 100644
--- a/configs/palmld_defconfig
+++ b/configs/palmld_defconfig
@@ -1,2 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_PALMLD=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/palmtc_defconfig b/configs/palmtc_defconfig
index 91cb76d..4042466 100644
--- a/configs/palmtc_defconfig
+++ b/configs/palmtc_defconfig
@@ -1,2 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TARGET_PALMTC=y
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/palmtreo680_defconfig b/configs/palmtreo680_defconfig
index f30d2b7..b56191d 100644
--- a/configs/palmtreo680_defconfig
+++ b/configs/palmtreo680_defconfig
@@ -1,3 +1,12 @@
 CONFIG_ARM=y
 CONFIG_TARGET_PALMTREO680=y
 CONFIG_SPL=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index 1dfef48..60fb2d6 100644
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -3,7 +3,12 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA20=y
 CONFIG_TARGET_PAZ00=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-paz00"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/pb1000_defconfig b/configs/pb1000_defconfig
index 4b8212c..72756a7 100644
--- a/configs/pb1000_defconfig
+++ b/configs/pb1000_defconfig
@@ -1,5 +1,12 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_PB1X00=y
 CONFIG_SYS_EXTRA_OPTIONS="PB1000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/pcm030_LOWBOOT_defconfig b/configs/pcm030_LOWBOOT_defconfig
index 5ec6370..42389bb 100644
--- a/configs/pcm030_LOWBOOT_defconfig
+++ b/configs/pcm030_LOWBOOT_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_PCM030=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFF000000"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/pcm030_defconfig b/configs/pcm030_defconfig
index da0cb5f..df9309e 100644
--- a/configs/pcm030_defconfig
+++ b/configs/pcm030_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_PCM030=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig
index 8050b42..2f1022c 100644
--- a/configs/pcm051_rev1_defconfig
+++ b/configs/pcm051_rev1_defconfig
@@ -2,5 +2,7 @@ CONFIG_ARM=y
 CONFIG_TARGET_PCM051=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="REV1"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig
index 16f314e..61d94b8 100644
--- a/configs/pcm051_rev3_defconfig
+++ b/configs/pcm051_rev3_defconfig
@@ -2,5 +2,7 @@ CONFIG_ARM=y
 CONFIG_TARGET_PCM051=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="REV3"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/pcs440ep_defconfig b/configs/pcs440ep_defconfig
index 593766e..b01f63a 100644
--- a/configs/pcs440ep_defconfig
+++ b/configs/pcs440ep_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_PCS440EP=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/pdm360ng_defconfig b/configs/pdm360ng_defconfig
index ca83cc0..3997f59 100644
--- a/configs/pdm360ng_defconfig
+++ b/configs/pdm360ng_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC512X=y
 CONFIG_TARGET_PDM360NG=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
index a198455..c17fc73 100644
--- a/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@ -3,7 +3,8 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_PEACH_PI=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5800-peach-pi"
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index a519cff..8f21722 100644
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -3,7 +3,8 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_PEACH_PIT=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit"
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig
index 72ccb3e..38add54 100644
--- a/configs/pengwyn_defconfig
+++ b/configs/pengwyn_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_PENGWYN=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig
index c4c6257..eb1b6cf 100644
--- a/configs/pepper_defconfig
+++ b/configs/pepper_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_PEPPER=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig
index 9b8c668..650201a 100644
--- a/configs/ph1_ld4_defconfig
+++ b/configs/ph1_ld4_defconfig
@@ -11,29 +11,17 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_BDI=y
-CONFIG_CMD_CONSOLE=y
-CONFIG_CMD_BOOTD=y
-CONFIG_CMD_RUN=y
-CONFIG_CMD_IMI=y
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_EDITENV=y
-CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_MEMORY=y
-CONFIG_CMD_LOADB=y
-CONFIG_CMD_LOADS=y
-CONFIG_CMD_FLASH=y
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_ENV_EXISTS is not set
 CONFIG_CMD_NAND=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
-CONFIG_CMD_ECHO=y
-CONFIG_CMD_ITEST=y
-CONFIG_CMD_SOURCE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TFTPPUT=y
-CONFIG_CMD_NFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
+# CONFIG_CMD_MISC is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_NAND_DENALI=y
diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig
index bf0f8f2..7d8d9cc 100644
--- a/configs/ph1_pro4_defconfig
+++ b/configs/ph1_pro4_defconfig
@@ -10,29 +10,17 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_BDI=y
-CONFIG_CMD_CONSOLE=y
-CONFIG_CMD_BOOTD=y
-CONFIG_CMD_RUN=y
-CONFIG_CMD_IMI=y
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_EDITENV=y
-CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_MEMORY=y
-CONFIG_CMD_LOADB=y
-CONFIG_CMD_LOADS=y
-CONFIG_CMD_FLASH=y
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_ENV_EXISTS is not set
 CONFIG_CMD_NAND=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
-CONFIG_CMD_ECHO=y
-CONFIG_CMD_ITEST=y
-CONFIG_CMD_SOURCE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TFTPPUT=y
-CONFIG_CMD_NFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
+# CONFIG_CMD_MISC is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_NAND_DENALI=y
diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig
index 791e633..90c44ac 100644
--- a/configs/ph1_sld8_defconfig
+++ b/configs/ph1_sld8_defconfig
@@ -11,29 +11,17 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_BDI=y
-CONFIG_CMD_CONSOLE=y
-CONFIG_CMD_BOOTD=y
-CONFIG_CMD_RUN=y
-CONFIG_CMD_IMI=y
-CONFIG_CMD_IMLS=y
-CONFIG_CMD_EDITENV=y
-CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_MEMORY=y
-CONFIG_CMD_LOADB=y
-CONFIG_CMD_LOADS=y
-CONFIG_CMD_FLASH=y
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_ENV_EXISTS is not set
 CONFIG_CMD_NAND=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
-CONFIG_CMD_ECHO=y
-CONFIG_CMD_ITEST=y
-CONFIG_CMD_SOURCE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TFTPPUT=y
-CONFIG_CMD_NFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
+# CONFIG_CMD_MISC is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_NAND_DENALI=y
diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig
index 672ea28..3484c46 100644
--- a/configs/platinum_picon_defconfig
+++ b/configs/platinum_picon_defconfig
@@ -2,4 +2,6 @@ CONFIG_ARM=y
 CONFIG_TARGET_PLATINUM_PICON=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig
index 39236f1..6a2cacf 100644
--- a/configs/platinum_titanium_defconfig
+++ b/configs/platinum_titanium_defconfig
@@ -2,4 +2,6 @@ CONFIG_ARM=y
 CONFIG_TARGET_PLATINUM_TITANIUM=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
index c9a3afe..8d96e33 100644
--- a/configs/plutux_defconfig
+++ b/configs/plutux_defconfig
@@ -3,7 +3,12 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA20=y
 CONFIG_TARGET_PLUTUX=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-plutux"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig
index 3393fba..2c842b4 100644
--- a/configs/pm9261_defconfig
+++ b/configs/pm9261_defconfig
@@ -2,4 +2,9 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_PM9261=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig
index c6398f5..a065ce0 100644
--- a/configs/pm9263_defconfig
+++ b/configs/pm9263_defconfig
@@ -2,4 +2,9 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_PM9263=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/pm9g45_defconfig b/configs/pm9g45_defconfig
index 5227bd2..bbaeae8 100644
--- a/configs/pm9g45_defconfig
+++ b/configs/pm9g45_defconfig
@@ -2,4 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_PM9G45=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G45"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
index 11af9cf..f21237f 100644
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_POGO_E02=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/polaris_defconfig b/configs/polaris_defconfig
index 703c48b..e209566 100644
--- a/configs/polaris_defconfig
+++ b/configs/polaris_defconfig
@@ -1,4 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_TRIZEPSIV=y
 CONFIG_SYS_EXTRA_OPTIONS="POLARIS"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/porter_defconfig b/configs/porter_defconfig
index 1ef1483..15f3434 100644
--- a/configs/porter_defconfig
+++ b/configs/porter_defconfig
@@ -1,6 +1,20 @@
 CONFIG_ARM=y
 CONFIG_RMOBILE=y
 CONFIG_TARGET_PORTER=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SH_SDHI=y
diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig
index e6c9730..3ff9ebb 100644
--- a/configs/portl2_defconfig
+++ b/configs/portl2_defconfig
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_PORTL2"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/portuxg20_defconfig b/configs/portuxg20_defconfig
index aa44a80..1e8344f 100644
--- a/configs/portuxg20_defconfig
+++ b/configs/portuxg20_defconfig
@@ -2,4 +2,9 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_STAMP9G20=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,PORTUXG20"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/pr1_defconfig b/configs/pr1_defconfig
index 405e494..b06babc 100644
--- a/configs/pr1_defconfig
+++ b/configs/pr1_defconfig
@@ -1,6 +1,8 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_PR1=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
diff --git a/configs/pxa255_idp_defconfig b/configs/pxa255_idp_defconfig
index ad9bd4c..c7be4e9 100644
--- a/configs/pxa255_idp_defconfig
+++ b/configs/pxa255_idp_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_PXA255_IDP=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 63fd450..0bb42ff 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -4,5 +4,7 @@ CONFIG_SPL=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/qemu-ppce500_defconfig b/configs/qemu-ppce500_defconfig
index 3f58564..27daa62 100644
--- a/configs/qemu-ppce500_defconfig
+++ b/configs/qemu-ppce500_defconfig
@@ -1,5 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_QEMU_PPCE500=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index 38e0fdb..5639cc5 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -1,7 +1,10 @@
 CONFIG_X86=y
 CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
 CONFIG_GENERATE_PIRQ_TABLE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CMD_BOOTSTAGE=y
diff --git a/configs/qemu_mips64_defconfig b/configs/qemu_mips64_defconfig
index 9eceae6..4187430 100644
--- a/configs/qemu_mips64_defconfig
+++ b/configs/qemu_mips64_defconfig
@@ -1,5 +1,7 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_QEMU_MIPS=y
 CONFIG_CPU_MIPS64_R1=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/qemu_mips64el_defconfig b/configs/qemu_mips64el_defconfig
index d847757..c8bcbb7 100644
--- a/configs/qemu_mips64el_defconfig
+++ b/configs/qemu_mips64el_defconfig
@@ -2,5 +2,7 @@ CONFIG_MIPS=y
 CONFIG_TARGET_QEMU_MIPS=y
 CONFIG_SYS_LITTLE_ENDIAN=y
 CONFIG_CPU_MIPS64_R1=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/qemu_mips_defconfig b/configs/qemu_mips_defconfig
index 714e72b..337ecea 100644
--- a/configs/qemu_mips_defconfig
+++ b/configs/qemu_mips_defconfig
@@ -1,4 +1,6 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_QEMU_MIPS=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/qemu_mipsel_defconfig b/configs/qemu_mipsel_defconfig
index f6cb45e..bfb3bcc 100644
--- a/configs/qemu_mipsel_defconfig
+++ b/configs/qemu_mipsel_defconfig
@@ -1,5 +1,7 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_QEMU_MIPS=y
 CONFIG_SYS_LITTLE_ENDIAN=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/qong_defconfig b/configs/qong_defconfig
index 233b046..fddd836 100644
--- a/configs/qong_defconfig
+++ b/configs/qong_defconfig
@@ -1,4 +1,2 @@
 CONFIG_ARM=y
 CONFIG_TARGET_QONG=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/r0p7734_defconfig b/configs/r0p7734_defconfig
index 727c46c..d8a15ac 100644
--- a/configs/r0p7734_defconfig
+++ b/configs/r0p7734_defconfig
@@ -1,4 +1,20 @@
 CONFIG_SH=y
 CONFIG_TARGET_R0P7734=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig
index 05026bc..cca0156 100644
--- a/configs/r2dplus_defconfig
+++ b/configs/r2dplus_defconfig
@@ -1,4 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_R2DPLUS=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig
index 9c124d0..ac7928d 100644
--- a/configs/r7-tv-dongle_defconfig
+++ b/configs/r7-tv-dongle_defconfig
@@ -7,10 +7,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-r7-tv-dongle"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/r7780mp_defconfig b/configs/r7780mp_defconfig
index 514bd70..180b9e9 100644
--- a/configs/r7780mp_defconfig
+++ b/configs/r7780mp_defconfig
@@ -1,4 +1,20 @@
 CONFIG_SH=y
 CONFIG_TARGET_R7780MP=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/rainier_defconfig b/configs/rainier_defconfig
index e84b349..1713592 100644
--- a/configs/rainier_defconfig
+++ b/configs/rainier_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_SEQUOIA=y
 CONFIG_SYS_EXTRA_OPTIONS="RAINIER"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/rainier_ramboot_defconfig b/configs/rainier_ramboot_defconfig
index cca296e..ba22d9d 100644
--- a/configs/rainier_ramboot_defconfig
+++ b/configs/rainier_ramboot_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_SEQUOIA=y
 CONFIG_SYS_EXTRA_OPTIONS="RAINIER,SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/sequoia/u-boot-ram.lds"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/rd6281a_defconfig b/configs/rd6281a_defconfig
index 1a9fcd3..8fe8594 100644
--- a/configs/rd6281a_defconfig
+++ b/configs/rd6281a_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_RD6281A=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/redwood_defconfig b/configs/redwood_defconfig
index 97252c4..ad87d0e 100644
--- a/configs/redwood_defconfig
+++ b/configs/redwood_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_REDWOOD=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index cbe3dea..fd18e2d 100644
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_EMBESTMX6BOARDS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024,ENV_IS_IN_MMC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_THERMAL=y
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index 534a8a8..139189d 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -1,5 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_BCM283X=y
 CONFIG_TARGET_RPI_2=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_PHYS_TO_BUS=y
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index ccfbb8f..db8da68 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -1,5 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_BCM283X=y
 CONFIG_TARGET_RPI=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_PHYS_TO_BUS=y
diff --git a/configs/rsk7203_defconfig b/configs/rsk7203_defconfig
index 27f9b65..6134172 100644
--- a/configs/rsk7203_defconfig
+++ b/configs/rsk7203_defconfig
@@ -1,4 +1,20 @@
 CONFIG_SH=y
 CONFIG_TARGET_RSK7203=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/rsk7264_defconfig b/configs/rsk7264_defconfig
index 701f73a..272bd86 100644
--- a/configs/rsk7264_defconfig
+++ b/configs/rsk7264_defconfig
@@ -1,4 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_RSK7264=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/rsk7269_defconfig b/configs/rsk7269_defconfig
index ae5fe02..41e70a5 100644
--- a/configs/rsk7269_defconfig
+++ b/configs/rsk7269_defconfig
@@ -1,4 +1,4 @@
 CONFIG_SH=y
 CONFIG_TARGET_RSK7269=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index 2f125e4..da9dfe3 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -4,5 +4,7 @@ CONFIG_SPL=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig
index 618e590..7e03b9d 100644
--- a/configs/s5p_goni_defconfig
+++ b/configs/s5p_goni_defconfig
@@ -2,3 +2,11 @@ CONFIG_ARM=y
 CONFIG_ARCH_S5PC1XX=y
 CONFIG_TARGET_S5P_GONI=y
 CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
index 30d6059..21a4708 100644
--- a/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@ -2,7 +2,12 @@ CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_S5PC210_UNIVERSAL=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210"
-CONFIG_CMD_SETEXPR=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_USB=y
diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig
index 5a39b2e..36f8254 100644
--- a/configs/sama5d3_xplained_mmc_defconfig
+++ b/configs/sama5d3_xplained_mmc_defconfig
@@ -3,5 +3,8 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D3_XPLAINED=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig
index 59d9e21..2de83d4 100644
--- a/configs/sama5d3_xplained_nandflash_defconfig
+++ b/configs/sama5d3_xplained_nandflash_defconfig
@@ -3,5 +3,8 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D3_XPLAINED=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig
index 5c5841f..e953d0a 100644
--- a/configs/sama5d3xek_mmc_defconfig
+++ b/configs/sama5d3xek_mmc_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D3XEK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig
index d178620..832b9eb 100644
--- a/configs/sama5d3xek_nandflash_defconfig
+++ b/configs/sama5d3xek_nandflash_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D3XEK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig
index ad0aedf..bcfc65b 100644
--- a/configs/sama5d3xek_spiflash_defconfig
+++ b/configs/sama5d3xek_spiflash_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D3XEK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_SERIALFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig
index 0fa5852..42d302c 100644
--- a/configs/sama5d4_xplained_mmc_defconfig
+++ b/configs/sama5d4_xplained_mmc_defconfig
@@ -3,6 +3,9 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4_XPLAINED=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig
index 3bf4ac6..d27f572 100644
--- a/configs/sama5d4_xplained_nandflash_defconfig
+++ b/configs/sama5d4_xplained_nandflash_defconfig
@@ -3,6 +3,9 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4_XPLAINED=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig
index 1074471..e5d026a 100644
--- a/configs/sama5d4_xplained_spiflash_defconfig
+++ b/configs/sama5d4_xplained_spiflash_defconfig
@@ -3,6 +3,9 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4_XPLAINED=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig
index fc9e0f1..82fa9d4 100644
--- a/configs/sama5d4ek_mmc_defconfig
+++ b/configs/sama5d4ek_mmc_defconfig
@@ -3,6 +3,9 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig
index 3961654..a333e06 100644
--- a/configs/sama5d4ek_nandflash_defconfig
+++ b/configs/sama5d4ek_nandflash_defconfig
@@ -3,6 +3,9 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig
index 12857e4..fc6dbb0 100644
--- a/configs/sama5d4ek_spiflash_defconfig
+++ b/configs/sama5d4ek_spiflash_defconfig
@@ -3,6 +3,9 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SAMA5D4EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 4c2c230..598519d 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -3,7 +3,9 @@ CONFIG_DEFAULT_DEVICE_TREE="sandbox"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_SOUND=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
@@ -19,7 +21,6 @@ CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SANDBOX=y
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_SANDBOX_SERIAL=y
 CONFIG_TPM_TIS_SANDBOX=y
diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig
index e1aae9c..840f9d4 100644
--- a/configs/sansa_fuze_plus_defconfig
+++ b/configs/sansa_fuze_plus_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SANSA_FUZE_PLUS=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc405_defconfig b/configs/sbc405_defconfig
index 7324f22..0bc0ab2 100644
--- a/configs/sbc405_defconfig
+++ b/configs/sbc405_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_SBC405=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc8349_PCI_33_defconfig b/configs/sbc8349_PCI_33_defconfig
index 46218f2..c03a807 100644
--- a/configs/sbc8349_PCI_33_defconfig
+++ b/configs/sbc8349_PCI_33_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_SBC8349=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,PCI_33M"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc8349_PCI_66_defconfig b/configs/sbc8349_PCI_66_defconfig
index 496b649..030c2d6 100644
--- a/configs/sbc8349_PCI_66_defconfig
+++ b/configs/sbc8349_PCI_66_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_SBC8349=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,PCI_66M"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc8349_defconfig b/configs/sbc8349_defconfig
index fe59219..01392aa 100644
--- a/configs/sbc8349_defconfig
+++ b/configs/sbc8349_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_SBC8349=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc8548_PCI_33_PCIE_defconfig b/configs/sbc8548_PCI_33_PCIE_defconfig
index a355db8..b6e8766 100644
--- a/configs/sbc8548_PCI_33_PCIE_defconfig
+++ b/configs/sbc8548_PCI_33_PCIE_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_SBC8548=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,33,PCIE"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc8548_PCI_33_defconfig b/configs/sbc8548_PCI_33_defconfig
index b007ab7..f3c4ced 100644
--- a/configs/sbc8548_PCI_33_defconfig
+++ b/configs/sbc8548_PCI_33_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_SBC8548=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,33"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc8548_PCI_66_PCIE_defconfig b/configs/sbc8548_PCI_66_PCIE_defconfig
index e9c9cdf..bb0ad95 100644
--- a/configs/sbc8548_PCI_66_PCIE_defconfig
+++ b/configs/sbc8548_PCI_66_PCIE_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_SBC8548=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,66,PCIE"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc8548_PCI_66_defconfig b/configs/sbc8548_PCI_66_defconfig
index eca365e..d601416 100644
--- a/configs/sbc8548_PCI_66_defconfig
+++ b/configs/sbc8548_PCI_66_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_SBC8548=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,66"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc8548_defconfig b/configs/sbc8548_defconfig
index 2c609b4..3e3b507 100644
--- a/configs/sbc8548_defconfig
+++ b/configs/sbc8548_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_SBC8548=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc8641d_defconfig b/configs/sbc8641d_defconfig
index af43b5b..b67c7c0 100644
--- a/configs/sbc8641d_defconfig
+++ b/configs/sbc8641d_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC86xx=y
 CONFIG_TARGET_SBC8641D=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sc_sps_1_defconfig b/configs/sc_sps_1_defconfig
index d4e72f7..468113d 100644
--- a/configs/sc_sps_1_defconfig
+++ b/configs/sc_sps_1_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SC_SPS_1=y
 CONFIG_SPL=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
diff --git a/configs/scb9328_defconfig b/configs/scb9328_defconfig
index 5ae7515..3104586 100644
--- a/configs/scb9328_defconfig
+++ b/configs/scb9328_defconfig
@@ -1,3 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SCB9328=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 01cb8f7..942f17e 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -3,7 +3,12 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA20=y
 CONFIG_TARGET_SEABOARD=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/secomx6quq7_defconfig b/configs/secomx6quq7_defconfig
index f9d7ee9..0095ceb 100644
--- a/configs/secomx6quq7_defconfig
+++ b/configs/secomx6quq7_defconfig
@@ -5,5 +5,5 @@ CONFIG_SECOMX6_UQ7=y
 CONFIG_SECOMX6Q=y
 CONFIG_SECOMX6_2GB=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
diff --git a/configs/sequoia_defconfig b/configs/sequoia_defconfig
index 2ea6c78..bbaec61 100644
--- a/configs/sequoia_defconfig
+++ b/configs/sequoia_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_SEQUOIA=y
 CONFIG_SYS_EXTRA_OPTIONS="SEQUOIA"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/sequoia_ramboot_defconfig b/configs/sequoia_ramboot_defconfig
index 4522287..5b2c6f4 100644
--- a/configs/sequoia_ramboot_defconfig
+++ b/configs/sequoia_ramboot_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_SEQUOIA=y
 CONFIG_SYS_EXTRA_OPTIONS="SEQUOIA,SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/sequoia/u-boot-ram.lds"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/sh7752evb_defconfig b/configs/sh7752evb_defconfig
index bd97913..b748e37 100644
--- a/configs/sh7752evb_defconfig
+++ b/configs/sh7752evb_defconfig
@@ -1,6 +1,21 @@
 CONFIG_SH=y
 CONFIG_SH_32BIT=y
 CONFIG_TARGET_SH7752EVB=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/sh7753evb_defconfig b/configs/sh7753evb_defconfig
index 84c207a..7bac054 100644
--- a/configs/sh7753evb_defconfig
+++ b/configs/sh7753evb_defconfig
@@ -1,5 +1,20 @@
 CONFIG_SH=y
 CONFIG_TARGET_SH7753EVB=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig
index d22e70e..1a253dc 100644
--- a/configs/sh7757lcr_defconfig
+++ b/configs/sh7757lcr_defconfig
@@ -1,6 +1,21 @@
 CONFIG_SH=y
 CONFIG_SH_32BIT=y
 CONFIG_TARGET_SH7757LCR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/sh7763rdp_defconfig b/configs/sh7763rdp_defconfig
index 21fbc6a..ff84516 100644
--- a/configs/sh7763rdp_defconfig
+++ b/configs/sh7763rdp_defconfig
@@ -1,4 +1,20 @@
 CONFIG_SH=y
 CONFIG_TARGET_SH7763RDP=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/sh7785lcr_32bit_defconfig b/configs/sh7785lcr_32bit_defconfig
index a0f0640..611ee18 100644
--- a/configs/sh7785lcr_32bit_defconfig
+++ b/configs/sh7785lcr_32bit_defconfig
@@ -1,5 +1,20 @@
 CONFIG_SH=y
 CONFIG_SH_32BIT=y
 CONFIG_TARGET_SH7785LCR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/sh7785lcr_defconfig b/configs/sh7785lcr_defconfig
index 0984580..bc27765 100644
--- a/configs/sh7785lcr_defconfig
+++ b/configs/sh7785lcr_defconfig
@@ -1,4 +1,19 @@
 CONFIG_SH=y
 CONFIG_TARGET_SH7785LCR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index 7a0fb10..54e2ad7 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_SHEEVAPLUG=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/shmin_defconfig b/configs/shmin_defconfig
index 8979fdd..8240aad 100644
--- a/configs/shmin_defconfig
+++ b/configs/shmin_defconfig
@@ -1,4 +1,20 @@
 CONFIG_SH=y
 CONFIG_TARGET_SHMIN=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/silk_defconfig b/configs/silk_defconfig
index ed107e3..20c85fd 100644
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@@ -1,6 +1,20 @@
 CONFIG_ARM=y
 CONFIG_RMOBILE=y
 CONFIG_TARGET_SILK=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SH_SDHI=y
diff --git a/configs/smdk2410_defconfig b/configs/smdk2410_defconfig
index 846ac8e..74bb9e3 100644
--- a/configs/smdk2410_defconfig
+++ b/configs/smdk2410_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SMDK2410=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 9092f3b..8412d6f 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -3,7 +3,8 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_SMDK5250=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_SOUND=y
 CONFIG_SPI_FLASH=y
 CONFIG_SOUND=y
diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index e3d829b..a96b368 100644
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -3,7 +3,8 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_SMDK5420=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420"
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig
index bc17009..6c8359e 100644
--- a/configs/smdkc100_defconfig
+++ b/configs/smdkc100_defconfig
@@ -2,4 +2,6 @@ CONFIG_ARM=y
 CONFIG_ARCH_S5PC1XX=y
 CONFIG_TARGET_SMDKC100=y
 CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig
index 5d01f89..39dd5be 100644
--- a/configs/smdkv310_defconfig
+++ b/configs/smdkv310_defconfig
@@ -3,7 +3,10 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_SMDKV310=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-smdkv310"
 CONFIG_SPL=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig
index 942a73f..d319a4f 100644
--- a/configs/snapper9260_defconfig
+++ b/configs/snapper9260_defconfig
@@ -2,4 +2,11 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SNAPPER9260=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig
index 9e814e4..def06f1 100644
--- a/configs/snapper9g20_defconfig
+++ b/configs/snapper9g20_defconfig
@@ -2,4 +2,11 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SNAPPER9260=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index a43e51e..93fbcae 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -3,7 +3,8 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_SNOW=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-snow"
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_SOUND=y
 CONFIG_SPI_FLASH=y
 CONFIG_CMD_CROS_EC=y
diff --git a/configs/snowball_defconfig b/configs/snowball_defconfig
index 19100c2..31aa583 100644
--- a/configs/snowball_defconfig
+++ b/configs/snowball_defconfig
@@ -1,2 +1,12 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SNOWBALL=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig
index 8c5b109..4ba4b8c 100644
--- a/configs/socfpga_arria5_defconfig
+++ b/configs/socfpga_arria5_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARCH_SOCFPGA=y
 CONFIG_TARGET_SOCFPGA_ARRIA5=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
 CONFIG_SPL=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig
index 6302ec5..e101f76 100644
--- a/configs/socfpga_cyclone5_defconfig
+++ b/configs/socfpga_cyclone5_defconfig
@@ -3,8 +3,8 @@ CONFIG_ARCH_SOCFPGA=y
 CONFIG_TARGET_SOCFPGA_CYCLONE5=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
 CONFIG_SPL=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig
index cf390f3..63dda73 100644
--- a/configs/socfpga_socrates_defconfig
+++ b/configs/socfpga_socrates_defconfig
@@ -3,8 +3,8 @@ CONFIG_ARCH_SOCFPGA=y
 CONFIG_TARGET_SOCFPGA_CYCLONE5=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
 CONFIG_SPL=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index cabce0f..37af82e 100644
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_SOCRATES=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/spear300_defconfig b/configs/spear300_defconfig
index 5d179b9..49296bc 100644
--- a/configs/spear300_defconfig
+++ b/configs/spear300_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR300=y
 CONFIG_SYS_EXTRA_OPTIONS="spear300"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear300_nand_defconfig b/configs/spear300_nand_defconfig
index d0a62a8..560ff26 100644
--- a/configs/spear300_nand_defconfig
+++ b/configs/spear300_nand_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR300=y
 CONFIG_SYS_EXTRA_OPTIONS="spear300,nand"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear300_usbtty_defconfig b/configs/spear300_usbtty_defconfig
index ae5c2b5..3e280d5 100644
--- a/configs/spear300_usbtty_defconfig
+++ b/configs/spear300_usbtty_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR300=y
 CONFIG_SYS_EXTRA_OPTIONS="spear300,usbtty"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear300_usbtty_nand_defconfig b/configs/spear300_usbtty_nand_defconfig
index a5020c9..97a0f2a 100644
--- a/configs/spear300_usbtty_nand_defconfig
+++ b/configs/spear300_usbtty_nand_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR300=y
 CONFIG_SYS_EXTRA_OPTIONS="spear300,usbtty,nand"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_defconfig b/configs/spear310_defconfig
index 0e01abd..d4ce01d 100644
--- a/configs/spear310_defconfig
+++ b/configs/spear310_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR310=y
 CONFIG_SYS_EXTRA_OPTIONS="spear310"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_nand_defconfig b/configs/spear310_nand_defconfig
index cd99e3a..517e42f 100644
--- a/configs/spear310_nand_defconfig
+++ b/configs/spear310_nand_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR310=y
 CONFIG_SYS_EXTRA_OPTIONS="spear310,nand"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_pnor_defconfig b/configs/spear310_pnor_defconfig
index ef4d3a1..2fe149b 100644
--- a/configs/spear310_pnor_defconfig
+++ b/configs/spear310_pnor_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR310=y
 CONFIG_SYS_EXTRA_OPTIONS="spear310,FLASH_PNOR"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_usbtty_defconfig b/configs/spear310_usbtty_defconfig
index 5dea48b..f8b027d 100644
--- a/configs/spear310_usbtty_defconfig
+++ b/configs/spear310_usbtty_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR310=y
 CONFIG_SYS_EXTRA_OPTIONS="spear310,usbtty"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_usbtty_nand_defconfig b/configs/spear310_usbtty_nand_defconfig
index c9b526c..a4d8fdc 100644
--- a/configs/spear310_usbtty_nand_defconfig
+++ b/configs/spear310_usbtty_nand_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR310=y
 CONFIG_SYS_EXTRA_OPTIONS="spear310,usbtty,nand"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear310_usbtty_pnor_defconfig b/configs/spear310_usbtty_pnor_defconfig
index d9d7214..fd1d8c0 100644
--- a/configs/spear310_usbtty_pnor_defconfig
+++ b/configs/spear310_usbtty_pnor_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR310=y
 CONFIG_SYS_EXTRA_OPTIONS="spear310,usbtty,FLASH_PNOR"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_defconfig b/configs/spear320_defconfig
index db0a1cd..e720f38 100644
--- a/configs/spear320_defconfig
+++ b/configs/spear320_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR320=y
 CONFIG_SYS_EXTRA_OPTIONS="spear320"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_nand_defconfig b/configs/spear320_nand_defconfig
index 691433b..24c01c6 100644
--- a/configs/spear320_nand_defconfig
+++ b/configs/spear320_nand_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR320=y
 CONFIG_SYS_EXTRA_OPTIONS="spear320,nand"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_pnor_defconfig b/configs/spear320_pnor_defconfig
index 41fb10e..636bb48 100644
--- a/configs/spear320_pnor_defconfig
+++ b/configs/spear320_pnor_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR320=y
 CONFIG_SYS_EXTRA_OPTIONS="spear320,FLASH_PNOR"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_usbtty_defconfig b/configs/spear320_usbtty_defconfig
index 3f73df6..ca98d58 100644
--- a/configs/spear320_usbtty_defconfig
+++ b/configs/spear320_usbtty_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR320=y
 CONFIG_SYS_EXTRA_OPTIONS="spear320,usbtty"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_usbtty_nand_defconfig b/configs/spear320_usbtty_nand_defconfig
index 8563f4c..cdb1f31 100644
--- a/configs/spear320_usbtty_nand_defconfig
+++ b/configs/spear320_usbtty_nand_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR320=y
 CONFIG_SYS_EXTRA_OPTIONS="spear320,usbtty,nand"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear320_usbtty_pnor_defconfig b/configs/spear320_usbtty_pnor_defconfig
index 3980280..85f2af6 100644
--- a/configs/spear320_usbtty_pnor_defconfig
+++ b/configs/spear320_usbtty_pnor_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR320=y
 CONFIG_SYS_EXTRA_OPTIONS="spear320,usbtty,FLASH_PNOR"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear600_defconfig b/configs/spear600_defconfig
index 85c484c..95a530b1 100644
--- a/configs/spear600_defconfig
+++ b/configs/spear600_defconfig
@@ -4,6 +4,6 @@ CONFIG_SYS_EXTRA_OPTIONS="spear600"
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear600_nand_defconfig b/configs/spear600_nand_defconfig
index 715d949..019e74a 100644
--- a/configs/spear600_nand_defconfig
+++ b/configs/spear600_nand_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR600=y
 CONFIG_SYS_EXTRA_OPTIONS="spear600,nand"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear600_usbtty_defconfig b/configs/spear600_usbtty_defconfig
index 6709658..2168013 100644
--- a/configs/spear600_usbtty_defconfig
+++ b/configs/spear600_usbtty_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR600=y
 CONFIG_SYS_EXTRA_OPTIONS="spear600,usbtty"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/spear600_usbtty_nand_defconfig b/configs/spear600_usbtty_nand_defconfig
index fdadae2..fc501d9 100644
--- a/configs/spear600_usbtty_nand_defconfig
+++ b/configs/spear600_usbtty_nand_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR600=y
 CONFIG_SYS_EXTRA_OPTIONS="spear600,usbtty,nand"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/stamp9g20_defconfig b/configs/stamp9g20_defconfig
index 592203f..78c4775 100644
--- a/configs/stamp9g20_defconfig
+++ b/configs/stamp9g20_defconfig
@@ -2,4 +2,9 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_STAMP9G20=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig
index 3c868ff..188adc5 100644
--- a/configs/stm32f429-discovery_defconfig
+++ b/configs/stm32f429-discovery_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_STM32F429_DISCOVERY=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig
index 425bcfb..8e8ce9f 100644
--- a/configs/stv0991_defconfig
+++ b/configs/stv0991_defconfig
@@ -6,6 +6,9 @@ CONFIG_SYS_EXTRA_OPTIONS="stv0991"
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/stxgp3_defconfig b/configs/stxgp3_defconfig
index 63d97cc..86afe88 100644
--- a/configs/stxgp3_defconfig
+++ b/configs/stxgp3_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_STXGP3=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/stxssa_4M_defconfig b/configs/stxssa_4M_defconfig
index 4e81488..7547906 100644
--- a/configs/stxssa_4M_defconfig
+++ b/configs/stxssa_4M_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_STXSSA=y
 CONFIG_SYS_EXTRA_OPTIONS="STXSSA_4M"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/stxssa_defconfig b/configs/stxssa_defconfig
index e46febe..c072417 100644
--- a/configs/stxssa_defconfig
+++ b/configs/stxssa_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_STXSSA=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sunxi_Gemei_G9_defconfig b/configs/sunxi_Gemei_G9_defconfig
index dfd1b5d..e95cbe4 100644
--- a/configs/sunxi_Gemei_G9_defconfig
+++ b/configs/sunxi_Gemei_G9_defconfig
@@ -12,10 +12,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-gemei-g9"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig
index 174ed9e..e477b0e 100644
--- a/configs/suvd3_defconfig
+++ b/configs/suvd3_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_SUVD3=y
 CONFIG_SYS_EXTRA_OPTIONS="SUVD3"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/sycamore_defconfig b/configs/sycamore_defconfig
index f49007b..844e67f 100644
--- a/configs/sycamore_defconfig
+++ b/configs/sycamore_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_WALNUT=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/t3corp_defconfig b/configs/t3corp_defconfig
index fc80d1f..c61508a 100644
--- a/configs/t3corp_defconfig
+++ b/configs/t3corp_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_T3CORP=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/taihu_defconfig b/configs/taihu_defconfig
index 3581648..ac83725 100644
--- a/configs/taihu_defconfig
+++ b/configs/taihu_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_TAIHU=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/taishan_defconfig b/configs/taishan_defconfig
index eddb981..e956c6f 100644
--- a/configs/taishan_defconfig
+++ b/configs/taishan_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_TAISHAN=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig
index ce45fba..ae4b49b 100644
--- a/configs/tao3530_defconfig
+++ b/configs/tao3530_defconfig
@@ -2,4 +2,8 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_TAO3530=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index f02c442..3787493 100644
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -3,5 +3,11 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_TAURUS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2067,BOARD_TAURUS"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/tb100_defconfig b/configs/tb100_defconfig
index c94118a..cc8f527 100644
--- a/configs/tb100_defconfig
+++ b/configs/tb100_defconfig
@@ -4,7 +4,9 @@ CONFIG_TARGET_TB100=y
 CONFIG_SYS_CLK_FREQ=500000000
 CONFIG_SYS_TEXT_BASE=0x84000000
 CONFIG_DEFAULT_DEVICE_TREE="abilis_tb100"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DM=y
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index 3e720a7..bb14026 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TARGET_TBS2910=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
diff --git a/configs/tcm-bf518_defconfig b/configs/tcm-bf518_defconfig
index c362868..26da180 100644
--- a/configs/tcm-bf518_defconfig
+++ b/configs/tcm-bf518_defconfig
@@ -1,5 +1,5 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_TCM_BF518=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/tcm-bf537_defconfig b/configs/tcm-bf537_defconfig
index 5267faf..8933625 100644
--- a/configs/tcm-bf537_defconfig
+++ b/configs/tcm-bf537_defconfig
@@ -1,5 +1,5 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_TCM_BF537=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index 99252df..e731205 100644
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -3,7 +3,12 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA30=y
 CONFIG_TARGET_TEC_NG=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-tec-ng"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
diff --git a/configs/tec_defconfig b/configs/tec_defconfig
index d1fd04b..3f815fe 100644
--- a/configs/tec_defconfig
+++ b/configs/tec_defconfig
@@ -3,7 +3,12 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA20=y
 CONFIG_TARGET_TEC=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-tec"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index 7f9afc8..8192b28 100644
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -4,5 +4,7 @@ CONFIG_SPL=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/ti814x_evm_defconfig b/configs/ti814x_evm_defconfig
index 4928cba..ade4ea2 100644
--- a/configs/ti814x_evm_defconfig
+++ b/configs/ti814x_evm_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_TI814X_EVM=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig
index 57fcf52..67e5e60 100644
--- a/configs/ti816x_evm_defconfig
+++ b/configs/ti816x_evm_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_TI816X_EVM=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/titanium_defconfig b/configs/titanium_defconfig
index 554daac..e892d3e 100644
--- a/configs/titanium_defconfig
+++ b/configs/titanium_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_TITANIUM=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/barco/titanium/imximage.cfg"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/tk71_defconfig b/configs/tk71_defconfig
index 195bdcc..5e2a0b8 100644
--- a/configs/tk71_defconfig
+++ b/configs/tk71_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_TK71=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig
index b8022aa..ceb3386 100644
--- a/configs/tqma6q_mba6_mmc_defconfig
+++ b/configs/tqma6q_mba6_mmc_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_TQMA6=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_MMC_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig
index 321ebea..e413ef4 100644
--- a/configs/tqma6q_mba6_spi_defconfig
+++ b/configs/tqma6q_mba6_spi_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_TQMA6=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_SPI_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig
index dca194a..6c37b4f 100644
--- a/configs/tqma6s_mba6_mmc_defconfig
+++ b/configs/tqma6s_mba6_mmc_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_TQMA6=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_MMC_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig
index f0c4fe9..af7853f 100644
--- a/configs/tqma6s_mba6_spi_defconfig
+++ b/configs/tqma6s_mba6_spi_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_TQMA6=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_SPI_BOOT"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index a991645..f3cbe6d 100644
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -3,7 +3,12 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_TRATS2=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_CMD_SETEXPR=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_USB=y
diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index d3aedbd..6553edb 100644
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -2,7 +2,12 @@ CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_TRATS=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats"
-CONFIG_CMD_SETEXPR=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_USB=y
diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig
index a710804..cbd4dd3 100644
--- a/configs/tricorder_defconfig
+++ b/configs/tricorder_defconfig
@@ -2,3 +2,10 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_TRICORDER=y
 CONFIG_SPL=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig
index c00bffe..4619fc9 100644
--- a/configs/tricorder_flash_defconfig
+++ b/configs/tricorder_flash_defconfig
@@ -3,3 +3,10 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_TRICORDER=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="FLASHCARD"
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index 51137c3..9d2fb2d 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -3,7 +3,12 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA20=y
 CONFIG_TARGET_TRIMSLICE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-trimslice"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
diff --git a/configs/trizepsiv_defconfig b/configs/trizepsiv_defconfig
index 327677e..1887983 100644
--- a/configs/trizepsiv_defconfig
+++ b/configs/trizepsiv_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_TRIZEPSIV=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/tseries_mmc_defconfig b/configs/tseries_mmc_defconfig
index a5c8511..9ed13b6 100644
--- a/configs/tseries_mmc_defconfig
+++ b/configs/tseries_mmc_defconfig
@@ -2,5 +2,15 @@ CONFIG_ARM=y
 CONFIG_TARGET_TSERIES=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT"
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
 # CONFIG_CMD_CRC32 is not set
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/tseries_nand_defconfig b/configs/tseries_nand_defconfig
index 9b738db..0b577edc 100644
--- a/configs/tseries_nand_defconfig
+++ b/configs/tseries_nand_defconfig
@@ -2,5 +2,15 @@ CONFIG_ARM=y
 CONFIG_TARGET_TSERIES=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
 # CONFIG_CMD_CRC32 is not set
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/tseries_spi_defconfig b/configs/tseries_spi_defconfig
index 92d49eb..1602a43 100644
--- a/configs/tseries_spi_defconfig
+++ b/configs/tseries_spi_defconfig
@@ -2,6 +2,16 @@ CONFIG_ARM=y
 CONFIG_TARGET_TSERIES=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT"
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
 # CONFIG_CMD_CRC32 is not set
-CONFIG_CMD_NET=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/tt01_defconfig b/configs/tt01_defconfig
index 58cd9f9..d23904d 100644
--- a/configs/tt01_defconfig
+++ b/configs/tt01_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_TT01=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index 92fd767..d4a422c 100644
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_SYS_EXTRA_OPTIONS="TUGE1"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig
index a08412e..c8db21a 100644
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_SYS_EXTRA_OPTIONS="TUXX1"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/twister_defconfig b/configs/twister_defconfig
index 495ec3a..7381665 100644
--- a/configs/twister_defconfig
+++ b/configs/twister_defconfig
@@ -2,4 +2,6 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_TWISTER=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/tx25_defconfig b/configs/tx25_defconfig
index 9257361..b752414 100644
--- a/configs/tx25_defconfig
+++ b/configs/tx25_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_TX25=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/u8500_href_defconfig b/configs/u8500_href_defconfig
index fef179f..5a82ca8 100644
--- a/configs/u8500_href_defconfig
+++ b/configs/u8500_href_defconfig
@@ -1,2 +1,12 @@
 CONFIG_ARM=y
 CONFIG_TARGET_U8500_HREF=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/udoo_quad_defconfig b/configs/udoo_quad_defconfig
index 17f48c8..42c21c6 100644
--- a/configs/udoo_quad_defconfig
+++ b/configs/udoo_quad_defconfig
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TARGET_UDOO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/udoo/udoo.cfg,MX6Q,DDR_MB=1024"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig
index 12fc468..5f3974e 100644
--- a/configs/usb_a9263_dataflash_defconfig
+++ b/configs/usb_a9263_dataflash_defconfig
@@ -2,4 +2,11 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_USB_A9263=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/usbarmory_defconfig b/configs/usbarmory_defconfig
index 75781ed..c25d103 100644
--- a/configs/usbarmory_defconfig
+++ b/configs/usbarmory_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX5=y
 CONFIG_TARGET_USBARMORY=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/v38b_defconfig b/configs/v38b_defconfig
index d0f3ae6..cc3d802 100644
--- a/configs/v38b_defconfig
+++ b/configs/v38b_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_V38B=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/v5fx30teval_defconfig b/configs/v5fx30teval_defconfig
index 42e0438..8173f3e 100644
--- a/configs/v5fx30teval_defconfig
+++ b/configs/v5fx30teval_defconfig
@@ -2,3 +2,7 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_V5FX30TEVAL=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1,INIT_TLB=board/xilinx/ppc440-generic/init.o"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/v5fx30teval_flash_defconfig b/configs/v5fx30teval_flash_defconfig
index 495f3b9..b9b05e8 100644
--- a/configs/v5fx30teval_flash_defconfig
+++ b/configs/v5fx30teval_flash_defconfig
@@ -2,3 +2,7 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_V5FX30TEVAL=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC,INIT_TLB=board/xilinx/ppc440-generic/init.o"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/vct_platinum_defconfig b/configs/vct_platinum_defconfig
index 89369e2..81cf280 100644
--- a/configs/vct_platinum_defconfig
+++ b/configs/vct_platinum_defconfig
@@ -1,5 +1,5 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUM=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig
index de10b76..8d91aa5 100644
--- a/configs/vct_platinum_onenand_defconfig
+++ b/configs/vct_platinum_onenand_defconfig
@@ -2,5 +2,7 @@ CONFIG_MIPS=y
 CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUM=y
 CONFIG_VCT_ONENAND=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig
index 053c825..6eaec0c 100644
--- a/configs/vct_platinum_onenand_small_defconfig
+++ b/configs/vct_platinum_onenand_small_defconfig
@@ -3,5 +3,17 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUM=y
 CONFIG_VCT_ONENAND=y
 CONFIG_VCT_SMALL_IMAGE=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_CRC32 is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_platinum_small_defconfig b/configs/vct_platinum_small_defconfig
index 69053fb..088ab7e 100644
--- a/configs/vct_platinum_small_defconfig
+++ b/configs/vct_platinum_small_defconfig
@@ -2,5 +2,15 @@ CONFIG_MIPS=y
 CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUM=y
 CONFIG_VCT_SMALL_IMAGE=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_CRC32 is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_platinumavc_defconfig b/configs/vct_platinumavc_defconfig
index 32685d5..faeb6a2 100644
--- a/configs/vct_platinumavc_defconfig
+++ b/configs/vct_platinumavc_defconfig
@@ -1,4 +1,7 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUMAVC=y
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig
index eebaf2c..900a626 100644
--- a/configs/vct_platinumavc_onenand_defconfig
+++ b/configs/vct_platinumavc_onenand_defconfig
@@ -2,4 +2,9 @@ CONFIG_MIPS=y
 CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUMAVC=y
 CONFIG_VCT_ONENAND=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig
index 9a7cc94..e9928a0 100644
--- a/configs/vct_platinumavc_onenand_small_defconfig
+++ b/configs/vct_platinumavc_onenand_small_defconfig
@@ -3,5 +3,17 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUMAVC=y
 CONFIG_VCT_ONENAND=y
 CONFIG_VCT_SMALL_IMAGE=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_CRC32 is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_platinumavc_small_defconfig b/configs/vct_platinumavc_small_defconfig
index 3aba19d..719bd64 100644
--- a/configs/vct_platinumavc_small_defconfig
+++ b/configs/vct_platinumavc_small_defconfig
@@ -2,5 +2,15 @@ CONFIG_MIPS=y
 CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUMAVC=y
 CONFIG_VCT_SMALL_IMAGE=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_CRC32 is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_premium_defconfig b/configs/vct_premium_defconfig
index 50108eb..7b04e7c 100644
--- a/configs/vct_premium_defconfig
+++ b/configs/vct_premium_defconfig
@@ -1,5 +1,5 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_VCT=y
 CONFIG_VCT_PREMIUM=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_premium_onenand_defconfig b/configs/vct_premium_onenand_defconfig
index 1241630..769f8bd 100644
--- a/configs/vct_premium_onenand_defconfig
+++ b/configs/vct_premium_onenand_defconfig
@@ -2,5 +2,7 @@ CONFIG_MIPS=y
 CONFIG_TARGET_VCT=y
 CONFIG_VCT_PREMIUM=y
 CONFIG_VCT_ONENAND=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig
index 46f3dc4..c062a01 100644
--- a/configs/vct_premium_onenand_small_defconfig
+++ b/configs/vct_premium_onenand_small_defconfig
@@ -3,5 +3,17 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PREMIUM=y
 CONFIG_VCT_ONENAND=y
 CONFIG_VCT_SMALL_IMAGE=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_CRC32 is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_premium_small_defconfig b/configs/vct_premium_small_defconfig
index ccd06c0..4a5cdb0 100644
--- a/configs/vct_premium_small_defconfig
+++ b/configs/vct_premium_small_defconfig
@@ -2,5 +2,15 @@ CONFIG_MIPS=y
 CONFIG_TARGET_VCT=y
 CONFIG_VCT_PREMIUM=y
 CONFIG_VCT_SMALL_IMAGE=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_CRC32 is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/ve8313_defconfig b/configs/ve8313_defconfig
index 9bfd4bb..627bb3c 100644
--- a/configs/ve8313_defconfig
+++ b/configs/ve8313_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_VE8313=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index 3fab99c..9ccd739 100644
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -3,7 +3,12 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA124=y
 CONFIG_TARGET_VENICE2=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index 0a6e10f..f728585 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -3,7 +3,12 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA20=y
 CONFIG_TARGET_VENTANA=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-ventana"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/versatileab_defconfig b/configs/versatileab_defconfig
index f4ff591..765fe6e 100644
--- a/configs/versatileab_defconfig
+++ b/configs/versatileab_defconfig
@@ -1,4 +1,19 @@
 CONFIG_ARM=y
 CONFIG_ARCH_VERSATILE=y
 CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_AB"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
diff --git a/configs/versatilepb_defconfig b/configs/versatilepb_defconfig
index 54b5129..1973c38 100644
--- a/configs/versatilepb_defconfig
+++ b/configs/versatilepb_defconfig
@@ -1,4 +1,19 @@
 CONFIG_ARM=y
 CONFIG_ARCH_VERSATILE=y
 CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_PB"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
diff --git a/configs/versatileqemu_defconfig b/configs/versatileqemu_defconfig
index 7d6c4e1..ea9c5b9 100644
--- a/configs/versatileqemu_defconfig
+++ b/configs/versatileqemu_defconfig
@@ -1,4 +1,19 @@
 CONFIG_ARM=y
 CONFIG_ARCH_VERSATILE=y
 CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_RUN is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig
index cd1e6db..0baaa91 100644
--- a/configs/vexpress_aemv8a_juno_defconfig
+++ b/configs/vexpress_aemv8a_juno_defconfig
@@ -2,6 +2,16 @@ CONFIG_ARM=y
 CONFIG_TARGET_VEXPRESS64_JUNO=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="vexpress64"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_DM=y
 CONFIG_DM_SERIAL=y
diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
index 395ffa6..bf5576a 100644
--- a/configs/vexpress_aemv8a_semi_defconfig
+++ b/configs/vexpress_aemv8a_semi_defconfig
@@ -2,6 +2,17 @@ CONFIG_ARM=y
 CONFIG_TARGET_VEXPRESS64_BASE_FVP=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="vexpress64"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
 CONFIG_DM=y
 CONFIG_DM_SERIAL=y
diff --git a/configs/vexpress_ca15_tc2_defconfig b/configs/vexpress_ca15_tc2_defconfig
index 401317f..a3ff78a 100644
--- a/configs/vexpress_ca15_tc2_defconfig
+++ b/configs/vexpress_ca15_tc2_defconfig
@@ -1,3 +1,16 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VEXPRESS_CA15_TC2=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
diff --git a/configs/vexpress_ca5x2_defconfig b/configs/vexpress_ca5x2_defconfig
index d6286af..ce5da91 100644
--- a/configs/vexpress_ca5x2_defconfig
+++ b/configs/vexpress_ca5x2_defconfig
@@ -1,3 +1,16 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VEXPRESS_CA5X2=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig
index b8e938c..2947fc1 100644
--- a/configs/vexpress_ca9x4_defconfig
+++ b/configs/vexpress_ca9x4_defconfig
@@ -1,3 +1,16 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VEXPRESS_CA9X4=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ECHO is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_MISC is not set
diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig
index 3955ee0..dc8df5c 100644
--- a/configs/vf610twr_defconfig
+++ b/configs/vf610twr_defconfig
@@ -1,7 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VF610TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_IS_IN_MMC"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig
index 98f1aa7..98880f3 100644
--- a/configs/vf610twr_nand_defconfig
+++ b/configs/vf610twr_nand_defconfig
@@ -1,7 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VF610TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_IS_IN_NAND"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/vision2_defconfig b/configs/vision2_defconfig
index 94df0d1..afe3b3c 100644
--- a/configs/vision2_defconfig
+++ b/configs/vision2_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VISION2=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/ttcontrol/vision2/imximage_hynix.cfg"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/vl_ma2sc_defconfig b/configs/vl_ma2sc_defconfig
index eab4019..7a66783 100644
--- a/configs/vl_ma2sc_defconfig
+++ b/configs/vl_ma2sc_defconfig
@@ -1,4 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_VL_MA2SC=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/vl_ma2sc_ram_defconfig b/configs/vl_ma2sc_ram_defconfig
index 6ffbf88..43a576f 100644
--- a/configs/vl_ma2sc_ram_defconfig
+++ b/configs/vl_ma2sc_ram_defconfig
@@ -2,4 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_VL_MA2SC=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMLOAD"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/vme8349_defconfig b/configs/vme8349_defconfig
index 1f9a469..117a154 100644
--- a/configs/vme8349_defconfig
+++ b/configs/vme8349_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_VME8349=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/vpac270_nor_128_defconfig b/configs/vpac270_nor_128_defconfig
index 6c40f1e..bbc6e6a 100644
--- a/configs/vpac270_nor_128_defconfig
+++ b/configs/vpac270_nor_128_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VPAC270=y
 CONFIG_SYS_EXTRA_OPTIONS="NOR,RAM_128M"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/vpac270_nor_256_defconfig b/configs/vpac270_nor_256_defconfig
index 74b9473..3f1ae1e 100644
--- a/configs/vpac270_nor_256_defconfig
+++ b/configs/vpac270_nor_256_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VPAC270=y
 CONFIG_SYS_EXTRA_OPTIONS="NOR,RAM_256M"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/vpac270_ond_256_defconfig b/configs/vpac270_ond_256_defconfig
index c8a3158..7500b7c 100644
--- a/configs/vpac270_ond_256_defconfig
+++ b/configs/vpac270_ond_256_defconfig
@@ -2,4 +2,6 @@ CONFIG_ARM=y
 CONFIG_TARGET_VPAC270=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="ONENAND,RAM_256M"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/walnut_defconfig b/configs/walnut_defconfig
index f49007b..844e67f 100644
--- a/configs/walnut_defconfig
+++ b/configs/walnut_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_WALNUT=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index eaa5962..62666ff 100644
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_TARGET_WANDBOARD=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
 CONFIG_DM=y
 CONFIG_DM_THERMAL=y
diff --git a/configs/warp_defconfig b/configs/warp_defconfig
index 24e1b9f..dacb432 100644
--- a/configs/warp_defconfig
+++ b/configs/warp_defconfig
@@ -1,3 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_WARP=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig
index f7f822b..43d725b 100644
--- a/configs/whistler_defconfig
+++ b/configs/whistler_defconfig
@@ -3,7 +3,12 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA20=y
 CONFIG_TARGET_WHISTLER=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-whistler"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/wireless_space_defconfig b/configs/wireless_space_defconfig
index 766552c..5551d27 100644
--- a/configs/wireless_space_defconfig
+++ b/configs/wireless_space_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_WIRELESS_SPACE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/woodburn_defconfig b/configs/woodburn_defconfig
index 80aa753..8dcf3e1 100644
--- a/configs/woodburn_defconfig
+++ b/configs/woodburn_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_WOODBURN=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/woodburn_sd_defconfig b/configs/woodburn_sd_defconfig
index 26502fd..96a00b3 100644
--- a/configs/woodburn_sd_defconfig
+++ b/configs/woodburn_sd_defconfig
@@ -2,4 +2,4 @@ CONFIG_ARM=y
 CONFIG_TARGET_WOODBURN_SD=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/woodburn/imximage.cfg"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig
index e71db29..2d3d9f3 100644
--- a/configs/work_92105_defconfig
+++ b/configs/work_92105_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_TARGET_WORK_92105=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
diff --git a/configs/wtk_defconfig b/configs/wtk_defconfig
index a52db30..7d4f754 100644
--- a/configs/wtk_defconfig
+++ b/configs/wtk_defconfig
@@ -2,4 +2,4 @@ CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM823L=y
 CONFIG_SYS_EXTRA_OPTIONS="LCD,SHARP_LQ065T9DR51U"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/x600_defconfig b/configs/x600_defconfig
index f8b0340..fdd4d3b 100644
--- a/configs/x600_defconfig
+++ b/configs/x600_defconfig
@@ -4,6 +4,6 @@ CONFIG_SPL=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
diff --git a/configs/xaeniax_defconfig b/configs/xaeniax_defconfig
index ada03f4..8634cc7 100644
--- a/configs/xaeniax_defconfig
+++ b/configs/xaeniax_defconfig
@@ -1,3 +1,3 @@
 CONFIG_ARM=y
 CONFIG_TARGET_XAENIAX=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig
index ec79cc6..90927ed 100644
--- a/configs/xfi3_defconfig
+++ b/configs/xfi3_defconfig
@@ -1,4 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_XFI3=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig
index f4ed6d1..9dae755 100644
--- a/configs/xilinx-ppc405-generic_defconfig
+++ b/configs/xilinx-ppc405-generic_defconfig
@@ -2,3 +2,7 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_XILINX_PPC405_GENERIC=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/xilinx-ppc405-generic_flash_defconfig b/configs/xilinx-ppc405-generic_flash_defconfig
index 1b0311c..37084fb 100644
--- a/configs/xilinx-ppc405-generic_flash_defconfig
+++ b/configs/xilinx-ppc405-generic_flash_defconfig
@@ -2,3 +2,7 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_XILINX_PPC405_GENERIC=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig
index cac8785..398362b 100644
--- a/configs/xilinx-ppc440-generic_defconfig
+++ b/configs/xilinx-ppc440-generic_defconfig
@@ -2,3 +2,7 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_XILINX_PPC440_GENERIC=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/xilinx-ppc440-generic_flash_defconfig b/configs/xilinx-ppc440-generic_flash_defconfig
index b271554..6299033 100644
--- a/configs/xilinx-ppc440-generic_flash_defconfig
+++ b/configs/xilinx-ppc440-generic_flash_defconfig
@@ -2,3 +2,7 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_XILINX_PPC440_GENERIC=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/xilinx_zynqmp_defconfig b/configs/xilinx_zynqmp_defconfig
index c512e9c..1c64eea 100644
--- a/configs/xilinx_zynqmp_defconfig
+++ b/configs/xilinx_zynqmp_defconfig
@@ -1,14 +1,17 @@
 CONFIG_ARM=y
 CONFIG_TARGET_XILINX_ZYNQMP=y
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp"
-CONFIG_CMD_BDI=y
-CONFIG_CMD_BOOTD=y
-CONFIG_CMD_RUN=y
-CONFIG_CMD_IMI=y
-CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_FLASH=y
-CONFIG_CMD_ECHO=y
-CONFIG_CMD_SOURCE=y
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
 CONFIG_CMD_TIME=y
-CONFIG_CMD_MISC=y
 CONFIG_CMD_TIMER=y
diff --git a/configs/xpedite1000_defconfig b/configs/xpedite1000_defconfig
index af198b7..73d5ff2 100644
--- a/configs/xpedite1000_defconfig
+++ b/configs/xpedite1000_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_XPEDITE1000=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/xpedite517x_defconfig b/configs/xpedite517x_defconfig
index 3648745..45d0ae1 100644
--- a/configs/xpedite517x_defconfig
+++ b/configs/xpedite517x_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC86xx=y
 CONFIG_TARGET_XPEDITE517X=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/xpedite520x_defconfig b/configs/xpedite520x_defconfig
index 0dc106f..797c166 100644
--- a/configs/xpedite520x_defconfig
+++ b/configs/xpedite520x_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_XPEDITE520X=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/xpedite537x_defconfig b/configs/xpedite537x_defconfig
index 797df9f..2db7f65 100644
--- a/configs/xpedite537x_defconfig
+++ b/configs/xpedite537x_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_XPEDITE537X=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/xpedite550x_defconfig b/configs/xpedite550x_defconfig
index 712b285..2740957 100644
--- a/configs/xpedite550x_defconfig
+++ b/configs/xpedite550x_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_XPEDITE550X=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/yellowstone_defconfig b/configs/yellowstone_defconfig
index 816636f..7b1a630 100644
--- a/configs/yellowstone_defconfig
+++ b/configs/yellowstone_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_YOSEMITE=y
 CONFIG_SYS_EXTRA_OPTIONS="YELLOWSTONE"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/yosemite_defconfig b/configs/yosemite_defconfig
index 3456748..00ec425 100644
--- a/configs/yosemite_defconfig
+++ b/configs/yosemite_defconfig
@@ -2,5 +2,3 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_YOSEMITE=y
 CONFIG_SYS_EXTRA_OPTIONS="YOSEMITE"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/yucca_defconfig b/configs/yucca_defconfig
index c0d0f45..6c8e20a 100644
--- a/configs/yucca_defconfig
+++ b/configs/yucca_defconfig
@@ -1,5 +1,3 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_YUCCA=y
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
diff --git a/configs/zeus_defconfig b/configs/zeus_defconfig
index 7524ca9..da2ff3c 100644
--- a/configs/zeus_defconfig
+++ b/configs/zeus_defconfig
@@ -1,4 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_ZEUS=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig
index 8d921a0..3591849 100644
--- a/configs/zipitz2_defconfig
+++ b/configs/zipitz2_defconfig
@@ -1,2 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_ZIPITZ2=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
diff --git a/configs/zmx25_defconfig b/configs/zmx25_defconfig
index a776f6a..a34e827 100644
--- a/configs/zmx25_defconfig
+++ b/configs/zmx25_defconfig
@@ -4,4 +4,4 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="boot in %d s\n"
 CONFIG_AUTOBOOT_DELAY_STR="delaygs"
 CONFIG_AUTOBOOT_STOP_STR="stopgs"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index a7307cf..533cdb5 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -7,6 +7,8 @@ CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
index ff023e6..af77a9d 100644
--- a/configs/zynq_picozed_defconfig
+++ b/configs/zynq_picozed_defconfig
@@ -3,4 +3,6 @@ CONFIG_ARCH_ZYNQ=y
 CONFIG_TARGET_ZYNQ_PICOZED=y
 CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed"
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
index 23850c8..2e40508 100644
--- a/configs/zynq_zc702_defconfig
+++ b/configs/zynq_zc702_defconfig
@@ -7,5 +7,7 @@ CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index 4d2e59c..7c3713e 100644
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -7,5 +7,7 @@ CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
diff --git a/configs/zynq_zc70x_defconfig b/configs/zynq_zc70x_defconfig
index d3dce0f..41c04bb 100644
--- a/configs/zynq_zc70x_defconfig
+++ b/configs/zynq_zc70x_defconfig
@@ -7,6 +7,8 @@ CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
index 69a1d8a..73b5854 100644
--- a/configs/zynq_zc770_xm010_defconfig
+++ b/configs/zynq_zc770_xm010_defconfig
@@ -8,7 +8,9 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_SPI_FLASH=y
diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig
index 311d686..0d5c77e 100644
--- a/configs/zynq_zc770_xm012_defconfig
+++ b/configs/zynq_zc770_xm012_defconfig
@@ -8,6 +8,6 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
index 5c51c68..8d320a1 100644
--- a/configs/zynq_zc770_xm013_defconfig
+++ b/configs/zynq_zc770_xm013_defconfig
@@ -8,6 +8,8 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index 8637c0f..9f37849 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -7,6 +7,8 @@ CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index fcfd543..e25573b 100644
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -7,6 +7,8 @@ CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
-CONFIG_CMD_NET=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_DISABLE_OF_CONTROL=y
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 973258a..ce76a02 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -11,6 +11,7 @@ config DM_ETH
 menuconfig NETDEVICES
 	bool "Network device support"
 	depends on NET
+	default y if DM_ETH
 	help
 	  You must select Y to enable any network device support
 	  Generally if you have any networking support this is a given
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index 4d9f63d..4c46dda 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -15,58 +15,43 @@
 
 #define CONFIG_CMD_AMBAPP	/* AMBA Plug & Play Bus print utility */
 #define CONFIG_CMD_ASKENV	/* ask for env variable		*/
-#define CONFIG_CMD_BDI		/* bdinfo			*/
 #define CONFIG_CMD_BEDBUG	/* Include BedBug Debugger	*/
 #define CONFIG_CMD_BMP		/* BMP support			*/
-#define CONFIG_CMD_BOOTD	/* bootd			*/
 #define CONFIG_CMD_BOOTZ	/* boot zImage			*/
 #define CONFIG_CMD_BSP		/* Board Specific functions	*/
 #define CONFIG_CMD_CACHE	/* icache, dcache		*/
 #define CONFIG_CMD_CDP		/* Cisco Discovery Protocol	*/
 #define CONFIG_CMD_CLK		/* Clock support		*/
-#define CONFIG_CMD_CONSOLE	/* coninfo			*/
 #define CONFIG_CMD_DATE		/* support for RTC, date/time...*/
 #define CONFIG_CMD_DHCP		/* DHCP Support			*/
 #define CONFIG_CMD_DIAG		/* Diagnostics			*/
 #define CONFIG_CMD_DISPLAY	/* Display support		*/
 #define CONFIG_CMD_DOC		/* Disk-On-Chip Support		*/
 #define CONFIG_CMD_DTT		/* Digital Therm and Thermostat */
-#define CONFIG_CMD_ECHO		/* echo arguments		*/
-#define CONFIG_CMD_EDITENV	/* editenv			*/
 #define CONFIG_CMD_EEPROM	/* EEPROM read/write support	*/
 #define CONFIG_CMD_ELF		/* ELF (VxWorks) load/boot cmd	*/
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/
 #define CONFIG_CMD_FAT		/* FAT support			*/
 #define CONFIG_CMD_FDC		/* Floppy Disk Support		*/
-#define CONFIG_CMD_FLASH	/* flinfo, erase, protect	*/
-#define CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
 #define CONFIG_CMD_FUSE		/* Device fuse support		*/
 #define CONFIG_CMD_GETTIME	/* Get time since boot         */
 #define CONFIG_CMD_HASH		/* calculate hash / digest	*/
 #define CONFIG_CMD_HWFLOW	/* RTS/CTS hw flow control	*/
 #define CONFIG_CMD_I2C		/* I2C serial bus support	*/
 #define CONFIG_CMD_IDE		/* IDE harddisk support		*/
-#define CONFIG_CMD_IMI		/* iminfo			*/
-#define CONFIG_CMD_IMLS		/* List all found images	*/
 #define CONFIG_CMD_IMMAP	/* IMMR dump support		*/
 #define CONFIG_CMD_IO		/* Access to X86 IO space	*/
 #define CONFIG_CMD_IRQ		/* irqinfo			*/
-#define CONFIG_CMD_ITEST	/* Integer (and string) test	*/
 #define CONFIG_CMD_JFFS2	/* JFFS2 Support		*/
 #define CONFIG_CMD_KGDB		/* kgdb				*/
 #define CONFIG_CMD_LICENSE	/* console license display	*/
-#define CONFIG_CMD_LOADB	/* loadb			*/
-#define CONFIG_CMD_LOADS	/* loads			*/
 #define CONFIG_CMD_MEMINFO	/* meminfo			*/
-#define CONFIG_CMD_MEMORY	/* md mm nm mw cp cmp crc base loop */
 #define CONFIG_CMD_MEMTEST	/* mtest			*/
 #define CONFIG_CMD_MFSL		/* FSL support for Microblaze	*/
 #define CONFIG_CMD_MII		/* MII support			*/
-#define CONFIG_CMD_MISC		/* Misc functions like sleep etc*/
 #define CONFIG_CMD_MMC		/* MMC support			*/
 #define CONFIG_CMD_MTDPARTS	/* mtd parts support		*/
 #define CONFIG_CMD_NAND		/* NAND support			*/
-#define CONFIG_CMD_NFS		/* NFS support			*/
 #define CONFIG_CMD_ONENAND	/* OneNAND support		*/
 #define CONFIG_CMD_PCI		/* pciinfo			*/
 #define CONFIG_CMD_PCMCIA	/* PCMCIA support		*/
@@ -76,15 +61,11 @@
 #define CONFIG_CMD_REISER	/* Reiserfs support		*/
 #define CONFIG_CMD_RARP		/* rarpboot support		*/
 #define CONFIG_CMD_READ		/* Read data from partition	*/
-#define CONFIG_CMD_RUN		/* run command in env variable	*/
 #define CONFIG_CMD_SANDBOX	/* sb command to access sandbox features */
-#define CONFIG_CMD_SAVEENV	/* saveenv			*/
 #define CONFIG_CMD_SAVES	/* save S record dump		*/
 #define CONFIG_CMD_SCSI		/* SCSI Support			*/
 #define CONFIG_CMD_SDRAM	/* SDRAM DIMM SPD info printout */
-#define CONFIG_CMD_SETGETDCR	/* DCR support on 4xx		*/
 #define CONFIG_CMD_SNTP		/* SNTP support			*/
-#define CONFIG_CMD_SOURCE	/* "source" command support	*/
 #define CONFIG_CMD_SPI		/* SPI utility			*/
 #define CONFIG_CMD_TERMINAL	/* built-in Serial Terminal	*/
 #define CONFIG_CMD_UBI		/* UBI Support			*/
@@ -92,7 +73,6 @@
 #define CONFIG_CMD_UNIVERSE	/* Tundra Universe Support	*/
 #define CONFIG_CMD_UNZIP	/* unzip from memory to memory	*/
 #define CONFIG_CMD_USB		/* USB Support			*/
-#define CONFIG_CMD_XIMG		/* Load part of Multi Image	*/
 #define CONFIG_CMD_ZFS		/* ZFS Support			*/
 
 #endif	/* _CONFIG_CMD_ALL_H */
diff --git a/include/config_cmd_default.h b/include/config_cmd_default.h
deleted file mode 100644
index b915c2f..0000000
--- a/include/config_cmd_default.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2007 Freescale Semiconductor, Inc.
- *
- * This file is licensed under the terms of the GNU General Public
- * License Version 2. This file is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#ifndef _CONFIG_CMD_DEFAULT_H
-#define _CONFIG_CMD_DEFAULT_H
-
-/*
- * Alphabetical list of all commands that are configured by default.
- * This is essentially all commands minus those that are considered
- * "non-standard" for some reason (memory hogs, requires special
- * hardware, not fully tested, etc.).
- */
-
-#define CONFIG_CMD_BDI		/* bdinfo			*/
-#define CONFIG_CMD_BOOTD	/* bootd			*/
-#define CONFIG_CMD_CONSOLE	/* coninfo			*/
-#define CONFIG_CMD_ECHO		/* echo arguments		*/
-#define CONFIG_CMD_EDITENV	/* editenv			*/
-#define CONFIG_CMD_ENV_EXISTS	/* query whether env variables exists */
-#define CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
-#define CONFIG_CMD_IMI		/* iminfo			*/
-#define CONFIG_CMD_ITEST	/* Integer (and string) test	*/
-#ifndef CONFIG_SYS_NO_FLASH
-#define CONFIG_CMD_FLASH	/* flinfo, erase, protect	*/
-#define CONFIG_CMD_IMLS		/* List all found images	*/
-#endif
-#define CONFIG_CMD_LOADB	/* loadb			*/
-#define CONFIG_CMD_LOADS	/* loads			*/
-#define CONFIG_CMD_MEMORY	/* md mm nm mw cp cmp crc base loop */
-#define CONFIG_CMD_MISC		/* Misc functions like sleep etc*/
-#define CONFIG_CMD_NFS		/* NFS support			*/
-#define CONFIG_CMD_RUN		/* run command in env variable	*/
-#define CONFIG_CMD_SAVEENV	/* saveenv			*/
-#define CONFIG_CMD_SETGETDCR	/* DCR support on 4xx		*/
-#define CONFIG_CMD_SOURCE	/* "source" command support	*/
-#define CONFIG_CMD_XIMG		/* Load part of Multi Image	*/
-
-#endif	/* _CONFIG_CMD_DEFAULT_H */
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 884e522..b396764 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -755,8 +755,6 @@ unsigned long get_board_ddr_clk(void);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index e2ad557..a7c9277 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -340,8 +340,6 @@ extern unsigned long get_sdram_size(void);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_ELF
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 869c195..e5cd267 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -580,8 +580,6 @@ combinations. this should be removed later
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index 08aec84..2357809 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -495,8 +495,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index 3ccb9a7..638a586 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -53,8 +53,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_ELF
@@ -62,7 +60,6 @@
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_EEPROM
 
-#undef CONFIG_CMD_NFS
 
 #undef	CONFIG_WATCHDOG			/* watchdog disabled		*/
 
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index 019700d..9c25751 100644
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -67,8 +67,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 03fa5e6..a2468c3 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -22,14 +22,9 @@
 #define CONFIG_WATCHDOG_TIMEOUT		5000
 
 /* Command line configuration */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
 #undef CONFIG_CMD_I2C
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index fb5b4f5..2e86016 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -37,19 +37,11 @@
 #define CONFIG_BOOTP_HOSTNAME
 
 /* Command line configuration */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_LOADB
-#define CONFIG_CMD_LOADS
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
-#undef CONFIG_CMD_NFS
 #define CONFIG_CMD_REGINFO
 #undef CONFIG_CMD_USB
 #undef CONFIG_CMD_BMP
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 8bf4e53..ae11e7d 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -35,23 +35,15 @@
 #define CONFIG_BOOTP_HOSTNAME
 
 /* Command line configuration */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_BOOTD
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
 
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index b4fa5af..a93bafc 100644
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -39,7 +39,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_CACHE
 
 #define CONFIG_SYS_LONGHELP				/* undef to save memory		*/
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 5d97874..ddb5cda 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -39,16 +39,10 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_LOADB
-#define CONFIG_CMD_LOADS
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_IDE
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
 #define CONFIG_CMD_PING
 
 #ifdef CONFIG_CMD_IDE
diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index 0bfa946..7f5ee8a 100644
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -49,15 +49,10 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_LOADB
-#define CONFIG_CMD_LOADS
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_IDE
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
 
 /* ATA */
 #define CONFIG_DOS_PARTITION
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index f5cd0a0..d888c3e 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -56,18 +56,11 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_MISC
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_MEMORY
 
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_LOADB
 
 #define CONFIG_BOOTDELAY	5
 #define CONFIG_MCFFEC
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 3660dda..fa9b973 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -55,19 +55,13 @@
 #define CONFIG_BOOTP_HOSTNAME
 
 /* Available command configuration */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_DHCP
 
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_LOADB
 
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index aeba9c0..860abe7 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -47,14 +47,10 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_MII
 
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_LOADB
-
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_MII		1
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 65adadc..817b142 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -27,15 +27,10 @@
 #define CONFIG_WATCHDOG_TIMEOUT		5000
 
 /* Command line configuration */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
 #undef CONFIG_CMD_I2C
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 16ef80b..4724a9c 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -27,15 +27,10 @@
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
 
 /* Command line configuration */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index e3c36a6..32afa44 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -27,15 +27,10 @@
 #define CONFIG_WATCHDOG_TIMEOUT	3360	/* timeout in ms, max is 3.36 sec */
 
 /* Command line configuration */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 271ea3d..1f65918 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -38,30 +38,20 @@
 #define CONFIG_BOOTP_HOSTNAME
 
 /* Command line configuration */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_BOOTD
 #define CONFIG_CMD_CACHE
 #undef CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
-#undef CONFIG_CMD_FLASH
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_JFFS2
 #undef CONFIG_CMD_UBI
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
 #define CONFIG_CMD_MII
 #undef CONFIG_CMD_NAND
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_SF
-#undef CONFIG_CMD_IMLS
 
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
 
 /*
  * NAND FLASH
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 7a4a945..2c08512 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -39,27 +39,18 @@
 #define CONFIG_BOOTP_HOSTNAME
 
 /* Command line configuration */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_BOOTD
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
 #undef CONFIG_CMD_JFFS2
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_SF
 
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
 
 /* Network configuration */
 #define CONFIG_MCFFEC
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index f503744..e82ba32 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -39,21 +39,15 @@
 #define CONFIG_BOOTP_HOSTNAME
 
 /* Command line configuration */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_BOOTD
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
 #define CONFIG_CMD_MII
 #undef CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
@@ -61,8 +55,6 @@
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_SF
 
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
 
 /* Network configuration */
 #define CONFIG_MCFFEC
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index 427ccf0..3c1bb90 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -29,15 +29,10 @@
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
 
 /* Command line configuration */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #undef CONFIG_CMD_DATE
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 26a16ec..7e1b364 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -29,15 +29,10 @@
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
 
 /* Command line configuration */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #undef CONFIG_CMD_DATE
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 147f122..cb21b73 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -51,8 +51,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 771ea1e..4150d5a 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -446,8 +446,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_I2C
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 9cea76a..d558db7 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -489,8 +489,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_I2C
@@ -498,11 +496,6 @@
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_PCI
 
-#if defined(CONFIG_SYS_RAMBOOT) && !defined(CONFIG_NAND)
-    #undef CONFIG_CMD_SAVEENV
-    #undef CONFIG_CMD_LOADS
-#endif
-
 #define CONFIG_CMDLINE_EDITING 1
 #define CONFIG_AUTO_COMPLETE	/* add autocompletion support   */
 
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index fbf38c8..cbe10af 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -469,19 +469,12 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_PCI
 
-#if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_SAVEENV
-    #undef CONFIG_CMD_LOADS
-#endif
-
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history */
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support */
 
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 2dd71b7..7547c12 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -335,8 +335,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_EEPROM
@@ -345,10 +343,6 @@
 #if defined(CONFIG_PCI)
 	#define CONFIG_CMD_PCI
 #endif
-#if defined(CONFIG_SYS_RAMBOOT)
-	#undef CONFIG_CMD_SAVEENV
-	#undef CONFIG_CMD_LOADS
-#endif
 
 #undef CONFIG_WATCHDOG		/* watchdog disabled */
 
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 14abd35..9805df7 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -420,8 +420,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_ASKENV
@@ -430,12 +428,6 @@
     #define CONFIG_CMD_PCI
 #endif
 
-#if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_SAVEENV
-    #undef CONFIG_CMD_LOADS
-#endif
-
-
 #undef CONFIG_WATCHDOG		/* watchdog disabled */
 
 /*
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 17f230f..57547a4 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -486,8 +486,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_DATE
@@ -497,12 +495,6 @@
     #define CONFIG_CMD_PCI
 #endif
 
-#if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_SAVEENV
-    #undef CONFIG_CMD_LOADS
-#endif
-
-
 #undef CONFIG_WATCHDOG			/* watchdog disabled */
 
 /*
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 7204068..32cb007 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -496,8 +496,6 @@ boards, we say we have two, but don't display a message if we find only one. */
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 521904d..cebd175 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -490,8 +490,6 @@ extern int board_pci_host_broken(void);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
@@ -501,11 +499,6 @@ extern int board_pci_host_broken(void);
     #define CONFIG_CMD_PCI
 #endif
 
-#if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_SAVEENV
-    #undef CONFIG_CMD_LOADS
-#endif
-
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history */
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support   */
 
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 19e0e30..5c6ad19 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -500,8 +500,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
@@ -511,11 +509,6 @@
 #define CONFIG_CMD_PCI
 #endif
 
-#if defined(CONFIG_SYS_RAMBOOT)
-#undef CONFIG_CMD_SAVEENV
-#undef CONFIG_CMD_LOADS
-#endif
-
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history */
 #define CONFIG_AUTO_COMPLETE		/* add autocompletion support */
 
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 30d8cdc..6a90531 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -635,8 +635,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index ff9a67d..931816b 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -348,8 +348,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_ELF
@@ -359,12 +357,6 @@
     #define CONFIG_CMD_PCI
 #endif
 
-#if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_SAVEENV
-    #undef CONFIG_CMD_LOADS
-#endif
-
-
 #undef CONFIG_WATCHDOG			/* watchdog disabled */
 
 /*
diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index 6b7f784..d24d1ca 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -366,8 +366,6 @@ extern unsigned long get_clock_freq(void);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index ad2c52c..ef268a8 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -382,8 +382,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index f49b1e5..a80221a 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -491,8 +491,6 @@ extern unsigned long get_clock_freq(void);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index 15b6e6c..675ca87 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -364,8 +364,6 @@ extern unsigned long get_clock_freq(void);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 2250c2f..5a481d5 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -384,8 +384,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_ELF
@@ -400,12 +398,6 @@
     #define CONFIG_CMD_MII
 #endif
 
-#if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_SAVEENV
-    #undef CONFIG_CMD_LOADS
-#endif
-
-
 #undef CONFIG_WATCHDOG			/* watchdog disabled */
 
 /*
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 91bf267..05e5a3d 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -386,8 +386,6 @@ extern unsigned long get_clock_freq(void);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 4cb586d..78019b9 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -477,8 +477,6 @@ extern unsigned long get_clock_freq(void);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 943c575..71bd51b 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -593,8 +593,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_PING
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 4b99fc3..de56c48 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -467,16 +467,10 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 
-#if defined(CONFIG_SYS_RAMBOOT)
-#undef CONFIG_CMD_SAVEENV
-#endif
-
 #if defined(CONFIG_PCI)
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_SCSI
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 938874f..f20ee79 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -627,16 +627,10 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_REGINFO
 
-#if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_SAVEENV
-#endif
-
 #if defined(CONFIG_PCI)
     #define CONFIG_CMD_PCI
     #define CONFIG_CMD_SCSI
diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index d10bd2a..f1af928 100644
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -13,14 +13,8 @@
 #define CONFIG_CPU_SH7722	1
 #define CONFIG_MIGO_R		1
 
-#define CONFIG_CMD_LOADB
-#define CONFIG_CMD_LOADS
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTDELAY	3
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 09e670f..4e3c05a 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -812,8 +812,6 @@ extern unsigned long get_sdram_size(void);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_ELF
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 78ce4c0..6ddf447 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -679,8 +679,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index 233995c..8fff431 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -271,8 +271,6 @@ extern unsigned long get_clock_freq(void);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_MII
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index a510b4c..cc8700b 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -618,8 +618,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index 3ca204e..dfc4fc0 100644
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -42,21 +42,11 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_LOADB
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_LOADS
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_BDI
-#define CONFIG_CMD_CONSOLE
-#define CONFIG_CMD_RUN
 #define CONFIG_CMD_BSP
-#define CONFIG_CMD_IMI
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_MISC
 
 
 #if 0
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 9a1b2ac..c9d08e6 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -41,8 +41,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PCI
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 80f4276..3a71ff8 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -61,8 +61,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h
index a64c82a..5712298 100644
--- a/include/configs/PMC405DE.h
+++ b/include/configs/PMC405DE.h
@@ -54,8 +54,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_CHIP_CONFIG
 #define CONFIG_CMD_DATE
@@ -65,7 +63,6 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
 
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 31b9050..9ed6c61 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -271,8 +271,6 @@
 #define CONFIG_DOS_PARTITION
 #define CONFIG_ISO_PARTITION
 
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -283,7 +281,6 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_USB
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 2cad01c..0fa03cf 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -848,8 +848,6 @@ unsigned long get_board_ddr_clk(void);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 8430f97..f99663a 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -853,8 +853,6 @@ unsigned long get_board_ddr_clk(void);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
@@ -865,9 +863,7 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_ECHO
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_BDI
 
 #ifdef CONFIG_PCI
 #define CONFIG_CMD_PCI
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index e28b8d5..0206e54 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -722,8 +722,6 @@ unsigned long get_board_ddr_clk(void);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 7366457..16d2e0e 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -745,8 +745,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #ifdef CONFIG_T1042RDB_PI
 #define CONFIG_CMD_DATE
 #endif
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index b2d2d83..b0ee0de 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -792,8 +792,6 @@ unsigned long get_board_ddr_clk(void);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
@@ -803,7 +801,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_BDI
 
 #ifdef CONFIG_PCI
 #define CONFIG_CMD_PCI
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 151007b..8c637c2 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -748,17 +748,13 @@ unsigned long get_board_ddr_clk(void);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_ECHO
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_BDI
 
 #ifdef CONFIG_PCI
 #define CONFIG_CMD_PCI
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index b2207da..8ed6bf7 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -318,8 +318,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index cdccbef..5a59b80 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -166,8 +166,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -175,7 +173,6 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_SNTP
diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index 0d5a2b9..9b9217e 100644
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -106,8 +106,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -115,7 +113,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
 
 #ifdef	CONFIG_SPLASH_SCREEN
diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index e765a03..5240e0f 100644
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -104,8 +104,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -113,7 +111,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
 
 
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 7b496c8..4164303 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -289,15 +289,12 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
@@ -308,11 +305,6 @@
     #define CONFIG_CMD_PCI
 #endif
 
-#if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_SAVEENV
-    #undef CONFIG_CMD_LOADS
-#endif
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index bbdc3f8..edadf55 100644
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -94,8 +94,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -103,7 +101,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
 
 
diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index 5fc87f2..166bb2c 100644
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -94,8 +94,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -103,7 +101,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
 
 
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index 589d168..8b16ad2 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -97,8 +97,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -106,7 +104,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
 
 
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 60acb56..8a05fa4 100644
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -126,8 +126,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -136,7 +134,6 @@
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
 
 
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index ebc5571..bf3a25b 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -97,8 +97,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -106,7 +104,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
 
 
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index f4ce07f..47e5c6c 100644
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -97,8 +97,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -106,7 +104,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
 
 
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index 97db519..fa892a9 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -100,8 +100,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -109,7 +107,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
 
 
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index 25d60a7..13319f2 100644
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -100,8 +100,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -109,7 +107,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
 
 
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index 928b879..0e378f2 100644
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -140,8 +140,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
@@ -149,7 +147,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
 
 
diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index 598020c..76ddef5 100644
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -136,8 +136,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -146,7 +144,6 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 
 
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index bc2ca66..bdedef5 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -490,8 +490,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 6aee6db..60c2948 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -49,8 +49,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_I2C
diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h
index e229256..ddd6377 100644
--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@@ -59,8 +59,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_IRQ
diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h
index f8cea62..fc4595b 100644
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -45,8 +45,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_MII
diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h
index b03f163..1be78fd 100644
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -93,13 +93,10 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IDE
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_MII
diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h
index 28f4de2..8a5d1e6 100644
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@@ -394,8 +394,6 @@
 #define CONFIG_LOADS_ECHO		1
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	1
 
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
@@ -405,7 +403,6 @@
 #undef CONFIG_CMD_EXT2
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 
diff --git a/include/configs/adp-ag101.h b/include/configs/adp-ag101.h
index e318c75..4d52ba1 100644
--- a/include/configs/adp-ag101.h
+++ b/include/configs/adp-ag101.h
@@ -109,8 +109,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_PING
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index 24904b0..06860b5 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -109,8 +109,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_PING
diff --git a/include/configs/adp-ag102.h b/include/configs/adp-ag102.h
index c46eed9..026696c 100644
--- a/include/configs/adp-ag102.h
+++ b/include/configs/adp-ag102.h
@@ -104,8 +104,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_PING
@@ -113,8 +111,6 @@
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_ELF
 
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 
 /*
  * PCI
diff --git a/include/configs/alpr.h b/include/configs/alpr.h
index 0f125dc..f113ebd 100644
--- a/include/configs/alpr.h
+++ b/include/configs/alpr.h
@@ -217,18 +217,12 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_FPGA
 #define CONFIG_CMD_FPGA_LOADMK
 #define CONFIG_CMD_I2C
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NAND
-#undef CONFIG_CMD_NFS
 #define CONFIG_CMD_PCI
 
 #undef CONFIG_WATCHDOG			/* watchdog disabled		*/
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 4961180..035c156 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -451,7 +451,6 @@
  */
 #if defined(CONFIG_NOR)
 #undef CONFIG_SYS_NO_FLASH
-#define CONFIG_CMD_FLASH
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 #define CONFIG_SYS_FLASH_PROTECTION
 #define CONFIG_SYS_FLASH_CFI
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 9b31b9c..2f4117d 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -127,8 +127,6 @@
 #endif /* CONFIG_USB_AM35X */
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/
 #define CONFIG_CMD_FAT		/* FAT support			*/
 #define CONFIG_CMD_JFFS2	/* JFFS2 Support		*/
@@ -139,10 +137,6 @@
 #define CONFIG_CMD_DHCP
 #undef CONFIG_CMD_PING
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
-#undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
-#undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
 
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_SYS_I2C
@@ -150,7 +144,6 @@
 #define CONFIG_SYS_OMAP24_I2C_SLAVE	1
 #define CONFIG_SYS_I2C_OMAP34XX
 
-#undef CONFIG_CMD_NFS
 /*
  * Board NAND Info.
  */
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 31e758d..e5b4621 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -126,8 +126,6 @@
 #endif /* CONFIG_USB_MUSB_AM35X */
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/
 #define CONFIG_CMD_FAT		/* FAT support			*/
 #define CONFIG_CMD_JFFS2	/* JFFS2 Support		*/
@@ -138,10 +136,6 @@
 #define CONFIG_CMD_DHCP
 #undef CONFIG_CMD_PING
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
-#undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
-#undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
 
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_SYS_I2C
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 4ee7931..466ded7 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -12,7 +12,6 @@
 #define CONFIG_AM43XX
 
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_ARCH_CPU_INIT
diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index 9d6146a..37dac7d 100644
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -53,8 +53,6 @@
 /*
  * Commands
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #if defined(CONFIG_440)
 #define CONFIG_CMD_CACHE
@@ -67,7 +65,6 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 
diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index 5e197be..45fd265 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -21,12 +21,7 @@
 #define CONFIG_BOOTDELAY		1
 #define CONFIG_BOOTCOMMAND		"bootm ffc20000"
 
-#include <config_cmd_default.h>
 #undef CONFIG_CMD_AES
-#undef CONFIG_CMD_BOOTD
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_XIMG
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_TIMER
 #define CONFIG_CMD_DIAG
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 573c98f..03810c3 100644
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -14,14 +14,8 @@
 #define CONFIG_CPU_SH7723	1
 #define CONFIG_AP325RXA	1
 
-#define CONFIG_CMD_LOADB
-#define CONFIG_CMD_LOADS
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_EXT2
 #define CONFIG_DOS_PARTITION
diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h
index 5b95dd3..4bcfb4c 100644
--- a/include/configs/ap_sh4a_4a.h
+++ b/include/configs/ap_sh4a_4a.h
@@ -18,14 +18,10 @@
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_SYS_TEXT_BASE 0x8BFC0000
 
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTDELAY	3
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index 7554023..a0a26bb 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -25,7 +25,7 @@
 /*
  * Enable the call to miscellaneous platform dependent initialization.
  */
-#define CONFIG_SYS_NO_FLASH	/* to be define before <config_cmd_default.h> */
+#define CONFIG_SYS_NO_FLASH
 
 /*
  * Board display option
@@ -65,8 +65,6 @@
 /*
  * U-Boot Commands
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV	/* ask for env variable		*/
 #define CONFIG_CMD_BSP		/* Board Specific functions	*/
 #define CONFIG_CMD_CACHE	/* icache, dcache		*/
@@ -84,7 +82,6 @@
 #define CONFIG_CMD_NAND		/* NAND support			*/
 #define CONFIG_CMD_NAND_LOCK_UNLOCK
 #define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_CMD_NFS		/* NFS support			*/
 #define CONFIG_CMD_PING		/* ping support			*/
 #define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
index 445cb19..2bbef55 100644
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -21,7 +21,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#include <config_cmd_default.h>
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
 
@@ -34,9 +33,7 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_USB
 
 /* Memory configuration */
diff --git a/include/configs/arcangel4.h b/include/configs/arcangel4.h
index 5e4097f..6636e0e 100644
--- a/include/configs/arcangel4.h
+++ b/include/configs/arcangel4.h
@@ -41,8 +41,6 @@
 /*
  * Command line configuration
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ELF
 
 #define CONFIG_OF_LIBFDT
diff --git a/include/configs/aria.h b/include/configs/aria.h
index 2f9677c..2265f3e 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -407,8 +407,6 @@
 #define CONFIG_LOADS_ECHO		1
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	1
 
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
@@ -417,7 +415,6 @@
 #undef CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index e540e3f..7f5cbcc 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -16,15 +16,11 @@
 
 #include <asm/arch/rmobile.h>
 
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_DFL
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_RUN
-#define CONFIG_CMD_LOADS
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_BOOTZ
 
 #define CONFIG_OF_LIBFDT
diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h
index f4cf1c0..62c5374 100644
--- a/include/configs/aspenite.h
+++ b/include/configs/aspenite.h
@@ -40,9 +40,7 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_I2C
-#undef CONFIG_CMD_NFS
 /*
  * mv-common.h should be defined after CMD configs since it used them
  * to enable certain macros
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index bd0919e..c6e1f56 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -42,8 +42,6 @@
 #define CONFIG_ASTRO5373L		/* define board type */
 
 /* Command line configuration */
-#include <config_cmd_default.h>
-
 /*
  * CONFIG_RAM defines if u-boot is loaded via BDM (or started from
  * a different bootloader that has already performed RAM setup) or
@@ -64,19 +62,11 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
-#define CONFIG_CMD_XIMG
-#undef CONFIG_CMD_NFS
 #if ENABLE_JFFS
 #define CONFIG_CMD_JFFS2
 #endif
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_LOADS
-#define CONFIG_CMD_LOADB
-#define CONFIG_CMD_FPGA
 #define CONFIG_CMD_FPGA_LOADMK
 #define CONFIG_CMDLINE_EDITING
 
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index 9289964..c2621ff 100644
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -48,10 +48,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_LOADS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index 735c82a..6f1f65f 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -122,14 +122,11 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_USB
-#undef CONFIG_CMD_FPGA
 
 /*
  * Network Driver Setting
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index c4b2e16..e98cf0c 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -79,14 +79,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_SOURCE
-
 #define CONFIG_CMD_PING		1
 #define CONFIG_CMD_DHCP		1
 #define CONFIG_CMD_NAND		1
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 407a53e..42461d2 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -86,14 +86,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_SOURCE
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_NAND
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index fa19e8b..731c7f1 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -94,14 +94,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_SOURCE
-
 #define CONFIG_CMD_PING		1
 #define CONFIG_CMD_DHCP		1
 #define CONFIG_CMD_NAND		1
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index e4c49f4..09d8bec 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -80,14 +80,6 @@
 
 /* No NOR flash */
 #define CONFIG_SYS_NO_FLASH
-
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_LOADS
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_NAND
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index aec91da..a19d4d9 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -70,9 +70,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_FPGA
-
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 637d150..e709f9c 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -76,14 +76,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_SOURCE
 #undef CONFIG_CMD_USB
 
 #define CONFIG_CMD_NAND			1
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index c241dac..b9a7754 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -68,10 +68,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_NAND
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index ac59014..1cab0a9 100644
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -80,8 +80,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EXT2
@@ -91,10 +89,6 @@
 #define CONFIG_CMD_SF
 #define CONFIG_CMD_SPI
 
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SETGETDCR
-#undef CONFIG_CMD_SOURCE
-#undef CONFIG_CMD_XIMG
 
 #define CONFIG_ATMEL_USART
 #define CONFIG_MACB
diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
index 77af772..486d9ee 100644
--- a/include/configs/atngw100mkii.h
+++ b/include/configs/atngw100mkii.h
@@ -99,8 +99,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EXT2
@@ -111,9 +109,6 @@
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_MII
 
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SETGETDCR
-#undef CONFIG_CMD_XIMG
 
 #define CONFIG_ATMEL_USART
 #define CONFIG_MACB
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 4beb068..1cd99e9 100644
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -101,8 +101,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EXT2
@@ -110,10 +108,6 @@
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MMC
 
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SETGETDCR
-#undef CONFIG_CMD_SOURCE
-#undef CONFIG_CMD_XIMG
 
 #define CONFIG_ATMEL_USART
 #define CONFIG_MACB
diff --git a/include/configs/axs101.h b/include/configs/axs101.h
index 5e8c14d..25116e5 100644
--- a/include/configs/axs101.h
+++ b/include/configs/axs101.h
@@ -121,8 +121,6 @@
 /*
  * Command line configuration
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_ELF
diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h
index 60981f9..12c5a6c 100644
--- a/include/configs/balloon3.h
+++ b/include/configs/balloon3.h
@@ -46,13 +46,8 @@
 /*
  * Bootloader Components Configuration
  */
-#include <config_cmd_default.h>
-
-#undef	CONFIG_CMD_NFS
 #undef	CONFIG_CMD_ENV
-#undef	CONFIG_CMD_IMLS
 #define	CONFIG_CMD_USB
-#define	CONFIG_CMD_FPGA
 #define	CONFIG_CMD_FPGA_LOADMK
 #undef	CONFIG_LCD
 
diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 6242895..68bfee5 100644
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -196,8 +196,6 @@
 	"run mmcboot;" \
 	"run nandboot;"
 
-#define CONFIG_CMD_SAVEENV
-#define CONFIG_CMD_NFS
 
 /* NS16550 Configuration */
 #define CONFIG_SYS_NS16550_COM1		0x44e09000	/* Base EVM has UART0 */
diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index 2e118d8..741fb05 100644
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -601,7 +601,6 @@ DEFAULT_LINUX_BOOT_ENV \
  */
 #if defined(CONFIG_NOR)
 #undef CONFIG_SYS_NO_FLASH
-#define CONFIG_CMD_FLASH
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 #define CONFIG_SYS_FLASH_PROTECTION
 #define CONFIG_SYS_FLASH_CFI
diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h
index 900dc42..8f0f7f0 100644
--- a/include/configs/bcm28155_ap.h
+++ b/include/configs/bcm28155_ap.h
@@ -71,7 +71,6 @@
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE
 
 /* No mtest functions as recommended */
-#undef CONFIG_CMD_MEMORY
 
 /*
  * This is the initial SP which is used only briefly for relocating the u-boot
@@ -124,7 +123,6 @@
 #define CONFIG_BOOTCOMMAND		""
 
 /* Commands */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_FAT
@@ -134,6 +132,5 @@
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_FAT_WRITE
 
-#undef CONFIG_CMD_NFS
 
 #endif /* __BCM28155_AP_H */
diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h
index fb85c72..ba26964 100644
--- a/include/configs/bcm_ep_board.h
+++ b/include/configs/bcm_ep_board.h
@@ -35,9 +35,6 @@
 /* Some commands use this as the default load address */
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE
 
-/* No mtest functions as recommended */
-#undef CONFIG_CMD_MEMORY
-
 /*
  * This is the initial SP which is used only briefly for relocating the u-boot
  * image to the top of SDRAM. After relocation u-boot moves the stack to the
@@ -85,8 +82,6 @@
 #define CONFIG_MX_CYCLIC
 
 /* Commands */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_FAT
diff --git a/include/configs/beagle_x15.h b/include/configs/beagle_x15.h
index c5dde99..17fdded 100644
--- a/include/configs/beagle_x15.h
+++ b/include/configs/beagle_x15.h
@@ -28,8 +28,6 @@
 #define FAT_ENV_DEVICE_AND_PART		"0:1"
 #define FAT_ENV_FILE			"uboot.env"
 
-#define CONFIG_CMD_SAVEENV
-
 #define CONSOLEDEV			"ttyO2"
 #define CONFIG_SYS_NS16550_COM1		UART1_BASE	/* Base EVM has UART0 */
 #define CONFIG_SYS_NS16550_COM2		UART2_BASE	/* UART2 */
@@ -50,7 +48,6 @@
 #define CONFIG_EFI_PARTITION
 
 /* CPSW Ethernet */
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_DHCP
 #define CONFIG_BOOTP_DNS		/* Configurable parts of CMD_DHCP */
 #define CONFIG_BOOTP_DNS2
diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h
index dd6cb7a..64db3ac 100644
--- a/include/configs/bf506f-ezkit.h
+++ b/include/configs/bf506f-ezkit.h
@@ -62,7 +62,6 @@
 #define CONFIG_SYS_FLASH_CFI
 #define CONFIG_SYS_MAX_FLASH_BANKS	1
 #define CONFIG_SYS_MAX_FLASH_SECT	71
-#define CONFIG_CMD_FLASH
 #define CONFIG_MONITOR_IS_IN_RAM
 */
 #define CONFIG_SYS_NO_FLASH
@@ -96,7 +95,6 @@
 #define CONFIG_BAUDRATE 115200
 #define CONFIG_BFIN_SERIAL
 
-#define CONFIG_CMD_MEMORY
 #undef CONFIG_GZIP
 #undef CONFIG_ZLIB
 #undef CONFIG_BOOTM_RTEMS
diff --git a/include/configs/bf525-ucr2.h b/include/configs/bf525-ucr2.h
index d4f06f3..fce6fc2 100644
--- a/include/configs/bf525-ucr2.h
+++ b/include/configs/bf525-ucr2.h
@@ -93,9 +93,4 @@
 		"sf read 0x1000000 0x20000 0x300000;" \
 		"bootm 0x1000000\0"
 
-/* this sets up the default list of enabled commands */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_IMLS
-
 #endif
diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index 530763d..7e52d17 100644
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -145,22 +145,16 @@
 # define CONFIG_BOOTDELAY	5
 #endif
 
-#include <config_cmd_default.h>
-
 #ifdef CONFIG_BFIN_MAC
 # define CONFIG_CMD_DHCP
 # define CONFIG_CMD_PING
-#else
-# undef CONFIG_CMD_NFS
 #endif
 
 #define CONFIG_CMD_BOOTLDR
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_ELF
-#undef CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
-#undef CONFIG_CMD_IMLS
 #define CONFIG_CMD_SF
 
 #define CONFIG_BOOTCOMMAND	"run ramboot"
diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index 11338a5..d8a0cc6 100644
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -144,22 +144,16 @@
 # define CONFIG_BOOTDELAY	5
 #endif
 
-#include <config_cmd_default.h>
-
 #ifdef CONFIG_BFIN_MAC
 # define CONFIG_CMD_DHCP
 # define CONFIG_CMD_PING
-#else
-# undef CONFIG_CMD_NFS
 #endif
 
 #define CONFIG_CMD_BOOTLDR
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_ELF
-#undef CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
-#undef CONFIG_CMD_IMLS
 #define CONFIG_CMD_SF
 
 #define CONFIG_BOOTCOMMAND	"run flashboot"
diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h
index 6d3f690..da28396 100644
--- a/include/configs/bf561-acvilon.h
+++ b/include/configs/bf561-acvilon.h
@@ -121,7 +121,6 @@
  * Env Storage Settings
  */
 #define CONFIG_ENV_IS_IN_SPI_FLASH
-/* #define CONFIG_CMD_SAVEENV */
 #define CONFIG_ENV_SECT_SIZE		(1056 * 8)
 #define CONFIG_ENV_OFFSET			((16 + 256) * 1056)
 #define CONFIG_ENV_SIZE				(8 * 1056)
diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h
index fc8378d..0e353b9 100644
--- a/include/configs/bf609-ezkit.h
+++ b/include/configs/bf609-ezkit.h
@@ -84,7 +84,6 @@
 /*
  * Flash Settings
  */
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_JFFS2
 #define CONFIG_SYS_FLASH_CFI_WIDTH     2
 #define CONFIG_FLASH_CFI_DRIVER
@@ -140,7 +139,6 @@
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_UART_CONSOLE	0
 
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_SOFTSWITCH
 
 #define CONFIG_SYS_MEMTEST_END (CONFIG_STACKBASE - 20*1024*1024 + 4)
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index 1c9d584..7b2faf2 100644
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -9,7 +9,6 @@
  * Command Settings
  */
 #ifndef _CONFIG_CMD_DEFAULT_H
-# include <config_cmd_default.h>
 # ifdef ADI_CMDS_NETWORK
 #  define CONFIG_CMD_DHCP
 #  define CONFIG_BOOTP_SUBNETMASK
@@ -23,9 +22,6 @@
 #  ifdef CONFIG_BFIN_MAC
 #   define CONFIG_CMD_MII
 #  endif
-# else
-#  undef CONFIG_CMD_BOOTD
-#  undef CONFIG_CMD_NFS
 # endif
 # ifdef CONFIG_LIBATA
 #  define CONFIG_CMD_FAT
@@ -75,10 +71,7 @@
 #  define CONFIG_CMD_I2C
 #  define CONFIG_SOFT_I2C_READ_REPEATED_START
 # endif
-# ifdef CONFIG_SYS_NO_FLASH
-#  undef CONFIG_CMD_FLASH
-#  undef CONFIG_CMD_IMLS
-# else
+# ifndef CONFIG_SYS_NO_FLASH
 #  define CONFIG_CMD_JFFS2
 # endif
 # ifdef CONFIG_CMD_JFFS2
diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h
index 99202b5..76c1c6a 100644
--- a/include/configs/bg0900.h
+++ b/include/configs/bg0900.h
@@ -11,7 +11,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#include <config_cmd_default.h>
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
 
@@ -22,9 +21,7 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_SF
 #define CONFIG_CMD_SPI
 
diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h
index 92bb573..c0197ca 100644
--- a/include/configs/blackstamp.h
+++ b/include/configs/blackstamp.h
@@ -102,8 +102,6 @@
 #define CONFIG_AUTO_COMPLETE	1
 #define CONFIG_ENV_OVERWRITE	1
 
-#include <config_cmd_default.h>
-
 #ifdef CONFIG_SMC91111
 # define CONFIG_CMD_DHCP
 # define CONFIG_CMD_PING
@@ -236,8 +234,6 @@
  * hardware don't support Parallel Flash at all.
  */
 #define CONFIG_SYS_NO_FLASH
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_JFFS2
-#undef CONFIG_CMD_FLASH
 
 #endif
diff --git a/include/configs/blackvme.h b/include/configs/blackvme.h
index ffa6969..4752b07 100644
--- a/include/configs/blackvme.h
+++ b/include/configs/blackvme.h
@@ -152,8 +152,6 @@
 #define CONFIG_CMDLINE_EDITING	1
 #define CONFIG_AUTO_COMPLETE	1
 
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_BOOTLDR
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_CPLBINFO
@@ -233,8 +231,6 @@
  * No Parallel Flash on this board
  */
 #define CONFIG_SYS_NO_FLASH
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_JFFS2
-#undef CONFIG_CMD_FLASH
 
 #endif
diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index e28e5ad..1521415 100644
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -151,28 +151,6 @@
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-/*
- * For commands to use, we take the default list and add a few other
- * useful commands.  Note that we must have set CONFIG_SYS_NO_FLASH
- * prior to this include, in order to skip a few commands.  When we do
- * have flash, if we expect these commands they must be enabled in that
- * config.  If desired, a specific list of desired commands can be used
- * instead.
- */
-#include <config_cmd_default.h>
-/* undefine commands, which we do not need */
-#undef CONFIG_CMD_EDITENV
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_ITEST
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_SETGETDCR
-#undef CONFIG_CMD_XIMG
-/* define command we need always */
-#define CONFIG_CMD_ECHO
-#define CONFIG_CMD_SOURCE
 
 /*
  * Our platforms make use of SPL to initalize the hardware (primarily
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 8353fc9..7d8bb47 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -311,7 +311,6 @@
 /*
  * U-Boot commands
  */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
@@ -319,7 +318,6 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SAVES
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_GPIO
 
 #ifndef CONFIG_DRIVER_TI_EMAC
diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index 7fa6fcc..21e3a0c 100644
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -90,12 +90,6 @@
 #define CONFIG_MMC_MBLOCK
 
 /* U-Boot command configuration */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_BDI
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SETGETDCR
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DHCP
diff --git a/include/configs/canmb.h b/include/configs/canmb.h
index c901793..c656378 100644
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -49,14 +49,11 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_SNTP
 
diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index 9393864..4607d9f 100644
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -26,8 +26,6 @@
 /*
  * Supported commands
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_DATE
@@ -37,7 +35,6 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_SNTP
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 3796374..231f4ba 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -19,10 +19,6 @@
 
 /* CMD */
 #define CONFIG_CMD_GREPENV
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_XIMG
-#undef CONFIG_CMD_FPGA
 
 /* MMC */
 #define CONFIG_SYS_FSL_USDHC_NUM	3
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 3eb7886..41df106 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -110,8 +110,6 @@
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/
 #define CONFIG_CMD_FAT		/* FAT support			*/
@@ -129,9 +127,6 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
-#undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
 
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_SYS_I2C
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index 8c63138..a8d0b97 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -120,8 +120,6 @@
 #define CONFIG_CMD_USB
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/
 #define CONFIG_CMD_FAT		/* FAT support			*/
@@ -140,9 +138,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_GPIO
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
-#undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
 
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_SYS_I2C
diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h
index a129f68..2a8b730 100644
--- a/include/configs/cm_t54.h
+++ b/include/configs/cm_t54.h
@@ -57,7 +57,6 @@
 #define CONFIG_ENV_SIZE			(16 << 10)	/* 16 KB */
 #define CONFIG_ENV_OFFSET_REDUND	(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_CMD_SAVEENV
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_HSMMC2_8BIT
diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h
index 9bc3795..d081865 100644
--- a/include/configs/cmi_mpc5xx.h
+++ b/include/configs/cmi_mpc5xx.h
@@ -44,21 +44,8 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
-#undef	CONFIG_CMD_NFS
-
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_LOADB
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_LOADS
 #define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_BDI
-#define CONFIG_CMD_CONSOLE
-#define CONFIG_CMD_SAVEENV
-#define CONFIG_CMD_RUN
-#define CONFIG_CMD_IMI
 
 
 #if 0
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 11dd4d7..8a6106d 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -120,12 +120,8 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_LOADB
 #undef CONFIG_CMD_MII
 
 #ifdef CONFIG_MCFFEC
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 6f25fdb..e3f0ab0 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -52,15 +52,9 @@
 /*
  * Bootloader Components Configuration
  */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_LOADB			/* Both together */
-#undef CONFIG_CMD_LOADS			/* saves 10 KB */
 #define	CONFIG_CMD_ENV
-#undef	CONFIG_CMD_IMLS
 #define	CONFIG_CMD_MMC
 #define	CONFIG_CMD_USB
-#define	CONFIG_CMD_FLASH
 
 /*
  * Networking Configuration
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index a3f27e3..8228e42 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -55,7 +55,6 @@
 #define CONFIG_ENV_SIZE                (SZ_64K)
 
 /* Debug commands */
-#define CONFIG_CMD_BDI
 #define CONFIG_CMD_CACHE
 
 /* Miscellaneous commands */
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index f26aad4..aff2810 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -13,7 +13,6 @@
 #define __CONFIG_H
 
 #include <asm/arch/imx-regs.h>
-#include <config_cmd_default.h>
 
 #define CONFIG_VF610
 #define CONFIG_SYS_THUMB_BUILD
@@ -70,7 +69,6 @@
 				"512k(u-boot-env),"		\
 				"-(ubi)"
 
-#undef CONFIG_CMD_IMLS
 
 #define CONFIG_MMC
 #define CONFIG_FSL_ESDHC
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index b3cb72c..8f829ed 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -352,7 +352,6 @@
 #if defined(CONFIG_TRAILBLAZER)
 #define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_ENV_SIZE		0x2000		/* 8KB */
-#undef CONFIG_CMD_SAVEENV
 #elif defined(CONFIG_RAMBOOT_SPIFLASH)
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_BUS	0
@@ -394,8 +393,6 @@
 #define CONFIG_SYS_MAXARGS	16
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
 
-#include <config_cmd_default.h>
-
 #ifndef CONFIG_TRAILBLAZER
 
 #define CONFIG_CMD_ELF
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index cb063a4..88750e0 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -619,8 +619,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index f5b8f9b..3cfae21 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -70,13 +70,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_LOADS
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_NAND
diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h
index 1feaefd..d3c6f75 100644
--- a/include/configs/cpu9260.h
+++ b/include/configs/cpu9260.h
@@ -249,13 +249,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_NAND
diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h
index 77d3ab8..f990cf7 100644
--- a/include/configs/cpuat91.h
+++ b/include/configs/cpuat91.h
@@ -108,16 +108,10 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_CACHE
 #undef CONFIG_CMD_USB
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_NFS
 #undef CONFIG_CMD_DHCP
 
 #ifdef CONFIG_SYS_I2C_SOFT
diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index a5c6f84..71cb5df 100644
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -71,8 +71,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_BEDBUG
 #define CONFIG_CMD_ELF
diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index 6aa98ef..5bd3867 100644
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -71,8 +71,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_BEDBUG
 #define CONFIG_CMD_ELF
diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index 3505229..729b6e7 100644
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -170,7 +170,6 @@
 /*
  * U-Boot commands
  */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
@@ -178,9 +177,6 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SAVES
-#define CONFIG_CMD_MEMORY
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SETGETDCR
 
 #ifdef CONFIG_CMD_BDI
 #define CONFIG_CLOCKS
@@ -193,8 +189,6 @@
 #endif
 
 #ifdef CONFIG_USE_NAND
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_PARTITIONS
@@ -202,11 +196,8 @@
 #endif
 
 #ifdef CONFIG_USE_SPIFLASH
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_FLASH
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_SF
-#define CONFIG_CMD_SAVEENV
 #endif
 
 /* SD/MMC configuration */
@@ -237,8 +228,6 @@
 #define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_ENV_SIZE		(16 << 10)
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_FLASH
 #undef CONFIG_CMD_ENV
 #endif
 
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index e9a144d..3da9da4 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -293,7 +293,6 @@
 /*
  * U-Boot commands
  */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
@@ -301,7 +300,6 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SAVES
-#define CONFIG_CMD_MEMORY
 
 #ifdef CONFIG_CMD_BDI
 #define CONFIG_CLOCKS
@@ -314,8 +312,6 @@
 #endif
 
 #ifdef CONFIG_USE_NAND
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 #define CONFIG_CMD_NAND
 
 #define CONFIG_CMD_MTDPARTS
@@ -328,10 +324,7 @@
 #endif
 
 #ifdef CONFIG_USE_SPIFLASH
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_FLASH
 #define CONFIG_CMD_SPI
-#define CONFIG_CMD_SAVEENV
 #endif
 
 #if !defined(CONFIG_USE_NAND) && \
@@ -340,7 +333,6 @@
 #define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_ENV_SIZE		(16 << 10)
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_ENV
 #endif
 
diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h
index 16b901b..847d788 100644
--- a/include/configs/davinci_dm355evm.h
+++ b/include/configs/davinci_dm355evm.h
@@ -69,13 +69,6 @@
 /* NYET -- #define CONFIG_USB_DAVINCI */
 
 /* U-Boot command configuration */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SETGETDCR
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_I2C
diff --git a/include/configs/davinci_dm355leopard.h b/include/configs/davinci_dm355leopard.h
index 4eed722..d4b994a 100644
--- a/include/configs/davinci_dm355leopard.h
+++ b/include/configs/davinci_dm355leopard.h
@@ -54,13 +54,6 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 
 /* U-Boot command configuration */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SETGETDCR
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_I2C
diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h
index c50c059..8b42c50 100644
--- a/include/configs/davinci_dm365evm.h
+++ b/include/configs/davinci_dm365evm.h
@@ -112,13 +112,6 @@
 #endif /* CONFIG_MUSB_UDC */
 
 /* U-Boot command configuration */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SETGETDCR
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_I2C
diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h
index b02e73c..8571cbd 100644
--- a/include/configs/davinci_dm6467evm.h
+++ b/include/configs/davinci_dm6467evm.h
@@ -112,7 +112,6 @@ extern unsigned int davinci_arm_clk_get(void);
 					"root=/dev/hda1 rw noinitrd ip=dhcp"
 
 /* U-Boot commands */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DIAG
 #define CONFIG_CMD_I2C
@@ -121,12 +120,7 @@ extern unsigned int davinci_arm_clk_get(void);
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SETGETDCR
 #ifdef CONFIG_SYS_USE_NAND
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 #define CONFIG_CMD_NAND
 #endif
 
diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index 2467f70..6108736 100644
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -169,7 +169,6 @@
 /*=================*/
 /* U-Boot commands */
 /*=================*/
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DIAG
@@ -178,17 +177,12 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SAVES
 #define CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_BDI
 
 #ifdef CONFIG_CMD_BDI
 #define CONFIG_CLOCKS
 #endif
 
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SETGETDCR
 #ifdef CONFIG_SYS_USE_NAND
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 #define CONFIG_CMD_NAND
 #elif defined(CONFIG_SYS_USE_NOR)
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index 2505465..db636e4 100644
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -111,7 +111,6 @@
 /*=================*/
 /* U-Boot commands */
 /*=================*/
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DIAG
@@ -122,11 +121,6 @@
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_NAND
 #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SETGETDCR
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 
 #ifdef CONFIG_CMD_BDI
 #define CONFIG_CLOCKS
diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index e773835..9ecf6ce 100644
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -104,7 +104,6 @@
 	"nand read 87A00000 100000 300000;"	\
 	"bootelf 87A00000"
 /* U-Boot commands */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DIAG
@@ -115,11 +114,6 @@
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_ELF	/* Needed to load Integrity kernel. */
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SETGETDCR
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 
 #ifdef CONFIG_CMD_BDI
 #define CONFIG_CLOCKS
diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index dae37cd..410cf68 100644
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -157,7 +157,6 @@
 /*=================*/
 /* U-Boot commands */
 /*=================*/
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DIAG
@@ -166,12 +165,7 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SAVES
 #define CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SETGETDCR
 #ifdef CONFIG_SYS_USE_NAND
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 #define CONFIG_CMD_NAND
 #elif defined(CONFIG_SYS_USE_NOR)
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index 12a24ce..c32e078 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -26,7 +26,6 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index 77d3408..c33a588 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -24,7 +24,6 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_I2C
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index ea55084..0abab78 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -74,26 +74,15 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_BDI
 #undef CONFIG_CMD_BEDBUG
 #undef CONFIG_CMD_ELF
-#undef CONFIG_CMD_SAVEENV
 #undef CONFIG_CMD_FAT
-#undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_MII
-#undef CONFIG_CMD_RUN
-
 
 #ifdef CONFIG_DBAU1550
 
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_LOADB
-
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IDE
-#undef CONFIG_CMD_NFS
 #undef CONFIG_CMD_PCMCIA
 
 #else
@@ -101,10 +90,6 @@
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_DHCP
 
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
-
 #endif
 
 
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index bd96a7d..4f35234 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -49,7 +49,6 @@
 /*
  * NOR Flash
  */
-#define CONFIG_CMD_FLASH
 #define CONFIG_SYS_MAX_FLASH_BANKS	1
 #define CONFIG_SYS_MAX_FLASH_SECT	71
 #define CONFIG_SYS_FLASH_BASE		EMC_CS0_BASE
@@ -78,7 +77,6 @@
 /*
  * U-Boot Commands
  */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_CACHE
 
 /*
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 84b047e..215dc30 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -100,8 +100,6 @@
 #define CONFIG_CMD_JFFS2		/* JFFS2 Support		*/
 #define CONFIG_CMD_NAND_LOCK_UNLOCK	/* nand (un)lock commands	*/
 
-#undef CONFIG_CMD_FPGA			/* FPGA configuration Support	*/
-#undef CONFIG_CMD_IMI			/* iminfo			*/
 #undef CONFIG_CMD_SPI
 #undef CONFIG_CMD_GPIO
 #undef CONFIG_CMD_ASKENV
diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index 5ec3c99..f6d7ec4 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -103,8 +103,6 @@
 #define CONFIG_LZO
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_FAT		/* FAT support			*/
 #define CONFIG_CMD_UBI		/* UBI Support			*/
 #define CONFIG_CMD_UBIFS	/* UBIFS Support		*/
@@ -118,12 +116,6 @@
 #define CONFIG_CMD_MMC		/* MMC support			*/
 #define CONFIG_CMD_NAND		/* NAND support			*/
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
-#undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
-#undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
-#undef CONFIG_CMD_NFS		/* NFS support			*/
-
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED	100000
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index 06da3c3..a7af351 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -99,8 +99,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #ifdef CONFIG_VIDEO
 #define CONFIG_CMD_BMP
 #endif
diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h
index 0f67595..e6bfe58 100644
--- a/include/configs/dlvision-10g.h
+++ b/include/configs/dlvision-10g.h
@@ -71,7 +71,6 @@
 #undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IRQ
-#undef CONFIG_CMD_NFS
 
 /*
  * SDRAM configuration (please see cpu/ppc/sdram.[ch])
diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h
index a9cfc10..0299d16 100644
--- a/include/configs/dlvision.h
+++ b/include/configs/dlvision.h
@@ -67,7 +67,6 @@
 #undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IRQ
-#undef CONFIG_CMD_NFS
 
 /*
  * SDRAM configuration (please see cpu/ppc/sdram.[ch])
diff --git a/include/configs/dnp5370.h b/include/configs/dnp5370.h
index 3cbd67f..e809f20 100644
--- a/include/configs/dnp5370.h
+++ b/include/configs/dnp5370.h
@@ -118,11 +118,4 @@
 		"cp.b 0x01000000 0x20030000 0x2c0000\0" \
 	"runme=bootm 0x01000000\0"
 
-/* this sets up the default list of enabled commands */
-#include <config_cmd_default.h>
-
-#ifndef CONFIG_BFIN_MAC
-# undef CONFIG_CMD_NFS
-#endif
-
 #endif
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 379e6c7..54be415 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -32,7 +32,6 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_NAND
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index ec7f721..b27b202 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -31,7 +31,6 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_MII
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 63e22f1..914e1cf 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -28,7 +28,6 @@
 #define CONFIG_ENV_OFFSET_REDUND	(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #endif
-#define CONFIG_CMD_SAVEENV
 
 #if (CONFIG_CONS_INDEX == 1)
 #define CONSOLEDEV			"ttyO0"
@@ -275,7 +274,6 @@
 #define CONFIG_SYS_FLASH_SIZE		(64 * 1024 * 1024) /* 64 MB */
 /* #define CONFIG_INIT_IGNORE_ERROR */
 #undef CONFIG_SYS_NO_FLASH
-#define CONFIG_CMD_FLASH
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 #define CONFIG_SYS_FLASH_PROTECTION
 #define CONFIG_SYS_FLASH_CFI
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index 5216cb5..133c7f4 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -46,7 +46,6 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_FAT
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 9370708..b9f28a3 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -147,7 +147,6 @@
 /*
  * U-Boot commands
  */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
@@ -155,7 +154,6 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SAVES
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_GPIO
 
@@ -171,8 +169,6 @@
 
 /* NAND Setup */
 #ifdef CONFIG_SYS_USE_NAND
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 #define CONFIG_CMD_NAND
 
 #define CONFIG_CMD_MTDPARTS
@@ -196,11 +192,8 @@
 
 /* SPI Flash */
 #ifdef CONFIG_USE_SPIFLASH
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_FLASH
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_SF
-#define CONFIG_CMD_SAVEENV
 #endif
 
 #if !defined(CONFIG_SYS_USE_NAND) && \
@@ -209,7 +202,6 @@
 #define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_ENV_SIZE		(16 << 10)
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_ENV
 #endif
 
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 5f6148e..924362c 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -64,9 +64,6 @@
  * Command line configuration.
  */
 #define CONFIG_CMDLINE_EDITING
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_LOADB
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_I2C
diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index f7e70aa..271e071 100644
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -112,9 +112,6 @@
 /*
  * Command line configuration
  */
-
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_BMP
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index 358314c..8e62674 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -30,17 +30,13 @@
 #define CONFIG_ECOVEC_ROMIMAGE_ADDR 0xA0040000
 #define CONFIG_SYS_TEXT_BASE 0x8FFC0000
 
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
-#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_USB_STORAGE
 #define CONFIG_DOS_PARTITION
diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index 70f1226..87b29f8 100644
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -91,11 +91,6 @@
 #undef CONFIG_USE_IRQ				/* Don't need IRQ/FIQ */
 
 /* Monitor configuration */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SETGETDCR
-#undef CONFIG_CMD_XIMG
-
 #undef CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index bd08740..b5e8e0e 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -135,9 +135,8 @@
 #define	CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE \
 		+sizeof(CONFIG_SYS_PROMPT) + 16)	/* Print Buff */
 /*
- * Commands configuration - using default command set for now
+ * Commands configuration
  */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_USB
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index f83449f..cba58aa 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -76,9 +76,6 @@
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
 #endif
 
-/* Command definition */
-#undef CONFIG_CMD_FPGA
-
 #define CONFIG_CMD_BMODE
 
 #define CONFIG_ARP_TIMEOUT     200UL
diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h
index 3be17f1..141489d 100644
--- a/include/configs/enbw_cmc.h
+++ b/include/configs/enbw_cmc.h
@@ -152,8 +152,6 @@
 #define CONFIG_SYS_MAX_FLASH_SECT       128
 #define CONFIG_FLASH_16BIT              /* Flash is 16-bit */
 
-#define CONFIG_CMD_FLASH
-
 #define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_SYS_MONITOR_LEN	0x80000
 #define CONFIG_ENV_ADDR		(CONFIG_SYS_FLASH_BASE + \
@@ -246,7 +244,6 @@
 /*
  * U-Boot commands
  */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
@@ -254,7 +251,6 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SAVES
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_CACHE
 
 #ifdef CONFIG_CMD_BDI
@@ -268,7 +264,6 @@
 #endif
 
 #ifdef CONFIG_USE_NAND
-#undef CONFIG_CMD_IMLS
 #define CONFIG_CMD_NAND
 
 #define CONFIG_CMD_MTDPARTS
@@ -286,7 +281,6 @@
 #define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_ENV_SIZE		(16 << 10)
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_ENV
 #endif
 
diff --git a/include/configs/espt.h b/include/configs/espt.h
index f717954..d854341 100644
--- a/include/configs/espt.h
+++ b/include/configs/espt.h
@@ -18,13 +18,9 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_NFS
-#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_BOOTDELAY        -1
 #define CONFIG_BOOTARGS         "console=ttySC0,115200 root=1f01"
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index c9dac4c..c7b1e5c 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -90,29 +90,13 @@
 #define CONFIG_AT91_GPIO
 
 /* Command line configuration */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_LOADS
-
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_SPI
 
-#ifdef MINIMAL_LOADER
-#undef CONFIG_CMD_CONSOLE
-#undef CONFIG_CMD_EDITENV
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_ITEST
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_SETGETDCR
-#undef CONFIG_CMD_XIMG
-#else
+#ifndef MINIMAL_LOADER
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_CACHE
diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h
index 87f8db0..d7bf80b 100644
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -59,8 +59,6 @@
 #define CONFIG_PWM
 
 /* Command definition*/
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_EXT4_WRITE
 #define CONFIG_FAT_WRITE
@@ -79,7 +77,6 @@
 
 /* FLASH and environment organization */
 #define CONFIG_SYS_NO_FLASH
-#undef CONFIG_CMD_IMLS
 
 #include <config_distro_defaults.h>
 
diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index f6b0a6f..08e2009 100644
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -22,10 +22,6 @@
 #define CONFIG_MMC_SDMA
 #define CONFIG_MMC_DEFAULT_DEV	0
 
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_MISC
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_XIMG
 #undef CONFIG_CMD_ONENAND
 #undef CONFIG_CMD_MTDPARTS
 #define CONFIG_CMD_DFU
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index 846b868..5d66901 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -72,9 +72,6 @@
 /*
  * Command definition
  */
-
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_BOOTP_SUBNETMASK
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index 836515d..967a05a 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -53,7 +53,6 @@
 #define CONFIG_CONSOLE_MUX
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
-#include <config_cmd_default.h>
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_MII
diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
index 0ac198d..0de6ae8 100644
--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -57,9 +57,7 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_I2C
-#undef CONFIG_CMD_FPGA
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
@@ -122,8 +120,6 @@
 #define CONFIG_ENV_OFFSET		0x07C000
 
 #define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_EDITENV
-#define CONFIG_CMD_SAVEENV
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_EHCI
diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index 5d28d8b..782746e 100644
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -59,8 +59,6 @@
 /*
  * Supported commands
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_AMBAPP
 #define CONFIG_CMD_PING
diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index dd8653a..5c466f2 100644
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -53,8 +53,6 @@
 /*
  * Supported commands
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_AMBAPP
 #define CONFIG_CMD_PING
diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index fdd0aa5..e01578c 100644
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -40,8 +40,6 @@
 /*
  * Supported commands
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_AMBAPP
 #define CONFIG_CMD_PING
diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h
index e183f51..231f25a 100644
--- a/include/configs/grasshopper.h
+++ b/include/configs/grasshopper.h
@@ -92,12 +92,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
-/* remove unneeded commands */
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_SETGETDCR
-
 /* add useful commands */
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index 6c52a17..f54919e 100644
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -48,22 +48,10 @@
  * Supported commands
  */
 #define CONFIG_CMD_AMBAPP	/* AMBA Plyg&Play information	*/
-#define CONFIG_CMD_BDI		/* bdinfo			*/
-#define CONFIG_CMD_CONSOLE	/* coninfo			*/
 #define CONFIG_CMD_DIAG
-#define CONFIG_CMD_ECHO		/* echo arguments		*/
-#define CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
 #define CONFIG_CMD_FPGA_LOADMK
 #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_ITEST	/* Integer (and string) test	*/
-#define CONFIG_CMD_LOADB	/* loadb			*/
-#define CONFIG_CMD_LOADS	/* loads			*/
-#define CONFIG_CMD_MISC		/* Misc functions like sleep etc */
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_RUN		/* run command in env variable	*/
-#define CONFIG_CMD_SETGETDCR	/* DCR support on 4xx		*/
-#define CONFIG_CMD_SOURCE	/* "source" command support	*/
-#define CONFIG_CMD_XIMG		/* Load part of Multi Image	*/
 
 /*
  * Autobooting
diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index f050754..bd2eaa9 100644
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -46,22 +46,10 @@
 /*
  * Supported commands
  */
-#define CONFIG_CMD_BDI		/* bdinfo			*/
-#define CONFIG_CMD_CONSOLE	/* coninfo			*/
 #define CONFIG_CMD_DIAG
-#define CONFIG_CMD_ECHO		/* echo arguments		*/
-#define CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
 #define CONFIG_CMD_FPGA_LOADMK
 #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_ITEST	/* Integer (and string) test	*/
-#define CONFIG_CMD_LOADB	/* loadb			*/
-#define CONFIG_CMD_LOADS	/* loads			*/
-#define CONFIG_CMD_MISC		/* Misc functions like sleep etc */
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_RUN		/* run command in env variable	*/
-#define CONFIG_CMD_SETGETDCR	/* DCR support on 4xx		*/
-#define CONFIG_CMD_SOURCE	/* "source" command support	*/
-#define CONFIG_CMD_XIMG		/* Load part of Multi Image	*/
 
 /*
  * Autobooting
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index 8e53af8..5f09567 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -46,7 +46,6 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index c00b951..1d2d09a 100644
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -116,11 +116,6 @@
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 38400, 115200 }
 
-#define CONFIG_CMD_LOADB
-#define CONFIG_CMD_SOURCE
-#define CONFIG_CMD_RUN
-#define CONFIG_CMD_IMI
-
 #define CONFIG_FIT
 #define CONFIG_FIT_DISABLE_SHA256
 #define CONFIG_SETUP_MEMORY_TAGS
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 08dcdf8..86823e2 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -54,11 +54,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_BDI
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_LOADS
 #define CONFIG_CMD_SCSI
 
 #define CONFIG_BOOT_RETRY_TIME		-1
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index bea1985..08e2f42 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -471,8 +471,6 @@ int fpga_gpio_get(unsigned int bus, int pin);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PCI
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index f1ddf21..ee52452 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -45,7 +45,6 @@
  */
 #define CONFIG_SYS_NO_FLASH		/* declare no flash (NOR/SPI) */
 #define CONFIG_SYS_MVFS
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_IDE
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index 2baf50c..1a5c93d 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -40,7 +40,6 @@
  */
 #define CONFIG_SYS_NO_FLASH		/* declare no flash (NOR/SPI) */
 #define CONFIG_SYS_MVFS
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NAND
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 10f840d..e60e753 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -418,18 +418,13 @@
 /*
  * U-Boot environment setup
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_SNTP
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_DATE
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_CMD_EDITENV
 #define CONFIG_CMD_JFFS2
 #define CONFIG_BOOTP_SUBNETMASK
 #define CONFIG_BOOTP_GATEWAY
diff --git a/include/configs/ima3-mx53.h b/include/configs/ima3-mx53.h
index 081a054..5a02917 100644
--- a/include/configs/ima3-mx53.h
+++ b/include/configs/ima3-mx53.h
@@ -73,7 +73,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Command definition */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index 386dbd8..526659c 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -171,7 +171,6 @@
 /*
  * U-Boot commands
  */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DHCP
diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index 0f22032..c552e9f 100644
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -73,9 +73,6 @@
 /***********************************************************
  * Command definition
  ***********************************************************/
-
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SPI
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index db197f3..54e8121 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -52,9 +52,6 @@
 /***********************************************************
  * Command definition
  ***********************************************************/
-
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_I2C
diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 9258734..c7bf531 100644
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -80,14 +80,11 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_IDE
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SNTP
diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h
index 12c7382..1d307ca 100644
--- a/include/configs/integrator-common.h
+++ b/include/configs/integrator-common.h
@@ -94,7 +94,6 @@
  * - SIB block
  * - U-Boot environment
  */
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_ARMFLASH
 #define CONFIG_SYS_FLASH_CFI		1
 #define CONFIG_FLASH_CFI_DRIVER		1
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index 12eb172..c76ebcb 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -43,8 +43,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_BOOTDELAY	2
 #define CONFIG_BOOTARGS		"root=/dev/mtdblock0 console=ttyAM0 console=tty"
 #define CONFIG_BOOTCOMMAND	""
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 7518b60..d6f2602 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -40,8 +40,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_BOOTDELAY	2
 #define CONFIG_BOOTARGS	"root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0"
 #define CONFIG_BOOTCOMMAND "tftpboot ; bootm"
diff --git a/include/configs/io.h b/include/configs/io.h
index 8101933..f5b09b6 100644
--- a/include/configs/io.h
+++ b/include/configs/io.h
@@ -71,7 +71,6 @@
 #undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IRQ
-#undef CONFIG_CMD_NFS
 
 /*
  * SDRAM configuration (please see cpu/ppc/sdram.[ch])
diff --git a/include/configs/iocon.h b/include/configs/iocon.h
index 9d9dabf..f7ae663 100644
--- a/include/configs/iocon.h
+++ b/include/configs/iocon.h
@@ -67,7 +67,6 @@
 #undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IRQ
-#undef CONFIG_CMD_NFS
 
 /*
  * SDRAM configuration (please see cpu/ppc/sdram.[ch])
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index 16bc373..e68b661 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -255,7 +255,6 @@
 /*
  * U-Boot commands
  */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
@@ -263,7 +262,6 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SAVES
-#define CONFIG_CMD_MEMORY
 
 #ifdef CONFIG_CMD_BDI
 #define CONFIG_CLOCKS
diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index 41ced15..230f2c4 100644
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -101,8 +101,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #ifdef CONFIG_VIDEO
 #define CONFIG_CMD_BMP		/* BMP support */
 #endif
diff --git a/include/configs/jornada.h b/include/configs/jornada.h
index dd30ba2..71f2ee1 100644
--- a/include/configs/jornada.h
+++ b/include/configs/jornada.h
@@ -43,14 +43,7 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_JFFS2
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_MISC
-#undef CONFIG_CMD_SETGETDCR
-#undef CONFIG_CMD_XIMG
 
 #define CONFIG_BOOTDELAY	5
 #define CONFIG_BOOTARGS	"root=/dev/hda1 console=ttySA0,19200n8 console=tty1"
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index 7dfaa22..65b3df6 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -85,9 +85,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
 
 #if defined(CONFIG_PCI)
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 5649901..f3248bc 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -13,13 +13,10 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DEFAULTENV_VARS
 #define CONFIG_CMD_GREPENV
-#define CONFIG_CMD_ECHO
 #define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 851e269..15fca1a 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -124,14 +124,11 @@
  */
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_MTDPARTS
-#define CONFIG_CMD_NFS
 
 /*
  * Without NOR FLASH we need this
  */
 #define CONFIG_SYS_NO_FLASH
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 
 /*
  * NAND Flash configuration
diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index ed942a0..a8cf3f7 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -409,8 +409,6 @@ int get_scl(void);
 
 /* we don't need flash support */
 #define CONFIG_SYS_NO_FLASH
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_FLASH
 #undef CONFIG_FLASH_CFI_MTD
 #undef CONFIG_JFFS2_CMDLINE
 
diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h
index 559446a..e05d56c 100644
--- a/include/configs/ks2_evm.h
+++ b/include/configs/ks2_evm.h
@@ -208,7 +208,6 @@
 #define CONFIG_USB_PHY_CFG_BASE			KS2_USB_PHY_CFG_BASE
 
 /* U-Boot command configuration */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_I2C
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 7111b08..93c2976 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -24,7 +24,6 @@
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_OF_LIBFDT
 
-#include <config_cmd_default.h>
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 9ac5d33..30810d3 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -53,7 +53,6 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
diff --git a/include/configs/lp8x4x.h b/include/configs/lp8x4x.h
index e3dd5e0..e9ee3fb 100644
--- a/include/configs/lp8x4x.h
+++ b/include/configs/lp8x4x.h
@@ -44,10 +44,7 @@
 /*
  * Bootloader Components Configuration
  */
-#include <config_cmd_default.h>
-
 #define	CONFIG_CMD_ENV
-#undef	CONFIG_CMD_IMLS
 #define	CONFIG_CMD_MMC
 #define	CONFIG_CMD_USB
 #undef	CONFIG_LCD
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 14c2393..5c9d275 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -7,8 +7,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <config_cmd_default.h>
-
 #define CONFIG_LS102XA
 
 #define CONFIG_SYS_GENERIC_BOARD
@@ -538,12 +536,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_CMDLINE_EDITING
 
-#ifdef CONFIG_QSPI_BOOT
-#undef CONFIG_CMD_IMLS
-#else
-#define CONFIG_CMD_IMLS
-#endif
-
 #define CONFIG_ARMV7_NONSEC
 #define CONFIG_ARMV7_VIRT
 #define CONFIG_PEN_ADDR_BIG_ENDIAN
@@ -586,7 +578,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
-#define CONFIG_CMD_ENV_EXISTS
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_MEMINFO
 #define CONFIG_CMD_MEMTEST
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 0748e61..446d562 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -7,8 +7,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <config_cmd_default.h>
-
 #define CONFIG_LS102XA
 
 #define CONFIG_SYS_GENERIC_BOARD
@@ -355,12 +353,6 @@
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_CMDLINE_EDITING
 
-#ifdef CONFIG_QSPI_BOOT
-#undef CONFIG_CMD_IMLS
-#else
-#define CONFIG_CMD_IMLS
-#endif
-
 #define CONFIG_ARMV7_NONSEC
 #define CONFIG_ARMV7_VIRT
 #define CONFIG_PEN_ADDR_BIG_ENDIAN
@@ -399,7 +391,6 @@
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
-#define CONFIG_CMD_ENV_EXISTS
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_MEMINFO
 #define CONFIG_CMD_MEMTEST
diff --git a/include/configs/ls2085a_common.h b/include/configs/ls2085a_common.h
index 547026e..72ba3b3 100644
--- a/include/configs/ls2085a_common.h
+++ b/include/configs/ls2085a_common.h
@@ -205,20 +205,10 @@ unsigned long long get_qixis_addr(void);
 
 /* Command line configuration */
 #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_BDI
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_IMI
-#define CONFIG_CMD_LOADB
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_SAVEENV
-#define CONFIG_CMD_RUN
-#define CONFIG_CMD_BOOTD
-#define CONFIG_CMD_ECHO
-#define CONFIG_CMD_SOURCE
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LOAD_ADDR	(CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000)
diff --git a/include/configs/ls2085aqds.h b/include/configs/ls2085aqds.h
index cd2b080..e488ac8 100644
--- a/include/configs/ls2085aqds.h
+++ b/include/configs/ls2085aqds.h
@@ -8,7 +8,6 @@
 #define __LS2_QDS_H
 
 #include "ls2085a_common.h"
-#include <config_cmd_default.h>
 
 #define CONFIG_IDENT_STRING		" LS2085A-QDS"
 #define CONFIG_BOOTP_VCI_STRING		"U-boot.LS2085A-QDS"
diff --git a/include/configs/ls2085ardb.h b/include/configs/ls2085ardb.h
index 0837fcd..600261e 100644
--- a/include/configs/ls2085ardb.h
+++ b/include/configs/ls2085ardb.h
@@ -8,8 +8,6 @@
 #define __LS2_RDB_H
 
 #include "ls2085a_common.h"
-#include <config_cmd_default.h>
-
 #define CONFIG_IDENT_STRING		" LS2085A-RDB"
 #define CONFIG_BOOTP_VCI_STRING		"U-boot.LS2085A-RDB"
 
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index 7d22173..ddbf5ce 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -53,7 +53,6 @@
 /*
  * Commands configuration
  */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 799850a..513167e 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -428,8 +428,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -440,7 +438,6 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_SDRAM
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index ad7b996..29c60b7 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -18,7 +18,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#include <config_cmd_default.h>
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
@@ -40,7 +39,6 @@
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SF
 #define CONFIG_CMD_SPI
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 2d2b226..35058e2 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -26,7 +26,6 @@
 /*
  * U-Boot Commands
  */
-#include <config_cmd_default.h>
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
diff --git a/include/configs/malta.h b/include/configs/malta.h
index 9445c9b..ab2335f 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -119,13 +119,6 @@
 /*
  * Commands
  */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_NFS
-
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
diff --git a/include/configs/manroland/common.h b/include/configs/manroland/common.h
index ab4a471..941290c 100644
--- a/include/configs/manroland/common.h
+++ b/include/configs/manroland/common.h
@@ -21,8 +21,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DISPLAY
 #define CONFIG_CMD_DHCP
@@ -32,7 +30,6 @@
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_SNTP
 
diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h
index d8811a4..0839d39 100644
--- a/include/configs/maxbcm.h
+++ b/include/configs/maxbcm.h
@@ -22,7 +22,6 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_I2C
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 3405c83..0a7b7cf 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -113,8 +113,6 @@
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/
 #define CONFIG_CMD_FAT		/* FAT support			*/
 #define CONFIG_CMD_JFFS2	/* JFFS2 Support		*/
@@ -137,11 +135,6 @@
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_CMD_GPIO
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
-#undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
-#undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
-
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED	100000
@@ -153,7 +146,6 @@
 #define CONFIG_SYS_I2C_RTC_ADDR		0x68
 
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 /*
  * Board NAND Info.
  */
diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h
index 0b9cbae..a8b4b24 100644
--- a/include/configs/mecp5123.h
+++ b/include/configs/mecp5123.h
@@ -296,13 +296,10 @@
 #define CONFIG_LOADS_ECHO		/* echo on for serial download	*/
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change	*/
 
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_EEPROM
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index 955d0e2..e5bb873 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -86,12 +86,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_NAND
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index faa13e3..e16965c 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -244,12 +244,9 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MFSL
-#define CONFIG_CMD_ECHO
 #define CONFIG_CMD_GPIO
 
 #if defined(CONFIG_DCACHE) || defined(CONFIG_ICACHE)
@@ -258,9 +255,7 @@
 # undef CONFIG_CMD_CACHE
 #endif
 
-#ifndef CONFIG_SYS_ENET
-# undef CONFIG_CMD_NFS
-#else
+#ifdef CONFIG_SYS_ENET
 # define CONFIG_CMD_PING
 # define CONFIG_CMD_DHCP
 # define CONFIG_CMD_TFTPPUT
@@ -272,15 +267,11 @@
 #endif
 
 #if defined(FLASH)
-# define CONFIG_CMD_ECHO
-# define CONFIG_CMD_FLASH
-# define CONFIG_CMD_IMLS
 # define CONFIG_CMD_JFFS2
 # define CONFIG_CMD_UBI
 # undef CONFIG_CMD_UBIFS
 
 # if !defined(RAMENV)
-#  define CONFIG_CMD_SAVEENV
 #  define CONFIG_CMD_SAVES
 # endif
 
@@ -289,12 +280,9 @@
 # define CONFIG_CMD_SF
 
 # if !defined(RAMENV)
-#  define CONFIG_CMD_SAVEENV
 #  define CONFIG_CMD_SAVES
 # endif
 #else
-# undef CONFIG_CMD_IMLS
-# undef CONFIG_CMD_FLASH
 # undef CONFIG_CMD_JFFS2
 # undef CONFIG_CMD_UBI
 # undef CONFIG_CMD_UBIFS
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index cdd5c79..6dc84eb 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -33,8 +33,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_BEDBUG
 #define CONFIG_CMD_DATE
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index 41ae0a5..782b29d 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -415,8 +415,6 @@
 #define CONFIG_LOADS_ECHO	1	/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	1	/* allow baudrate change */
 
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -426,7 +424,6 @@
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 
diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index 195bc18..1b09e70 100644
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -398,8 +398,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index 8ae497c..3ac4b0b 100644
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -11,10 +11,7 @@
 #define __MPR2_H
 
 /* Supported commands */
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_FLASH
 
 /* Default environment variables */
 #define CONFIG_BAUDRATE		115200
diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index 585d68f..3e99966 100644
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -12,10 +12,7 @@
 #define CONFIG_CPU_SH7720	1
 #define CONFIG_MS7720SE		1
 
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_PCMCIA
 #define CONFIG_CMD_IDE
diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index fb5fcc6..12bb3a0 100644
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -12,13 +12,9 @@
 #define CONFIG_CPU_SH7722	1
 #define CONFIG_MS7722SE		1
 
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTDELAY	3
diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index 4cf8efe..bbd2d6b 100644
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -18,11 +18,6 @@
 /*
  * Command line configuration.
  */
-/*#include <config_cmd_default.h>*/
-
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_SAVEENV
-
 #define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_BAUDRATE		38400
 #define CONFIG_CONS_SCIF1	1
diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index 01e395a..dd516ac 100644
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -48,7 +48,6 @@
 /*
  * FPGA
  */
-#define CONFIG_CMD_FPGA
 #define CONFIG_CMD_FPGA_LOADMK
 #define CONFIG_FPGA
 #define CONFIG_FPGA_XILINX
diff --git a/include/configs/munices.h b/include/configs/munices.h
index 535bf2a..42ac029 100644
--- a/include/configs/munices.h
+++ b/include/configs/munices.h
@@ -26,8 +26,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_IMMAP
diff --git a/include/configs/mv88f6281gtw_ge.h b/include/configs/mv88f6281gtw_ge.h
index 311fc0c..45a4a75 100644
--- a/include/configs/mv88f6281gtw_ge.h
+++ b/include/configs/mv88f6281gtw_ge.h
@@ -26,7 +26,6 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_ENV
diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h
index 65203a0..529f73b 100644
--- a/include/configs/mx23_olinuxino.h
+++ b/include/configs/mx23_olinuxino.h
@@ -12,7 +12,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#include <config_cmd_default.h>
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
 
diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h
index 273b7d3..b649c7d 100644
--- a/include/configs/mx23evk.h
+++ b/include/configs/mx23evk.h
@@ -15,9 +15,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_NFS
-
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
 
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index 5f61eb1..bd7216e 100644
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -82,7 +82,6 @@
 #define CONFIG_SYS_LONGHELP
 
 /* U-Boot commands */
-#include <config_cmd_default.h>
 #define CONFIG_OF_LIBFDT
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_CACHE
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 976192f..588490f 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -17,7 +17,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#include <config_cmd_default.h>
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
 
@@ -28,9 +27,7 @@
 #define CONFIG_CMD_GPIO
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_MMC
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_SF
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_USB
diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index bed071f..c4513d2 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -74,9 +74,6 @@
 /***********************************************************
  * Command definition
  ***********************************************************/
-
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_SPI
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 1282a6e..7e709cd 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -80,9 +80,6 @@
 /***********************************************************
  * Command definition
  ***********************************************************/
-
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
@@ -91,12 +88,6 @@
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_BOOTZ
 
-/*
- * Disabled due to compilation errors in cmd_bootm.c (IMLS seems to require
- * that CFG_NO_FLASH is undefined).
- */
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_BOARD_LATE_INIT
 
 #define CONFIG_BOOTDELAY	1
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 4c71360..c9983f3 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -77,9 +77,6 @@
 /*
  * Command definition
  */
-
-#include <config_cmd_default.h>
-
 #define CONFIG_OF_LIBFDT
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_PING
diff --git a/include/configs/mx51_efikamx.h b/include/configs/mx51_efikamx.h
index 3f7e4bc..22aec4f 100644
--- a/include/configs/mx51_efikamx.h
+++ b/include/configs/mx51_efikamx.h
@@ -11,8 +11,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <config_cmd_default.h>
-
 /*
  * High Level Board Configuration Options
  */
@@ -42,7 +40,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_DATE
-#undef CONFIG_CMD_IMLS
 
 /*
  * Environmental settings
@@ -197,9 +194,6 @@
  */
 #ifdef CONFIG_CMD_FAT
 #define CONFIG_DOS_PARTITION
-#ifdef	CONFIG_CMD_NET
-#define	CONFIG_CMD_NFS
-#endif
 #endif
 
 /*
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 61e8a98..2203c15 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -128,10 +128,7 @@
 /***********************************************************
  * Command definition
  ***********************************************************/
-
-#include <config_cmd_default.h>
 #define CONFIG_CMD_BOOTZ
-#undef CONFIG_CMD_IMLS
 
 #define CONFIG_CMD_DATE
 
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index 220d4b8..0479195 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -75,10 +75,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Command definition */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_BOOTDELAY	3
 
 #define CONFIG_ETHPRIME		"smc911x"
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index 4af9f7e..82c8af8 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -83,10 +83,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Command definition */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_BOOTDELAY	3
 
 #define CONFIG_ETHPRIME		"FEC0"
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index db551a9..53f725d 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -92,12 +92,9 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Command definition */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_SUPPORT_RAW_INITRD
 
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_BOOTDELAY	1
 
 #define CONFIG_ETHPRIME		"FEC0"
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index dcc86b4..bcdb054 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -69,10 +69,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Command definition */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_BOOTDELAY	3
 
 #define CONFIG_ETHPRIME		"FEC0"
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 50370e1..2ef3201 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -36,7 +36,6 @@
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/imx-common/gpio.h>
-#include <config_cmd_default.h>
 
 #ifndef CONFIG_MX6
 #define CONFIG_MX6
@@ -88,7 +87,6 @@
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_NO_FLASH
-#undef CONFIG_CMD_IMLS
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index cfb85bf..61af61f 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -45,11 +45,9 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_DATE
diff --git a/include/configs/neo.h b/include/configs/neo.h
index 09300ca..33cee43 100644
--- a/include/configs/neo.h
+++ b/include/configs/neo.h
@@ -70,7 +70,6 @@
 #undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IRQ
-#undef CONFIG_CMD_NFS
 
 /*
  * SDRAM configuration (please see cpu/ppc/sdram.[ch])
diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
index 8a6d256..8755be7 100644
--- a/include/configs/nhk8815.h
+++ b/include/configs/nhk8815.h
@@ -17,14 +17,8 @@
 #define CONFIG_SKIP_LOWLEVEL_INIT /* we have already been loaded to RAM */
 
 /* commands */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_NFS
-/* There is no NOR flash, so undefine these commands */
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 #define CONFIG_SYS_NO_FLASH
 /* There is NAND storage */
 #define CONFIG_NAND_NOMADIK
diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h
index 6247bf1..945cbd4 100644
--- a/include/configs/nios2-generic.h
+++ b/include/configs/nios2-generic.h
@@ -75,15 +75,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BOOTD
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_ITEST
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_SETGETDCR
-#undef CONFIG_CMD_XIMG
-
 #ifdef CONFIG_CMD_NET
 # define CONFIG_CMD_DHCP
 # define CONFIG_CMD_PING
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index ed98425..efc583f 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -124,8 +124,6 @@
 #define CONFIG_SYS_NO_FLASH
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_EXT2			/* EXT2 Support */
 #define CONFIG_CMD_EXT4			/* EXT4 Support */
 #define CONFIG_CMD_FAT			/* FAT support */
@@ -152,13 +150,6 @@
 
 #endif
 
-/* commands not needed from config_cmd_default.h */
-#undef CONFIG_CMD_FPGA			/* FPGA configuration Support */
-#undef CONFIG_CMD_IMI			/* iminfo */
-#undef CONFIG_CMD_NFS			/* NFS support */
-#undef CONFIG_CMD_SAVEENV		/* saveenv */
-#undef CONFIG_CMD_SETGETDCR		/* DCR support on 4xx */
-
 #define CONFIG_OMAP3_SPI
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED	100000
diff --git a/include/configs/o2d.h b/include/configs/o2d.h
index b2905b2..4b36af6 100644
--- a/include/configs/o2d.h
+++ b/include/configs/o2d.h
@@ -25,9 +25,6 @@
  */
 #include "o2dnt-common.h"
 
-/* additional commands */
-#define CONFIG_CMD_ITEST
-
 /*
  * GPIO configuration:
  * CS1 SDRAM activate + no CAN + no PCI
diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h
index 3248429..435f1a2 100644
--- a/include/configs/o2dnt-common.h
+++ b/include/configs/o2dnt-common.h
@@ -76,8 +76,6 @@
 /*
  * Supported commands
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
diff --git a/include/configs/o2dnt2.h b/include/configs/o2dnt2.h
index 1b765a7..00a8d96 100644
--- a/include/configs/o2dnt2.h
+++ b/include/configs/o2dnt2.h
@@ -25,9 +25,6 @@
  */
 #include "o2dnt-common.h"
 
-/* additional commands */
-#define CONFIG_CMD_ITEST
-
 /*
  * GPIO configuration:
  * CS1 SDRAM activate + no CAN + no PCI
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 709528b..e574742 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -95,8 +95,6 @@
 #define CONFIG_OMAP3_GPIO_6		/* GPIO160..191 is in GPIO bank 6 */
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 
 #define CONFIG_CMD_CACHE
diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
index ed79566..81d4b34 100644
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -60,14 +60,8 @@
 #define CONFIG_NAND
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_NAND_LOCK_UNLOCK
 
-/* Disable some commands */
-#undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
-#undef CONFIG_CMD_IMI		/* iminfo			*/
-
 /*
  * TWL4030
  */
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 4e587e1..70fab4b 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -24,8 +24,6 @@
  * Supported U-boot commands
  * ----------------------------------------------------------------------------
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 
 #define CONFIG_CMD_EXT2
@@ -38,11 +36,6 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
-#undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
-#undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
-
 /* ----------------------------------------------------------------------------
  * Supported U-boot features
  * ----------------------------------------------------------------------------
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index 8aecb57..89ec73c 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -78,7 +78,6 @@
 #endif
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_NFS		/* NFS support			*/
 
 /*#undef CONFIG_ENV_IS_NOWHERE*/
 
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 6783f68..af6ae73 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -89,8 +89,6 @@
 #define CONFIG_DOS_PARTITION
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/
 #define CONFIG_CMD_FAT		/* FAT support			*/
@@ -109,11 +107,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
-#undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
-#undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
-
 #define CONFIG_SYS_NO_FLASH
 
 /*
diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
index e88cdaa..4339b05 100644
--- a/include/configs/omap3_mvblx.h
+++ b/include/configs/omap3_mvblx.h
@@ -114,20 +114,14 @@
 #define CONFIG_SYS_NO_FLASH
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/
 #define CONFIG_CMD_FAT		/* FAT support			*/
 #define CONFIG_CMD_I2C		/* I2C serial bus support	*/
 #define CONFIG_CMD_MMC		/* MMC support			*/
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
-#define CONFIG_CMD_NFS		/* NFS support			*/
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_FPGA
 #define CONFIG_CMD_FPGA_LOADMK
 
 #define CONFIG_SYS_I2C
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index e1db29a..76bf3b6 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -58,9 +58,6 @@
 /* commands to include */
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_USB
-#undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
-#undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_NFS		/* NFS support			*/
 
 #ifdef CONFIG_NAND
 #define CONFIG_CMD_UBI		/* UBI-formated MTD partition support */
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index a8af1c5..49467c9 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -57,14 +57,7 @@
 #define CONFIG_SERIAL3			3
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE	/* Cache control		*/
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
-#undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
-#undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
-#undef CONFIG_CMD_NFS		/* NFS support			*/
 
 /*
  * Board NAND Info.
diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h
index d97e4d4..16ceb91 100644
--- a/include/configs/omap3_sdp3430.h
+++ b/include/configs/omap3_sdp3430.h
@@ -148,9 +148,6 @@
 #define CONFIG_ENV_ADDR	(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_ENV_SECT_SIZE)
 /*--------------------------------------------------------------------------*/
 
-/* commands to include */
-#include <config_cmd_default.h>
-
 /* Enabled commands */
 #define CONFIG_CMD_DHCP		/* DHCP Support			*/
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/
@@ -159,10 +156,6 @@
 #define CONFIG_CMD_JFFS2	/* JFFS2 Support		*/
 #define CONFIG_CMD_MMC		/* MMC support			*/
 
-/* Disabled commands */
-#undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
-
 /*--------------------------------------------------------------------------*/
 /*
  * MMC boot support
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index 36a52a9..d90cc42 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -78,11 +78,6 @@
 #define CONFIG_CMD_NAND_LOCK_UNLOCK /* Enable lock/unlock support */
 #endif
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
-#undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
-#undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
-#define CONFIG_CMD_NFS		/* NFS support			*/
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 
diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h
index 3313f96..95614b9 100644
--- a/include/configs/omap4_panda.h
+++ b/include/configs/omap4_panda.h
@@ -48,7 +48,6 @@
 #define FAT_ENV_INTERFACE               "mmc"
 #define FAT_ENV_DEVICE_AND_PART         "0:1"
 #define FAT_ENV_FILE                    "uboot.env"
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_ENV_OVERWRITE
 
 #endif /* __CONFIG_PANDA_H */
diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h
index a837974..072b97e 100644
--- a/include/configs/omap4_sdp4430.h
+++ b/include/configs/omap4_sdp4430.h
@@ -30,6 +30,5 @@
 #define CONFIG_ENV_IS_IN_MMC		1
 #define CONFIG_SYS_MMC_ENV_DEV		1	/* SLOT2: eMMC(1) */
 #define CONFIG_ENV_OFFSET		0xE0000
-#define CONFIG_CMD_SAVEENV
 
 #endif /* __CONFIG_SDP4430_H */
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index cb12c6c..8647921 100644
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -33,7 +33,6 @@
 #define CONFIG_ENV_OFFSET		0xE0000
 #define CONFIG_ENV_OFFSET_REDUND	(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_CMD_SAVEENV
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_CMD_GPT
@@ -61,7 +60,6 @@
 
 /* Enabled commands */
 #define CONFIG_CMD_DHCP		/* DHCP Support			*/
-#define CONFIG_CMD_NFS		/* NFS support			*/
 
 /* USB Networking options */
 #define CONFIG_USB_HOST_ETHER
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index eb3184b..6d0d020 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -229,7 +229,6 @@
 /*
  * U-Boot commands
  */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
@@ -237,7 +236,6 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SAVES
-#define CONFIG_CMD_MEMORY
 #ifdef CONFIG_CMD_BDI
 #define CONFIG_CLOCKS
 #endif
@@ -249,8 +247,6 @@
 #endif
 
 #ifdef CONFIG_USE_NAND
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 #define CONFIG_CMD_NAND
 
 #define CONFIG_CMD_MTDPARTS
@@ -263,11 +259,8 @@
 #endif
 
 #ifdef CONFIG_USE_SPIFLASH
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_FLASH
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_SF
-#define CONFIG_CMD_SAVEENV
 #endif
 
 #if !defined(CONFIG_USE_NAND) && \
@@ -276,7 +269,6 @@
 #define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_ENV_SIZE		(16 << 10)
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_ENV
 #endif
 
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index b6f80af..7211314 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -44,7 +44,6 @@
  */
 #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
 #define CONFIG_SYS_MVFS
-#include <config_cmd_default.h>
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_MII
diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h
index d4de3c3..23929c2 100644
--- a/include/configs/openrisc-generic.h
+++ b/include/configs/openrisc-generic.h
@@ -114,9 +114,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
-
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_BSP
diff --git a/include/configs/origen.h b/include/configs/origen.h
index 5d43229..dae8fd5 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -60,7 +60,6 @@
 #define CONFIG_CMD_FS_GENERIC
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_SUPPORT_RAW_INITRD
-#undef CONFIG_CMD_NFS
 
 /* MMC SPL */
 #define COPY_BL2_FNPTR_ADDR	0x02020030
diff --git a/include/configs/otc570.h b/include/configs/otc570.h
index 2390beb..0cada63 100644
--- a/include/configs/otc570.h
+++ b/include/configs/otc570.h
@@ -135,11 +135,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_NAND
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index a585d70..af3086d 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -891,8 +891,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index 58dc98a..8231eb4 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -422,8 +422,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h
index 4433c7c..eb14003 100644
--- a/include/configs/p3p440.h
+++ b/include/configs/p3p440.h
@@ -171,8 +171,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -181,7 +179,6 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
diff --git a/include/configs/palmld.h b/include/configs/palmld.h
index b54c016..a9f92fa 100644
--- a/include/configs/palmld.h
+++ b/include/configs/palmld.h
@@ -50,11 +50,7 @@
 /*
  * Bootloader Components Configuration
  */
-#include <config_cmd_default.h>
-
-#undef	CONFIG_CMD_NFS
 #define	CONFIG_CMD_ENV
-#undef	CONFIG_CMD_IMLS
 #define	CONFIG_CMD_MMC
 #define	CONFIG_CMD_IDE
 #define	CONFIG_LCD
diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h
index 965200a..b68ad3b 100644
--- a/include/configs/palmtc.h
+++ b/include/configs/palmtc.h
@@ -54,9 +54,6 @@
 /*
  * Bootloader Components Configuration
  */
-#include <config_cmd_default.h>
-
-#undef	CONFIG_CMD_NFS
 #define	CONFIG_CMD_ENV
 #define	CONFIG_CMD_MMC
 #define	CONFIG_LCD
diff --git a/include/configs/palmtreo680.h b/include/configs/palmtreo680.h
index 3817815..3946607 100644
--- a/include/configs/palmtreo680.h
+++ b/include/configs/palmtreo680.h
@@ -40,16 +40,6 @@
 /*
  * Bootloader Components Configuration
  */
-#include <config_cmd_default.h>
-#undef  CONFIG_CMD_FPGA
-#undef  CONFIG_CMD_LOADS
-#undef  CONFIG_CMD_NFS
-#undef  CONFIG_CMD_IMLS
-#undef  CONFIG_CMD_FLASH
-#undef  CONFIG_CMD_SETGETDCR
-#undef  CONFIG_CMD_SOURCE
-#undef  CONFIG_CMD_XIMG
-
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_NAND
diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index 2508702..af2654e 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -168,23 +168,14 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 
-#undef CONFIG_CMD_SAVEENV
 #undef CONFIG_CMD_FAT
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_IDE
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_RUN
-#undef CONFIG_CMD_LOADB
 #undef CONFIG_CMD_ELF
-#undef CONFIG_CMD_BDI
 #undef CONFIG_CMD_BEDBUG
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h
index 31a93c8..83c96a8 100644
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -50,15 +50,12 @@ Serial console configuration
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PCI
 
 #define	CONFIG_TIMESTAMP	1	/* Print image info with timestamp */
diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h
index 3cadf34..77e20cf 100644
--- a/include/configs/pcs440ep.h
+++ b/include/configs/pcs440ep.h
@@ -248,7 +248,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DIAG
@@ -260,7 +259,6 @@
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h
index 17d7bca..e7413c9 100644
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@@ -381,8 +381,6 @@
 #define CONFIG_LOADS_ECHO	1	/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	1	/* allow baudrate change */
 
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index 10415d3..f9a1d51 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -183,13 +183,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_PING		1
 #define CONFIG_CMD_DHCP		1
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 9bdbf53..6c434f0 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -197,13 +197,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_PING		1
 #define CONFIG_CMD_DHCP		1
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index a8dc0f0..c793865 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -72,10 +72,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_PING		1
 #define CONFIG_CMD_DHCP		1
@@ -96,7 +92,6 @@
 
 /* NOR flash, not available */
 #define CONFIG_SYS_NO_FLASH		1
-#undef CONFIG_CMD_FLASH
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index 89560ad..3a0992a 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -34,7 +34,6 @@
  */
 #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
 #define CONFIG_SYS_MVFS
-#include <config_cmd_default.h>
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_MII
diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
index af7c076..3edeb08 100644
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -104,8 +104,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_DHCP
 
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index 75da8a1..b22637b 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -45,13 +45,9 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
 #define CONFIG_CMD_DHCP
 
 #define CONFIG_DRIVER_NE2000
diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index b07ca4e..fae5b05 100644
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -45,13 +45,9 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
 #define CONFIG_CMD_DHCP
 
 #define CONFIG_DRIVER_NE2000
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index cf9e2ff..be430ff 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -158,8 +158,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_BOOTZ
diff --git a/include/configs/qong.h b/include/configs/qong.h
index 8a9847e..f34a54f 100644
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -111,9 +111,6 @@
 /***********************************************************
  * Command definition
  ***********************************************************/
-
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h
index 708647e..b1d79fd 100644
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -18,14 +18,10 @@
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_SYS_TEXT_BASE 0x8FFC0000
 
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTDELAY	3
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 5371a65..2d1e56a 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -11,10 +11,7 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_IDE
diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 9c62a04..82a056c 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -20,12 +20,8 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_SAVEENV
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_EXT2
 #define CONFIG_DOS_PARTITION
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 3845e60..7dd9260 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -11,17 +11,11 @@
 
 #include <asm/arch/rmobile.h>
 
-#define CONFIG_CMD_EDITENV
-#define CONFIG_CMD_SAVEENV
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_DFL
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_RUN
-#define CONFIG_CMD_LOADS
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_FAT
diff --git a/include/configs/rd6281a.h b/include/configs/rd6281a.h
index e80949e..a0120b0 100644
--- a/include/configs/rd6281a.h
+++ b/include/configs/rd6281a.h
@@ -26,7 +26,6 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_FAT
diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h
index b54cf8b..1012cdd 100644
--- a/include/configs/rpi-common.h
+++ b/include/configs/rpi-common.h
@@ -120,7 +120,6 @@
 #define CONFIG_COMMAND_HISTORY
 
 /* Commands */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_GPIO
 #define CONFIG_CMD_MMC
 #define CONFIG_PARTITION_UUIDS
@@ -135,9 +134,6 @@
 
 #include <config_distro_defaults.h>
 
-/* Some things don't make sense on this HW or yet */
-#undef CONFIG_CMD_FPGA
-
 /* Environment */
 #define ENV_DEVICE_SETTINGS \
 	"stdin=serial,lcd\0" \
diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index fc8e967..039880b 100644
--- a/include/configs/rsk7203.h
+++ b/include/configs/rsk7203.h
@@ -14,12 +14,8 @@
 #define CONFIG_CPU_SH7203	1
 #define CONFIG_RSK7203	1
 
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_CACHE
 
 #define CONFIG_BAUDRATE		115200
diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h
index 2ecf785..c60e233 100644
--- a/include/configs/rsk7264.h
+++ b/include/configs/rsk7264.h
@@ -15,10 +15,6 @@
 #define CONFIG_CPU_SH7264	1
 #define CONFIG_RSK7264		1
 
-#ifndef _CONFIG_CMD_DEFAULT_H
-# include <config_cmd_default.h>
-#endif
-
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTARGS		"console=ttySC3,115200"
 #define CONFIG_BOOTDELAY	3
diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h
index 14c1da7..b4fbc9c 100644
--- a/include/configs/rsk7269.h
+++ b/include/configs/rsk7269.h
@@ -14,10 +14,6 @@
 #define CONFIG_CPU_SH7269	1
 #define CONFIG_RSK7269		1
 
-#ifndef _CONFIG_CMD_DEFAULT_H
-# include <config_cmd_default.h>
-#endif
-
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTARGS		"console=ttySC7,115200"
 #define CONFIG_BOOTDELAY	3
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 16770f0..7994ecf 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -58,16 +58,8 @@
 /* PWM */
 #define CONFIG_PWM			1
 
-/* It should define before config_cmd_default.h */
 #define CONFIG_SYS_NO_FLASH		1
 
-/* Command definition */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_MISC
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_XIMG
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_ONENAND
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index 046891e..9497bea 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -52,7 +52,6 @@
 
 /* NOR flash */
 #ifndef CONFIG_SYS_NO_FLASH
-#define CONFIG_CMD_FLASH
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI
 #define CONFIG_SYS_FLASH_PROTECTION
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 01b9ddf..6965d92 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -116,7 +116,6 @@
 #define CONFIG_SYS_NO_FLASH
 
 /* include default commands */
-#include <config_cmd_default.h>
 #include <config_distro_defaults.h>
 
 #define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h
index 8cce34a..1715678 100644
--- a/include/configs/sansa_fuze_plus.h
+++ b/include/configs/sansa_fuze_plus.h
@@ -11,7 +11,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#include <config_cmd_default.h>
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
 
diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h
index 11bf504..b2adea9 100644
--- a/include/configs/sbc405.h
+++ b/include/configs/sbc405.h
@@ -86,8 +86,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 2d264d2..9d89b2a 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -417,8 +417,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
@@ -427,12 +425,6 @@
     #define CONFIG_CMD_PCI
 #endif
 
-#if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_SAVEENV
-    #undef CONFIG_CMD_LOADS
-#endif
-
-
 #undef CONFIG_WATCHDOG			/* watchdog disabled */
 
 /*
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 5b373cb..0717156 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -536,8 +536,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 021da50..00aab6b 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -479,10 +479,9 @@
 #define CONFIG_LOADS_ECHO	1	/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	1	/* allow baudrate change */
 
-#include <config_cmd_default.h>
-    #define CONFIG_CMD_PING
-    #define CONFIG_CMD_I2C
-    #define CONFIG_CMD_REGINFO
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_REGINFO
 
 #if defined(CONFIG_PCI)
     #define CONFIG_CMD_PCI
diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h
index 0c4ca21..6d35cd3 100644
--- a/include/configs/sc_sps_1.h
+++ b/include/configs/sc_sps_1.h
@@ -16,7 +16,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#include <config_cmd_default.h>
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
 
@@ -27,7 +26,6 @@
 #define CONFIG_CMD_GPIO
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_MMC
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_USB
 
diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h
index ecb372f..f367d62 100644
--- a/include/configs/scb9328.h
+++ b/include/configs/scb9328.h
@@ -30,15 +30,9 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 
-#undef CONFIG_CMD_CONSOLE
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_SOURCE
-
 /*
  * Boot options. Setting delay to -1 stops autostart count down.
  * NOTE: Sending parameters to kernel depends on kernel version and
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 623be7d..1f1beea 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -124,6 +124,7 @@
 
 #define CONFIG_SYS_FLASH_EMPTY_INFO	      /* print 'E' for empty sector on flinfo */
 #define CONFIG_SYS_FLASH_QUIET_TEST	1	/* don't warn upon unknown flash      */
+#endif /* CONFIG_CMD_FLASH */
 
 #ifdef CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_SECT_SIZE	0x20000	/* size of one complete sector	      */
@@ -134,7 +135,6 @@
 #define CONFIG_ENV_ADDR_REDUND	(CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SIZE_REDUND	(CONFIG_ENV_SIZE)
 #endif
-#endif /* CONFIG_CMD_FLASH */
 
 /*
  * DDR SDRAM
diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index 7e8565d..f1f9ca8 100644
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -16,18 +16,13 @@
 #define CONFIG_SYS_TEXT_BASE	0x5ff80000
 #define CONFIG_SYS_LDSCRIPT	"board/renesas/sh7752evb/u-boot.lds"
 
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_DFL
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_SF
-#define CONFIG_CMD_RUN
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_MD5SUM
 #define CONFIG_MD5
-#define CONFIG_CMD_LOADS
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_EXT2
 #define CONFIG_DOS_PARTITION
diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index 857b26f..d7ed65b 100644
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -16,18 +16,13 @@
 #define CONFIG_SYS_TEXT_BASE	0x5ff80000
 #define CONFIG_SYS_LDSCRIPT	"board/renesas/sh7753evb/u-boot.lds"
 
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_DFL
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_SF
-#define CONFIG_CMD_RUN
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_MD5SUM
 #define CONFIG_MD5
-#define CONFIG_CMD_LOADS
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_EXT2
 #define CONFIG_DOS_PARTITION
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index 18569bd..cf514b6 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -17,17 +17,12 @@
 #define CONFIG_SYS_TEXT_BASE	0x8ef80000
 #define CONFIG_SYS_LDSCRIPT	"board/renesas/sh7757lcr/u-boot.lds"
 
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_SF
-#define CONFIG_CMD_RUN
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_MD5SUM
 #define CONFIG_MD5
-#define CONFIG_CMD_LOADS
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_EXT2
 #define CONFIG_DOS_PARTITION
diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 27ad96e..7148f1d 100644
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -18,12 +18,8 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_SAVEENV
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_JFFS2
 
 #define CONFIG_BOOTDELAY        -1
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 9f42ae1..2ba0c58 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -13,14 +13,9 @@
 #define CONFIG_CPU_SH7785	1
 #define CONFIG_SH7785LCR	1
 
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_RUN
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_SH_ZIMAGEBOOT
 
 #define CONFIG_CMD_USB
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 84029cb..272e3ca 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -46,7 +46,6 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
diff --git a/include/configs/shmin.h b/include/configs/shmin.h
index 8c02afe..11ae15c 100644
--- a/include/configs/shmin.h
+++ b/include/configs/shmin.h
@@ -15,13 +15,9 @@
 /* T-SH7706LSR*/
 /* #define CONFIG_T_SH7706LSR	1 */
 
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTARGS		"console=ttySC0,115200"
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index b61f6a0..0f32594 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -42,10 +42,7 @@
 #define CONFIG_SYS_CACHELINE_SIZE       64
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_ECHO
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_TIME
 
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 71eb81c..7b4b3b0 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -75,8 +75,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 080fc3a..08a2e9f 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -63,10 +63,6 @@
 /***********************************************************
  * Command definition
  ***********************************************************/
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_NAND
 
 #define CONFIG_CMD_CACHE
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 6c68596..70ef939 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -149,14 +149,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(1 << 20)
 
 /* Command line configuration */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_SOURCE
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_FAT
diff --git a/include/configs/snowball.h b/include/configs/snowball.h
index 126201c..91aaffa 100644
--- a/include/configs/snowball.h
+++ b/include/configs/snowball.h
@@ -43,7 +43,6 @@
 
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_ENV_OFFSET		0x0118000
 #define CONFIG_SYS_MMC_ENV_DEV          0              /* SLOT2: eMMC */
 
@@ -79,20 +78,9 @@
 /*
  * Commands
  */
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_BOOTD
-#define CONFIG_CMD_BDI
-#define CONFIG_CMD_IMI
-#define CONFIG_CMD_MISC
-#define CONFIG_CMD_RUN
-#define CONFIG_CMD_ECHO
-#define CONFIG_CMD_CONSOLE
-#define CONFIG_CMD_LOADS
-#define CONFIG_CMD_LOADB
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
-#define CONFIG_CMD_SOURCE
 
 #ifndef CONFIG_BOOTDELAY
 #define CONFIG_BOOTDELAY	1
diff --git a/include/configs/socfpga_arria5.h b/include/configs/socfpga_arria5.h
index 70ee4c9..7aee1ce 100644
--- a/include/configs/socfpga_arria5.h
+++ b/include/configs/socfpga_arria5.h
@@ -13,7 +13,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#include <config_cmd_default.h>
 #define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 #define CONFIG_HW_WATCHDOG
@@ -26,7 +25,6 @@
 #define CONFIG_CMD_EXT4
 #define CONFIG_CMD_EXT4_WRITE
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_FPGA
 #define CONFIG_CMD_FS_GENERIC
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_MII
diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h
index e321381..33d04fd 100644
--- a/include/configs/socfpga_cyclone5.h
+++ b/include/configs/socfpga_cyclone5.h
@@ -13,7 +13,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#include <config_cmd_default.h>
 #define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 #define CONFIG_HW_WATCHDOG
@@ -26,7 +25,6 @@
 #define CONFIG_CMD_EXT4
 #define CONFIG_CMD_EXT4_WRITE
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_FPGA
 #define CONFIG_CMD_FS_GENERIC
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_MII
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index c654a0e..292b514 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -314,8 +314,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_BMP
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -325,7 +323,6 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_MII
-#undef CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SNTP
 #define CONFIG_CMD_USB
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index b386c7c..f75c306 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -105,16 +105,11 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_RUN
 #define CONFIG_CMD_SAVES
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 
-/* This must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <config_cmd_default.h>
-
 /*
  * Default Environment Varible definitions
  */
diff --git a/include/configs/stamp9g20.h b/include/configs/stamp9g20.h
index 5d51abf..086ebcf 100644
--- a/include/configs/stamp9g20.h
+++ b/include/configs/stamp9g20.h
@@ -232,12 +232,6 @@
 		"bootm 22000000"
 
 /* Command line & features configuration */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_LOADS
-
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_FAT
@@ -246,9 +240,6 @@
 #ifdef CONFIG_MACB
 # define CONFIG_CMD_PING
 # define CONFIG_CMD_DHCP
-#else
-# undef CONFIG_CMD_BOOTD
-# undef CONFIG_CMD_NFS
 #endif /* CONFIG_MACB */
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index 84cc19d..46869dd 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -95,18 +95,13 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT	       "U-Boot > "
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_MEM
-#define CONFIG_CMD_MISC
 #define CONFIG_CMD_TIMER
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index d8f51d8..6379fd3 100644
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -61,9 +61,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_PHY_RESET_DELAY			10000		/* in usec */
 
-#include "config_cmd_default.h"
-#undef CONFIG_CMD_SAVEENV
-
 #define CONFIG_SYS_MEMTEST_START               0x0000
 #define CONFIG_SYS_MEMTEST_END                 1024*1024
 #define CONFIG_CMD_MEMTEST
diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index a0817a0..6676f37 100644
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -292,16 +292,11 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_REGINFO
 
-#if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_SAVEENV
-    #undef CONFIG_CMD_LOADS
-#else
+#if !defined(CONFIG_SYS_RAMBOOT)
     #define CONFIG_CMD_ELF
 #endif
 
diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index 78ac080..5b1f3ab 100644
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -322,13 +322,10 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SNTP
 #define CONFIG_CMD_REGINFO
@@ -341,10 +338,7 @@
     #define CONFIG_CMD_MII
 #endif
 
-#if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_SAVEENV
-    #undef CONFIG_CMD_LOADS
-#else
+#if !defined(CONFIG_SYS_RAMBOOT)
     #define CONFIG_CMD_ELF
 #endif
 
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 063abd5..aed040b 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -134,8 +134,6 @@
 #define CONFIG_CMD_SCSI
 #endif
 
-#define CONFIG_CMD_MEMORY
-
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_INITRD_TAG
@@ -160,7 +158,6 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_CMD_ECHO
 #define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE	1024	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
@@ -188,9 +185,6 @@
 #define CONFIG_ENV_OFFSET		(544 << 10) /* (8 + 24 + 512) KiB */
 #define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */
 
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_FPGA
-
 #define CONFIG_FAT_WRITE	/* enable write access */
 
 #define CONFIG_SPL_FRAMEWORK
diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h
index efd76da..658f8b2 100644
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -273,8 +273,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index af5cca6..34f1228 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -100,8 +100,6 @@
 #define CONFIG_USB_STORAGE
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/
@@ -110,15 +108,11 @@
 #define CONFIG_CMD_I2C		/* I2C serial bus support	*/
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_MMC		/* MMC support			*/
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_NAND		/* NAND support			*/
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_EEPROM
 
-#undef CONFIG_CMD_FLASH		/* only NAND on the SOM */
-#undef CONFIG_CMD_IMLS
-
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED	400000
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 49ed79f..c8ec79b 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -94,8 +94,6 @@
 #define CONFIG_OMAP3_GPIO_6		/* GPIO160..191 is in GPIO bank 6 */
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/
 #define CONFIG_CMD_FAT		/* FAT support			*/
@@ -112,11 +110,6 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
 
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
-#undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
-#undef CONFIG_CMD_IMI		/* iminfo			*/
-#undef CONFIG_CMD_IMLS		/* List all found images	*/
-
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_OMAP34XX
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index cce4b7d..d5b93eb 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -70,14 +70,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_SOURCE
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_NAND
diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index b2b4b10..42817ae 100644
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -68,8 +68,6 @@
 /*
  * Command line configuration
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_PING
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 2d58422..7b4c0d7 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -67,16 +67,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_BAUDRATE			115200
 
-/* include default commands */
-#include <config_cmd_default.h>
-
-/* remove unused commands */
-#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect */
-#undef CONFIG_CMD_FPGA		/* FPGA configuration support */
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_NFS		/* NFS support */
-
 /* turn on command-line edit/hist/auto */
 #define CONFIG_COMMAND_HISTORY
 
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 372a02b..fcfb70e 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -38,8 +38,6 @@
 #define CONFIG_INITRD_TAG		/* for ramdisk support */
 
 /* commands to include */
-# include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_VERSION_VARIABLE
 
@@ -102,8 +100,6 @@
 #define V_OSCK			24000000	/* Clock output from T2 */
 #define V_SCLK			(V_OSCK >> 1)
 
-#define CONFIG_CMD_ECHO
-
 /* max number of command args */
 #define CONFIG_SYS_MAXARGS		16
 
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 27a3dd1..8d52057 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -32,8 +32,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG		/* required for ramdisk support */
 
-#include <config_cmd_default.h>		/* u-boot default commands */
-
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_DISPLAY_CPUINFO
 
@@ -61,7 +59,6 @@
 #define CONFIG_SYS_LOAD_ADDR		0x81000000 /* Default load address */
 
 #define CONFIG_CMD_ASKEN
-#define CONFIG_CMD_ECHO
 #define CONFIG_OMAP_GPIO
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 7a95cb8..0aea7d1 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -166,17 +166,7 @@
 #define CONFIG_CMD_MTDPARTS
 #endif
 
-/*
- * For commands to use, we take the default list and add a few other
- * useful commands.  Note that we must have set CONFIG_SYS_NO_FLASH
- * prior to this include, in order to skip a few commands.  When we do
- * have flash, if we expect these commands they must be enabled in that
- * config.  If desired, a specific list of desired commands can be used
- * instead.
- */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_ECHO
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_SUPPORT_RAW_INITRD
 
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index ef5a69d..e966134 100644
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -78,9 +78,6 @@
 #define CONFIG_USB_TTY			1
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV	1
 
-/* Per-Soc commands */
-#undef CONFIG_CMD_NFS
-
 /*
  * Environment setup
  */
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index 3da7816..f3e5a75 100644
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -57,9 +57,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	(-4)
 #define CONFIG_SYS_NS16550_CLK		48000000
 
-/* Per-SoC commands */
-#undef CONFIG_CMD_NFS
-
 /*
  * Environment setup
  */
diff --git a/include/configs/tk71.h b/include/configs/tk71.h
index a9c6d2e..46e8c90 100644
--- a/include/configs/tk71.h
+++ b/include/configs/tk71.h
@@ -33,7 +33,6 @@
 #define CONFIG_DOS_PARTITION
 #define CONFIG_SUPPORT_VFAT
 
-#include <config_cmd_default.h>
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_EXT2
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 52d5ae6..78a8e39 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -120,7 +120,6 @@
 
 /* Command definition */
 #define CONFIG_CMD_BMODE
-#define CONFIG_CMD_ITEST
 
 #define CONFIG_ENV_SIZE			(SZ_8K)
 /* Size of malloc() pool */
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index b004d09..23bf599 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -149,8 +149,6 @@
 #define CONFIG_SYS_NAND_MAX_ECCPOS	56
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_EXT2			/* EXT2 Support */
 #define CONFIG_CMD_FAT			/* FAT support */
 #define CONFIG_CMD_I2C			/* I2C serial bus support */
@@ -162,9 +160,6 @@
 #define CONFIG_CMD_UBIFS		/* UBIFS commands */
 #define CONFIG_LZO			/* LZO is needed for UBIFS */
 
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_FPGA			/* FPGA configuration Support */
-#undef CONFIG_CMD_IMI			/* iminfo */
 #undef CONFIG_CMD_JFFS2			/* JFFS2 Support */
 
 /* needed for ubi */
diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index b7804d2..8368931 100644
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -63,10 +63,7 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_IMLS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_USB
 
diff --git a/include/configs/tt01.h b/include/configs/tt01.h
index cf169a4..9501a83 100644
--- a/include/configs/tt01.h
+++ b/include/configs/tt01.h
@@ -187,13 +187,9 @@
 /*
  * Command definition
  */
-
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_NAND
 /*
  * #define CONFIG_CMD_NAND_LOCK_UNLOCK the NAND01... chip does not support
diff --git a/include/configs/tx25.h b/include/configs/tx25.h
index 622bd53..e7b006c 100644
--- a/include/configs/tx25.h
+++ b/include/configs/tx25.h
@@ -122,7 +122,6 @@
 #define CONFIG_SYS_LONGHELP
 
 /* U-Boot commands */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_CACHE
 
diff --git a/include/configs/u8500_href.h b/include/configs/u8500_href.h
index 5302b1f..6a22571 100644
--- a/include/configs/u8500_href.h
+++ b/include/configs/u8500_href.h
@@ -62,20 +62,9 @@
 /*
  * Commands
  */
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_BOOTD
-#define CONFIG_CMD_BDI
-#define CONFIG_CMD_IMI
-#define CONFIG_CMD_MISC
-#define CONFIG_CMD_RUN
-#define CONFIG_CMD_ECHO
-#define CONFIG_CMD_CONSOLE
-#define CONFIG_CMD_LOADS
-#define CONFIG_CMD_LOADB
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
-#define CONFIG_CMD_SOURCE
 #define CONFIG_CMD_I2C
 
 #ifndef CONFIG_BOOTDELAY
@@ -191,7 +180,6 @@
 #define CONFIG_MMC_DEV_NUM		1
 
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_SAVEENV	/* CMD_ENV is obsolete but used in env_emmc.c */
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_ENV_OFFSET		0x13F80000
 #define CONFIG_SYS_MMC_ENV_DEV          0               /* SLOT2: eMMC */
diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index 84571f6..4774de5 100644
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -61,15 +61,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_ITEST
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_NAND
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index f29ab2d..4a7702c 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -20,13 +20,11 @@
 #define CONFIG_MXC_GPIO
 
 #include <asm/arch/imx-regs.h>
-#include <config_cmd_default.h>
 
 #include <config_distro_defaults.h>
 
 /* U-Boot commands */
 #define CONFIG_CMD_MEMTEST
-#undef CONFIG_CMD_IMLS
 
 /* U-Boot environment */
 #define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index 688d60e..63049ab 100644
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -85,8 +85,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IDE
diff --git a/include/configs/vct.h b/include/configs/vct.h
index ed9378e..b54519d 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -83,8 +83,6 @@
 /*
  * Commands
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_EEPROM
@@ -97,8 +95,6 @@
 	!defined(CONFIG_VCT_SMALL_IMAGE)
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SNTP
-#else
-#undef CONFIG_CMD_NFS
 #endif
 
 /*
@@ -128,11 +124,6 @@
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* re-init HCD after CMD_RESET */
 #endif /* CONFIG_CMD_USB */
 
-#if !defined(CONFIG_VCT_NOR)
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
-#endif
-
 #if defined(CONFIG_VCT_NAND)
 #define CONFIG_CMD_NAND
 #endif
@@ -293,10 +284,8 @@ int vct_gpio_get(int pin);
  */
 #if defined(CONFIG_VCT_SMALL_IMAGE)
 #undef CONFIG_CMD_ASKENV
-#undef CONFIG_CMD_BDI
 #undef CONFIG_CMD_BEDBUG
 #undef CONFIG_CMD_CACHE
-#undef CONFIG_CMD_CONSOLE
 #undef CONFIG_CMD_DHCP
 #undef CONFIG_CMD_EEPROM
 #undef CONFIG_CMD_EEPROM
@@ -305,16 +294,11 @@ int vct_gpio_get(int pin);
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IRQ
-#undef CONFIG_CMD_ITEST
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
 #undef CONFIG_CMD_LOADY
 #undef CONFIG_CMD_MII
-#undef CONFIG_CMD_MISC
 #undef CONFIG_CMD_PING
 #undef CONFIG_CMD_REGINFO
 #undef CONFIG_CMD_SNTP
-#undef CONFIG_CMD_SOURCE
 #undef CONFIG_CMD_STRINGS
 #undef CONFIG_CMD_TERMINAL
 #undef CONFIG_CMD_USB
diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 107f01a..a88216c 100644
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -331,8 +331,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index 8c3774a..de23375 100644
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -81,13 +81,8 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_BDI
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_IMI
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_SAVEENV
 
 /*
  * BOOTP options
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 0c86779..c36237f 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -142,22 +142,13 @@
 #define CONFIG_MENU
 /*#define CONFIG_MENU_SHOW*/
 #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_BDI
 #define CONFIG_CMD_BOOTI
 #define CONFIG_CMD_UNZIP
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PXE
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_IMI
-#define CONFIG_CMD_LOADB
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_SAVEENV
-#define CONFIG_CMD_RUN
-#define CONFIG_CMD_BOOTD
-#define CONFIG_CMD_ECHO
-#define CONFIG_CMD_SOURCE
 #define CONFIG_CMD_FAT
 #define CONFIG_DOS_PARTITION
 
@@ -261,7 +252,6 @@
 #ifndef CONFIG_TARGET_VEXPRESS64_JUNO
 #define CONFIG_SYS_NO_FLASH
 #else
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_ARMFLASH
 #define CONFIG_SYS_FLASH_CFI		1
 #define CONFIG_FLASH_CFI_DRIVER		1
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index db78c85..0c1da01 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -153,18 +153,12 @@
 #define CONFIG_SYS_SERIAL1		V2M_UART1
 
 /* Command line configuration */
-#define CONFIG_CMD_BDI
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PXE
 #define CONFIG_MENU
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_IMI
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_SAVEENV
-#define CONFIG_CMD_RUN
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_SUPPORT_RAW_INITRD
 
@@ -292,7 +286,6 @@
 #define CONFIG_SYS_HUSH_PARSER
 
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE /* Boot args buffer */
-#define CONFIG_CMD_SOURCE
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CMDLINE_EDITING		1
 #define CONFIG_SYS_MAXARGS		16	/* max command args */
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index dfe316a..c5131af 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -10,7 +10,6 @@
 #define __CONFIG_H
 
 #include <asm/arch/imx-regs.h>
-#include <config_cmd_default.h>
 
 #define CONFIG_VF610
 
@@ -43,8 +42,6 @@
 #define CONFIG_SYS_UART_PORT		(1)
 #define CONFIG_BAUDRATE			115200
 
-#undef CONFIG_CMD_IMLS
-
 /* NAND support */
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_NAND_TRIMFFS
diff --git a/include/configs/vision2.h b/include/configs/vision2.h
index 07cd72c..93c7348 100644
--- a/include/configs/vision2.h
+++ b/include/configs/vision2.h
@@ -123,10 +123,7 @@
  * Command definition
  ***********************************************************/
 
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_SPI
-#undef CONFIG_CMD_IMLS
 
 #define CONFIG_BOOTDELAY        3
 
diff --git a/include/configs/vl_ma2sc.h b/include/configs/vl_ma2sc.h
index 7dfb6da..e4958ce 100644
--- a/include/configs/vl_ma2sc.h
+++ b/include/configs/vl_ma2sc.h
@@ -83,12 +83,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_LOADS
-
 #define CONFIG_CMD_BMP
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index c7730fc..3998274 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -357,8 +357,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
@@ -374,7 +372,6 @@
 
 #if defined(CONFIG_SYS_RAMBOOT)
     #undef CONFIG_CMD_ENV
-    #undef CONFIG_CMD_LOADS
 #endif
 
 #define CONFIG_CMD_ELF
diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index 0886ba3..95a69b3 100644
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -67,20 +67,15 @@
 /*
  * Bootloader Components Configuration
  */
-#include <config_cmd_default.h>
-
 #define	CONFIG_CMD_ENV
-#undef	CONFIG_CMD_IMLS
 #define	CONFIG_CMD_MMC
 #define	CONFIG_CMD_USB
 #undef	CONFIG_LCD
 #define	CONFIG_CMD_IDE
 
 #ifdef	CONFIG_ONENAND
-#undef	CONFIG_CMD_FLASH
 #define	CONFIG_CMD_ONENAND
 #else
-#define	CONFIG_CMD_FLASH
 #undef	CONFIG_CMD_ONENAND
 #endif
 
diff --git a/include/configs/warp.h b/include/configs/warp.h
index 39b4919..48e2058 100644
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -30,9 +30,6 @@
 #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
 #define CONFIG_SUPPORT_EMMC_BOOT
 
-/* Command definition */
-#undef CONFIG_CMD_NFS
-
 /* Watchdog */
 #define CONFIG_HW_WATCHDOG
 #define CONFIG_IMX_WATCHDOG
diff --git a/include/configs/wireless_space.h b/include/configs/wireless_space.h
index 036c1e4..7219034 100644
--- a/include/configs/wireless_space.h
+++ b/include/configs/wireless_space.h
@@ -29,7 +29,6 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH		/* no NOR or SPI flash */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index e8eabdb..52d392c 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -82,9 +82,6 @@
 /*
  * Command definition
  */
-
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index 4725fc3..15ee284 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -177,11 +177,6 @@
 #define CONFIG_ENV_ADDR			0x80000100
 
 /*
- * U-Boot Commands
- */
-#include <config_cmd_default.h>
-
-/*
  * Boot Linux
  */
 #define CONFIG_CMDLINE_TAG
diff --git a/include/configs/x600.h b/include/configs/x600.h
index a07482c..1d4c1a9 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -105,24 +105,18 @@
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_FPGA
 #define CONFIG_CMD_FPGA_LOADMK
 #define CONFIG_CMD_GPIO
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_RUN
 #define CONFIG_CMD_SAVES
 #define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
 #define CONFIG_LZO
 
-/* This must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <config_cmd_default.h>
-
 #define CONFIG_BOOTDELAY			3
 
 #define CONFIG_SYS_HUSH_PARSER			/* Use the HUSH parser	*/
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 0481cf3..349b06c 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -100,36 +100,15 @@
 /*-----------------------------------------------------------------------
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_BDI
-#define CONFIG_CMD_BOOTD
-#define CONFIG_CMD_CONSOLE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ECHO
-#undef CONFIG_CMD_FLASH
-#define CONFIG_CMD_FPGA
 #define CONFIG_CMD_FPGA_LOADMK
 #define CONFIG_CMD_GPIO
-#define CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
 #define CONFIG_CMD_IO
 #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_ITEST
-#define CONFIG_CMD_LOADB
-#define CONFIG_CMD_LOADS
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
-#undef CONFIG_CMD_NFS
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_RUN
-#define CONFIG_CMD_SAVEENV
-#define CONFIG_CMD_SETGETDCR
-#define CONFIG_CMD_SOURCE
 #define CONFIG_CMD_TIME
 #define CONFIG_CMD_GETTIME
-#define CONFIG_CMD_XIMG
 #define CONFIG_CMD_SCSI
 
 #define CONFIG_CMD_FAT
diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index fcb76a2..a072464 100644
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -59,11 +59,8 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DIAG
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_SNTP
 
diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h
index 8e6b365..0551580 100644
--- a/include/configs/xfi3.h
+++ b/include/configs/xfi3.h
@@ -11,7 +11,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#include <config_cmd_default.h>
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
 
diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h
index 4f62607..309d68d 100644
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -26,7 +26,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128 * 1024)
 
 /*Cmd*/
-#include <config_cmd_default.h>
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DIAG
@@ -41,8 +40,6 @@
 #undef CONFIG_CMD_PING
 #undef CONFIG_CMD_DHCP
 #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_NFS
 
 /*Misc*/
 #define CONFIG_BOOTDELAY		5/* autoboot after 5 seconds     */
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index ff419c3..ad82ed6 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -69,7 +69,6 @@
 #define CONFIG_CMD_EXT4
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_FS_GENERIC
-#define CONFIG_CMD_MEMORY
 #define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_ELF
 #define CONFIG_MP
diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h
index ea747c8..4fafb5a 100644
--- a/include/configs/xpedite1000.h
+++ b/include/configs/xpedite1000.h
@@ -187,21 +187,17 @@ extern void out32(unsigned int, unsigned long);
 /*
  * Command configuration
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_SNTP
 
 /*
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index a762ec0..669aa53 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -526,8 +526,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 /*
  * Command configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -536,8 +534,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_SAVEENV
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_JFFS2
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index 9484ccb..34a124c 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -311,15 +311,11 @@
 /*
  * Command configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_SAVEENV
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 0391459..58ace2c 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -381,8 +381,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 /*
  * Command configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -391,7 +389,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
@@ -401,7 +398,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PCI_ENUM
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_SNTP
 #define CONFIG_CMD_REGINFO
 
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 09c248a..765aaad 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -367,15 +367,12 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 /*
  * Command configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
@@ -386,7 +383,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define CONFIG_CMD_PCI_ENUM
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_SNTP
 #define CONFIG_CMD_USB
 
diff --git a/include/configs/zeus.h b/include/configs/zeus.h
index cc1b960..2bc4e1a 100644
--- a/include/configs/zeus.h
+++ b/include/configs/zeus.h
@@ -51,8 +51,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DHCP
@@ -62,7 +60,6 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 49ca978..cff3ba8 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -62,11 +62,7 @@
 /*
  * Bootloader Components Configuration
  */
-#include <config_cmd_default.h>
-
-#undef	CONFIG_CMD_NFS
 #define	CONFIG_CMD_ENV
-#undef	CONFIG_CMD_IMLS
 #define	CONFIG_CMD_MMC
 #define	CONFIG_CMD_SPI
 
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 004af38..af7cc49 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -77,7 +77,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_CACHE
 
 /*
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index c7b3058..5526214 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -203,7 +203,6 @@
 
 # define CONFIG_ENV_SECT_SIZE		CONFIG_ENV_SIZE
 # define CONFIG_ENV_OFFSET		0xE0000
-# define CONFIG_CMD_SAVEENV
 #endif
 
 /* Default environment */
@@ -271,7 +270,6 @@
 #define CONFIG_FPGA
 #define CONFIG_FPGA_XILINX
 #define CONFIG_FPGA_ZYNQPL
-#define CONFIG_CMD_FPGA
 #define CONFIG_CMD_FPGA_LOADMK
 #define CONFIG_CMD_FPGA_LOADP
 #define CONFIG_CMD_FPGA_LOADBP
@@ -299,8 +297,6 @@
 #define CONFIG_SYS_LDSCRIPT  "arch/arm/mach-zynq/u-boot.lds"
 
 /* Commands */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII
-- 
1.7.11.5

[U-Boot] [PATCH] sunxi: Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default

[Joe Hershberger]

Hi Tom,

On Fri, Jun 12, 2015 at 7:08 AM, Tom Rini <trini@konsulko.com> wrote:
> On Thu, Jun 11, 2015 at 11:12:43AM -0500, Joe Hershberger wrote:
>> Hi Tom,
>>
>> On Thu, Jun 11, 2015 at 10:12 AM, Tom Rini <trini@konsulko.com> wrote:
>> > On Thu, Jun 11, 2015 at 09:14:33AM -0500, Joe Hershberger wrote:
>> >> Hi Tom,
>> >>
>> >> On Wed, Jun 3, 2015 at 5:12 PM, Tom Rini <trini@konsulko.com> wrote:
>> >> > On Wed, Jun 03, 2015 at 08:12:16PM +0200, Hans de Goede wrote:
>> >> >
>> >> >> Select CONFIG_CMD_NET and CONFIG_CMD_SETEXPR by default rather then
>> >> >> needing to have this in every sunxi defconfig file.
>> >> >>
>> >> >> This also fixes the Merrii_A80_Optimus defconfig no longer building.
>> >> >>
>> >> >> Cc: Maxin B. John <maxin.john@enea.com>
>> >> >> Reported-by: Maxin B. John <maxin.john@enea.com>
>> >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>> >> >
>> >> > Joe? Masahiro?  It feels like something has gone wrong with the
>> >> > conversion here.  Or do people need to get used to the defconfig files
>> >> > being a non-trivial size?  Or do we need some more default y if ...
>> >> > lines around things?  Or a few of the above?  Thanks!
>> >>
>> >> I'm surprised you pulled this in for -rc2. I guess we can always revert it.
>> >
>> > OK, so where did we end up again exactly?  Ah yes, (a) we can't
>> > unexpectedly break peoples build.  So I took this for now.
>>
>> This isn't fixing a breakage... it simply reduced the size of the
>> sunxi boards' defconfig and caused defconfig noise in every other
>> board when running savedefconfig.
>>
>> > (b) I'm being stubborn here and saying that if it was in
>> > include/config_cmd_default.h as a #define it needs to get converted to
>> > Kconfig as a "default y" (with text so that it's a question and not a
>> > silently enforced option).
>>
>> Agreed... but this doesn't do that either... only for sunxi.
>>
>> > That doesn't preclude boards from setting it
>> > to N in their defconfig and savedefconfig capturing it.  That's in fact
>> > what I want.  So I'm expecting (or hunting for time to make) a patch
>> > that updates CMD_NET/etc to match that behavour.
>>
>> OK... I can take a stab at it if you want it for this release.
>
> Yes please, thanks!

I just sent a series that addresses this request. It is pretty big so
it will be blocked by the mailing list until a moderator sees it.

There were a number of boards that fail for me in master, but I'm not
sure if that's just my toolchains or if there are build failures on a
number of boards currently in master.

For me it was:

sparc:  +   grsim_leon2 gr_cpci_ax2000 gr_xc3s_1500 gr_ep2s60
sh:  +   sh7753evb
blackfin:  +   cm-bf548 bf538f-ezkit bf533-stamp
powerpc:  +   ebony taihu ocotea taishan katmai CPCI4052 alpr
aarch64:  +   ls2085ardb ls2085aqds_nand ls2085a_emu_D4 ls2085a_simu
xilinx_zynqmp ls2085ardb_nand ls2085a_emu ls2085aqds
arm:  +   openrd_base axm openrd_ultimate openrd_client zynq_zc70x
tricorder tricorder_flash taurus

I think the blackfin board failures Masahiro mentioned were caused by
one of my patches to the network stack or something, so I'll look into
that.

Cheers,
-Joe

[U-Boot] [PATCH 4/7] arm: Make new baltos board not break on savedefconfig

[Tom Rini]

On Mon, Jun 22, 2015 at 04:15:27PM -0500, Joe Hershberger wrote:

> This config defined a CONS_INDEX as a config but did not define it in
> any Kconfig, so savedefconfig will delete that entry. Use
> CONFIG_SYS_EXTRA_OPTIONS for now until that is added to Kconfig.
> 
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
> ---
> 
>  configs/am335x_baltos_defconfig | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
> index 679b04f..030cb51 100644
> --- a/configs/am335x_baltos_defconfig
> +++ b/configs/am335x_baltos_defconfig
> @@ -1,7 +1,6 @@
>  CONFIG_SPL=y
>  CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_STACK_R_ADDR=0x82000000
> -CONFIG_SYS_EXTRA_OPTIONS="NAND"
> -CONFIG_CONS_INDEX=1
> +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,NAND"
>  CONFIG_ARM=y
>  CONFIG_TARGET_AM335X_BALTOS=y

No, something else is wrong.  board/vscom/baltos/Kconfig has CONS_INDEX
(like the other am335x boards and yes this needs moving to a better
place).

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150623/ed47950f/attachment.sig>

[U-Boot] [PATCH 7/7] Move defaults from config_cmd_default.h to Kconfig

[Tom Rini]

On Mon, Jun 22, 2015 at 04:15:30PM -0500, Joe Hershberger wrote:

> This sets the default commands Kconfig to match
> include/config_cmd_default.h commands in the common/Kconfig and removes
> them from include/configs.
[snip]
> diff --git a/common/Kconfig b/common/Kconfig
> index cb14592..2976cd7 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
[snip]
>  config CMD_IMLS
>  	bool "imls"
> +	default y
>  	help
>  	  List all images found in flash
[snip]
>  
>  config CMD_FLASH
>  	bool "flinfo, erase, protect"
> +	default y
>  	help
>  	  NOR flash support.
>  	    flinfo - print FLASH memory information

Today we only set these when !SYS_NO_FLASH so we need to Kconfig that
first.

> @@ -352,6 +371,7 @@ menu "Network commands"
>  config CMD_NET
>  	bool "bootp, tftpboot"
>          select NET
> +	default y
>  	help
>  	  Network commands.
>  	  bootp - boot image via network using BOOTP/TFTP protocol
> @@ -379,6 +399,7 @@ config CMD_DHCP
>  
>  config CMD_NFS
>  	bool "nfs"
> +	default y
>  	help
>  	  Boot image via network using NFS protocol.

I think we now have the smarts available to us to do this only if we
have NET set, so "depends NET", yes?

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150623/7c379d45/attachment.sig>

[U-Boot] [PATCH 4/7] arm: Make new baltos board not break on savedefconfig

[Joe Hershberger]

Hi Tom,

On Tue, Jun 23, 2015 at 9:23 AM, Tom Rini <trini@konsulko.com> wrote:
> On Mon, Jun 22, 2015 at 04:15:27PM -0500, Joe Hershberger wrote:
>
>> This config defined a CONS_INDEX as a config but did not define it in
>> any Kconfig, so savedefconfig will delete that entry. Use
>> CONFIG_SYS_EXTRA_OPTIONS for now until that is added to Kconfig.
>>
>> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
>> ---
>>
>>  configs/am335x_baltos_defconfig | 3 +--
>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
>> index 679b04f..030cb51 100644
>> --- a/configs/am335x_baltos_defconfig
>> +++ b/configs/am335x_baltos_defconfig
>> @@ -1,7 +1,6 @@
>>  CONFIG_SPL=y
>>  CONFIG_SPL_STACK_R=y
>>  CONFIG_SPL_STACK_R_ADDR=0x82000000
>> -CONFIG_SYS_EXTRA_OPTIONS="NAND"
>> -CONFIG_CONS_INDEX=1
>> +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,NAND"
>>  CONFIG_ARM=y
>>  CONFIG_TARGET_AM335X_BALTOS=y
>
> No, something else is wrong.  board/vscom/baltos/Kconfig has CONS_INDEX
> (like the other am335x boards and yes this needs moving to a better
> place).

Any thoughts on what's wrong, then? I'm at FTF this week and won't be
debugging it until next week. There was an issue with this board,
caused by savedefconfig, which is why I even noticed this board exists
now. Maybe whoever added it (Yegor Yefremov) didn't try safedefconfig
against the board?

If nothing else, at least this makes it consistent with all other
boards that specify CONS_INDEX. At least they don't break.

-Joe

[U-Boot] [PATCH 7/7] Move defaults from config_cmd_default.h to Kconfig

[Joe Hershberger]

Hi Tom,

On Tue, Jun 23, 2015 at 9:33 AM, Tom Rini <trini@konsulko.com> wrote:
> On Mon, Jun 22, 2015 at 04:15:30PM -0500, Joe Hershberger wrote:
>
>> This sets the default commands Kconfig to match
>> include/config_cmd_default.h commands in the common/Kconfig and removes
>> them from include/configs.
> [snip]
>> diff --git a/common/Kconfig b/common/Kconfig
>> index cb14592..2976cd7 100644
>> --- a/common/Kconfig
>> +++ b/common/Kconfig
> [snip]
>>  config CMD_IMLS
>>       bool "imls"
>> +     default y
>>       help
>>         List all images found in flash
> [snip]
>>
>>  config CMD_FLASH
>>       bool "flinfo, erase, protect"
>> +     default y
>>       help
>>         NOR flash support.
>>           flinfo - print FLASH memory information
>
> Today we only set these when !SYS_NO_FLASH so we need to Kconfig that
> first.

While that's true, the moveconfig tool will de-select that option
based on SYS_NO_FLASH having been set for that board. While that may
not be ideal as far as reacting to an end-user changing that default
setting for a given board, the defconfig itself should be consistent
with the former default behavior. Also, once SYS_NO_FLASH is moved,
such defconfig entries will be removed automatically by savedefconfig.
I was trying to limit the number of changes included in this already
sizable undertaking.

If you feel it's important to include moving this change at the same
time, then I can add a patch at the end of the series to include this
move.

>> @@ -352,6 +371,7 @@ menu "Network commands"
>>  config CMD_NET
>>       bool "bootp, tftpboot"
>>          select NET
>> +     default y
>>       help
>>         Network commands.
>>         bootp - boot image via network using BOOTP/TFTP protocol
>> @@ -379,6 +399,7 @@ config CMD_DHCP
>>
>>  config CMD_NFS
>>       bool "nfs"
>> +     default y
>>       help
>>         Boot image via network using NFS protocol.
>
> I think we now have the smarts available to us to do this only if we
> have NET set, so "depends NET", yes?

Sure. It could also be a follow-on, though, right? I'm just a bit
hesitant to redo all of this, since it really takes a long time to
validate (and still may not be perfect).

I need a new build machine. :/

-Joe

[U-Boot] [PATCH 4/7] arm: Make new baltos board not break on savedefconfig

[Yegor Yefremov]

Hi Joe,

On Wed, Jun 24, 2015 at 5:26 AM, Joe Hershberger
<joe.hershberger@gmail.com> wrote:
> Hi Tom,
>
> On Tue, Jun 23, 2015 at 9:23 AM, Tom Rini <trini@konsulko.com> wrote:
>> On Mon, Jun 22, 2015 at 04:15:27PM -0500, Joe Hershberger wrote:
>>
>>> This config defined a CONS_INDEX as a config but did not define it in
>>> any Kconfig, so savedefconfig will delete that entry. Use
>>> CONFIG_SYS_EXTRA_OPTIONS for now until that is added to Kconfig.
>>>
>>> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
>>> ---
>>>
>>>  configs/am335x_baltos_defconfig | 3 +--
>>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>>
>>> diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
>>> index 679b04f..030cb51 100644
>>> --- a/configs/am335x_baltos_defconfig
>>> +++ b/configs/am335x_baltos_defconfig
>>> @@ -1,7 +1,6 @@
>>>  CONFIG_SPL=y
>>>  CONFIG_SPL_STACK_R=y
>>>  CONFIG_SPL_STACK_R_ADDR=0x82000000
>>> -CONFIG_SYS_EXTRA_OPTIONS="NAND"
>>> -CONFIG_CONS_INDEX=1
>>> +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,NAND"
>>>  CONFIG_ARM=y
>>>  CONFIG_TARGET_AM335X_BALTOS=y
>>
>> No, something else is wrong.  board/vscom/baltos/Kconfig has CONS_INDEX
>> (like the other am335x boards and yes this needs moving to a better
>> place).
>
> Any thoughts on what's wrong, then? I'm at FTF this week and won't be
> debugging it until next week. There was an issue with this board,
> caused by savedefconfig, which is why I even noticed this board exists
> now. Maybe whoever added it (Yegor Yefremov) didn't try safedefconfig
> against the board?
>
> If nothing else, at least this makes it consistent with all other
> boards that specify CONS_INDEX. At least they don't break.

I'll take a look at this.

Yegor

[U-Boot] [PATCH 4/7] arm: Make new baltos board not break on savedefconfig

[Yegor Yefremov]

On Wed, Jun 24, 2015 at 8:55 AM, Yegor Yefremov
<yegorslists@googlemail.com> wrote:
> Hi Joe,
>
> On Wed, Jun 24, 2015 at 5:26 AM, Joe Hershberger
> <joe.hershberger@gmail.com> wrote:
>> Hi Tom,
>>
>> On Tue, Jun 23, 2015 at 9:23 AM, Tom Rini <trini@konsulko.com> wrote:
>>> On Mon, Jun 22, 2015 at 04:15:27PM -0500, Joe Hershberger wrote:
>>>
>>>> This config defined a CONS_INDEX as a config but did not define it in
>>>> any Kconfig, so savedefconfig will delete that entry. Use
>>>> CONFIG_SYS_EXTRA_OPTIONS for now until that is added to Kconfig.
>>>>
>>>> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
>>>> ---
>>>>
>>>>  configs/am335x_baltos_defconfig | 3 +--
>>>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>>>
>>>> diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
>>>> index 679b04f..030cb51 100644
>>>> --- a/configs/am335x_baltos_defconfig
>>>> +++ b/configs/am335x_baltos_defconfig
>>>> @@ -1,7 +1,6 @@
>>>>  CONFIG_SPL=y
>>>>  CONFIG_SPL_STACK_R=y
>>>>  CONFIG_SPL_STACK_R_ADDR=0x82000000
>>>> -CONFIG_SYS_EXTRA_OPTIONS="NAND"
>>>> -CONFIG_CONS_INDEX=1
>>>> +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,NAND"
>>>>  CONFIG_ARM=y
>>>>  CONFIG_TARGET_AM335X_BALTOS=y
>>>
>>> No, something else is wrong.  board/vscom/baltos/Kconfig has CONS_INDEX
>>> (like the other am335x boards and yes this needs moving to a better
>>> place).
>>
>> Any thoughts on what's wrong, then? I'm at FTF this week and won't be
>> debugging it until next week. There was an issue with this board,
>> caused by savedefconfig, which is why I even noticed this board exists
>> now. Maybe whoever added it (Yegor Yefremov) didn't try safedefconfig
>> against the board?
>>
>> If nothing else, at least this makes it consistent with all other
>> boards that specify CONS_INDEX. At least they don't break.
>
> I'll take a look at this.

I've pulled the latest master
(325849ff3d4adeebb8f8f9bc5db950724df9bc21) and tried:

make am35x_baltos_defconfig
make savedefconfg
make

and aside from CONS_INDEX disappearing I see no problems. And "make
menuconfig" still shows CONS_INDEX = 1.

Should I submit following patch, so that Baltos has the same config as BBB?

diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
index 679b04f..1d287a8 100644
--- a/configs/am335x_baltos_defconfig
+++ b/configs/am335x_baltos_defconfig
@@ -1,7 +1,6 @@
+CONFIG_ARM=y
+CONFIG_TARGET_AM335X_BALTOS=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="NAND"
-CONFIG_CONS_INDEX=1
-CONFIG_ARM=y
-CONFIG_TARGET_AM335X_BALTOS=y

Yegor

[U-Boot] [PATCH 4/7] arm: Make new baltos board not break on savedefconfig

[Joe Hershberger]

Hi Yegor,

On Wed, Jun 24, 2015 at 2:33 AM, Yegor Yefremov
<yegorslists@googlemail.com> wrote:
> On Wed, Jun 24, 2015 at 8:55 AM, Yegor Yefremov
> <yegorslists@googlemail.com> wrote:
>> Hi Joe,
>>
>> On Wed, Jun 24, 2015 at 5:26 AM, Joe Hershberger
>> <joe.hershberger@gmail.com> wrote:
>>> Hi Tom,
>>>
>>> On Tue, Jun 23, 2015 at 9:23 AM, Tom Rini <trini@konsulko.com> wrote:
>>>> On Mon, Jun 22, 2015 at 04:15:27PM -0500, Joe Hershberger wrote:
>>>>
>>>>> This config defined a CONS_INDEX as a config but did not define it in
>>>>> any Kconfig, so savedefconfig will delete that entry. Use
>>>>> CONFIG_SYS_EXTRA_OPTIONS for now until that is added to Kconfig.
>>>>>
>>>>> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
>>>>> ---
>>>>>
>>>>>  configs/am335x_baltos_defconfig | 3 +--
>>>>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
>>>>> index 679b04f..030cb51 100644
>>>>> --- a/configs/am335x_baltos_defconfig
>>>>> +++ b/configs/am335x_baltos_defconfig
>>>>> @@ -1,7 +1,6 @@
>>>>>  CONFIG_SPL=y
>>>>>  CONFIG_SPL_STACK_R=y
>>>>>  CONFIG_SPL_STACK_R_ADDR=0x82000000
>>>>> -CONFIG_SYS_EXTRA_OPTIONS="NAND"
>>>>> -CONFIG_CONS_INDEX=1
>>>>> +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,NAND"
>>>>>  CONFIG_ARM=y
>>>>>  CONFIG_TARGET_AM335X_BALTOS=y
>>>>
>>>> No, something else is wrong.  board/vscom/baltos/Kconfig has CONS_INDEX
>>>> (like the other am335x boards and yes this needs moving to a better
>>>> place).
>>>
>>> Any thoughts on what's wrong, then? I'm at FTF this week and won't be
>>> debugging it until next week. There was an issue with this board,
>>> caused by savedefconfig, which is why I even noticed this board exists
>>> now. Maybe whoever added it (Yegor Yefremov) didn't try safedefconfig
>>> against the board?
>>>
>>> If nothing else, at least this makes it consistent with all other
>>> boards that specify CONS_INDEX. At least they don't break.
>>
>> I'll take a look at this.
>
> I've pulled the latest master
> (325849ff3d4adeebb8f8f9bc5db950724df9bc21) and tried:
>
> make am35x_baltos_defconfig
> make savedefconfg
> make
>
> and aside from CONS_INDEX disappearing I see no problems. And "make
> menuconfig" still shows CONS_INDEX = 1.
>
> Should I submit following patch, so that Baltos has the same config as BBB?

That shouldn't really be necessary since this series already
effectively does this. It is good practice in the future, though.

> diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
> index 679b04f..1d287a8 100644
> --- a/configs/am335x_baltos_defconfig
> +++ b/configs/am335x_baltos_defconfig
> @@ -1,7 +1,6 @@
> +CONFIG_ARM=y
> +CONFIG_TARGET_AM335X_BALTOS=y
>  CONFIG_SPL=y
>  CONFIG_SPL_STACK_R=y
>  CONFIG_SPL_STACK_R_ADDR=0x82000000
>  CONFIG_SYS_EXTRA_OPTIONS="NAND"
> -CONFIG_CONS_INDEX=1
> -CONFIG_ARM=y
> -CONFIG_TARGET_AM335X_BALTOS=y

Cheers,
-Joe

[U-Boot] [PATCH 4/7] arm: Make new baltos board not break on savedefconfig

[Joe Hershberger]

Hi Tom,

On Wed, Jun 24, 2015 at 2:33 AM, Yegor Yefremov
<yegorslists@googlemail.com> wrote:
> On Wed, Jun 24, 2015 at 8:55 AM, Yegor Yefremov
> <yegorslists@googlemail.com> wrote:
>> Hi Joe,
>>
>> On Wed, Jun 24, 2015 at 5:26 AM, Joe Hershberger
>> <joe.hershberger@gmail.com> wrote:
>>> Hi Tom,
>>>
>>> On Tue, Jun 23, 2015 at 9:23 AM, Tom Rini <trini@konsulko.com> wrote:
>>>> On Mon, Jun 22, 2015 at 04:15:27PM -0500, Joe Hershberger wrote:
>>>>
>>>>> This config defined a CONS_INDEX as a config but did not define it in
>>>>> any Kconfig, so savedefconfig will delete that entry. Use
>>>>> CONFIG_SYS_EXTRA_OPTIONS for now until that is added to Kconfig.
>>>>>
>>>>> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
>>>>> ---
>>>>>
>>>>>  configs/am335x_baltos_defconfig | 3 +--
>>>>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
>>>>> index 679b04f..030cb51 100644
>>>>> --- a/configs/am335x_baltos_defconfig
>>>>> +++ b/configs/am335x_baltos_defconfig
>>>>> @@ -1,7 +1,6 @@
>>>>>  CONFIG_SPL=y
>>>>>  CONFIG_SPL_STACK_R=y
>>>>>  CONFIG_SPL_STACK_R_ADDR=0x82000000
>>>>> -CONFIG_SYS_EXTRA_OPTIONS="NAND"
>>>>> -CONFIG_CONS_INDEX=1
>>>>> +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,NAND"
>>>>>  CONFIG_ARM=y
>>>>>  CONFIG_TARGET_AM335X_BALTOS=y
>>>>
>>>> No, something else is wrong.  board/vscom/baltos/Kconfig has CONS_INDEX
>>>> (like the other am335x boards and yes this needs moving to a better
>>>> place).
>>>
>>> Any thoughts on what's wrong, then? I'm at FTF this week and won't be
>>> debugging it until next week. There was an issue with this board,
>>> caused by savedefconfig, which is why I even noticed this board exists
>>> now. Maybe whoever added it (Yegor Yefremov) didn't try safedefconfig
>>> against the board?
>>>
>>> If nothing else, at least this makes it consistent with all other
>>> boards that specify CONS_INDEX. At least they don't break.
>>
>> I'll take a look at this.
>
> I've pulled the latest master
> (325849ff3d4adeebb8f8f9bc5db950724df9bc21) and tried:
>
> make am35x_baltos_defconfig
> make savedefconfg
> make
>
> and aside from CONS_INDEX disappearing I see no problems. And "make
> menuconfig" still shows CONS_INDEX = 1.

It seems this is another case of being bitten by the default value. It
seems I can either move the definition from its current location in
board/vscom/baltos/Kconfig to the root Kconfig or maybe the
common/Kconfig and make the default be 0 (which will bring back the
entry) and move other boards out of CONFIG_SYS_EXTRA_OPTIONS... or I
can add to this patch deleting the definition in
board/vscom/baltos/Kconfig and wait until later to move it properly
for all boards.

Cheers,
-Joe

[U-Boot] [PATCH 7/7] Move defaults from config_cmd_default.h to Kconfig

[Joe Hershberger]

Hi Tom,

On Tue, Jun 23, 2015 at 10:36 PM, Joe Hershberger
<joe.hershberger@gmail.com> wrote:
> Hi Tom,
>
> On Tue, Jun 23, 2015 at 9:33 AM, Tom Rini <trini@konsulko.com> wrote:
>> On Mon, Jun 22, 2015 at 04:15:30PM -0500, Joe Hershberger wrote:
>>
>>> This sets the default commands Kconfig to match
>>> include/config_cmd_default.h commands in the common/Kconfig and removes
>>> them from include/configs.
>> [snip]
>>> diff --git a/common/Kconfig b/common/Kconfig
>>> index cb14592..2976cd7 100644
>>> --- a/common/Kconfig
>>> +++ b/common/Kconfig
>> [snip]
>>>  config CMD_IMLS
>>>       bool "imls"
>>> +     default y
>>>       help
>>>         List all images found in flash
>> [snip]
>>>
>>>  config CMD_FLASH
>>>       bool "flinfo, erase, protect"
>>> +     default y
>>>       help
>>>         NOR flash support.
>>>           flinfo - print FLASH memory information
>>
>> Today we only set these when !SYS_NO_FLASH so we need to Kconfig that
>> first.
>
> While that's true, the moveconfig tool will de-select that option
> based on SYS_NO_FLASH having been set for that board. While that may
> not be ideal as far as reacting to an end-user changing that default
> setting for a given board, the defconfig itself should be consistent
> with the former default behavior. Also, once SYS_NO_FLASH is moved,
> such defconfig entries will be removed automatically by savedefconfig.
> I was trying to limit the number of changes included in this already
> sizable undertaking.
>
> If you feel it's important to include moving this change at the same
> time, then I can add a patch at the end of the series to include this
> move.
>
>>> @@ -352,6 +371,7 @@ menu "Network commands"
>>>  config CMD_NET
>>>       bool "bootp, tftpboot"
>>>          select NET
>>> +     default y
>>>       help
>>>         Network commands.
>>>         bootp - boot image via network using BOOTP/TFTP protocol
>>> @@ -379,6 +399,7 @@ config CMD_DHCP
>>>
>>>  config CMD_NFS
>>>       bool "nfs"
>>> +     default y
>>>       help
>>>         Boot image via network using NFS protocol.
>>
>> I think we now have the smarts available to us to do this only if we
>> have NET set, so "depends NET", yes?
>
> Sure. It could also be a follow-on, though, right? I'm just a bit
> hesitant to redo all of this, since it really takes a long time to
> validate (and still may not be perfect).
>
> I need a new build machine. :/

So what do you need me to do here?

Thanks,
-Joe

[U-Boot] [PATCH 7/7] Move defaults from config_cmd_default.h to Kconfig

[Tom Rini]

On Tue, Jun 23, 2015 at 10:36:20PM -0500, Joe Hershberger wrote:
> Hi Tom,
> 
> On Tue, Jun 23, 2015 at 9:33 AM, Tom Rini <trini@konsulko.com> wrote:
> > On Mon, Jun 22, 2015 at 04:15:30PM -0500, Joe Hershberger wrote:
> >
> >> This sets the default commands Kconfig to match
> >> include/config_cmd_default.h commands in the common/Kconfig and removes
> >> them from include/configs.
> > [snip]
> >> diff --git a/common/Kconfig b/common/Kconfig
> >> index cb14592..2976cd7 100644
> >> --- a/common/Kconfig
> >> +++ b/common/Kconfig
> > [snip]
> >>  config CMD_IMLS
> >>       bool "imls"
> >> +     default y
> >>       help
> >>         List all images found in flash
> > [snip]
> >>
> >>  config CMD_FLASH
> >>       bool "flinfo, erase, protect"
> >> +     default y
> >>       help
> >>         NOR flash support.
> >>           flinfo - print FLASH memory information
> >
> > Today we only set these when !SYS_NO_FLASH so we need to Kconfig that
> > first.
> 
> While that's true, the moveconfig tool will de-select that option
> based on SYS_NO_FLASH having been set for that board. While that may
> not be ideal as far as reacting to an end-user changing that default
> setting for a given board, the defconfig itself should be consistent
> with the former default behavior. Also, once SYS_NO_FLASH is moved,
> such defconfig entries will be removed automatically by savedefconfig.
> I was trying to limit the number of changes included in this already
> sizable undertaking.
> 
> If you feel it's important to include moving this change at the same
> time, then I can add a patch at the end of the series to include this
> move.
> 
> >> @@ -352,6 +371,7 @@ menu "Network commands"
> >>  config CMD_NET
> >>       bool "bootp, tftpboot"
> >>          select NET
> >> +     default y
> >>       help
> >>         Network commands.
> >>         bootp - boot image via network using BOOTP/TFTP protocol
> >> @@ -379,6 +399,7 @@ config CMD_DHCP
> >>
> >>  config CMD_NFS
> >>       bool "nfs"
> >> +     default y
> >>       help
> >>         Boot image via network using NFS protocol.
> >
> > I think we now have the smarts available to us to do this only if we
> > have NET set, so "depends NET", yes?
> 
> Sure. It could also be a follow-on, though, right? I'm just a bit
> hesitant to redo all of this, since it really takes a long time to
> validate (and still may not be perfect).

Sorry for the delay.  Yeah, OK, we can do these as follow-ups but lets
not wait too long.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150625/2a3837a6/attachment.sig>

[U-Boot] [PATCH 4/7] arm: Make new baltos board not break on savedefconfig

[Tom Rini]

On Thu, Jun 25, 2015 at 10:48:09AM -0500, Joe Hershberger wrote:
> Hi Tom,
> 
> On Wed, Jun 24, 2015 at 2:33 AM, Yegor Yefremov
> <yegorslists@googlemail.com> wrote:
> > On Wed, Jun 24, 2015 at 8:55 AM, Yegor Yefremov
> > <yegorslists@googlemail.com> wrote:
> >> Hi Joe,
> >>
> >> On Wed, Jun 24, 2015 at 5:26 AM, Joe Hershberger
> >> <joe.hershberger@gmail.com> wrote:
> >>> Hi Tom,
> >>>
> >>> On Tue, Jun 23, 2015 at 9:23 AM, Tom Rini <trini@konsulko.com> wrote:
> >>>> On Mon, Jun 22, 2015 at 04:15:27PM -0500, Joe Hershberger wrote:
> >>>>
> >>>>> This config defined a CONS_INDEX as a config but did not define it in
> >>>>> any Kconfig, so savedefconfig will delete that entry. Use
> >>>>> CONFIG_SYS_EXTRA_OPTIONS for now until that is added to Kconfig.
> >>>>>
> >>>>> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
> >>>>> ---
> >>>>>
> >>>>>  configs/am335x_baltos_defconfig | 3 +--
> >>>>>  1 file changed, 1 insertion(+), 2 deletions(-)
> >>>>>
> >>>>> diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
> >>>>> index 679b04f..030cb51 100644
> >>>>> --- a/configs/am335x_baltos_defconfig
> >>>>> +++ b/configs/am335x_baltos_defconfig
> >>>>> @@ -1,7 +1,6 @@
> >>>>>  CONFIG_SPL=y
> >>>>>  CONFIG_SPL_STACK_R=y
> >>>>>  CONFIG_SPL_STACK_R_ADDR=0x82000000
> >>>>> -CONFIG_SYS_EXTRA_OPTIONS="NAND"
> >>>>> -CONFIG_CONS_INDEX=1
> >>>>> +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,NAND"
> >>>>>  CONFIG_ARM=y
> >>>>>  CONFIG_TARGET_AM335X_BALTOS=y
> >>>>
> >>>> No, something else is wrong.  board/vscom/baltos/Kconfig has CONS_INDEX
> >>>> (like the other am335x boards and yes this needs moving to a better
> >>>> place).
> >>>
> >>> Any thoughts on what's wrong, then? I'm at FTF this week and won't be
> >>> debugging it until next week. There was an issue with this board,
> >>> caused by savedefconfig, which is why I even noticed this board exists
> >>> now. Maybe whoever added it (Yegor Yefremov) didn't try safedefconfig
> >>> against the board?
> >>>
> >>> If nothing else, at least this makes it consistent with all other
> >>> boards that specify CONS_INDEX. At least they don't break.
> >>
> >> I'll take a look at this.
> >
> > I've pulled the latest master
> > (325849ff3d4adeebb8f8f9bc5db950724df9bc21) and tried:
> >
> > make am35x_baltos_defconfig
> > make savedefconfg
> > make
> >
> > and aside from CONS_INDEX disappearing I see no problems. And "make
> > menuconfig" still shows CONS_INDEX = 1.
> 
> It seems this is another case of being bitten by the default value. It
> seems I can either move the definition from its current location in
> board/vscom/baltos/Kconfig to the root Kconfig or maybe the
> common/Kconfig and make the default be 0 (which will bring back the
> entry) and move other boards out of CONFIG_SYS_EXTRA_OPTIONS... or I
> can add to this patch deleting the definition in
> board/vscom/baltos/Kconfig and wait until later to move it properly
> for all boards.

I guess I don't see why we need to do anything right now.  It's not
broken currently (nor are the other am335x boards).  It needs to be
moved out of the board Kconfigs but that can happen as a follow-up.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150625/9abf84d6/attachment.sig>

[U-Boot] [PATCH 7/7] Move defaults from config_cmd_default.h to Kconfig

[Joe Hershberger]

Hi Tom,

On Thu, Jun 25, 2015 at 11:15 AM, Tom Rini <trini@konsulko.com> wrote:
> On Tue, Jun 23, 2015 at 10:36:20PM -0500, Joe Hershberger wrote:
>> Hi Tom,
>>
>> On Tue, Jun 23, 2015 at 9:33 AM, Tom Rini <trini@konsulko.com> wrote:
>> > On Mon, Jun 22, 2015 at 04:15:30PM -0500, Joe Hershberger wrote:
>> >
>> >> This sets the default commands Kconfig to match
>> >> include/config_cmd_default.h commands in the common/Kconfig and removes
>> >> them from include/configs.
>> > [snip]
>> >> diff --git a/common/Kconfig b/common/Kconfig
>> >> index cb14592..2976cd7 100644
>> >> --- a/common/Kconfig
>> >> +++ b/common/Kconfig
>> > [snip]
>> >>  config CMD_IMLS
>> >>       bool "imls"
>> >> +     default y
>> >>       help
>> >>         List all images found in flash
>> > [snip]
>> >>
>> >>  config CMD_FLASH
>> >>       bool "flinfo, erase, protect"
>> >> +     default y
>> >>       help
>> >>         NOR flash support.
>> >>           flinfo - print FLASH memory information
>> >
>> > Today we only set these when !SYS_NO_FLASH so we need to Kconfig that
>> > first.
>>
>> While that's true, the moveconfig tool will de-select that option
>> based on SYS_NO_FLASH having been set for that board. While that may
>> not be ideal as far as reacting to an end-user changing that default
>> setting for a given board, the defconfig itself should be consistent
>> with the former default behavior. Also, once SYS_NO_FLASH is moved,
>> such defconfig entries will be removed automatically by savedefconfig.
>> I was trying to limit the number of changes included in this already
>> sizable undertaking.
>>
>> If you feel it's important to include moving this change at the same
>> time, then I can add a patch at the end of the series to include this
>> move.
>>
>> >> @@ -352,6 +371,7 @@ menu "Network commands"
>> >>  config CMD_NET
>> >>       bool "bootp, tftpboot"
>> >>          select NET
>> >> +     default y
>> >>       help
>> >>         Network commands.
>> >>         bootp - boot image via network using BOOTP/TFTP protocol
>> >> @@ -379,6 +399,7 @@ config CMD_DHCP
>> >>
>> >>  config CMD_NFS
>> >>       bool "nfs"
>> >> +     default y
>> >>       help
>> >>         Boot image via network using NFS protocol.
>> >
>> > I think we now have the smarts available to us to do this only if we
>> > have NET set, so "depends NET", yes?
>>
>> Sure. It could also be a follow-on, though, right? I'm just a bit
>> hesitant to redo all of this, since it really takes a long time to
>> validate (and still may not be perfect).
>
> Sorry for the delay.  Yeah, OK, we can do these as follow-ups but lets
> not wait too long.

OK... I'll start on them now... They won't be nearly as big as all this.

Does this mean you'll take v1 as is?

Thanks,
Joe

[U-Boot] [PATCH 4/7] arm: Make new baltos board not break on savedefconfig

[Yegor Yefremov]

On Thu, Jun 25, 2015 at 5:42 PM, Joe Hershberger
<joe.hershberger@gmail.com> wrote:
> Hi Yegor,
>
> On Wed, Jun 24, 2015 at 2:33 AM, Yegor Yefremov
> <yegorslists@googlemail.com> wrote:
>> On Wed, Jun 24, 2015 at 8:55 AM, Yegor Yefremov
>> <yegorslists@googlemail.com> wrote:
>>> Hi Joe,
>>>
>>> On Wed, Jun 24, 2015 at 5:26 AM, Joe Hershberger
>>> <joe.hershberger@gmail.com> wrote:
>>>> Hi Tom,
>>>>
>>>> On Tue, Jun 23, 2015 at 9:23 AM, Tom Rini <trini@konsulko.com> wrote:
>>>>> On Mon, Jun 22, 2015 at 04:15:27PM -0500, Joe Hershberger wrote:
>>>>>
>>>>>> This config defined a CONS_INDEX as a config but did not define it in
>>>>>> any Kconfig, so savedefconfig will delete that entry. Use
>>>>>> CONFIG_SYS_EXTRA_OPTIONS for now until that is added to Kconfig.
>>>>>>
>>>>>> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
>>>>>> ---
>>>>>>
>>>>>>  configs/am335x_baltos_defconfig | 3 +--
>>>>>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>>>>>
>>>>>> diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
>>>>>> index 679b04f..030cb51 100644
>>>>>> --- a/configs/am335x_baltos_defconfig
>>>>>> +++ b/configs/am335x_baltos_defconfig
>>>>>> @@ -1,7 +1,6 @@
>>>>>>  CONFIG_SPL=y
>>>>>>  CONFIG_SPL_STACK_R=y
>>>>>>  CONFIG_SPL_STACK_R_ADDR=0x82000000
>>>>>> -CONFIG_SYS_EXTRA_OPTIONS="NAND"
>>>>>> -CONFIG_CONS_INDEX=1
>>>>>> +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,NAND"
>>>>>>  CONFIG_ARM=y
>>>>>>  CONFIG_TARGET_AM335X_BALTOS=y
>>>>>
>>>>> No, something else is wrong.  board/vscom/baltos/Kconfig has CONS_INDEX
>>>>> (like the other am335x boards and yes this needs moving to a better
>>>>> place).
>>>>
>>>> Any thoughts on what's wrong, then? I'm at FTF this week and won't be
>>>> debugging it until next week. There was an issue with this board,
>>>> caused by savedefconfig, which is why I even noticed this board exists
>>>> now. Maybe whoever added it (Yegor Yefremov) didn't try safedefconfig
>>>> against the board?
>>>>
>>>> If nothing else, at least this makes it consistent with all other
>>>> boards that specify CONS_INDEX. At least they don't break.
>>>
>>> I'll take a look at this.
>>
>> I've pulled the latest master
>> (325849ff3d4adeebb8f8f9bc5db950724df9bc21) and tried:
>>
>> make am35x_baltos_defconfig
>> make savedefconfg
>> make
>>
>> and aside from CONS_INDEX disappearing I see no problems. And "make
>> menuconfig" still shows CONS_INDEX = 1.
>>
>> Should I submit following patch, so that Baltos has the same config as BBB?
>
> That shouldn't really be necessary since this series already
> effectively does this. It is good practice in the future, though.

You're right. I think, I forgot about savedefconfig, because Builroot
still doesn't have U-Boot's Kconfig support.

I've sent a patch, that provides properly created defconfig together
with CMD_NET activated.

>> diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
>> index 679b04f..1d287a8 100644
>> --- a/configs/am335x_baltos_defconfig
>> +++ b/configs/am335x_baltos_defconfig
>> @@ -1,7 +1,6 @@
>> +CONFIG_ARM=y
>> +CONFIG_TARGET_AM335X_BALTOS=y
>>  CONFIG_SPL=y
>>  CONFIG_SPL_STACK_R=y
>>  CONFIG_SPL_STACK_R_ADDR=0x82000000
>>  CONFIG_SYS_EXTRA_OPTIONS="NAND"
>> -CONFIG_CONS_INDEX=1
>> -CONFIG_ARM=y
>> -CONFIG_TARGET_AM335X_BALTOS=y
>
> Cheers,
> -Joe

[U-Boot] [PATCH 1/7] mtd: spi: Add the SPI_FLASH config to Kconfig

[Tom Rini]

On Mon, Jun 22, 2015 at 04:15:24PM -0500, Joe Hershberger wrote:

> This config needs to be available in the Kconfig to allow it to be
> removed from arch defaults.
> 
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150626/3b978dc5/attachment.sig>

[U-Boot] [PATCH 2/7] common: Fix comment for saveenv in Kconfig

[Tom Rini]

On Mon, Jun 22, 2015 at 04:15:25PM -0500, Joe Hershberger wrote:

> The help for this was simply copied from another command.
> 
> Update it to reflect the command.
> 
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150626/ba3a6eda/attachment.sig>

[U-Boot] [PATCH 3/7] common: Add the CMD_ENV_EXISTS config to Kconfig

[Tom Rini]

On Mon, Jun 22, 2015 at 04:15:26PM -0500, Joe Hershberger wrote:

> This command needs to exist in the Kconfig so that it can be moved from
> the config_cmd_default.h.
> 
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150626/47cb7cbc/attachment.sig>

[U-Boot] [PATCH 4/7] arm: Make new baltos board not break on savedefconfig

[Tom Rini]

On Mon, Jun 22, 2015 at 04:15:27PM -0500, Joe Hershberger wrote:

> This config defined a CONS_INDEX as a config but did not define it in
> any Kconfig, so savedefconfig will delete that entry. Use
> CONFIG_SYS_EXTRA_OPTIONS for now until that is added to Kconfig.
> 
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

For the record, NAK on this as we need to consolidate / move all of the
CONS_INDEX options elsewhere as a later follow-up.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150626/6e96a034/attachment.sig>

[U-Boot] [PATCH 5/7] a3m071: Add needed dependency on LIB_RAND

[Tom Rini]

On Mon, Jun 22, 2015 at 04:15:28PM -0500, Joe Hershberger wrote:

> Boards using link-local need lib rand.
> 
> When link-local is moved to Kconfig, this dependency will be described
> there.
> 
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150626/4e7aa68e/attachment.sig>

[U-Boot] [PATCH 6/7] Move default y configs out of arch/board Kconfig

[Tom Rini]

On Mon, Jun 22, 2015 at 04:15:29PM -0500, Joe Hershberger wrote:

> Some archs/boards specify their own default by pre-defining the config
> which causes the Kconfig system to mix up the order of the configs in
> the defconfigs... This will cause merge pain if allowed to proliferate.
> 
> Remove the configs that behave this way from the archs.
> 
> A few configs still remain, but that is because they only exist as
> defaults and do not have a proper Kconfig entry. Those appear to be:
> 
> SPIFLASH
> DISPLAY_BOARDINFO
> 
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

After updating rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot
and dropping CONFIG_DM_USB from MSI_Primo82 (as it uses
CONFIG_USB_MUSB_SUNXI which is not yet converted to DM),
Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150626/cf143fae/attachment.sig>

[U-Boot] [PATCH 7/7] Move defaults from config_cmd_default.h to Kconfig

[Tom Rini]

On Mon, Jun 22, 2015 at 04:15:30PM -0500, Joe Hershberger wrote:

> This sets the default commands Kconfig to match
> include/config_cmd_default.h commands in the common/Kconfig and removes
> them from include/configs.
> 
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
> 

After updating rastaban, am43xx_evm_usbhost_boot and am43xx_evm_ethboot:
Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150626/c6d3dd91/attachment.sig>

[U-Boot] [PATCH 1/7] mtd: spi: Add the SPI_FLASH config to Kconfig

[Jagan Teki]

On 27 June 2015 at 02:34, Tom Rini <trini@konsulko.com> wrote:
> On Mon, Jun 22, 2015 at 04:15:24PM -0500, Joe Hershberger wrote:
>
>> This config needs to be available in the Kconfig to allow it to be
>> removed from arch defaults.
>>
>> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
>
> Applied to u-boot/master, thanks!

Some how I have missed this as I thought this would go to next release as
it sent on out-of-merge window - and "the help description is quite incorrect"

Probably I will fix the same.

thanks!
-- 
Jagan | openedev.