At present a few of the Makefiles have confusing layouts, with separate sections for U-Boot proper and SPL/TPL. It is generally possible to have a simple rule of the form:
obj-$(CONFIG_$(SPL_TPL_)TIMER) += timer/
so that timer/ is built for the different U-Boot phases based on which of CONFIG_TIMER, CONFIG_SPL_TIMER and CONFIG_SPL_TIMER are set.
Moving towards this requires rationalisation of the Kconfig options, such as dropping the old _SUPPORT suffix sometimes applied to SPL options. It is also easier if there is single Kconfig option which controls each feature, at least each one that involves building a directory.
This series starts the process of tidying this up, renaming some SPL options and updated I2C to suit.
Note: The $(SPL_TPL) option is going to become confusing when we also have VPL (Verifying Program Loader). We may want to consider renaming it, e.g. to $(PHASE).
Simon Glass (17): README: Fix hyphenation in the directory docs Makefile: Sort the subdirectories Makefile: Move phy rules into drivers/phy Rename SPL_POWER_SUPPORT to SPL_POWER Rename SPL_CRYPTO_SUPPORT to SPL_CRYPTO Rename SPL_ETH_SUPPORT to SPL_ETH Rename SPL_MUSB_NEW_SUPPORT to SPL_MUSB_NEW Rename SPL_WATCHDOG_SUPPORT to SPL_WATCHDOG Rename SPL_USB_HOST_SUPPORT to SPL_USB_HOST Rename GPIO_SUPPORT to GPIO Rename DRIVERS_MISC_SUPPORT to DRIVERS_MISC i2c: Rename CONFIG_SYS_I2C to CONFIG_SYS_I2C_LEGACY i2c: Fix the migration warning i2c: Drop unused CONFIG_I2C i2c: Create a new Kconfig for I2C i2c: Rename SPL/TPL_I2C_SUPPORT to I2C Makefile: Move drivers/i2c/ into drivers/Makefile
Makefile | 13 ++++---- README | 25 ++++++++------- arch/Kconfig | 8 ++--- arch/arm/Kconfig | 6 ++-- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/spl.c | 4 +-- .../include/asm/arch-fsl-layerscape/config.h | 2 +- arch/arm/mach-exynos/Kconfig | 2 +- arch/arm/mach-imx/mx6/Kconfig | 6 ++-- arch/arm/mach-kirkwood/include/mach/config.h | 2 +- arch/arm/mach-mvebu/Kconfig | 2 +- arch/arm/mach-omap2/Kconfig | 18 +++++------ arch/arm/mach-omap2/am33xx/Kconfig | 16 +++++----- arch/arm/mach-omap2/am33xx/board.c | 2 +- arch/arm/mach-omap2/boot-common.c | 6 ++-- arch/arm/mach-rockchip/Kconfig | 10 +++--- arch/arm/mach-rockchip/rk3288/Kconfig | 2 +- arch/arm/mach-rockchip/rk3399/rk3399.c | 4 +-- arch/arm/mach-stm32/Kconfig | 4 +-- arch/arm/mach-stm32mp/Kconfig | 6 ++-- arch/arm/mach-sunxi/board.c | 2 +- arch/arm/mach-tegra/Kconfig | 2 +- arch/powerpc/cpu/mpc83xx/Kconfig | 14 ++++---- arch/riscv/cpu/fu740/Kconfig | 2 +- board/Arcturus/ucp1020/spl.c | 2 +- board/compulab/common/Makefile | 2 +- board/compulab/common/eeprom.h | 2 +- board/engicam/stm32mp1/spl.c | 2 +- board/freescale/ls1021aqds/ls1021aqds.c | 2 +- board/freescale/p1_p2_rdb_pc/spl.c | 2 +- board/phytec/phycore_rk3288/phycore-rk3288.c | 2 +- board/renesas/draak/draak.c | 2 +- board/renesas/salvator-x/salvator-x.c | 4 +-- board/renesas/ulcb/ulcb.c | 2 +- board/siemens/draco/board.c | 2 +- board/siemens/pxm2/board.c | 4 +-- board/somlabs/visionsom-6ull/visionsom-6ull.c | 2 +- board/st/stm32mp1/spl.c | 4 +-- board/tcl/sl50/board.c | 6 ++-- board/ti/am335x/board.c | 4 +-- board/tqc/tqma6/tqma6.c | 4 +-- board/vscom/baltos/board.c | 6 ++-- cmd/Kconfig | 2 +- cmd/date.c | 4 +-- cmd/eeprom.c | 2 +- cmd/i2c.c | 24 +++++++------- common/Kconfig.boot | 2 +- common/Makefile | 2 +- common/board_f.c | 4 +-- common/spl/Kconfig | 32 +++++++++---------- common/spl/spl.c | 2 +- common/spl/spl_net.c | 4 +-- common/stdio.c | 2 +- configs/A10-OLinuXino-Lime_defconfig | 2 +- configs/A10s-OLinuXino-M_defconfig | 2 +- configs/A13-OLinuXino_defconfig | 2 +- configs/A20-OLinuXino-Lime2-eMMC_defconfig | 2 +- configs/A20-OLinuXino-Lime2_defconfig | 2 +- configs/A20-OLinuXino-Lime_defconfig | 2 +- configs/A20-OLinuXino_MICRO-eMMC_defconfig | 2 +- configs/A20-OLinuXino_MICRO_defconfig | 2 +- configs/A20-Olimex-SOM-EVB_defconfig | 2 +- configs/A20-Olimex-SOM204-EVB-eMMC_defconfig | 2 +- configs/A20-Olimex-SOM204-EVB_defconfig | 2 +- configs/Ainol_AW1_defconfig | 2 +- configs/Ampe_A76_defconfig | 2 +- configs/Auxtek-T003_defconfig | 2 +- configs/Auxtek-T004_defconfig | 2 +- configs/Bananapi_M2_Ultra_defconfig | 2 +- configs/Bananapi_defconfig | 2 +- configs/Bananapro_defconfig | 2 +- configs/CHIP_defconfig | 2 +- configs/CHIP_pro_defconfig | 2 +- configs/Chuwi_V7_CW0825_defconfig | 2 +- configs/Cubieboard2_defconfig | 2 +- configs/Cubieboard_defconfig | 2 +- configs/Cubietruck_defconfig | 2 +- configs/Empire_electronix_d709_defconfig | 2 +- configs/Empire_electronix_m712_defconfig | 2 +- configs/Hyundai_A7HD_defconfig | 2 +- configs/Itead_Ibox_A20_defconfig | 2 +- configs/Lamobo_R1_defconfig | 2 +- configs/Linksprite_pcDuino3_Nano_defconfig | 2 +- configs/Linksprite_pcDuino3_defconfig | 2 +- configs/Linksprite_pcDuino_defconfig | 2 +- configs/MK808C_defconfig | 2 +- configs/MSI_Primo73_defconfig | 2 +- configs/Mele_A1000_defconfig | 2 +- configs/Mele_M3_defconfig | 2 +- configs/Mele_M5_defconfig | 2 +- configs/Mini-X_defconfig | 2 +- configs/Orangepi_defconfig | 2 +- configs/Orangepi_mini_defconfig | 2 +- configs/P1010RDB-PA_36BIT_NAND_defconfig | 6 ++-- configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 4 +-- configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 4 +-- configs/P1010RDB-PA_NAND_defconfig | 6 ++-- configs/P1010RDB-PA_SDCARD_defconfig | 4 +-- configs/P1010RDB-PA_SPIFLASH_defconfig | 4 +-- configs/P1010RDB-PB_36BIT_NAND_defconfig | 6 ++-- configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 4 +-- configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 4 +-- configs/P1010RDB-PB_NAND_defconfig | 6 ++-- configs/P1010RDB-PB_SDCARD_defconfig | 4 +-- configs/P1010RDB-PB_SPIFLASH_defconfig | 4 +-- configs/P1020RDB-PC_36BIT_NAND_defconfig | 2 +- configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 2 +- configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 2 +- configs/P1020RDB-PC_NAND_defconfig | 2 +- configs/P1020RDB-PC_SDCARD_defconfig | 2 +- configs/P1020RDB-PC_SPIFLASH_defconfig | 2 +- configs/P1020RDB-PD_NAND_defconfig | 2 +- configs/P1020RDB-PD_SDCARD_defconfig | 2 +- configs/P1020RDB-PD_SPIFLASH_defconfig | 2 +- configs/P2020RDB-PC_36BIT_NAND_defconfig | 2 +- configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 2 +- configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 2 +- configs/P2020RDB-PC_NAND_defconfig | 2 +- configs/P2020RDB-PC_SDCARD_defconfig | 2 +- configs/P2020RDB-PC_SPIFLASH_defconfig | 2 +- configs/T1024RDB_NAND_defconfig | 4 +-- configs/T1024RDB_SDCARD_defconfig | 4 +-- configs/T1024RDB_SPIFLASH_defconfig | 4 +-- configs/T1042D4RDB_NAND_defconfig | 4 +-- configs/T1042D4RDB_SDCARD_defconfig | 4 +-- configs/T1042D4RDB_SPIFLASH_defconfig | 4 +-- configs/T2080QDS_NAND_defconfig | 4 +-- configs/T2080QDS_SDCARD_defconfig | 4 +-- configs/T2080QDS_SPIFLASH_defconfig | 4 +-- configs/T2080RDB_NAND_defconfig | 4 +-- configs/T2080RDB_SDCARD_defconfig | 4 +-- configs/T2080RDB_SPIFLASH_defconfig | 4 +-- configs/T2080RDB_revD_NAND_defconfig | 4 +-- configs/T2080RDB_revD_SDCARD_defconfig | 4 +-- configs/T2080RDB_revD_SPIFLASH_defconfig | 4 +-- configs/T4240RDB_SDCARD_defconfig | 4 +-- configs/UTOO_P66_defconfig | 2 +- configs/Wexler_TAB7200_defconfig | 2 +- configs/Wits_Pro_A20_DKT_defconfig | 2 +- configs/Wobo_i5_defconfig | 2 +- configs/Yones_Toptech_BD1078_defconfig | 2 +- configs/am335x_baltos_defconfig | 6 ++-- configs/am335x_boneblack_vboot_defconfig | 2 +- configs/am335x_evm_defconfig | 4 +-- configs/am335x_guardian_defconfig | 12 +++---- configs/am335x_igep003x_defconfig | 8 ++--- configs/am335x_pdu001_defconfig | 4 +-- configs/am335x_shc_defconfig | 8 ++--- configs/am335x_shc_ict_defconfig | 8 ++--- configs/am335x_shc_netboot_defconfig | 8 ++--- configs/am335x_shc_sdboot_defconfig | 8 ++--- configs/am335x_sl50_defconfig | 8 ++--- configs/am3517_evm_defconfig | 4 +-- configs/am43xx_evm_defconfig | 6 ++-- configs/am43xx_evm_usbhost_boot_defconfig | 2 +- configs/am43xx_hs_evm_defconfig | 6 ++-- configs/am64x_evm_a53_defconfig | 6 ++-- configs/am64x_evm_r5_defconfig | 10 +++--- configs/am65x_evm_a53_defconfig | 6 ++-- configs/am65x_evm_r5_defconfig | 8 ++--- configs/am65x_evm_r5_usbdfu_defconfig | 8 ++--- configs/am65x_evm_r5_usbmsc_defconfig | 10 +++--- configs/am65x_hs_evm_a53_defconfig | 4 +-- configs/am65x_hs_evm_r5_defconfig | 8 ++--- configs/apalis_imx6_defconfig | 6 ++-- configs/axm_defconfig | 2 +- configs/ba10_tv_box_defconfig | 2 +- configs/bananapi_m1_plus_defconfig | 2 +- configs/bananapi_m2_berry_defconfig | 2 +- configs/bg0900_defconfig | 2 +- configs/brppt1_mmc_defconfig | 8 ++--- configs/brppt1_nand_defconfig | 8 ++--- configs/brppt1_spi_defconfig | 8 ++--- configs/brppt2_defconfig | 4 +-- configs/brsmarc1_defconfig | 6 ++-- configs/brxre1_defconfig | 6 ++-- configs/cgtqmx8_defconfig | 8 ++--- configs/chiliboard_defconfig | 6 ++-- configs/chromebook_bob_defconfig | 2 +- configs/chromebook_link64_defconfig | 2 +- configs/ci20_mmc_defconfig | 2 +- configs/cl-som-imx7_defconfig | 4 +-- configs/clearfog_defconfig | 2 +- configs/cm_fx6_defconfig | 6 ++-- configs/cm_t335_defconfig | 8 ++--- configs/cm_t43_defconfig | 4 +-- configs/colibri_imx6_defconfig | 6 ++-- configs/controlcenterdc_defconfig | 2 +- configs/corvus_defconfig | 2 +- configs/db-88f6720_defconfig | 2 +- configs/db-88f6820-amc_defconfig | 2 +- configs/db-88f6820-gp_defconfig | 2 +- configs/db-mv784mp-gp_defconfig | 2 +- configs/deneb_defconfig | 8 ++--- configs/dh_imx6_defconfig | 4 +-- configs/difrnce_dit4350_defconfig | 2 +- configs/display5_defconfig | 6 ++-- configs/display5_factory_defconfig | 8 ++--- configs/draco_defconfig | 6 ++-- configs/ds414_defconfig | 2 +- configs/dserve_dsrv9703c_defconfig | 2 +- configs/etamin_defconfig | 6 ++-- configs/evb-px30_defconfig | 2 +- configs/evb-px5_defconfig | 2 +- configs/evb-rk3308_defconfig | 2 +- configs/evb-rk3328_defconfig | 4 +-- configs/firefly-px30_defconfig | 2 +- .../gardena-smart-gateway-at91sam_defconfig | 2 +- configs/ge_b1x5v2_defconfig | 4 +-- configs/giedi_defconfig | 8 ++--- configs/gwventana_emmc_defconfig | 8 ++--- configs/gwventana_gw5904_defconfig | 8 ++--- configs/gwventana_nand_defconfig | 8 ++--- configs/helios4_defconfig | 2 +- configs/i12-tvbox_defconfig | 2 +- configs/iNet_3F_defconfig | 2 +- configs/iNet_3W_defconfig | 2 +- configs/iNet_86VS_defconfig | 2 +- configs/icnova-a20-swac_defconfig | 2 +- configs/imx28_xea_defconfig | 2 +- configs/imx6dl_icore_nand_defconfig | 4 +-- configs/imx6q_icore_nand_defconfig | 4 +-- configs/imx6q_logic_defconfig | 8 ++--- configs/imx6qdl_icore_mipi_defconfig | 4 +-- configs/imx6qdl_icore_mmc_defconfig | 4 +-- configs/imx6qdl_icore_nand_defconfig | 4 +-- configs/imx6qdl_icore_rqs_defconfig | 4 +-- configs/imx6ul_geam_mmc_defconfig | 4 +-- configs/imx6ul_geam_nand_defconfig | 4 +-- configs/imx6ul_isiot_emmc_defconfig | 4 +-- configs/imx6ul_isiot_nand_defconfig | 4 +-- configs/imx7_cm_defconfig | 6 ++-- configs/imx8mm-cl-iot-gate_defconfig | 10 +++--- configs/imx8mm-icore-mx8mm-ctouch2_defconfig | 6 ++-- configs/imx8mm-icore-mx8mm-edimm2.2_defconfig | 6 ++-- configs/imx8mm_beacon_defconfig | 10 +++--- configs/imx8mm_evk_defconfig | 10 +++--- configs/imx8mm_venice_defconfig | 10 +++--- configs/imx8mn_beacon_2g_defconfig | 8 ++--- configs/imx8mn_beacon_defconfig | 8 ++--- configs/imx8mn_ddr4_evk_defconfig | 8 ++--- configs/imx8mn_evk_defconfig | 10 +++--- configs/imx8mp_evk_defconfig | 10 +++--- configs/imx8mq_cm_defconfig | 4 +-- configs/imx8qm_mek_defconfig | 8 ++--- configs/imx8qm_rom7720_a1_4G_defconfig | 8 ++--- configs/imx8qxp_mek_defconfig | 6 ++-- configs/imxrt1020-evk_defconfig | 2 +- configs/imxrt1050-evk_defconfig | 2 +- configs/inet1_defconfig | 2 +- configs/inet97fv2_defconfig | 2 +- configs/inet98v_rev2_defconfig | 2 +- configs/inet9f_rev03_defconfig | 2 +- configs/j7200_evm_a72_defconfig | 8 ++--- configs/j7200_evm_r5_defconfig | 8 ++--- configs/j721e_evm_a72_defconfig | 8 ++--- configs/j721e_evm_r5_defconfig | 8 ++--- configs/j721e_hs_evm_a72_defconfig | 6 ++-- configs/j721e_hs_evm_r5_defconfig | 8 ++--- configs/jesurun_q5_defconfig | 2 +- configs/k2e_evm_defconfig | 4 +-- configs/k2g_evm_defconfig | 4 +-- configs/k2hk_evm_defconfig | 4 +-- configs/k2l_evm_defconfig | 4 +-- configs/kp_imx6q_tpc_defconfig | 6 ++-- configs/lion-rk3368_defconfig | 4 +-- configs/liteboard_defconfig | 4 +-- configs/ls1021aqds_nand_defconfig | 6 ++-- configs/ls1021aqds_sdcard_ifc_defconfig | 6 ++-- configs/ls1021aqds_sdcard_qspi_defconfig | 6 ++-- configs/ls1021atsn_sdcard_defconfig | 4 +-- ...s1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 8 ++--- configs/ls1021atwr_sdcard_ifc_defconfig | 4 +-- configs/ls1021atwr_sdcard_qspi_defconfig | 4 +-- configs/ls1043aqds_nand_defconfig | 6 ++-- configs/ls1043aqds_sdcard_ifc_defconfig | 6 ++-- configs/ls1043aqds_sdcard_qspi_defconfig | 6 ++-- configs/ls1043ardb_nand_SECURE_BOOT_defconfig | 6 ++-- configs/ls1043ardb_nand_defconfig | 6 ++-- .../ls1043ardb_sdcard_SECURE_BOOT_defconfig | 6 ++-- configs/ls1043ardb_sdcard_defconfig | 4 +-- configs/ls1046aqds_sdcard_ifc_defconfig | 6 ++-- configs/ls1046aqds_sdcard_qspi_defconfig | 6 ++-- configs/ls1046ardb_emmc_defconfig | 6 ++-- configs/ls1046ardb_qspi_spl_defconfig | 6 ++-- .../ls1046ardb_sdcard_SECURE_BOOT_defconfig | 8 ++--- configs/ls1046ardb_sdcard_defconfig | 6 ++-- configs/ls1088aqds_sdcard_ifc_defconfig | 4 +-- configs/ls1088aqds_sdcard_qspi_defconfig | 4 +-- ...1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 6 ++-- configs/ls1088ardb_sdcard_qspi_defconfig | 4 +-- configs/ls2080aqds_nand_defconfig | 4 +-- configs/ls2080aqds_sdcard_defconfig | 4 +-- configs/ls2080ardb_nand_defconfig | 4 +-- configs/m53menlo_defconfig | 4 +-- configs/maxbcm_defconfig | 2 +- configs/mccmon6_nor_defconfig | 2 +- configs/mccmon6_sd_defconfig | 2 +- configs/mk802_a10s_defconfig | 2 +- configs/mk802ii_defconfig | 2 +- configs/mt7629_rfb_defconfig | 4 +-- configs/mx23_olinuxino_defconfig | 2 +- configs/mx23evk_defconfig | 2 +- configs/mx28evk_auart_console_defconfig | 2 +- configs/mx28evk_defconfig | 2 +- configs/mx28evk_nand_defconfig | 2 +- configs/mx28evk_spi_defconfig | 2 +- configs/mx6cuboxi_defconfig | 6 ++-- configs/mx6memcal_defconfig | 4 +-- configs/mx6sabreauto_defconfig | 8 ++--- configs/mx6sabresd_defconfig | 6 ++-- configs/mx6slevk_spl_defconfig | 6 ++-- configs/mx6ul_14x14_evk_defconfig | 8 ++--- configs/mx6ul_9x9_evk_defconfig | 6 ++-- configs/myir_mys_6ulx_defconfig | 4 +-- configs/nanopi-r2s-rk3328_defconfig | 8 ++--- configs/novena_defconfig | 6 ++-- configs/odroid-go2_defconfig | 6 ++-- configs/omap35_logic_defconfig | 4 +-- configs/omap35_logic_somlv_defconfig | 6 ++-- configs/omap3_logic_defconfig | 4 +-- configs/omap3_logic_somlv_defconfig | 6 ++-- configs/omap4_panda_defconfig | 2 +- configs/omap4_sdp4430_defconfig | 2 +- configs/opos6uldev_defconfig | 4 +-- configs/orangepi_2_defconfig | 2 +- configs/orangepi_pc2_defconfig | 2 +- configs/orangepi_pc_defconfig | 2 +- configs/orangepi_pc_plus_defconfig | 2 +- configs/orangepi_plus2e_defconfig | 2 +- configs/orangepi_plus_defconfig | 2 +- configs/orangepi_zero2_defconfig | 2 +- configs/pcm058_defconfig | 4 +-- configs/phycore-am335x-r2-regor_defconfig | 6 ++-- configs/phycore-am335x-r2-wega_defconfig | 6 ++-- configs/phycore-imx8mm_defconfig | 10 +++--- configs/phycore-imx8mp_defconfig | 10 +++--- configs/phycore_pcl063_defconfig | 4 +-- configs/phycore_pcl063_ull_defconfig | 4 +-- configs/pico-dwarf-imx6ul_defconfig | 4 +-- configs/pico-dwarf-imx7d_defconfig | 6 ++-- configs/pico-hobbit-imx6ul_defconfig | 4 +-- configs/pico-hobbit-imx7d_defconfig | 6 ++-- configs/pico-imx6_defconfig | 6 ++-- configs/pico-imx6ul_defconfig | 4 +-- configs/pico-imx7d_bl33_defconfig | 6 ++-- configs/pico-imx7d_defconfig | 6 ++-- configs/pico-nymph-imx7d_defconfig | 6 ++-- configs/pico-pi-imx6ul_defconfig | 4 +-- configs/pico-pi-imx7d_defconfig | 6 ++-- configs/pinecube_defconfig | 2 +- configs/pov_protab2_ips9_defconfig | 2 +- configs/puma-rk3399_defconfig | 6 ++-- configs/px30-core-ctouch2-px30_defconfig | 2 +- configs/px30-core-edimm2.2-px30_defconfig | 2 +- configs/pxm2_defconfig | 6 ++-- configs/q8_a13_tablet_defconfig | 2 +- configs/r7-tv-dongle_defconfig | 2 +- configs/rastaban_defconfig | 6 ++-- configs/riotboard_defconfig | 2 +- configs/roc-cc-rk3308_defconfig | 2 +- configs/roc-cc-rk3328_defconfig | 8 ++--- configs/roc-pc-mezzanine-rk3399_defconfig | 2 +- configs/roc-pc-rk3399_defconfig | 2 +- configs/rock-pi-e-rk3328_defconfig | 10 +++--- configs/rock-pi-n10-rk3399pro_defconfig | 2 +- configs/rock64-rk3328_defconfig | 8 ++--- configs/rut_defconfig | 6 ++-- configs/sama5d27_giantboard_defconfig | 4 +-- configs/sama5d27_som1_ek_mmc1_defconfig | 4 +-- configs/sama5d27_som1_ek_mmc_defconfig | 4 +-- configs/sama5d27_som1_ek_qspiflash_defconfig | 4 +-- configs/sama5d27_wlsom1_ek_mmc_defconfig | 4 +-- .../sama5d27_wlsom1_ek_qspiflash_defconfig | 4 +-- configs/sama5d2_icp_mmc_defconfig | 4 +-- configs/sama5d2_xplained_emmc_defconfig | 4 +-- configs/sama5d2_xplained_mmc_defconfig | 4 +-- configs/sama5d2_xplained_qspiflash_defconfig | 4 +-- configs/sama5d2_xplained_spiflash_defconfig | 4 +-- configs/sama5d3_xplained_mmc_defconfig | 4 +-- configs/sama5d3_xplained_nandflash_defconfig | 4 +-- configs/sama5d3xek_mmc_defconfig | 4 +-- configs/sama5d3xek_nandflash_defconfig | 4 +-- configs/sama5d3xek_spiflash_defconfig | 4 +-- configs/sama5d4_xplained_mmc_defconfig | 4 +-- configs/sama5d4_xplained_nandflash_defconfig | 4 +-- configs/sama5d4_xplained_spiflash_defconfig | 4 +-- configs/sama5d4ek_mmc_defconfig | 4 +-- configs/sama5d4ek_nandflash_defconfig | 4 +-- configs/sama5d4ek_spiflash_defconfig | 4 +-- configs/sandbox_noinst_defconfig | 4 +-- configs/sandbox_spl_defconfig | 4 +-- configs/seeed_npi_imx6ull_defconfig | 4 +-- configs/sifive_unleashed_defconfig | 2 +- configs/sifive_unmatched_defconfig | 2 +- configs/smartweb_defconfig | 2 +- configs/socfpga_arria10_defconfig | 2 +- configs/socfpga_secu1_defconfig | 2 +- ...stm32mp15-icore-stm32mp1-ctouch2_defconfig | 4 +-- ...tm32mp15-icore-stm32mp1-edimm2.2_defconfig | 4 +-- ...-microgea-stm32mp1-microdev2-of7_defconfig | 4 +-- ...mp15-microgea-stm32mp1-microdev2_defconfig | 4 +-- configs/stm32mp15_basic_defconfig | 4 +-- configs/stm32mp15_dhcom_basic_defconfig | 4 +-- configs/stm32mp15_dhcor_basic_defconfig | 4 +-- configs/sunxi_Gemei_G9_defconfig | 2 +- configs/taurus_defconfig | 2 +- configs/theadorable_debug_defconfig | 2 +- configs/thuban_defconfig | 6 ++-- configs/ti816x_evm_defconfig | 2 +- configs/tinker-rk3288_defconfig | 6 ++-- configs/tinker-s-rk3288_defconfig | 6 ++-- configs/turris_omnia_defconfig | 4 +-- configs/udoo_defconfig | 6 ++-- configs/udoo_neo_defconfig | 4 +-- configs/variscite_dart6ul_defconfig | 4 +-- configs/verdin-imx8mm_defconfig | 10 +++--- configs/vining_2000_defconfig | 8 ++--- configs/wandboard_defconfig | 6 ++-- configs/x530_defconfig | 2 +- doc/README.SPL | 10 +++--- doc/SPL/README.am335x-network | 2 +- drivers/Makefile | 25 +++++++-------- drivers/gpio/Kconfig | 6 ++-- drivers/i2c/Kconfig | 28 ++++++++++++++-- drivers/i2c/Makefile | 2 +- drivers/mmc/omap_hsmmc.c | 2 +- drivers/phy/Makefile | 4 +++ drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 +-- drivers/power/regulator/Kconfig | 4 +-- drivers/usb/cdns3/Kconfig | 2 +- drivers/usb/cdns3/core.c | 6 ++-- drivers/usb/dwc3/dwc3-generic.c | 4 +-- drivers/usb/mtu3/mtu3_plat.c | 4 +-- include/asm-generic/global_data.h | 2 +- include/config_fallbacks.h | 4 +-- include/configs/M5208EVBE.h | 2 +- include/configs/M52277EVB.h | 2 +- include/configs/M5235EVB.h | 2 +- include/configs/M5253DEMO.h | 2 +- include/configs/M5275EVB.h | 2 +- include/configs/M53017EVB.h | 2 +- include/configs/M5329EVB.h | 2 +- include/configs/M5373EVB.h | 2 +- include/configs/M54451EVB.h | 2 +- include/configs/M54455EVB.h | 2 +- include/configs/MPC8349EMDS.h | 2 +- include/configs/MPC8349EMDS_SDRAM.h | 2 +- include/configs/MPC837XERDB.h | 2 +- include/configs/MPC8540ADS.h | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/MPC8560ADS.h | 2 +- include/configs/P1010RDB.h | 2 +- include/configs/P2041RDB.h | 2 +- include/configs/T102xRDB.h | 2 +- include/configs/T104xRDB.h | 2 +- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/T4240RDB.h | 2 +- include/configs/UCP1020.h | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/astro_mcf5373l.h | 2 +- include/configs/bur_am335x_common.h | 3 +- include/configs/cl-som-imx7.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/colibri_pxa270.h | 2 +- include/configs/controlcenterdc.h | 2 +- include/configs/corenet_ds.h | 2 +- include/configs/db-88f6720.h | 2 +- include/configs/db-88f6820-gp.h | 2 +- include/configs/db-mv784mp-gp.h | 2 +- include/configs/devkit3250.h | 2 +- include/configs/ds414.h | 2 +- include/configs/eb_cpu5282.h | 2 +- include/configs/edminiv2.h | 2 +- include/configs/el6x_common.h | 2 +- include/configs/embestmx6boards.h | 2 +- include/configs/ethernut5.h | 2 +- include/configs/flea3.h | 2 +- include/configs/gw_ventana.h | 2 +- include/configs/ids8313.h | 2 +- include/configs/imx8mp_evk.h | 2 +- include/configs/imx8mq_evk.h | 12 +++---- include/configs/imx8mq_phanbell.h | 12 +++---- include/configs/km/km-mpc83xx.h | 2 +- include/configs/km/km_arm.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 2 +- include/configs/kzm9g.h | 2 +- include/configs/legoev3.h | 2 +- include/configs/ls1012a_common.h | 2 +- include/configs/ls1021aiot.h | 6 ++-- include/configs/ls1021aqds.h | 2 +- include/configs/ls1021atsn.h | 2 +- include/configs/ls1021atwr.h | 2 +- include/configs/ls1028a_common.h | 2 +- include/configs/ls1043a_common.h | 2 +- include/configs/ls1046a_common.h | 8 ++--- include/configs/ls1088a_common.h | 2 +- include/configs/ls2080a_common.h | 2 +- include/configs/m53menlo.h | 2 +- include/configs/maxbcm.h | 2 +- include/configs/mx53loco.h | 2 +- include/configs/mx6_common.h | 2 +- include/configs/mx6sabreauto.h | 2 +- include/configs/mx6sabresd.h | 2 +- include/configs/mx7_common.h | 2 +- include/configs/nitrogen6x.h | 2 +- include/configs/novena.h | 2 +- include/configs/p1_p2_rdb_pc.h | 2 +- include/configs/phycore_imx8mp.h | 2 +- include/configs/pico-imx7d.h | 2 +- include/configs/pico-imx8mq.h | 12 +++---- include/configs/siemens-am33x-common.h | 3 +- include/configs/snapper9260.h | 2 +- include/configs/sniper.h | 2 +- include/configs/sunxi-common.h | 2 +- include/configs/t4qds.h | 2 +- include/configs/tam3517-common.h | 2 +- include/configs/theadorable.h | 2 +- include/configs/ti_armv7_common.h | 3 +- include/configs/ti_omap4_common.h | 2 +- include/configs/topic_miami.h | 2 +- include/configs/tqma6_wru4.h | 2 +- include/configs/turris_omnia.h | 2 +- include/configs/udoo_neo.h | 2 +- include/configs/usbarmory.h | 2 +- include/configs/vf610twr.h | 2 +- include/configs/vining_2000.h | 2 +- include/configs/warp.h | 2 +- include/configs/work_92105.h | 2 +- include/configs/xpress.h | 2 +- include/i2c.h | 8 ++--- include/watchdog.h | 2 +- scripts/config_whitelist.txt | 3 +- tools/buildman/README | 2 +- 535 files changed, 1113 insertions(+), 1092 deletions(-)