Skip to contentSkip to conversation

Kconfig: Move CONFIG_SPL_..._SUPPORT to Kconfig

PATCH Superseded Simon Glass 4 participants 68 messages Aug 30, 2016 – Sep 12, 2016 Page 5 of 5

Subsystems (15)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#60 lore raw

PATCH v2 39/44 Convert CONFIG_SPL_SPI_SUPPORT to Kconfig

In reply to Simon Glass

Move this option to Kconfig and tidy up existing uses.

---

Changes in v2: None

 arch/arm/cpu/armv8/zynqmp/Kconfig            | 3 +++
 arch/arm/mach-socfpga/Kconfig                | 3 +++
 arch/arm/mach-zynq/Kconfig                   | 3 +++
 configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 1 +
 configs/P1010RDB-PA_SPIFLASH_defconfig       | 1 +
 configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 1 +
 configs/P1010RDB-PB_SPIFLASH_defconfig       | 1 +
 configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
 configs/P1020RDB-PC_SPIFLASH_defconfig       | 1 +
 configs/P1020RDB-PD_SPIFLASH_defconfig       | 1 +
 configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
 configs/P1021RDB-PC_SPIFLASH_defconfig       | 1 +
 configs/P1022DS_36BIT_SPIFLASH_defconfig     | 1 +
 configs/P1022DS_SPIFLASH_defconfig           | 1 +
 configs/P1024RDB_SPIFLASH_defconfig          | 1 +
 configs/P1025RDB_SPIFLASH_defconfig          | 1 +
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
 configs/P2020RDB-PC_SPIFLASH_defconfig       | 1 +
 configs/T1023RDB_SPIFLASH_defconfig          | 1 +
 configs/T1024QDS_SPIFLASH_defconfig          | 1 +
 configs/T1024RDB_SPIFLASH_defconfig          | 1 +
 configs/T1040D4RDB_SPIFLASH_defconfig        | 1 +
 configs/T1040RDB_SPIFLASH_defconfig          | 1 +
 configs/T1042D4RDB_SPIFLASH_defconfig        | 1 +
 configs/T1042RDB_PI_SPIFLASH_defconfig       | 1 +
 configs/T2080QDS_SPIFLASH_defconfig          | 1 +
 configs/T2080RDB_SPIFLASH_defconfig          | 1 +
 configs/T2081QDS_SPIFLASH_defconfig          | 1 +
 configs/am335x_evm_spiboot_defconfig         | 1 +
 configs/am57xx_evm_defconfig                 | 1 +
 configs/am57xx_evm_nodt_defconfig            | 1 +
 configs/am57xx_hs_evm_defconfig              | 1 +
 configs/at91sam9n12ek_spiflash_defconfig     | 1 +
 configs/at91sam9x5ek_spiflash_defconfig      | 1 +
 configs/axm_defconfig                        | 1 +
 configs/brppt1_spi_defconfig                 | 1 +
 configs/cgtqmx6eval_defconfig                | 1 +
 configs/chromebook_jerry_defconfig           | 1 +
 configs/cm_fx6_defconfig                     | 1 +
 configs/cm_t43_defconfig                     | 1 +
 configs/da850_am18xxevm_defconfig            | 1 +
 configs/da850evm_defconfig                   | 1 +
 configs/db-88f6720_defconfig                 | 1 +
 configs/db-88f6820-gp_defconfig              | 1 +
 configs/db-mv784mp-gp_defconfig              | 1 +
 configs/dra7xx_evm_defconfig                 | 1 +
 configs/dra7xx_hs_evm_defconfig              | 1 +
 configs/draco_defconfig                      | 1 +
 configs/ds414_defconfig                      | 1 +
 configs/etamin_defconfig                     | 1 +
 configs/k2e_evm_defconfig                    | 1 +
 configs/k2g_evm_defconfig                    | 1 +
 configs/k2hk_evm_defconfig                   | 1 +
 configs/k2l_evm_defconfig                    | 1 +
 configs/ma5d4evk_defconfig                   | 1 +
 configs/maxbcm_defconfig                     | 1 +
 configs/ot1200_spl_defconfig                 | 1 +
 configs/pcm058_defconfig                     | 1 +
 configs/pxm2_defconfig                       | 1 +
 configs/rastaban_defconfig                   | 1 +
 configs/rut_defconfig                        | 1 +
 configs/sama5d2_ptc_spiflash_defconfig       | 1 +
 configs/sama5d2_xplained_spiflash_defconfig  | 1 +
 configs/sama5d3xek_spiflash_defconfig        | 1 +
 configs/sama5d4_xplained_spiflash_defconfig  | 1 +
 configs/sama5d4ek_spiflash_defconfig         | 1 +
 configs/theadorable_debug_defconfig          | 1 +
 configs/theadorable_defconfig                | 1 +
 configs/thuban_defconfig                     | 1 +
 configs/zc5202_defconfig                     | 1 +
 configs/zc5601_defconfig                     | 1 +
 include/configs/P1010RDB.h                   | 1 -
 include/configs/P1022DS.h                    | 1 -
 include/configs/T102xQDS.h                   | 1 -
 include/configs/T102xRDB.h                   | 1 -
 include/configs/T104xRDB.h                   | 1 -
 include/configs/T208xQDS.h                   | 1 -
 include/configs/T208xRDB.h                   | 1 -
 include/configs/am335x_evm.h                 | 1 -
 include/configs/am57xx_evm.h                 | 1 -
 include/configs/at91sam9n12ek.h              | 1 -
 include/configs/at91sam9x5ek.h               | 1 -
 include/configs/bav335x.h                    | 1 -
 include/configs/brppt1.h                     | 1 -
 include/configs/cgtqmx6eval.h                | 1 -
 include/configs/chromebook_jerry.h           | 1 -
 include/configs/clearfog.h                   | 1 -
 include/configs/cm_fx6.h                     | 1 -
 include/configs/cm_t43.h                     | 1 -
 include/configs/da850evm.h                   | 3 ---
 include/configs/db-88f6720.h                 | 1 -
 include/configs/db-88f6820-gp.h              | 1 -
 include/configs/db-mv784mp-gp.h              | 1 -
 include/configs/dra7xx_evm.h                 | 1 -
 include/configs/ds414.h                      | 1 -
 include/configs/el6x_common.h                | 1 -
 include/configs/ma5d4evk.h                   | 1 -
 include/configs/maxbcm.h                     | 1 -
 include/configs/omapl138_lcdk.h              | 1 -
 include/configs/ot1200.h                     | 1 -
 include/configs/p1_p2_rdb_pc.h               | 1 -
 include/configs/pcm051.h                     | 1 -
 include/configs/pcm058.h                     | 1 -
 include/configs/sama5d2_ptc.h                | 1 -
 include/configs/sama5d2_xplained.h           | 1 -
 include/configs/sama5d3xek.h                 | 1 -
 include/configs/sama5d4_xplained.h           | 1 -
 include/configs/sama5d4ek.h                  | 1 -
 include/configs/siemens-am33x-common.h       | 1 -
 include/configs/socfpga_common.h             | 3 ---
 include/configs/taurus.h                     | 1 -
 include/configs/theadorable.h                | 1 -
 include/configs/ti_armv7_keystone2.h         | 1 -
 include/configs/tqma6.h                      | 3 ---
 include/configs/zynq-common.h                | 1 -
 115 files changed, 77 insertions(+), 50 deletions(-)
arch/arm/cpu/armv8/zynqmp/Kconfig +3 -0
index eb1461a..fddcacd 100644
@@ -21,6 +21,9 @@ config SPL_SERIAL_SUPPORT
 config SPL_SPI_FLASH_SUPPORT
 	default y
 
+config SPL_SPI_SUPPORT
+	default y
+
 config SYS_BOARD
 	default "zynqmp"
 
arch/arm/mach-socfpga/Kconfig +3 -0
index 2607b01..e2bbe14 100644
@@ -21,6 +21,9 @@ config SPL_SERIAL_SUPPORT
 config SPL_SPI_FLASH_SUPPORT
 	default y
 
+config SPL_SPI_SUPPORT
+	default y
+
 config TARGET_SOCFPGA_ARRIA5
 	bool
 	select TARGET_SOCFPGA_GEN5
arch/arm/mach-zynq/Kconfig +3 -0
index ec08ed2..c7f157d 100644
@@ -21,6 +21,9 @@ config SPL_SERIAL_SUPPORT
 config SPL_SPI_FLASH_SUPPORT
 	default y
 
+config SPL_SPI_SUPPORT
+	default y
+
 config SYS_BOARD
 	default "zynq"
 
configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig +1 -0
index 9bfdea2..be2f9e8 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_PHYS_64BIT=y
configs/P1010RDB-PA_SPIFLASH_defconfig +1 -0
index 216fdd85..241743e 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_FIT=y
configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig +1 -0
index 620af9d..3806dbd 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_PHYS_64BIT=y
configs/P1010RDB-PB_SPIFLASH_defconfig +1 -0
index 68baa9d..f1043ed 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_FIT=y
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
index 19e9afc..b4a4c72 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_PHYS_64BIT=y
configs/P1020RDB-PC_SPIFLASH_defconfig +1 -0
index 9627496..30ff3ad 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_FIT=y
configs/P1020RDB-PD_SPIFLASH_defconfig +1 -0
index 6e58c01..1755898 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_FIT=y
configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
index c3bca0a..9234d96 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_PHYS_64BIT=y
configs/P1021RDB-PC_SPIFLASH_defconfig +1 -0
index aa4cf91..d747e09 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_FIT=y
configs/P1022DS_36BIT_SPIFLASH_defconfig +1 -0
index faea77c..ec7cf1d 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1022DS=y
 CONFIG_PHYS_64BIT=y
configs/P1022DS_SPIFLASH_defconfig +1 -0
index 3ef1dec..e957d30 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1022DS=y
 CONFIG_FIT=y
configs/P1024RDB_SPIFLASH_defconfig +1 -0
index 69886e2..efb0629 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_FIT=y
configs/P1025RDB_SPIFLASH_defconfig +1 -0
index 0473c85..0a7beff 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_FIT=y
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
index ab4df09..f979572 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_PHYS_64BIT=y
configs/P2020RDB-PC_SPIFLASH_defconfig +1 -0
index 8ab51f8..0d2ff81 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_FIT=y
configs/T1023RDB_SPIFLASH_defconfig +1 -0
index 8bd1db79..e3d61ff 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_FIT=y
configs/T1024QDS_SPIFLASH_defconfig +1 -0
index 41fe7ce..719c401 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_FIT=y
configs/T1024RDB_SPIFLASH_defconfig +1 -0
index 4f430b6..95b0e7a 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_FIT=y
configs/T1040D4RDB_SPIFLASH_defconfig +1 -0
index 63c43f0..029c262 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
configs/T1040RDB_SPIFLASH_defconfig +1 -0
index 1d7d3e1..4a4c54e 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
configs/T1042D4RDB_SPIFLASH_defconfig +1 -0
index 4a47b64..17c9fec 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
configs/T1042RDB_PI_SPIFLASH_defconfig +1 -0
index 4af555a..c2f7dd1 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_FIT=y
configs/T2080QDS_SPIFLASH_defconfig +1 -0
index e93683a..4cec19e 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_FIT=y
configs/T2080RDB_SPIFLASH_defconfig +1 -0
index 364fd2b..0ec6885 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XRDB=y
 CONFIG_FIT=y
configs/T2081QDS_SPIFLASH_defconfig +1 -0
index b800e36..19a500e 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_FIT=y
configs/am335x_evm_spiboot_defconfig +1 -0
index 78c6df9..48ba1ef 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_AM335X_EVM=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SPI_BOOT"
configs/am57xx_evm_defconfig +1 -0
index bb16ed1..24ad3d3 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP54XX=y
 CONFIG_TARGET_AM57XX_EVM=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y
configs/am57xx_evm_nodt_defconfig +1 -0
index 17b4096..e3ebddb 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP54XX=y
 CONFIG_TARGET_AM57XX_EVM=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_DMA_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/am57xx_hs_evm_defconfig +1 -0
index 6018ee3..b23bb9d 100644
@@ -3,6 +3,7 @@ CONFIG_OMAP54XX=y
 CONFIG_TI_SECURE_DEVICE=y
 CONFIG_TARGET_AM57XX_EVM=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y
configs/at91sam9n12ek_spiflash_defconfig +1 -0
index a6348f6..d0c421d 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_SPIFLASH"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/at91sam9x5ek_spiflash_defconfig +1 -0
index 2f7780d..b656363 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_SPIFLASH"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/axm_defconfig +1 -0
index d365a0e..a5261d2 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20-taurus"
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2068,BOARD_AXM"
 CONFIG_BOOTDELAY=3
configs/brppt1_spi_defconfig +1 -0
index 02cd1c2..f321293 100644
@@ -8,6 +8,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT"
 CONFIG_SPI_BOOT=y
configs/cgtqmx6eval_defconfig +1 -0
index 19ab950..3210940 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6QDL"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/chromebook_jerry_defconfig +1 -0
index 1ed5362..1a26b5f 100644
@@ -7,6 +7,7 @@ CONFIG_ROCKCHIP_RK3288=y
 CONFIG_TARGET_CHROMEBOOK_JERRY=y
 CONFIG_ROCKCHIP_FAST_SPL=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_DM_KEYBOARD=y
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-jerry"
configs/cm_fx6_defconfig +1 -0
index 5435e12..115ef58 100644
@@ -8,6 +8,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
 CONFIG_BOOTDELAY=3
configs/cm_t43_defconfig +1 -0
index 7a65cc8..d674cbe 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPL=y
configs/da850_am18xxevm_defconfig +1 -0
index 19cab5d..af31694 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/da850evm_defconfig +1 -0
index 589be4e..d4b82c4 100644
@@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/db-88f6720_defconfig +1 -0
index 07332a1..ce7976a 100644
@@ -7,6 +7,7 @@ CONFIG_TARGET_DB_88F6720=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-375-db"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_BOOTDELAY=3
configs/db-88f6820-gp_defconfig +1 -0
index 2761b31..a883be0 100644
@@ -7,6 +7,7 @@ CONFIG_TARGET_DB_88F6820_GP=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-388-gp"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/db-mv784mp-gp_defconfig +1 -0
index 77a4576..b7d2ae2 100644
@@ -7,6 +7,7 @@ CONFIG_TARGET_DB_MV784MP_GP=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-xp-gp"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_BOOTDELAY=3
configs/dra7xx_evm_defconfig +1 -0
index 5b5f1a8..de24d35 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP54XX=y
 CONFIG_TARGET_DRA7XX_EVM=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y
configs/dra7xx_hs_evm_defconfig +1 -0
index ff8125d..c5af1eb 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TI_SECURE_DEVICE=y
 CONFIG_TARGET_DRA7XX_EVM=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y
configs/draco_defconfig +1 -0
index af849be..8627a84 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-draco"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/ds414_defconfig +1 -0
index 54f98a6..2283148 100644
@@ -7,6 +7,7 @@ CONFIG_TARGET_DS414=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-xp-synology-ds414"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/etamin_defconfig +1 -0
index 9da0905..ef2cef5 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-draco"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/k2e_evm_defconfig +1 -0
index d6c55ad..9d213df 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEFAULT_DEVICE_TREE="k2e-evm"
 CONFIG_OF_BOARD_SETUP=y
configs/k2g_evm_defconfig +1 -0
index 03ef443..c258531 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEFAULT_DEVICE_TREE="k2g-evm"
 CONFIG_OF_BOARD_SETUP=y
configs/k2hk_evm_defconfig +1 -0
index 27c51fd..de673b6 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEFAULT_DEVICE_TREE="k2hk-evm"
 CONFIG_OF_BOARD_SETUP=y
configs/k2l_evm_defconfig +1 -0
index 9f0d1cd..0d32048 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEFAULT_DEVICE_TREE="k2l-evm"
 CONFIG_OF_BOARD_SETUP=y
configs/ma5d4evk_defconfig +1 -0
index 5a23e80..abeeb18 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4"
 CONFIG_BOOTDELAY=3
configs/maxbcm_defconfig +1 -0
index fdfe4f1..d689c63 100644
@@ -7,6 +7,7 @@ CONFIG_TARGET_MAXBCM=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-xp-maxbcm"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/ot1200_spl_defconfig +1 -0
index 5c0c0c4..c24b927 100644
@@ -7,6 +7,7 @@ CONFIG_TARGET_OT1200=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/pcm058_defconfig +1 -0
index defb9e8..a66f8f8 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
configs/pxm2_defconfig +1 -0
index c1d8e58..d73849b 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-pxm50"
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
configs/rastaban_defconfig +1 -0
index 3bbdce2..dd22451 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-draco"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/rut_defconfig +1 -0
index 183edae..59db0a2 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-rut"
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
configs/sama5d2_ptc_spiflash_defconfig +1 -0
index 2364455..9ec2575 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_SERIALFLASH"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/sama5d2_xplained_spiflash_defconfig +1 -0
index e3ff06f..10eb64e 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_SERIALFLASH"
 CONFIG_BOOTDELAY=3
configs/sama5d3xek_spiflash_defconfig +1 -0
index 1ba811b..9f45a9c 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_SERIALFLASH"
 CONFIG_BOOTDELAY=3
configs/sama5d4_xplained_spiflash_defconfig +1 -0
index 30f82f5..abcdf99 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
 CONFIG_BOOTDELAY=3
configs/sama5d4ek_spiflash_defconfig +1 -0
index 265b5ed..3b04158 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
 CONFIG_BOOTDELAY=3
configs/theadorable_debug_defconfig +1 -0
index f5acd59..bcba257 100644
@@ -7,6 +7,7 @@ CONFIG_TARGET_THEADORABLE=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/theadorable_defconfig +1 -0
index cd97bf2..e2e58cf 100644
@@ -7,6 +7,7 @@ CONFIG_TARGET_THEADORABLE=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/thuban_defconfig +1 -0
index b9e2682..d19d30c 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-draco"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/zc5202_defconfig +1 -0
index 8e7dfef..c0f3285 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/zc5601_defconfig +1 -0
index 1218f79..c9ad1bd 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
include/configs/P1010RDB.h +0 -1
index 9cf333c..44e6101 100644
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_TEXT_BASE		0x11000000
 #define CONFIG_RESET_VECTOR_ADDRESS	0x110bfffc
 #else
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_FLASH_MINIMAL
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
include/configs/P1022DS.h +0 -1
index 685c319..40eb426 100644
@@ -35,7 +35,6 @@
 #endif
 
 #ifdef CONFIG_SPIFLASH
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_FLASH_MINIMAL
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
include/configs/T102xQDS.h +0 -1
index 7670c5b..b952b5f 100644
@@ -70,7 +70,6 @@
 
 #ifdef CONFIG_SPIFLASH
 #define CONFIG_RESET_VECTOR_ADDRESS		0x200FFC
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_FLASH_MINIMAL
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE	(768 << 10)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST		(0x00200000)
include/configs/T102xRDB.h +0 -1
index 0dcfb84..43512be 100644
@@ -77,7 +77,6 @@
 
 #ifdef CONFIG_SPIFLASH
 #define CONFIG_RESET_VECTOR_ADDRESS		0x30000FFC
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_FLASH_MINIMAL
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE	(768 << 10)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST		(0x30000000)
include/configs/T104xRDB.h +0 -1
index b2dac74..bb40a82 100644
@@ -80,7 +80,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
 
 #ifdef CONFIG_SPIFLASH
 #define	CONFIG_RESET_VECTOR_ADDRESS		0x30000FFC
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_FLASH_MINIMAL
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE	(768 << 10)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST		(0x30000000)
include/configs/T208xQDS.h +0 -1
index 8fc429b..0acdfe2 100644
@@ -80,7 +80,6 @@
 
 #ifdef CONFIG_SPIFLASH
 #define	CONFIG_RESET_VECTOR_ADDRESS		0x200FFC
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_FLASH_MINIMAL
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE	(768 << 10)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST		(0x00200000)
include/configs/T208xRDB.h +0 -1
index 061994c..38cdf98 100644
@@ -69,7 +69,6 @@
 
 #ifdef CONFIG_SPIFLASH
 #define        CONFIG_RESET_VECTOR_ADDRESS             0x200FFC
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_FLASH_MINIMAL
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE       (768 << 10)
 #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST                (0x00200000)
include/configs/am335x_evm.h +0 -1
index a4aeb30..dd7c7b2 100644
@@ -396,7 +396,6 @@
 #if defined(CONFIG_SPI_BOOT)
 /* SPL related */
 #undef CONFIG_SPL_OS_BOOT		/* Not supported by existing map */
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 
include/configs/am57xx_evm.h +0 -1
index 5281740..4814390 100644
@@ -107,7 +107,6 @@
 #endif
 
 /* SPI SPL */
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_TI_EDMA3
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x40000
include/configs/at91sam9n12ek.h +0 -1
index 20d5735..b21ae4e 100644
@@ -259,7 +259,6 @@
 #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER
 
 #elif CONFIG_SYS_USE_SPIFLASH
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x8400
 
include/configs/at91sam9x5ek.h +0 -1
index 202f8d4..62a69ca 100644
@@ -259,7 +259,6 @@
 #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER
 
 #elif CONFIG_SYS_USE_SPIFLASH
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x8400
 
include/configs/bav335x.h +0 -1
index 7519c9a..a0b2969 100644
@@ -528,7 +528,6 @@ DEFAULT_LINUX_BOOT_ENV \
 #if defined(CONFIG_SPI_BOOT)
 /* SPL related */
 #undef CONFIG_SPL_OS_BOOT		/* Not supported by existing map */
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 
include/configs/brppt1.h +0 -1
index be59399..5dc435c 100644
@@ -254,7 +254,6 @@ MMCARGS
 #define CONFIG_OMAP3_SPI
 #define CONFIG_SF_DEFAULT_SPEED		24000000
 
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 #undef CONFIG_ENV_IS_NOWHERE
include/configs/cgtqmx6eval.h +0 -1
index c85d0c6..79848cd 100644
@@ -18,7 +18,6 @@
 #define CONFIG_MACH_TYPE	4122
 
 #ifdef CONFIG_SPL
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	(64 * 1024)
 #define CONFIG_SPL_SPI_LOAD
 #include "imx6_spl.h"
include/configs/chromebook_jerry.h +0 -1
index 701622e..180527a 100644
@@ -15,7 +15,6 @@
 #include <configs/rk3288_common.h>
 
 #define CONFIG_ENV_IS_NOWHERE
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SPI_FLASH_GIGADEVICE
 
include/configs/clearfog.h +0 -1
index 629b99e..3990900 100644
@@ -125,7 +125,6 @@
 
 #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH
 /* SPL related SPI defines */
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 #define CONFIG_SYS_U_BOOT_OFFS		CONFIG_SYS_SPI_U_BOOT_OFFS
include/configs/cm_fx6.h +0 -1
index 2afdedc..46584fd 100644
@@ -249,7 +249,6 @@
 #include "imx6_spl.h"
 #undef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR	0x80 /* offset 64 kb */
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	(64 * 1024)
 #define CONFIG_SPL_SPI_LOAD
 
include/configs/cm_t43.h +0 -1
index 1c8d594..9d1bdc0 100644
@@ -157,7 +157,6 @@
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	(256 * 1024)
 #define CONFIG_SYS_MONITOR_LEN		(512 * 1024)
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR	0x480
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 
 /* EEPROM */
include/configs/da850evm.h +0 -3
index b85a64a..64bd440 100644
@@ -147,7 +147,6 @@
 #define CONFIG_ENV_SPI_MAX_HZ	CONFIG_SF_DEFAULT_SPEED
 
 #ifdef CONFIG_USE_SPIFLASH
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x8000
 #define CONFIG_SYS_SPI_U_BOOT_SIZE	0x40000
@@ -339,7 +338,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START	(CONFIG_SYS_TEXT_BASE - \
 						CONFIG_SYS_MALLOC_LEN)
 #define CONFIG_SYS_SPL_MALLOC_SIZE	CONFIG_SYS_MALLOC_LEN
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SPL_LDSCRIPT	"board/$(BOARDDIR)/u-boot-spl-da850evm.lds"
 #define CONFIG_SPL_STACK	0x8001ff00
@@ -351,7 +349,6 @@
 /* Load U-Boot Image From MMC */
 #ifdef CONFIG_SPL_MMC_LOAD
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR	0x75
-#undef CONFIG_SPL_SPI_SUPPORT
 #undef CONFIG_SPL_SPI_LOAD
 #endif
 
include/configs/db-88f6720.h +0 -1
index 22168c5..a134889 100644
@@ -92,7 +92,6 @@
 #define CONFIG_SPL_BOOTROM_SAVE		(CONFIG_SPL_STACK + 4)
 
 /* SPL related SPI defines */
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 #define CONFIG_SYS_U_BOOT_OFFS		CONFIG_SYS_SPI_U_BOOT_OFFS
include/configs/db-88f6820-gp.h +0 -1
index b810021..48b4b2e 100644
@@ -126,7 +126,6 @@
 
 #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH
 /* SPL related SPI defines */
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x24000
 #define CONFIG_SYS_U_BOOT_OFFS		CONFIG_SYS_SPI_U_BOOT_OFFS
include/configs/db-mv784mp-gp.h +0 -1
index bb8f768..c43dece 100644
@@ -117,7 +117,6 @@
 #define CONFIG_SPL_BOOTROM_SAVE		(CONFIG_SPL_STACK + 4)
 
 /* SPL related SPI defines */
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 #define CONFIG_SYS_U_BOOT_OFFS		CONFIG_SYS_SPI_U_BOOT_OFFS
include/configs/dra7xx_evm.h +0 -1
index d5da97e..a573a04 100644
@@ -197,7 +197,6 @@
 #endif
 
 /* SPI SPL */
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_TI_EDMA3
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x40000
include/configs/ds414.h +0 -1
index 0171174..f3356f8 100644
@@ -124,7 +124,6 @@
 #define CONFIG_SPL_BOOTROM_SAVE		(CONFIG_SPL_STACK + 4)
 
 /* SPL related SPI defines */
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x24000
 
include/configs/el6x_common.h +0 -1
index aa3afe6..81b79b2 100644
@@ -25,7 +25,6 @@
 #define CONFIG_MXC_UART
 
 #ifdef CONFIG_SPL
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	(64 * 1024)
 #define CONFIG_SPL_SPI_LOAD
 #include "imx6_spl.h"
include/configs/ma5d4evk.h +0 -1
index 6f07962..7cdfcd6 100644
@@ -221,7 +221,6 @@
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_MONITOR_LEN		(512 << 10)
 
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x10000
 
include/configs/maxbcm.h +0 -1
index 1324af4..29ed284 100644
@@ -85,7 +85,6 @@
 #define CONFIG_SPL_BOOTROM_SAVE		(CONFIG_SPL_STACK + 4)
 
 /* SPL related SPI defines */
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 
include/configs/omapl138_lcdk.h +0 -1
index 605fe57..90370fa 100644
@@ -97,7 +97,6 @@
 #define CONFIG_ENV_SPI_MAX_HZ	CONFIG_SF_DEFAULT_SPEED
 
 #ifdef CONFIG_USE_SPIFLASH
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x8000
 #define CONFIG_SYS_SPI_U_BOOT_SIZE	0x30000
include/configs/ot1200.h +0 -1
index b8a0e19..2625fff 100644
@@ -81,7 +81,6 @@
 /* SPL */
 #ifdef CONFIG_SPL
 #include "imx6_spl.h"
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     (64 * 1024)
 #define CONFIG_SPL_SPI_LOAD
 #endif
include/configs/p1_p2_rdb_pc.h +0 -1
index 88772ab..d2eb1d1 100644
@@ -202,7 +202,6 @@
 #endif
 
 #ifdef CONFIG_SPIFLASH
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_FLASH_MINIMAL
 #define CONFIG_SPL_FLUSH_IMAGE
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
include/configs/pcm051.h +0 -1
index 83a0747..20f90da 100644
@@ -125,7 +125,6 @@
 #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
 
 #ifdef CONFIG_SPI_BOOT
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 #define CONFIG_SYS_SPI_U_BOOT_SIZE	0x40000
include/configs/pcm058.h +0 -1
index ac4ee43..b96e9b6 100644
@@ -12,7 +12,6 @@
 
 #ifdef CONFIG_SPL
 #define CONFIG_SPL_YMODEM_SUPPORT
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	(64 * 1024)
 #include "imx6_spl.h"
include/configs/sama5d2_ptc.h +0 -1
index 00bc33a..2554526 100644
@@ -126,7 +126,6 @@
 #define CONFIG_SYS_MONITOR_LEN		(512 << 10)
 
 #ifdef CONFIG_SYS_USE_SERIALFLASH
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x8000
 
include/configs/sama5d2_xplained.h +0 -1
index 4396170..f6ff0ac 100644
@@ -137,7 +137,6 @@
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME		"u-boot.img"
 
 #elif CONFIG_SYS_USE_SERIALFLASH
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x8000
 
include/configs/sama5d3xek.h +0 -1
index 541a67a..b616f43 100644
@@ -188,7 +188,6 @@
 #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER
 
 #elif CONFIG_SYS_USE_SERIALFLASH
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x8000
 
include/configs/sama5d4_xplained.h +0 -1
index cc882e7..bba51d1 100644
@@ -150,7 +150,6 @@
 #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER
 
 #elif CONFIG_SYS_USE_SERIALFLASH
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x8000
 
include/configs/sama5d4ek.h +0 -1
index f2c6d0b..5a8ed52 100644
@@ -148,7 +148,6 @@
 #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER
 
 #elif CONFIG_SYS_USE_SERIALFLASH
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x8000
 
include/configs/siemens-am33x-common.h +0 -1
index a77b822..5e764e1 100644
@@ -140,7 +140,6 @@
 
 #define CONFIG_SPL_WATCHDOG_SUPPORT
 
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 
include/configs/socfpga_common.h +0 -3
index 807a29e..1940554 100644
@@ -326,9 +326,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #define CONFIG_SPL_MAX_SIZE		(64 * 1024)
 
 #define CONFIG_SPL_WATCHDOG_SUPPORT
-#ifdef CONFIG_DM_SPI
-#define CONFIG_SPL_SPI_SUPPORT
-#endif
 
 /* SPL SDMMC boot support */
 #ifdef CONFIG_SPL_MMC_SUPPORT
include/configs/taurus.h +0 -1
index e9a15c1..d29011a 100644
@@ -146,7 +146,6 @@
 #if defined(CONFIG_SPL_BUILD)
 /* SPL related */
 #undef CONFIG_SPL_OS_BOOT		/* Not supported by existing map */
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 
include/configs/theadorable.h +0 -1
index 60d518e..d27ab9c 100644
@@ -150,7 +150,6 @@
 #define CONFIG_SPL_BOOTROM_SAVE		(CONFIG_SPL_STACK + 4)
 
 /* SPL related SPI defines */
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x1a000
 #define CONFIG_SYS_U_BOOT_OFFS		CONFIG_SYS_SPI_U_BOOT_OFFS
include/configs/ti_armv7_keystone2.h +0 -1
index 7b658ae..d956035 100644
@@ -54,7 +54,6 @@
 					CONFIG_SYS_SPL_MALLOC_SIZE + \
 					SPL_MALLOC_F_SIZE + \
 					CONFIG_SPL_STACK_SIZE - 4)
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	CONFIG_SPL_PAD_TO
 
include/configs/tqma6.h +0 -3
index b4c7652..d92ae0c 100644
@@ -12,9 +12,6 @@
 #include <linux/kconfig.h>
 /* SPL */
 /* #if defined(CONFIG_SPL_BUILD) */
-
-#define CONFIG_SPL_SPI_SUPPORT
-
 /* common IMX6 SPL configuration */
 #include "imx6_spl.h"
 
include/configs/zynq-common.h +0 -1
index 1a74357..2681f1f 100644
@@ -327,7 +327,6 @@
 
 /* qspi mode is working fine */
 #ifdef CONFIG_ZYNQ_QSPI
-#define CONFIG_SPL_SPI_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x100000
 #define CONFIG_SYS_SPI_ARGS_OFFS	0x200000
Signature · 1 line
2.8.0.rc3.226.g39d4020
#61 lore raw

PATCH v2 40/44 Convert CONFIG_SPL_USBETH_SUPPORT to Kconfig

In reply to Simon Glass

Move this option to Kconfig and tidy up existing uses.

---

Changes in v2: None

 configs/am335x_evm_usbspl_defconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
configs/am335x_evm_usbspl_defconfig +2 -1
index 83e97b1..b2c0a18 100644
@@ -2,12 +2,13 @@ CONFIG_ARM=y
 CONFIG_TARGET_AM335X_EVM=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="NAND,SPL_USBETH_SUPPORT"
+CONFIG_SYS_EXTRA_OPTIONS="NAND"
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_MUSB_NEW_SUPPORT=y
 CONFIG_SPL_NET_SUPPORT=y
+CONFIG_SPL_USBETH_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
Signature · 1 line
2.8.0.rc3.226.g39d4020
#62 lore raw

PATCH v2 41/44 Convert CONFIG_SPL_USB_HOST_SUPPORT to Kconfig

In reply to Simon Glass

Move this option to Kconfig and tidy up existing uses.

---

Changes in v2: None

 configs/am43xx_evm_usbhost_boot_defconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
configs/am43xx_evm_usbhost_boot_defconfig +2 -1
index 249460a..73333b0 100644
@@ -7,11 +7,12 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_USB_HOST_SUPPORT"
+CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
Signature · 1 line
2.8.0.rc3.226.g39d4020
#63 lore raw

PATCH v2 42/44 Convert CONFIG_SPL_USB_SUPPORT to Kconfig

In reply to Simon Glass

Move this option to Kconfig and tidy up existing uses.

---

Changes in v2: None

 configs/am43xx_evm_usbhost_boot_defconfig | 1 +
 include/configs/am43xx_evm.h              | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)
configs/am43xx_evm_usbhost_boot_defconfig +1 -0
index 73333b0..73b2a70 100644
@@ -13,6 +13,7 @@ CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_USB_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
include/configs/am43xx_evm.h +0 -3
index 9f33beb..552060f 100644
@@ -91,9 +91,6 @@
 #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"
 
 /* SPL USB Support */
-#ifdef CONFIG_SPL_USB_HOST_SUPPORT
-#define CONFIG_SPL_USB_SUPPORT
-#endif
 
 #if defined(CONFIG_SPL_USB_HOST_SUPPORT) || !defined(CONFIG_SPL_BUILD)
 #define CONFIG_SYS_USB_FAT_BOOT_PARTITION		1
Signature · 1 line
2.8.0.rc3.226.g39d4020
#64 lore raw

PATCH v2 43/44 Convert CONFIG_SPL_WATCHDOG_SUPPORT to Kconfig

In reply to Simon Glass

Move this option to Kconfig and tidy up existing uses.

---

Changes in v2: None

 arch/arm/Kconfig                                    | 1 +
 arch/arm/mach-socfpga/Kconfig                       | 3 +++
 board/ti/am335x/Kconfig                             | 3 +++
 configs/am335x_baltos_defconfig                     | 1 +
 configs/am335x_igep0033_defconfig                   | 1 +
 configs/am335x_shc_defconfig                        | 1 +
 configs/am335x_shc_ict_defconfig                    | 1 +
 configs/am335x_shc_netboot_defconfig                | 1 +
 configs/am335x_shc_prompt_defconfig                 | 1 +
 configs/am335x_shc_sdboot_defconfig                 | 1 +
 configs/am335x_shc_sdboot_prompt_defconfig          | 1 +
 configs/am335x_sl50_defconfig                       | 1 +
 configs/birdland_bav335a_defconfig                  | 1 +
 configs/birdland_bav335b_defconfig                  | 1 +
 configs/brppt1_mmc_defconfig                        | 1 +
 configs/brppt1_nand_defconfig                       | 1 +
 configs/brppt1_spi_defconfig                        | 1 +
 configs/cgtqmx6eval_defconfig                       | 1 +
 configs/cm_fx6_defconfig                            | 1 +
 configs/cm_t335_defconfig                           | 1 +
 configs/draco_defconfig                             | 1 +
 configs/etamin_defconfig                            | 1 +
 configs/gwventana_defconfig                         | 1 +
 configs/ls1021aqds_nand_defconfig                   | 1 +
 configs/ls1021aqds_sdcard_ifc_defconfig             | 1 +
 configs/ls1021aqds_sdcard_qspi_defconfig            | 1 +
 configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 1 +
 configs/ls1021atwr_sdcard_ifc_defconfig             | 1 +
 configs/ls1021atwr_sdcard_qspi_defconfig            | 1 +
 configs/ls1043aqds_nand_defconfig                   | 1 +
 configs/ls1043aqds_sdcard_ifc_defconfig             | 1 +
 configs/ls1043aqds_sdcard_qspi_defconfig            | 1 +
 configs/ls1043ardb_nand_defconfig                   | 1 +
 configs/ls1043ardb_sdcard_defconfig                 | 1 +
 configs/mx6cuboxi_defconfig                         | 1 +
 configs/mx6sabresd_spl_defconfig                    | 1 +
 configs/mx6slevk_spl_defconfig                      | 1 +
 configs/mx6sxsabresd_spl_defconfig                  | 1 +
 configs/mx6ul_14x14_evk_defconfig                   | 1 +
 configs/mx6ul_9x9_evk_defconfig                     | 1 +
 configs/novena_defconfig                            | 1 +
 configs/ot1200_spl_defconfig                        | 1 +
 configs/pcm051_rev1_defconfig                       | 1 +
 configs/pcm051_rev3_defconfig                       | 1 +
 configs/pcm058_defconfig                            | 1 +
 configs/pengwyn_defconfig                           | 1 +
 configs/pepper_defconfig                            | 1 +
 configs/picosam9g45_defconfig                       | 1 +
 configs/platinum_picon_defconfig                    | 1 +
 configs/platinum_titanium_defconfig                 | 1 +
 configs/pxm2_defconfig                              | 1 +
 configs/rastaban_defconfig                          | 1 +
 configs/rut_defconfig                               | 1 +
 configs/thuban_defconfig                            | 1 +
 configs/udoo_defconfig                              | 1 +
 configs/wandboard_defconfig                         | 1 +
 configs/xpress_spl_defconfig                        | 1 +
 configs/zc5202_defconfig                            | 1 +
 configs/zc5601_defconfig                            | 1 +
 include/configs/brppt1.h                            | 1 -
 include/configs/imx6_spl.h                          | 1 -
 include/configs/ls1021aqds.h                        | 2 --
 include/configs/ls1021atwr.h                        | 1 -
 include/configs/ls1043a_common.h                    | 2 --
 include/configs/picosam9g45.h                       | 2 --
 include/configs/siemens-am33x-common.h              | 2 --
 include/configs/socfpga_common.h                    | 2 --
 include/configs/ti_am335x_common.h                  | 1 -
 68 files changed, 63 insertions(+), 14 deletions(-)
arch/arm/Kconfig +1 -0
index aef901c..1203e1d 100644
@@ -790,6 +790,7 @@ config TARGET_LS1021AQDS
 	bool "Support ls1021aqds"
 	select CPU_V7
 	select SUPPORT_SPL
+
 config TARGET_LS1021ATWR
 	bool "Support ls1021atwr"
 	select CPU_V7
arch/arm/mach-socfpga/Kconfig +3 -0
index e2bbe14..5dfc200 100644
@@ -24,6 +24,9 @@ config SPL_SPI_FLASH_SUPPORT
 config SPL_SPI_SUPPORT
 	default y
 
+config SPL_WATCHDOG_SUPPORT
+	default y
+
 config TARGET_SOCFPGA_ARRIA5
 	bool
 	select TARGET_SOCFPGA_GEN5
board/ti/am335x/Kconfig +3 -0
index 0a0cbf6..753d652 100644
@@ -3,6 +3,9 @@ if TARGET_AM335X_EVM
 config SPL_ENV_SUPPORT
 	default y
 
+config SPL_WATCHDOG_SUPPORT
+	default y
+
 config SYS_BOARD
 	default "am335x"
 
configs/am335x_baltos_defconfig +1 -0
index 132ec21..931bd37 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/am335x_igep0033_defconfig +1 -0
index f44e593..7ff11d6 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
configs/am335x_shc_defconfig +1 -0
index 6f27a0d..774d520 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SERIES=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_FIT=y
configs/am335x_shc_ict_defconfig +1 -0
index 36f5d84..d90381a 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SHC_ICT=y
 CONFIG_SERIES=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
configs/am335x_shc_netboot_defconfig +1 -0
index 8c87ce5..a0ad39a 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SHC_NETBOOT=y
 CONFIG_SERIES=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
configs/am335x_shc_prompt_defconfig +1 -0
index 3c2bdf5..873ff57 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SERIES=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_FIT=y
configs/am335x_shc_sdboot_defconfig +1 -0
index d7b903c..062ad6b 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SHC_SDBOOT=y
 CONFIG_SERIES=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
configs/am335x_shc_sdboot_prompt_defconfig +1 -0
index d7b903c..062ad6b 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SHC_SDBOOT=y
 CONFIG_SERIES=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
configs/am335x_sl50_defconfig +1 -0
index 4282e46..a05adcc 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
configs/birdland_bav335a_defconfig +1 -0
index d661ea0..6b7b086 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_BAV_VERSION=1
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
configs/birdland_bav335b_defconfig +1 -0
index 8bb5af2..20444b7 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_BAV_VERSION=2
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
configs/brppt1_mmc_defconfig +1 -0
index 370d9d9..9c90e63 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT"
 CONFIG_BOOTDELAY=-2
configs/brppt1_nand_defconfig +1 -0
index 912685c..3da4213 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
 CONFIG_BOOTDELAY=-2
configs/brppt1_spi_defconfig +1 -0
index f321293..67e2c67 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT"
 CONFIG_SPI_BOOT=y
configs/cgtqmx6eval_defconfig +1 -0
index 3210940..f6bd2e4 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6QDL"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/cm_fx6_defconfig +1 -0
index 115ef58..998bc05 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
 CONFIG_BOOTDELAY=3
configs/cm_t335_defconfig +1 -0
index eaec887..7dc13c3 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/draco_defconfig +1 -0
index 8627a84..6b72513 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-draco"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/etamin_defconfig +1 -0
index ef2cef5..1dfab28 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-draco"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/gwventana_defconfig +1 -0
index fef4d6d..6afb8be 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x18000000
 CONFIG_DM_SERIAL=y
 CONFIG_FIT=y
configs/ls1021aqds_nand_defconfig +1 -0
index d211994..01a4c11 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
configs/ls1021aqds_sdcard_ifc_defconfig +1 -0
index ede7549..9bc2a84 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1021aqds_sdcard_qspi_defconfig +1 -0
index 0ad8250..2f98e63 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +1 -0
index ff6c13a..e899b70 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
configs/ls1021atwr_sdcard_ifc_defconfig +1 -0
index 67cb337..ea532e5 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
configs/ls1021atwr_sdcard_qspi_defconfig +1 -0
index c0c8796..d59a7a8 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1043aqds_nand_defconfig +1 -0
index a0dad9e..de787fe 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1043aqds_sdcard_ifc_defconfig +1 -0
index d5297f5..60ed0f5 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1043aqds_sdcard_qspi_defconfig +1 -0
index 224c6ae..7532739 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1043ardb_nand_defconfig +1 -0
index 47a9a67..24f51a3 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/ls1043ardb_sdcard_defconfig +1 -0
index df379f0..7717edc 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
configs/mx6cuboxi_defconfig +1 -0
index f3a0365..0b495a5 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/mx6sabresd_spl_defconfig +1 -0
index 14ff41b..5a9108b 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/mx6slevk_spl_defconfig +1 -0
index f4697a7..cf52a04 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6SL"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/mx6sxsabresd_spl_defconfig +1 -0
index 4f4694d..a86115b 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/mx6ul_14x14_evk_defconfig +1 -0
index 680da17..473b0da 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/mx6ul_9x9_evk_defconfig +1 -0
index 2b95458..924a3ed 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/novena_defconfig +1 -0
index c2a8b46..ecea030 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 CONFIG_SPL=y
configs/ot1200_spl_defconfig +1 -0
index c24b927..f88c653 100644
@@ -8,6 +8,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/pcm051_rev1_defconfig +1 -0
index 3b8d88b..d2c2161 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="REV1"
 CONFIG_SPL=y
 CONFIG_SPL_ETH_SUPPORT=y
configs/pcm051_rev3_defconfig +1 -0
index 5da41d8..de31c19 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="REV3"
 CONFIG_SPL=y
 CONFIG_SPL_ETH_SUPPORT=y
configs/pcm058_defconfig +1 -0
index a66f8f8..2851651 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
configs/pengwyn_defconfig +1 -0
index 9946fdb..d8e8c21 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_ETH_SUPPORT=y
 CONFIG_SPL_MTD_SUPPORT=y
configs/pepper_defconfig +1 -0
index 4c662a3..3729289 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="pepper# "
configs/picosam9g45_defconfig +1 -0
index 9bddcc4..70ed677 100644
@@ -8,6 +8,7 @@ CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/platinum_picon_defconfig +1 -0
index a064726..6344ae5 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/platinum_titanium_defconfig +1 -0
index 66e60a3..48eee29 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/pxm2_defconfig +1 -0
index d73849b..5ebc4fd 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-pxm50"
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
configs/rastaban_defconfig +1 -0
index dd22451..1e3af4b 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-draco"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/rut_defconfig +1 -0
index 59db0a2..f69902a 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-rut"
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
configs/thuban_defconfig +1 -0
index d19d30c..b2255f9 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-draco"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/udoo_defconfig +1 -0
index 4c7c873..a4a17c1 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/wandboard_defconfig +1 -0
index 253c856..47955bd 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/xpress_spl_defconfig +1 -0
index 93dbc61..f1d42c5 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/zc5202_defconfig +1 -0
index c0f3285..8d3f1df 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/zc5601_defconfig +1 -0
index c9ad1bd..a72c0e9 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
include/configs/brppt1.h +0 -1
index 5dc435c..e01d535 100644
@@ -24,7 +24,6 @@
 
 #define CONFIG_HW_WATCHDOG
 #define CONFIG_OMAP_WATCHDOG
-#define CONFIG_SPL_WATCHDOG_SUPPORT
 
 /* Bootcount using the RTC block */
 #define CONFIG_SYS_BOOTCOUNT_ADDR	0x44E3E000
include/configs/imx6_spl.h +0 -1
index e35b48e..76d1ca0 100644
@@ -29,7 +29,6 @@
 #define CONFIG_SPL_TEXT_BASE		0x00908000
 #define CONFIG_SPL_MAX_SIZE		0x10000
 #define CONFIG_SPL_STACK		0x0091FFB8
-#define CONFIG_SPL_WATCHDOG_SUPPORT
 
 /* NAND support */
 #if defined(CONFIG_SPL_NAND_SUPPORT)
include/configs/ls1021aqds.h +0 -2
index 81b5d45..303ecfa 100644
@@ -69,7 +69,6 @@ unsigned long get_board_ddr_clk(void);
 #endif
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_LDSCRIPT	"arch/$(ARCH)/cpu/u-boot-spl.lds"
-#define CONFIG_SPL_WATCHDOG_SUPPORT
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR		0xe8
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS		0x600
 
@@ -99,7 +98,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_FSL_PBL_RCW	board/freescale/ls1021aqds/ls102xa_rcw_nand.cfg
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_LDSCRIPT	"arch/$(ARCH)/cpu/u-boot-spl.lds"
-#define CONFIG_SPL_WATCHDOG_SUPPORT
 
 #define CONFIG_SPL_TEXT_BASE		0x10000000
 #define CONFIG_SPL_MAX_SIZE		0x1a000
include/configs/ls1021atwr.h +0 -1
index ccd2b90..2f9fda7 100644
@@ -118,7 +118,6 @@
 #endif
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_LDSCRIPT	"arch/$(ARCH)/cpu/u-boot-spl.lds"
-#define CONFIG_SPL_WATCHDOG_SUPPORT
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR		0xe8
 
 #ifdef CONFIG_SECURE_BOOT
include/configs/ls1043a_common.h +0 -2
index f667a2c..ed0e434 100644
@@ -60,7 +60,6 @@
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_LDSCRIPT		"arch/arm/cpu/armv8/u-boot-spl.lds"
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
-#define CONFIG_SPL_WATCHDOG_SUPPORT
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR		0xf0
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS		0x500
 
@@ -83,7 +82,6 @@
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_LDSCRIPT		"arch/arm/cpu/armv8/u-boot-spl.lds"
 #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
-#define CONFIG_SPL_WATCHDOG_SUPPORT
 #define CONFIG_SPL_TEXT_BASE		0x10000000
 #define CONFIG_SPL_MAX_SIZE		0x1a000
 #define CONFIG_SPL_STACK		0x1001d000
include/configs/picosam9g45.h +0 -2
index a45302a..75e5990 100644
@@ -164,8 +164,6 @@
 #define CONFIG_SPL_MAX_SIZE		0x010000
 #define CONFIG_SPL_STACK		0x310000
 
-#define CONFIG_SPL_WATCHDOG_SUPPORT
-
 #define CONFIG_SYS_MONITOR_LEN		0x80000
 
 #ifdef CONFIG_SYS_USE_MMC
include/configs/siemens-am33x-common.h +0 -2
index 5e764e1..05d6141 100644
@@ -138,8 +138,6 @@
 
 #define CONFIG_SPL_YMODEM_SUPPORT
 
-#define CONFIG_SPL_WATCHDOG_SUPPORT
-
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 
include/configs/socfpga_common.h +0 -2
index 1940554..611f61c 100644
@@ -325,8 +325,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #define CONFIG_SPL_TEXT_BASE		CONFIG_SYS_INIT_RAM_ADDR
 #define CONFIG_SPL_MAX_SIZE		(64 * 1024)
 
-#define CONFIG_SPL_WATCHDOG_SUPPORT
-
 /* SPL SDMMC boot support */
 #ifdef CONFIG_SPL_MMC_SUPPORT
 #if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
include/configs/ti_am335x_common.h +0 -1
index bcd56fc..cc2291c 100644
@@ -64,7 +64,6 @@
 					 (128 << 20))
 
 /* Enable the watchdog inside of SPL */
-#define CONFIG_SPL_WATCHDOG_SUPPORT
 
 /*
  * Since SPL did pll and ddr initialization for us,
Signature · 1 line
2.8.0.rc3.226.g39d4020
#65 lore raw

PATCH v2 44/44 Convert CONFIG_SPL_YMODEM_SUPPORT to Kconfig

In reply to Simon Glass

Move this option to Kconfig and tidy up existing uses.

---

Changes in v2:
- Lots of work to make use of common values across multiple boards
- Added a patch to change 'spear' CONFIGs to upper case

 board/ti/am335x/Kconfig                    | 3 +++
 configs/am335x_baltos_defconfig            | 1 +
 configs/am335x_igep0033_defconfig          | 1 +
 configs/am335x_shc_defconfig               | 1 +
 configs/am335x_shc_ict_defconfig           | 1 +
 configs/am335x_shc_netboot_defconfig       | 1 +
 configs/am335x_shc_prompt_defconfig        | 1 +
 configs/am335x_shc_sdboot_defconfig        | 1 +
 configs/am335x_shc_sdboot_prompt_defconfig | 1 +
 configs/am335x_sl50_defconfig              | 1 +
 configs/am43xx_evm_defconfig               | 1 +
 configs/am43xx_evm_ethboot_defconfig       | 1 +
 configs/am43xx_evm_usbhost_boot_defconfig  | 1 +
 configs/am43xx_hs_evm_defconfig            | 1 +
 configs/birdland_bav335a_defconfig         | 1 +
 configs/birdland_bav335b_defconfig         | 1 +
 configs/brppt1_mmc_defconfig               | 1 +
 configs/brppt1_nand_defconfig              | 1 +
 configs/brppt1_spi_defconfig               | 1 +
 configs/brxre1_defconfig                   | 1 +
 configs/draco_defconfig                    | 1 +
 configs/etamin_defconfig                   | 1 +
 configs/pcm051_rev1_defconfig              | 1 +
 configs/pcm051_rev3_defconfig              | 1 +
 configs/pcm058_defconfig                   | 1 +
 configs/pengwyn_defconfig                  | 1 +
 configs/pxm2_defconfig                     | 1 +
 configs/rastaban_defconfig                 | 1 +
 configs/rut_defconfig                      | 1 +
 configs/thuban_defconfig                   | 1 +
 configs/ti814x_evm_defconfig               | 1 +
 configs/ti816x_evm_defconfig               | 1 +
 include/configs/am335x_evm.h               | 3 ---
 include/configs/am335x_igep0033.h          | 1 -
 include/configs/am335x_shc.h               | 1 -
 include/configs/am335x_sl50.h              | 2 --
 include/configs/am43xx_evm.h               | 1 -
 include/configs/baltos.h                   | 2 --
 include/configs/bav335x.h                  | 2 --
 include/configs/bur_am335x_common.h        | 1 -
 include/configs/pcm051.h                   | 1 -
 include/configs/pcm058.h                   | 1 -
 include/configs/pengwyn.h                  | 1 -
 include/configs/siemens-am33x-common.h     | 2 --
 include/configs/ti814x_evm.h               | 1 -
 include/configs/ti816x_evm.h               | 1 -
 46 files changed, 34 insertions(+), 20 deletions(-)
board/ti/am335x/Kconfig +3 -0
index 753d652..a84e91b 100644
@@ -6,6 +6,9 @@ config SPL_ENV_SUPPORT
 config SPL_WATCHDOG_SUPPORT
 	default y
 
+config SPL_YMODEM_SUPPORT
+	default y
+
 config SYS_BOARD
 	default "am335x"
 
configs/am335x_baltos_defconfig +1 -0
index 931bd37..77eb014 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
configs/am335x_igep0033_defconfig +1 -0
index 7ff11d6..5f9c373 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_MTD_SUPPORT=y
configs/am335x_shc_defconfig +1 -0
index 774d520..0252a45 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SERIES=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
configs/am335x_shc_ict_defconfig +1 -0
index d90381a..28c8134 100644
@@ -14,6 +14,7 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SHC_ICT=y
 CONFIG_SERIES=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
configs/am335x_shc_netboot_defconfig +1 -0
index a0ad39a..8c85d7c 100644
@@ -15,6 +15,7 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SHC_NETBOOT=y
 CONFIG_SERIES=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
configs/am335x_shc_prompt_defconfig +1 -0
index 873ff57..43ec954 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SERIES=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
configs/am335x_shc_sdboot_defconfig +1 -0
index 062ad6b..19f8cdb 100644
@@ -14,6 +14,7 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SHC_SDBOOT=y
 CONFIG_SERIES=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
configs/am335x_shc_sdboot_prompt_defconfig +1 -0
index 062ad6b..19f8cdb 100644
@@ -14,6 +14,7 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SHC_SDBOOT=y
 CONFIG_SERIES=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
configs/am335x_sl50_defconfig +1 -0
index a05adcc..9accb09 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
 CONFIG_SPL=y
configs/am43xx_evm_defconfig +1 -0
index 3670e14..405462f 100644
@@ -4,6 +4,7 @@ CONFIG_TARGET_AM43XX_EVM=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,NAND"
configs/am43xx_evm_ethboot_defconfig +1 -0
index 1c9275a..a56e2cd 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_AM43XX=y
 CONFIG_TARGET_AM43XX_EVM=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
 CONFIG_SPL=y
 CONFIG_SPL_ETH_SUPPORT=y
configs/am43xx_evm_usbhost_boot_defconfig +1 -0
index 73b2a70..3489430 100644
@@ -5,6 +5,7 @@ CONFIG_ISW_ENTRY_ADDR=0x40300350
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
configs/am43xx_hs_evm_defconfig +1 -0
index 189d539..eddf90c 100644
@@ -6,6 +6,7 @@ CONFIG_ISW_ENTRY_ADDR=0x40302ae0
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1, NAND"
configs/birdland_bav335a_defconfig +1 -0
index 6b7b086..0f3e67e 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_BAV_VERSION=1
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
configs/birdland_bav335b_defconfig +1 -0
index 20444b7..941d3f1 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_BAV_VERSION=2
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
configs/brppt1_mmc_defconfig +1 -0
index 9c90e63..ce2d7ab 100644
@@ -8,6 +8,7 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT"
 CONFIG_BOOTDELAY=-2
configs/brppt1_nand_defconfig +1 -0
index 3da4213..c747b11 100644
@@ -8,6 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
 CONFIG_BOOTDELAY=-2
configs/brppt1_spi_defconfig +1 -0
index 67e2c67..d15ab7a 100644
@@ -10,6 +10,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT"
 CONFIG_SPI_BOOT=y
configs/brxre1_defconfig +1 -0
index ea1f245..f70a0f2 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
 CONFIG_BOOTDELAY=-2
 CONFIG_SPL=y
configs/draco_defconfig +1 -0
index 6b72513..d7404ea 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-draco"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/etamin_defconfig +1 -0
index 1dfab28..9ab5aef 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-draco"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/pcm051_rev1_defconfig +1 -0
index d2c2161..f86bf98 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="REV1"
 CONFIG_SPL=y
 CONFIG_SPL_ETH_SUPPORT=y
configs/pcm051_rev3_defconfig +1 -0
index de31c19..3083f7e 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="REV3"
 CONFIG_SPL=y
 CONFIG_SPL_ETH_SUPPORT=y
configs/pcm058_defconfig +1 -0
index 2851651..36cef56 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 CONFIG_BOOTDELAY=3
configs/pengwyn_defconfig +1 -0
index d8e8c21..bd1b0ef 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_ETH_SUPPORT=y
 CONFIG_SPL_MTD_SUPPORT=y
configs/pxm2_defconfig +1 -0
index 5ebc4fd..7572303 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-pxm50"
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
configs/rastaban_defconfig +1 -0
index 1e3af4b..f9c81a8 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-draco"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/rut_defconfig +1 -0
index f69902a..30ccd8a 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-rut"
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
configs/thuban_defconfig +1 -0
index b2255f9..e8568d7 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-draco"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
configs/ti814x_evm_defconfig +1 -0
index a6d1ca0..dcee43a 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_BOOTDELAY=1
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
configs/ti816x_evm_defconfig +1 -0
index 3833c0c..d10eac3 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_BOOTDELAY=3
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
include/configs/am335x_evm.h +0 -3
index dd7c7b2..d376025 100644
@@ -206,8 +206,6 @@
 
 /* SPL */
 #ifndef CONFIG_NOR_BOOT
-#define CONFIG_SPL_YMODEM_SUPPORT
-
 /* Bootcount using the RTC block */
 #define CONFIG_BOOTCOUNT_LIMIT
 #define CONFIG_BOOTCOUNT_AM33XX
@@ -328,7 +326,6 @@
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
 /* Remove other SPL modes. */
-#undef CONFIG_SPL_YMODEM_SUPPORT
 #define CONFIG_ENV_IS_NOWHERE
 #undef CONFIG_ENV_IS_IN_NAND
 /* disable host part of MUSB in SPL */
include/configs/am335x_igep0033.h +0 -1
index a14310a..18db58a 100644
@@ -124,7 +124,6 @@
 
 /* SPL */
 #undef CONFIG_SPL_OS_BOOT	/* Not supported by existing map */
-#define CONFIG_SPL_YMODEM_SUPPORT
 #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
 
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
include/configs/am335x_shc.h +0 -1
index 7262e52..2d839e8 100644
@@ -281,7 +281,6 @@
 #define CONFIG_POWER_TPS65217
 
 /* SPL */
-#define CONFIG_SPL_YMODEM_SUPPORT
 
 #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
 
include/configs/am335x_sl50.h +0 -2
index 7fd1e6f..b608eda 100644
@@ -80,7 +80,6 @@
 #define CONFIG_POWER_TPS65910
 
 /* SPL */
-#define CONFIG_SPL_YMODEM_SUPPORT
 
 /* Bootcount using the RTC block */
 #define CONFIG_BOOTCOUNT_LIMIT
@@ -97,7 +96,6 @@
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
 /* Remove other SPL modes. */
-#undef CONFIG_SPL_YMODEM_SUPPORT
 #define CONFIG_ENV_IS_NOWHERE
 #undef CONFIG_ENV_IS_IN_NAND
 /* disable host part of MUSB in SPL */
include/configs/am43xx_evm.h +0 -1
index 552060f..2aa61ac 100644
@@ -43,7 +43,6 @@
 					CONFIG_SPL_TEXT_BASE)
 #define CONFIG_SYS_SPL_ARGS_ADDR	(CONFIG_SYS_SDRAM_BASE + \
 					 (128 << 20))
-#define CONFIG_SPL_YMODEM_SUPPORT
 
 /* Enabling L2 Cache */
 #define CONFIG_SYS_L2_PL310
include/configs/baltos.h +0 -2
index 969db34..351b7cf 100644
@@ -217,8 +217,6 @@
 
 /* SPL */
 #ifndef CONFIG_NOR_BOOT
-#define CONFIG_SPL_YMODEM_SUPPORT
-
 /* Bootcount using the RTC block */
 #define CONFIG_BOOTCOUNT_LIMIT
 #define CONFIG_BOOTCOUNT_AM33XX
include/configs/bav335x.h +0 -2
index a0b2969..5ec35f6 100644
@@ -350,8 +350,6 @@ DEFAULT_LINUX_BOOT_ENV \
 
 /* SPL */
 #ifndef CONFIG_NOR_BOOT
-#define CONFIG_SPL_YMODEM_SUPPORT
-
 /* Bootcount using the RTC block */
 #define CONFIG_BOOTCOUNT_LIMIT
 #define CONFIG_BOOTCOUNT_AM33XX
include/configs/bur_am335x_common.h +0 -1
index 6c951f9..f448f89 100644
@@ -112,7 +112,6 @@
 
 /* General parts of the framework, required. */
 #define CONFIG_SPL_BOARD_INIT
-#define CONFIG_SPL_YMODEM_SUPPORT
 #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
 
 #endif	/* ! __BUR_AM335X_COMMON_H__ */
include/configs/pcm051.h +0 -1
index 20f90da..1f9b1d9 100644
@@ -120,7 +120,6 @@
 /* CPU */
 #define CONFIG_ENV_IS_NOWHERE
 
-#define CONFIG_SPL_YMODEM_SUPPORT
 #define CONFIG_SPL_NET_VCI_STRING	"pcm051 U-Boot SPL"
 #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
 
include/configs/pcm058.h +0 -1
index b96e9b6..193f06e 100644
@@ -11,7 +11,6 @@
 #include <config_distro_defaults.h>
 
 #ifdef CONFIG_SPL
-#define CONFIG_SPL_YMODEM_SUPPORT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	(64 * 1024)
 #include "imx6_spl.h"
include/configs/pengwyn.h +0 -1
index 6234eb5..14532b9 100644
@@ -114,7 +114,6 @@
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	2
 
 /* SPL */
-#define CONFIG_SPL_YMODEM_SUPPORT
 
 /* General network SPL */
 #define CONFIG_SPL_NET_VCI_STRING	"AM335x U-Boot SPL"
include/configs/siemens-am33x-common.h +0 -2
index 05d6141..a703e78 100644
@@ -136,8 +136,6 @@
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME	"u-boot.img"
 #define CONFIG_FS_FAT
 
-#define CONFIG_SPL_YMODEM_SUPPORT
-
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 
include/configs/ti814x_evm.h +0 -1
index 7b7bf1c..3fc5069 100644
@@ -169,7 +169,6 @@
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
 
-#define CONFIG_SPL_YMODEM_SUPPORT
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
 #define CONFIG_SYS_SPI_U_BOOT_SIZE	0x40000
 #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/omap-common/u-boot-spl.lds"
include/configs/ti816x_evm.h +0 -1
index 92a28b8..9dd711d 100644
@@ -135,7 +135,6 @@
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
 
-#define CONFIG_SPL_YMODEM_SUPPORT
 #define CONFIG_SYS_SPI_U_BOOT_OFFS  0x20000
 #define CONFIG_SYS_SPI_U_BOOT_SIZE  0x40000
 #define CONFIG_SPL_LDSCRIPT     "$(CPUDIR)/omap-common/u-boot-spl.lds"
Signature · 1 line
2.8.0.rc3.226.g39d4020
#66 lore raw

v2 cover Kconfig: Move CONFIG_SPL_..._SUPPORT to Kconfig

In reply to Simon Glass

Hello Simon,

Am 30.08.2016 um 02:21 schrieb Simon Glass:

Quoted 200 lines

This series moves all the CONFIG_SPL_..._SUPPORT options to Kconfig and fixes up existing boards to continue to build.

It also adds a few small but useful features to moveconfig.

There is existing work going on in this area, so some of these patches may be superseded. It has taken me a while to get this building cleanly. But I have run out of time so want to get this out.

As mentioned on a recent thread [1] there is some confusion about whether an option means enabling driver support or media support. Andrew's recent series seems like a good vehicle to tidy that up. But I hope this series will make it easier.

NOTE: in the v2 series I have tried to use common things in Kconfig to reduce the diffs in the defconfig files. This has helped a fair bit. But it is very error-prone and time consuming. Also I have had to add some exceptions (disabling an option in specific board configs). Overall it was not a pleasant experience :-(

There are a few strange features of this conversion. The main difficulty is that some PowerPC boards do things like this in their board config file:

  #ifdef CONFIG_TPL_BUILD
  #define CONFIG_SPL_SERIAL_SUPPORT
  #define CONFIG_SPL_ENV_SUPPORT
  #else
  #define CONFIG_SPL_SERIAL_SUPPORT
  #endif

This means that TPL reuses the SPL options. We can't support this in Kconfig so I have added a small number of CONFIG_TPL_xxx_SUPPORT options to cope with this. This made the conversion more painful than it should have been.

A related issue is boards using a common header file and setting options only for SPL:

  #ifdef CONFIG_SPL_BUILD
  #define CONFIG_SPL_SERIAL_SUPPORT
  #endif

This is not noticed by moveconfig so we have to clean it up manually. Also there are a few incorrect things where Kconfig options are set with #define:

  #ifdef CONFIG_SPL_BUILD
  #define CONFIG_SPL_DM
  #endif

Finally, many defconfig files are not ordered correctly, resulting in larger patches than we might like. It would be great to have a solution for this, perhaps with buildman providing a warning. But it might slow down development.

The series is fully build-tested (for bisectability) and causes no failures for the boards that already pass. The following boards fail for me at present on mainline (which I have not yet looked at):

   openrisc:  +   openrisc-generic
      sparc:  +   grsim grsim_leon2 gr_cpci_ax2000 gr_xc3s_1500 gr_ep2s60
   blackfin:  +   bf609-ezkit

This build is also config tested (with buildman -K). The changes are with spear (to rename options) and am335x_evm_usbspl (which I think is correct).

boards.cfg is up to date. Nothing to do.
Summary of 49 commits for 1185 boards (32 threads, 1 job per thread) 01: cfg

   openrisc:  +   openrisc-generic
      sparc:  +   grsim grsim_leon2 gr_cpci_ax2000 gr_xc3s_1500 gr_ep2s60
   blackfin:  +   bf609-ezkit

02: move
03: buildman
04: Correct defconfigs using savedefconfig
05: moveconfig: Add an option to skip prompts
06: moveconfig: Add an option to commit changes
07: Kconfig: Move SPL settings into their own file
08: arm: fsl: Adjust ordering of #ifndef CONFIG_SPL_BUILD
09: Drop CONFIG_SPL_RAM_SUPPORT
10: Use separate options for TPL support
11: Kconfig: spl: Add SPL support options to Kconfig
12: Kconfig: tpl: Add some TPL support options to Kconfig
13: Move existing use of CONFIG_SPL_DM to Kconfig
14: Move existing use of CONFIG_SPL_RSA to Kconfig
15: spear: Use upper case for CONFIG options
arm:
+ u-boot.cfg: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_STV0991=1 CONFIG_SYS_MONITOR_LEN=0x00040000 CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_DW_UDC=1 CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_nand=1 CONFIG_spear300=1 CONFIG_spear310=1 CONFIG_spear320=1 CONFIG_spear600=1 CONFIG_stv0991=1 CONFIG_usbtty=1
+ all: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_STV0991=1 CONFIG_SYS_MONITOR_LEN=0x00040000 CONFIG_USBTTY=1
- all: CONFIG_DW_UDC=1 CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_nand=1 CONFIG_spear300=1 CONFIG_spear310=1 CONFIG_spear320=1 CONFIG_spear600=1 CONFIG_stv0991=1 CONFIG_usbtty=1
spear600_nand :
+ u-boot.cfg: CONFIG_NAND=1
- u-boot.cfg: CONFIG_nand=1 CONFIG_spear600=1
+ all: CONFIG_NAND=1
- all: CONFIG_nand=1 CONFIG_spear600=1
spear300_nand :
+ u-boot.cfg: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000
- u-boot.cfg: CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_nand=1 CONFIG_spear300=1
+ all: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000
- all: CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_nand=1 CONFIG_spear300=1
spear300_usbtty :
+ u-boot.cfg: CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_DW_UDC=1 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_spear300=1 CONFIG_usbtty=1
+ all: CONFIG_USBTTY=1
- all: CONFIG_DW_UDC=1 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_spear300=1 CONFIG_usbtty=1
spear320_usbtty_nand :
+ u-boot.cfg: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000 CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_DW_UDC=1 CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_nand=1 CONFIG_spear320=1 CONFIG_usbtty=1
+ all: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000 CONFIG_USBTTY=1
- all: CONFIG_DW_UDC=1 CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_nand=1 CONFIG_spear320=1 CONFIG_usbtty=1
spear310_usbtty_nand :
+ u-boot.cfg: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000 CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_DW_UDC=1 CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_nand=1 CONFIG_spear310=1 CONFIG_usbtty=1
+ all: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000 CONFIG_USBTTY=1
- all: CONFIG_DW_UDC=1 CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_nand=1 CONFIG_spear310=1 CONFIG_usbtty=1
spear310_usbtty spear310_usbtty_pnor :
+ u-boot.cfg: CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_DW_UDC=1 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_spear310=1 CONFIG_usbtty=1
+ all: CONFIG_USBTTY=1
- all: CONFIG_DW_UDC=1 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_spear310=1 CONFIG_usbtty=1
spear300 :
- u-boot.cfg: CONFIG_spear300=1
- all: CONFIG_spear300=1
spear600_usbtty :
+ u-boot.cfg: CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_spear600=1 CONFIG_usbtty=1
+ all: CONFIG_USBTTY=1
- all: CONFIG_spear600=1 CONFIG_usbtty=1
spear320_nand :
+ u-boot.cfg: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000
- u-boot.cfg: CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_nand=1 CONFIG_spear320=1
+ all: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000
- all: CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_nand=1 CONFIG_spear320=1
stv0991 :
+ u-boot.cfg: CONFIG_STV0991=1
- u-boot.cfg: CONFIG_stv0991=1
+ all: CONFIG_STV0991=1
- all: CONFIG_stv0991=1
spear320 spear320_pnor :
- u-boot.cfg: CONFIG_spear320=1
- all: CONFIG_spear320=1
spear310_nand :
+ u-boot.cfg: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000
- u-boot.cfg: CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_nand=1 CONFIG_spear310=1
+ all: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000
- all: CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_nand=1 CONFIG_spear310=1
spear320_usbtty spear320_usbtty_pnor :
+ u-boot.cfg: CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_DW_UDC=1 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_spear320=1 CONFIG_usbtty=1
+ all: CONFIG_USBTTY=1
- all: CONFIG_DW_UDC=1 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_spear320=1 CONFIG_usbtty=1
spear600 :
- u-boot.cfg: CONFIG_spear600=1
- all: CONFIG_spear600=1
spear300_usbtty_nand :
+ u-boot.cfg: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000 CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_DW_UDC=1 CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_nand=1 CONFIG_spear300=1 CONFIG_usbtty=1
+ all: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000 CONFIG_USBTTY=1
- all: CONFIG_DW_UDC=1 CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_nand=1 CONFIG_spear300=1 CONFIG_usbtty=1
spear310 spear310_pnor :
- u-boot.cfg: CONFIG_spear310=1
- all: CONFIG_spear310=1
spear600_usbtty_nand :
+ u-boot.cfg: CONFIG_NAND=1 CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_nand=1 CONFIG_spear600=1 CONFIG_usbtty=1
+ all: CONFIG_NAND=1 CONFIG_USBTTY=1
- all: CONFIG_nand=1 CONFIG_spear600=1 CONFIG_usbtty=1
16: Convert CONFIG_SPL_CRYPTO_SUPPORT to Kconfig
17: Convert CONFIG_SPL_HASH_SUPPORT to Kconfig
18: Convert CONFIG_SPL_DMA_SUPPORT to Kconfig
19: Convert CONFIG_SPL_DRIVERS_MISC_SUPPORT to Kconfig
20: Convert CONFIG_SPL_ENV_SUPPORT to Kconfig
21: Convert CONFIG_SPL_ETH_SUPPORT to Kconfig
22: Convert CONFIG_SPL_EXT_SUPPORT to Kconfig
23: Convert CONFIG_SPL_FAT_SUPPORT to Kconfig
24: Convert CONFIG_SPL_GPIO_SUPPORT to Kconfig
25: Convert CONFIG_SPL_I2C_SUPPORT to Kconfig
26: Convert CONFIG_SPL_LIBCOMMON_SUPPORT to Kconfig
27: Convert CONFIG_SPL_LIBDISK_SUPPORT to Kconfig
28: Convert CONFIG_SPL_LIBGENERIC_SUPPORT to Kconfig
29: Convert CONFIG_SPL_MMC_SUPPORT to Kconfig
30: Convert CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT to Kconfig
31: Convert CONFIG_SPL_MTD_SUPPORT to Kconfig
32: Convert CONFIG_SPL_MUSB_NEW_SUPPORT to Kconfig
33: Convert CONFIG_SPL_NAND_SUPPORT to Kconfig
34: Convert CONFIG_SPL_NET_SUPPORT to Kconfig
35: Convert CONFIG_SPL_NOR_SUPPORT to Kconfig
36: Convert CONFIG_SPL_ONENAND_SUPPORT to Kconfig
37: Convert CONFIG_SPL_PINCTRL_SUPPORT to Kconfig
38: Convert CONFIG_SPL_POWER_SUPPORT to Kconfig
39: Convert CONFIG_SPL_SATA_SUPPORT to Kconfig
40: Convert CONFIG_SPL_SERIAL_SUPPORT to Kconfig
41: Convert CONFIG_SPL_SPI_FLASH_SUPPORT to Kconfig
42: Convert CONFIG_SPL_SPI_SUPPORT to Kconfig
43: Convert CONFIG_SPL_USBETH_SUPPORT to Kconfig
arm:
+ u-boot.cfg: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1
+ u-boot-spl.cfg: CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1
+ all: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1
am335x_evm_usbspl :
+ u-boot.cfg: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1

Quoted 8 lines

+ u-boot-spl.cfg: CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1
+ all: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1
44: Convert CONFIG_SPL_USB_HOST_SUPPORT to Kconfig
45: Convert CONFIG_SPL_USB_SUPPORT to Kconfig
46: Convert CONFIG_SPL_WATCHDOG_SUPPORT to Kconfig
47: Convert CONFIG_SPL_YMODEM_SUPPORT to Kconfig
48: Kconfig: Add a whitelist of ad-hoc CONFIG options
49: Makefile: Give a build error if ad-hoc CONFIG options are added

Your patchserie has 44 patches .. here buildman test 49 ... It seems to me the first 3 patches and the last 2 are missing in your series ...

Do you have a public git tree with this patches?
Ah, may:
http://git.denx.de/?p=u-boot/u-boot-dm.git;a=shortlog;h=refs/heads/kconfig-working3

Ok, I started tbot tc:
https://github.com/hsdenx/tbot/blob/master/src/tc/uboot/tc_uboot_check_kconfig.py
to check, if your series does not change u-boot.bin and spl/uboot-spl.bin

first outputs:

hs at localhost:tbot [master] $ python2.7 src/common/tbot.py -c config/tbot_uboot_kconfig_check.cfg -t tc_uboot_check_kconfig.py -l log/tbot_checkconfig.log
**** option cfg: config/tbot_uboot_kconfig_check.cfg log: log/tbot_checkconfig.log tc:
tc_uboot_check_kconfig.py v 0
('CUR WORK PATH: ', '/home/hs/data/Entwicklung/tbot')
('CFGFILE ', 'config/tbot_uboot_kconfig_check.cfg')
('LOGFILE ', '/home/hs/data/Entwicklung/tbot/log/tbot_checkconfig.log')
get u-boot source
testing board 10m50 1 / 1189
testing board 3c120 2 / 1189
testing board A10-OLinuXino-Lime 3 / 1189
A10-OLinuXino-Lime u-boot spl bin diff 6443bde88d3f4dd2e4a03ea0b5b23d40 != ccf133653c402c471644492201854d31
testing board A10s-OLinuXino-M 4 / 1189
A10s-OLinuXino-M u-boot spl bin diff 620fe3f1f87e6a4d283e088b20eaaabb != eba0ced2452df73c8c832217bce4e255
testing board A13-OLinuXino 5 / 1189
A13-OLinuXino u-boot spl bin diff 9524cb79bda360baa2e59982e792b62d != e65c6fa3842baf6b2964c29c3d92afcd testing board A13-OLinuXinoM 6 / 1189
A13-OLinuXinoM u-boot spl bin diff accae01a1f32f4ab8d5fe178b347fa19 != 153716412d66dc33790293d340c6fdbd testing board A20-Olimex-SOM-EVB 7 / 1189
A20-Olimex-SOM-EVB u-boot spl bin diff ccb7e2e6515af8511220af50886bc539 != 530e7d17fda711516b733a899f70b353
testing board A20-OLinuXino-Lime2 8 / 1189
A20-OLinuXino-Lime2 u-boot spl bin diff 75b6f0b647be28c085f78adef374799d != 7ca441f27790846d8ffad383de1a60c1
testing board A20-OLinuXino-Lime 9 / 1189
A20-OLinuXino-Lime u-boot spl bin diff 7086f5ffd5faf8ea144e7a2abb288c47 != 6a2805806c25aad683c8e6de71041133
testing board A20-OLinuXino_MICRO 10 / 1189
A20-OLinuXino_MICRO u-boot spl bin diff c0669e033d627abb96d04209abaa8eb8 != 76663a41fc8b33d748d2de2c4c18749c
testing board a3m071 11 / 1189
a3m071 u-boot spl bin diff 770b372a12ed027051933f00a87e123b != e5e1f8335c1ef3faf66ebba031c8d296 testing board a4m072 12 / 1189
testing board a4m2k 13 / 1189
a4m2k u-boot spl bin diff ead2adaf8f425857ebaea243af5768bc != cb0afb3ef300c953255f7f4d2a644373 testing board ac14xx 14 / 1189
testing board acadia 15 / 1189
testing board adp-ag101p 16 / 1189
testing board Ainol_AW1 17 / 1189
Ainol_AW1 u-boot spl bin diff 9b22f5439fdef333932be5948db0a0c1 != d9bdcfb6af5100c9a1830b5a3ace992f testing board alt 18 / 1189
testing board am335x_baltos 19 / 1189
am335x_baltos u-boot spl bin diff 103f8a788ff657ec0dbc21be1e89789e != dbd4ca792ccb091698d09756d6703f09 testing board am335x_boneblack 20 / 1189
testing board am335x_boneblack second compile failed

log here says:

2016-08-30 07:24:26,280:CON    :tbotlib   # tb_ctrl2: common/spl/spl_nand.c: In function 

'spl_nand_load_image':^M
common/spl/spl_nand.c:95:23: error: 'CONFIG_CMD_SPL_NAND_OFS' undeclared (first use in this function)^M common/spl/spl_nand.c:95:23: note: each undeclared identifier is reported only once for each function it appears in^M
common/spl/spl_nand.c:96:4: error: 'CONFIG_CMD_SPL_WRITE_SIZE' undeclared (first use in this function)^M common/spl/spl_nand.c:108:23: error: 'CONFIG_SYS_NAND_SPL_KERNEL_OFFS' undeclared (first use in this function)^M
common/spl/spl_nand.c:136:30: error: 'CONFIG_SYS_NAND_U_BOOT_OFFS' undeclared (first use in this function)^M
scripts/Makefile.build:280: recipe for target 'spl/common/spl/spl_nand.o' failed^M make[2]: *** [spl/common/spl/spl_nand.o] Error 1^M
make[2]: *** Waiting for unfinished jobs....^M
scripts/Makefile.spl:300: recipe for target 'spl/common/spl' failed^M
make[1]: *** [spl/common/spl] Error 2^M
make[1]: *** Waiting for unfinished jobs....^M
Makefile:1334: recipe for target 'spl/u-boot-spl' failed^M
make: *** [spl/u-boot-spl] Error 2^M
make: *** Waiting for unfinished jobs....^M
hs at pollux [ 7:24:26] ttbott>

testing board am335x_boneblack_vboot 21 / 1189

all boards takes a while ... but it seems there is an issue with SPL builds...

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#67 lore raw

v2 cover Kconfig: Move CONFIG_SPL_..._SUPPORT to Kconfig

Hi Heiko,

Quoted 326 lines · Heiko Schocher

Hello Simon,

Am 30.08.2016 um 02:21 schrieb Simon Glass:

Quoted 312 lines

This series moves all the CONFIG_SPL_..._SUPPORT options to Kconfig and fixes up existing boards to continue to build.

It also adds a few small but useful features to moveconfig.

There is existing work going on in this area, so some of these patches may be superseded. It has taken me a while to get this building cleanly. But I have run out of time so want to get this out.

As mentioned on a recent thread [1] there is some confusion about whether an
option means enabling driver support or media support. Andrew's recent series seems like a good vehicle to tidy that up. But I hope this series will make it easier.

NOTE: in the v2 series I have tried to use common things in Kconfig to reduce the diffs in the defconfig files. This has helped a fair bit. But it
is very error-prone and time consuming. Also I have had to add some exceptions (disabling an option in specific board configs). Overall it was not a pleasant experience :-(

There are a few strange features of this conversion. The main difficulty is
that some PowerPC boards do things like this in their board config file:

  #ifdef CONFIG_TPL_BUILD
  #define CONFIG_SPL_SERIAL_SUPPORT
  #define CONFIG_SPL_ENV_SUPPORT
  #else
  #define CONFIG_SPL_SERIAL_SUPPORT
  #endif

This means that TPL reuses the SPL options. We can't support this in Kconfig
so I have added a small number of CONFIG_TPL_xxx_SUPPORT options to cope with this. This made the conversion more painful than it should have been.

A related issue is boards using a common header file and setting options only
for SPL:

  #ifdef CONFIG_SPL_BUILD
  #define CONFIG_SPL_SERIAL_SUPPORT
  #endif

This is not noticed by moveconfig so we have to clean it up manually. Also there are a few incorrect things where Kconfig options are set with #define:

  #ifdef CONFIG_SPL_BUILD
  #define CONFIG_SPL_DM
  #endif

Finally, many defconfig files are not ordered correctly, resulting in larger
patches than we might like. It would be great to have a solution for this, perhaps with buildman providing a warning. But it might slow down development.

The series is fully build-tested (for bisectability) and causes no failures
for the boards that already pass. The following boards fail for me at present on mainline (which I have not yet looked at):

   openrisc:  +   openrisc-generic
      sparc:  +   grsim grsim_leon2 gr_cpci_ax2000 gr_xc3s_1500 gr_ep2s60
   blackfin:  +   bf609-ezkit

This build is also config tested (with buildman -K). The changes are with spear (to rename options) and am335x_evm_usbspl (which I think is correct).

boards.cfg is up to date. Nothing to do.
Summary of 49 commits for 1185 boards (32 threads, 1 job per thread) 01: cfg

   openrisc:  +   openrisc-generic
      sparc:  +   grsim grsim_leon2 gr_cpci_ax2000 gr_xc3s_1500 gr_ep2s60
   blackfin:  +   bf609-ezkit

02: move
03: buildman
04: Correct defconfigs using savedefconfig
05: moveconfig: Add an option to skip prompts
06: moveconfig: Add an option to commit changes
07: Kconfig: Move SPL settings into their own file
08: arm: fsl: Adjust ordering of #ifndef CONFIG_SPL_BUILD
09: Drop CONFIG_SPL_RAM_SUPPORT
10: Use separate options for TPL support
11: Kconfig: spl: Add SPL support options to Kconfig
12: Kconfig: tpl: Add some TPL support options to Kconfig
13: Move existing use of CONFIG_SPL_DM to Kconfig
14: Move existing use of CONFIG_SPL_RSA to Kconfig
15: spear: Use upper case for CONFIG options
arm:
+ u-boot.cfg: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE +
CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_STV0991=1 CONFIG_SYS_MONITOR_LEN=0x00040000 CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_DW_UDC=1 CONFIG_ENV_IS_IN_NAND=1
CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_nand=1 CONFIG_spear300=1 CONFIG_spear310=1 CONFIG_spear320=1 CONFIG_spear600=1 CONFIG_stv0991=1 CONFIG_usbtty=1
+ all: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE +
CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_STV0991=1 CONFIG_SYS_MONITOR_LEN=0x00040000 CONFIG_USBTTY=1
- all: CONFIG_DW_UDC=1 CONFIG_ENV_IS_IN_NAND=1
CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_nand=1 CONFIG_spear300=1 CONFIG_spear310=1 CONFIG_spear320=1 CONFIG_spear600=1 CONFIG_stv0991=1 CONFIG_usbtty=1 spear600_nand :
+ u-boot.cfg: CONFIG_NAND=1
- u-boot.cfg: CONFIG_nand=1 CONFIG_spear600=1
+ all: CONFIG_NAND=1
- all: CONFIG_nand=1 CONFIG_spear600=1
spear300_nand :
+ u-boot.cfg: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE +
CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000
- u-boot.cfg: CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000
CONFIG_ENV_RANGE=0x10000 CONFIG_nand=1 CONFIG_spear300=1
+ all: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE +
CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000
- all: CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000
CONFIG_ENV_RANGE=0x10000 CONFIG_nand=1 CONFIG_spear300=1 spear300_usbtty :
+ u-boot.cfg: CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_DW_UDC=1 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1
CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_spear300=1 CONFIG_usbtty=1
+ all: CONFIG_USBTTY=1
- all: CONFIG_DW_UDC=1 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1
CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_spear300=1 CONFIG_usbtty=1
spear320_usbtty_nand :
+ u-boot.cfg: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE +
CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000 CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_DW_UDC=1 CONFIG_ENV_IS_IN_NAND=1
CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_nand=1 CONFIG_spear320=1 CONFIG_usbtty=1
+ all: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE +
CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000 CONFIG_USBTTY=1
- all: CONFIG_DW_UDC=1 CONFIG_ENV_IS_IN_NAND=1
CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_nand=1 CONFIG_spear320=1 CONFIG_usbtty=1 spear310_usbtty_nand :
+ u-boot.cfg: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE +
CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000 CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_DW_UDC=1 CONFIG_ENV_IS_IN_NAND=1
CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_nand=1 CONFIG_spear310=1 CONFIG_usbtty=1
+ all: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE +
CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000 CONFIG_USBTTY=1
- all: CONFIG_DW_UDC=1 CONFIG_ENV_IS_IN_NAND=1
CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_nand=1 CONFIG_spear310=1 CONFIG_usbtty=1 spear310_usbtty spear310_usbtty_pnor :
+ u-boot.cfg: CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_DW_UDC=1 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1
CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_spear310=1 CONFIG_usbtty=1
+ all: CONFIG_USBTTY=1
- all: CONFIG_DW_UDC=1 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1
CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_spear310=1 CONFIG_usbtty=1
spear300 :
- u-boot.cfg: CONFIG_spear300=1
- all: CONFIG_spear300=1
spear600_usbtty :
+ u-boot.cfg: CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_spear600=1 CONFIG_usbtty=1
+ all: CONFIG_USBTTY=1
- all: CONFIG_spear600=1 CONFIG_usbtty=1
spear320_nand :
+ u-boot.cfg: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE +
CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000
- u-boot.cfg: CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000
CONFIG_ENV_RANGE=0x10000 CONFIG_nand=1 CONFIG_spear320=1
+ all: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE +
CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000
- all: CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000
CONFIG_ENV_RANGE=0x10000 CONFIG_nand=1 CONFIG_spear320=1 stv0991 :
+ u-boot.cfg: CONFIG_STV0991=1
- u-boot.cfg: CONFIG_stv0991=1
+ all: CONFIG_STV0991=1
- all: CONFIG_stv0991=1
spear320 spear320_pnor :
- u-boot.cfg: CONFIG_spear320=1
- all: CONFIG_spear320=1
spear310_nand :
+ u-boot.cfg: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE +
CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000
- u-boot.cfg: CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000
CONFIG_ENV_RANGE=0x10000 CONFIG_nand=1 CONFIG_spear310=1
+ all: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE +
CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000
- all: CONFIG_ENV_IS_IN_NAND=1 CONFIG_ENV_OFFSET=0x60000
CONFIG_ENV_RANGE=0x10000 CONFIG_nand=1 CONFIG_spear310=1 spear320_usbtty spear320_usbtty_pnor :
+ u-boot.cfg: CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_DW_UDC=1 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1
CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_spear320=1 CONFIG_usbtty=1
+ all: CONFIG_USBTTY=1
- all: CONFIG_DW_UDC=1 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1
CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_spear320=1 CONFIG_usbtty=1
spear600 :
- u-boot.cfg: CONFIG_spear600=1
- all: CONFIG_spear600=1
spear300_usbtty_nand :
+ u-boot.cfg: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE +
CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000 CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_DW_UDC=1 CONFIG_ENV_IS_IN_NAND=1
CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_nand=1 CONFIG_spear300=1 CONFIG_usbtty=1
+ all: CONFIG_ENV_ADDR=(CONFIG_SYS_FLASH_BASE +
CONFIG_SYS_MONITOR_LEN) CONFIG_ENV_IS_IN_FLASH=1 CONFIG_ENV_SECT_SIZE=0x00010000 CONFIG_NAND=1 CONFIG_SYS_MONITOR_LEN=0x00040000 CONFIG_USBTTY=1
- all: CONFIG_DW_UDC=1 CONFIG_ENV_IS_IN_NAND=1
CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_RANGE=0x10000 CONFIG_SPEAR_USBTTY=1 CONFIG_USBD_HS=1 CONFIG_USBD_MANUFACTURER="ST Microelectronics" CONFIG_USBD_PRODUCT_NAME="SPEAr SoC" CONFIG_USB_DEVICE=1 CONFIG_USB_TTY=1 CONFIG_nand=1 CONFIG_spear300=1 CONFIG_usbtty=1
spear310 spear310_pnor :
- u-boot.cfg: CONFIG_spear310=1
- all: CONFIG_spear310=1
spear600_usbtty_nand :
+ u-boot.cfg: CONFIG_NAND=1 CONFIG_USBTTY=1
- u-boot.cfg: CONFIG_nand=1 CONFIG_spear600=1 CONFIG_usbtty=1
+ all: CONFIG_NAND=1 CONFIG_USBTTY=1
- all: CONFIG_nand=1 CONFIG_spear600=1 CONFIG_usbtty=1
16: Convert CONFIG_SPL_CRYPTO_SUPPORT to Kconfig
17: Convert CONFIG_SPL_HASH_SUPPORT to Kconfig
18: Convert CONFIG_SPL_DMA_SUPPORT to Kconfig
19: Convert CONFIG_SPL_DRIVERS_MISC_SUPPORT to Kconfig
20: Convert CONFIG_SPL_ENV_SUPPORT to Kconfig
21: Convert CONFIG_SPL_ETH_SUPPORT to Kconfig
22: Convert CONFIG_SPL_EXT_SUPPORT to Kconfig
23: Convert CONFIG_SPL_FAT_SUPPORT to Kconfig
24: Convert CONFIG_SPL_GPIO_SUPPORT to Kconfig
25: Convert CONFIG_SPL_I2C_SUPPORT to Kconfig
26: Convert CONFIG_SPL_LIBCOMMON_SUPPORT to Kconfig
27: Convert CONFIG_SPL_LIBDISK_SUPPORT to Kconfig
28: Convert CONFIG_SPL_LIBGENERIC_SUPPORT to Kconfig
29: Convert CONFIG_SPL_MMC_SUPPORT to Kconfig
30: Convert CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT to Kconfig 31: Convert CONFIG_SPL_MTD_SUPPORT to Kconfig
32: Convert CONFIG_SPL_MUSB_NEW_SUPPORT to Kconfig
33: Convert CONFIG_SPL_NAND_SUPPORT to Kconfig
34: Convert CONFIG_SPL_NET_SUPPORT to Kconfig
35: Convert CONFIG_SPL_NOR_SUPPORT to Kconfig
36: Convert CONFIG_SPL_ONENAND_SUPPORT to Kconfig
37: Convert CONFIG_SPL_PINCTRL_SUPPORT to Kconfig
38: Convert CONFIG_SPL_POWER_SUPPORT to Kconfig
39: Convert CONFIG_SPL_SATA_SUPPORT to Kconfig
40: Convert CONFIG_SPL_SERIAL_SUPPORT to Kconfig
41: Convert CONFIG_SPL_SPI_FLASH_SUPPORT to Kconfig
42: Convert CONFIG_SPL_SPI_SUPPORT to Kconfig
43: Convert CONFIG_SPL_USBETH_SUPPORT to Kconfig
arm:
+ u-boot.cfg: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1
+ u-boot-spl.cfg: CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1
+ all: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_MMC_SUPPORT=1
CONFIG_SPL_NAND_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1 am335x_evm_usbspl :
+ u-boot.cfg: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1
+ u-boot-spl.cfg: CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1

Quoted 8 lines

+ all: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_MMC_SUPPORT=1
CONFIG_SPL_NAND_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1
44: Convert CONFIG_SPL_USB_HOST_SUPPORT to Kconfig
45: Convert CONFIG_SPL_USB_SUPPORT to Kconfig
46: Convert CONFIG_SPL_WATCHDOG_SUPPORT to Kconfig
47: Convert CONFIG_SPL_YMODEM_SUPPORT to Kconfig
48: Kconfig: Add a whitelist of ad-hoc CONFIG options 49: Makefile: Give a build error if ad-hoc CONFIG options are added

Quoted 7 lines

Your patchserie has 44 patches .. here buildman test 49 ... It seems to me the first 3 patches and the last 2 are missing in your series ...

Do you have a public git tree with this patches?
Ah, may:
http://git.denx.de/?p=u-boot/u-boot-dm.git;a=shortlog;h=refs/heads/kconfig-working3

Yes. I always push a working branch before sending patches, but don't always mention it :-(

Quoted 87 lines

Ok, I started tbot tc:
https://github.com/hsdenx/tbot/blob/master/src/tc/uboot/tc_uboot_check_kconfig.py
to check, if your series does not change u-boot.bin and spl/uboot-spl.bin

first outputs:

hs at localhost:tbot [master] $ python2.7 src/common/tbot.py -c config/tbot_uboot_kconfig_check.cfg -t tc_uboot_check_kconfig.py -l log/tbot_checkconfig.log
**** option cfg: config/tbot_uboot_kconfig_check.cfg log:
log/tbot_checkconfig.log tc: tc_uboot_check_kconfig.py v 0 ('CUR WORK PATH: ', '/home/hs/data/Entwicklung/tbot')
('CFGFILE ', 'config/tbot_uboot_kconfig_check.cfg')
('LOGFILE ', '/home/hs/data/Entwicklung/tbot/log/tbot_checkconfig.log') get u-boot source
testing board 10m50 1 / 1189
testing board 3c120 2 / 1189
testing board A10-OLinuXino-Lime 3 / 1189
A10-OLinuXino-Lime u-boot spl bin diff 6443bde88d3f4dd2e4a03ea0b5b23d40 != ccf133653c402c471644492201854d31
testing board A10s-OLinuXino-M 4 / 1189
A10s-OLinuXino-M u-boot spl bin diff 620fe3f1f87e6a4d283e088b20eaaabb != eba0ced2452df73c8c832217bce4e255
testing board A13-OLinuXino 5 / 1189
A13-OLinuXino u-boot spl bin diff 9524cb79bda360baa2e59982e792b62d != e65c6fa3842baf6b2964c29c3d92afcd
testing board A13-OLinuXinoM 6 / 1189
A13-OLinuXinoM u-boot spl bin diff accae01a1f32f4ab8d5fe178b347fa19 != 153716412d66dc33790293d340c6fdbd
testing board A20-Olimex-SOM-EVB 7 / 1189
A20-Olimex-SOM-EVB u-boot spl bin diff ccb7e2e6515af8511220af50886bc539 != 530e7d17fda711516b733a899f70b353
testing board A20-OLinuXino-Lime2 8 / 1189
A20-OLinuXino-Lime2 u-boot spl bin diff 75b6f0b647be28c085f78adef374799d != 7ca441f27790846d8ffad383de1a60c1
testing board A20-OLinuXino-Lime 9 / 1189
A20-OLinuXino-Lime u-boot spl bin diff 7086f5ffd5faf8ea144e7a2abb288c47 != 6a2805806c25aad683c8e6de71041133
testing board A20-OLinuXino_MICRO 10 / 1189
A20-OLinuXino_MICRO u-boot spl bin diff c0669e033d627abb96d04209abaa8eb8 != 76663a41fc8b33d748d2de2c4c18749c
testing board a3m071 11 / 1189
a3m071 u-boot spl bin diff 770b372a12ed027051933f00a87e123b != e5e1f8335c1ef3faf66ebba031c8d296
testing board a4m072 12 / 1189
testing board a4m2k 13 / 1189
a4m2k u-boot spl bin diff ead2adaf8f425857ebaea243af5768bc != cb0afb3ef300c953255f7f4d2a644373
testing board ac14xx 14 / 1189
testing board acadia 15 / 1189
testing board adp-ag101p 16 / 1189
testing board Ainol_AW1 17 / 1189
Ainol_AW1 u-boot spl bin diff 9b22f5439fdef333932be5948db0a0c1 != d9bdcfb6af5100c9a1830b5a3ace992f
testing board alt 18 / 1189
testing board am335x_baltos 19 / 1189
am335x_baltos u-boot spl bin diff 103f8a788ff657ec0dbc21be1e89789e != dbd4ca792ccb091698d09756d6703f09
testing board am335x_boneblack 20 / 1189
testing board am335x_boneblack second compile failed

log here says:

2016-08-30 07:24:26,280:CON    :tbotlib   # tb_ctrl2: common/spl/spl_nand.c:

In function 'spl_nand_load_image':^M common/spl/spl_nand.c:95:23: error: 'CONFIG_CMD_SPL_NAND_OFS' undeclared (first use in this function)^M
common/spl/spl_nand.c:95:23: note: each undeclared identifier is reported only once for each function it appears in^M common/spl/spl_nand.c:96:4: error: 'CONFIG_CMD_SPL_WRITE_SIZE' undeclared (first use in this function)^M
common/spl/spl_nand.c:108:23: error: 'CONFIG_SYS_NAND_SPL_KERNEL_OFFS' undeclared (first use in this function)^M common/spl/spl_nand.c:136:30: error: 'CONFIG_SYS_NAND_U_BOOT_OFFS' undeclared (first use in this function)^M scripts/Makefile.build:280: recipe for target 'spl/common/spl/spl_nand.o' failed^M
make[2]: *** [spl/common/spl/spl_nand.o] Error 1^M
make[2]: *** Waiting for unfinished jobs....^M scripts/Makefile.spl:300: recipe for target 'spl/common/spl' failed^M make[1]: *** [spl/common/spl] Error 2^M
make[1]: *** Waiting for unfinished jobs....^M
Makefile:1334: recipe for target 'spl/u-boot-spl' failed^M
make: *** [spl/u-boot-spl] Error 2^M
make: *** Waiting for unfinished jobs....^M
hs at pollux [ 7:24:26] ttbott>

Quoted 4 lines

testing board am335x_boneblack_vboot 21 / 1189

all boards takes a while ... but it seems there is an issue with SPL builds...

I'm not sure what is going on here. My build was clean.

I'll try again with v3.

Quoted 6 lines

bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Regards,
Simon