On Wed, Jan 23, 2019 at 7:20 AM <tien.fong.c...@intel.com> wrote:
>
> From: Tien Fong Chee <tien.fong.c...@intel.com>
>
> Replace CONFIG_SPL_FAT_SUPPORT with CONFIG_SPL_FS_FAT so
> obj-$(CONFIG_$(SPL_)FS_FAT) can be used to control the build in both
> SPL and U-Boot.
>
> Signed-off-by: Tien Fong Chee <tien.fong.c...@intel.com>
Reviewed-by: Simon Goldschmidt <simon.k.r.goldschm...@gmail.com>
> ---
> arch/arm/cpu/armv8/zynqmp/Kconfig | 2 +-
> arch/arm/mach-imx/spl.c | 2 +-
> arch/arm/mach-k3/am6_init.c | 2 +-
> arch/arm/mach-omap2/Kconfig | 6 +++---
> arch/arm/mach-omap2/am33xx/Kconfig | 4 ++--
> arch/arm/mach-socfpga/spl_a10.c | 2 +-
> arch/arm/mach-socfpga/spl_gen5.c | 2 +-
> arch/arm/mach-socfpga/spl_s10.c | 2 +-
> arch/arm/mach-zynq/Kconfig | 2 +-
> common/spl/Kconfig | 2 +-
> common/spl/Makefile | 2 +-
> common/spl/spl_mmc.c | 6 +++---
> configs/am335x_baltos_defconfig | 2 +-
> configs/am335x_hs_evm_uart_defconfig | 2 +-
> configs/am335x_igep003x_defconfig | 2 +-
> configs/am335x_pdu001_defconfig | 2 +-
> configs/am335x_shc_defconfig | 2 +-
> configs/am335x_shc_ict_defconfig | 2 +-
> configs/am335x_shc_netboot_defconfig | 2 +-
> configs/am335x_shc_prompt_defconfig | 2 +-
> configs/am335x_shc_sdboot_defconfig | 2 +-
> configs/am335x_shc_sdboot_prompt_defconfig | 2 +-
> configs/am335x_sl50_defconfig | 2 +-
> configs/am65x_evm_a53_defconfig | 2 +-
> configs/am65x_evm_r5_defconfig | 2 +-
> configs/birdland_bav335a_defconfig | 2 +-
> configs/birdland_bav335b_defconfig | 2 +-
> configs/chiliboard_defconfig | 2 +-
> configs/cm_t335_defconfig | 2 +-
> configs/cm_t43_defconfig | 2 +-
> configs/draco_defconfig | 2 +-
> configs/etamin_defconfig | 2 +-
> configs/novena_defconfig | 2 +-
> configs/pcm051_rev1_defconfig | 2 +-
> configs/pcm051_rev3_defconfig | 2 +-
> configs/pengwyn_defconfig | 2 +-
> configs/pepper_defconfig | 2 +-
> configs/picosam9g45_defconfig | 2 +-
> configs/pxm2_defconfig | 2 +-
> configs/rastaban_defconfig | 2 +-
> configs/rut_defconfig | 2 +-
> configs/sama5d27_som1_ek_mmc1_defconfig | 2 +-
> configs/sama5d27_som1_ek_mmc_defconfig | 2 +-
> configs/sama5d2_xplained_emmc_defconfig | 2 +-
> configs/sama5d2_xplained_mmc_defconfig | 2 +-
> configs/sama5d3_xplained_mmc_defconfig | 2 +-
> configs/sama5d3xek_mmc_defconfig | 2 +-
> configs/sama5d4_xplained_mmc_defconfig | 2 +-
> configs/sama5d4ek_mmc_defconfig | 2 +-
> configs/socfpga_arria10_defconfig | 2 +-
> configs/socfpga_stratix10_defconfig | 2 +-
> configs/thuban_defconfig | 2 +-
> configs/ti814x_evm_defconfig | 2 +-
> configs/ti816x_evm_defconfig | 2 +-
> configs/xilinx_zynqmp_zc1232_revA_defconfig | 2 +-
> configs/xilinx_zynqmp_zc1254_revA_defconfig | 2 +-
> configs/xilinx_zynqmp_zc1275_revA_defconfig | 2 +-
> configs/xilinx_zynqmp_zc1275_revB_defconfig | 2 +-
> configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 2 +-
> configs/zynq_zc770_xm011_defconfig | 2 +-
> configs/zynq_zc770_xm011_x16_defconfig | 2 +-
> configs/zynq_zc770_xm012_defconfig | 2 +-
> configs/zynq_zc770_xm013_defconfig | 2 +-
> doc/README.SPL | 2 +-
> fs/Makefile | 2 +-
> include/configs/imx6_spl.h | 2 +-
> include/configs/imx7_spl.h | 2 +-
> include/configs/socfpga_common.h | 2 +-
> include/part.h | 2 +-
> 69 files changed, 74 insertions(+), 74 deletions(-)
>
> diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig
> b/arch/arm/cpu/armv8/zynqmp/Kconfig
> index 8a311e1..e9f7e7e 100644
> --- a/arch/arm/cpu/armv8/zynqmp/Kconfig
> +++ b/arch/arm/cpu/armv8/zynqmp/Kconfig
> @@ -1,6 +1,6 @@
> if ARCH_ZYNQMP
>
> -config SPL_FAT_SUPPORT
> +config SPL_FS_FAT
> default y
>
> config SPL_LIBCOMMON_SUPPORT
> diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
> index a20b30d..6c57ef2 100644
> --- a/arch/arm/mach-imx/spl.c
> +++ b/arch/arm/mach-imx/spl.c
> @@ -162,7 +162,7 @@ u32 spl_boot_mode(const u32 boot_device)
> /* for MMC return either RAW or FAT mode */
> case BOOT_DEVICE_MMC1:
> case BOOT_DEVICE_MMC2:
> -#if defined(CONFIG_SPL_FAT_SUPPORT)
> +#if defined(CONFIG_SPL_FS_FAT)
> return MMCSD_MODE_FS;
> #elif defined(CONFIG_SUPPORT_EMMC_BOOT)
> return MMCSD_MODE_EMMCBOOT;
> diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c
> index e2fe00c..4aef3cd 100644
> --- a/arch/arm/mach-k3/am6_init.c
> +++ b/arch/arm/mach-k3/am6_init.c
> @@ -106,7 +106,7 @@ u32 spl_boot_mode(const u32 boot_device)
> #endif
>
> /* Everything else use filesystem if available */
> -#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
> +#if defined(CONFIG_SPL_FS_FAT) || defined(CONFIG_SPL_EXT_SUPPORT)
> return MMCSD_MODE_FS;
> #else
> return MMCSD_MODE_RAW;
> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index 58e545a..7293362 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -14,7 +14,7 @@ config OMAP34XX
> select USE_TINY_PRINTF
> imply NAND_OMAP_GPMC
> imply SPL_EXT_SUPPORT
> - imply SPL_FAT_SUPPORT
> + imply SPL_FS_FAT
> imply SPL_GPIO_SUPPORT
> imply SPL_I2C_SUPPORT
> imply SPL_LIBCOMMON_SUPPORT
> @@ -36,7 +36,7 @@ config OMAP44XX
> imply NAND_OMAP_GPMC
> imply SPL_DISPLAY_PRINT
> imply SPL_EXT_SUPPORT
> - imply SPL_FAT_SUPPORT
> + imply SPL_FS_FAT
> imply SPL_GPIO_SUPPORT
> imply SPL_I2C_SUPPORT
> imply SPL_LIBCOMMON_SUPPORT
> @@ -60,7 +60,7 @@ config OMAP54XX
> imply SPL_DISPLAY_PRINT
> imply SPL_ENV_SUPPORT
> imply SPL_EXT_SUPPORT
> - imply SPL_FAT_SUPPORT
> + imply SPL_FS_FAT
> imply SPL_GPIO_SUPPORT
> imply SPL_I2C_SUPPORT
> imply SPL_LIBCOMMON_SUPPORT
> diff --git a/arch/arm/mach-omap2/am33xx/Kconfig
> b/arch/arm/mach-omap2/am33xx/Kconfig
> index 3529607..6902034 100644
> --- a/arch/arm/mach-omap2/am33xx/Kconfig
> +++ b/arch/arm/mach-omap2/am33xx/Kconfig
> @@ -39,7 +39,7 @@ config TARGET_AM335X_EVM
> imply SPL_DM_SEQ_ALIAS
> imply SPL_ENV_SUPPORT
> imply SPL_EXT_SUPPORT
> - imply SPL_FAT_SUPPORT
> + imply SPL_FS_FAT
> imply SPL_GPIO_SUPPORT
> imply SPL_I2C_SUPPORT
> imply SPL_LIBCOMMON_SUPPORT
> @@ -232,7 +232,7 @@ config TARGET_AM43XX_EVM
> imply SPI_FLASH_BAR
> imply SPL_ENV_SUPPORT
> imply SPL_EXT_SUPPORT
> - imply SPL_FAT_SUPPORT
> + imply SPL_FS_FAT
> imply SPL_GPIO_SUPPORT
> imply SPL_I2C_SUPPORT
> imply SPL_LIBCOMMON_SUPPORT
> diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach-socfpga/spl_a10.c
> index d523167..bd21fc2 100644
> --- a/arch/arm/mach-socfpga/spl_a10.c
> +++ b/arch/arm/mach-socfpga/spl_a10.c
> @@ -63,7 +63,7 @@ u32 spl_boot_device(void)
> #ifdef CONFIG_SPL_MMC_SUPPORT
> u32 spl_boot_mode(const u32 boot_device)
> {
> -#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
> +#if defined(CONFIG_SPL_FS_FAT) || defined(CONFIG_SPL_EXT_SUPPORT)
> return MMCSD_MODE_FS;
> #else
> return MMCSD_MODE_RAW;
> diff --git a/arch/arm/mach-socfpga/spl_gen5.c
> b/arch/arm/mach-socfpga/spl_gen5.c
> index ccdc661..98d39a7 100644
> --- a/arch/arm/mach-socfpga/spl_gen5.c
> +++ b/arch/arm/mach-socfpga/spl_gen5.c
> @@ -55,7 +55,7 @@ u32 spl_boot_device(void)
> #ifdef CONFIG_SPL_MMC_SUPPORT
> u32 spl_boot_mode(const u32 boot_device)
> {
> -#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
> +#if defined(CONFIG_SPL_FS_FAT) || defined(CONFIG_SPL_EXT_SUPPORT)
> return MMCSD_MODE_FS;
> #else
> return MMCSD_MODE_RAW;
> diff --git a/arch/arm/mach-socfpga/spl_s10.c b/arch/arm/mach-socfpga/spl_s10.c
> index cc5dc4f..f40a156 100644
> --- a/arch/arm/mach-socfpga/spl_s10.c
> +++ b/arch/arm/mach-socfpga/spl_s10.c
> @@ -33,7 +33,7 @@ u32 spl_boot_device(void)
> #ifdef CONFIG_SPL_MMC_SUPPORT
> u32 spl_boot_mode(const u32 boot_device)
> {
> -#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
> +#if defined(CONFIG_SPL_FS_FAT) || defined(CONFIG_SPL_EXT_SUPPORT)
> return MMCSD_MODE_FS;
> #else
> return MMCSD_MODE_RAW;
> diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
> index a599ed6..8946da2 100644
> --- a/arch/arm/mach-zynq/Kconfig
> +++ b/arch/arm/mach-zynq/Kconfig
> @@ -3,7 +3,7 @@ if ARCH_ZYNQ
> config SPL_LDSCRIPT
> default "arch/arm/mach-zynq/u-boot-spl.lds"
>
> -config SPL_FAT_SUPPORT
> +config SPL_FS_FAT
> default y
>
> config SPL_LIBCOMMON_SUPPORT
> diff --git a/common/spl/Kconfig b/common/spl/Kconfig
> index 0ddbffc..93e7fe9 100644
> --- a/common/spl/Kconfig
> +++ b/common/spl/Kconfig
> @@ -394,7 +394,7 @@ config SPL_EXT_SUPPORT
> filesystem from within SPL. Support for the underlying block
> device (e.g. MMC or USB) must be enabled separately.
>
> -config SPL_FAT_SUPPORT
> +config SPL_FS_FAT
> bool "Support FAT filesystems"
> select FS_FAT
> help
> diff --git a/common/spl/Makefile b/common/spl/Makefile
> index a130a5b..5d4d6ed 100644
> --- a/common/spl/Makefile
> +++ b/common/spl/Makefile
> @@ -23,7 +23,7 @@ obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) += spl_mmc.o
> obj-$(CONFIG_$(SPL_TPL_)ATF) += spl_atf.o
> obj-$(CONFIG_$(SPL_TPL_)OPTEE) += spl_optee.o
> obj-$(CONFIG_$(SPL_TPL_)USB_SUPPORT) += spl_usb.o
> -obj-$(CONFIG_$(SPL_TPL_)FAT_SUPPORT) += spl_fat.o
> +obj-$(CONFIG_$(SPL_TPL_)FS_FAT) += spl_fat.o
> obj-$(CONFIG_$(SPL_TPL_)EXT_SUPPORT) += spl_ext.o
> obj-$(CONFIG_$(SPL_TPL_)SATA_SUPPORT) += spl_sata.o
> obj-$(CONFIG_$(SPL_TPL_)DFU_SUPPORT) += spl_dfu.o
> diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
> index 4d55dcc..e526167 100644
> --- a/common/spl/spl_mmc.c
> +++ b/common/spl/spl_mmc.c
> @@ -238,7 +238,7 @@ static int spl_mmc_do_fs_boot(struct spl_image_info
> *spl_image, struct mmc *mmc)
> {
> int err = -ENOSYS;
>
> -#ifdef CONFIG_SPL_FAT_SUPPORT
> +#ifdef CONFIG_SPL_FS_FAT
> if (!spl_start_uboot()) {
> err = spl_load_image_fat_os(spl_image, mmc_get_blk_desc(mmc),
> CONFIG_SYS_MMCSD_FS_BOOT_PARTITION);
> @@ -269,7 +269,7 @@ static int spl_mmc_do_fs_boot(struct spl_image_info
> *spl_image, struct mmc *mmc)
> #endif
> #endif
>
> -#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
> +#if defined(CONFIG_SPL_FS_FAT) || defined(CONFIG_SPL_EXT_SUPPORT)
> err = -ENOENT;
> #endif
>
> @@ -284,7 +284,7 @@ static int spl_mmc_do_fs_boot(struct spl_image_info
> *spl_image, struct mmc *mmc)
>
> u32 __weak spl_boot_mode(const u32 boot_device)
> {
> -#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
> +#if defined(CONFIG_SPL_FS_FAT) || defined(CONFIG_SPL_EXT_SUPPORT)
> return MMCSD_MODE_FS;
> #elif defined(CONFIG_SUPPORT_EMMC_BOOT)
> return MMCSD_MODE_EMMCBOOT;
> diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
> index 05d41ae..f5c25af 100644
> --- a/configs/am335x_baltos_defconfig
> +++ b/configs/am335x_baltos_defconfig
> @@ -7,7 +7,7 @@ CONFIG_TARGET_AM335X_BALTOS=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_FIT_VERBOSE=y
> diff --git a/configs/am335x_hs_evm_uart_defconfig
> b/configs/am335x_hs_evm_uart_defconfig
> index 419b41c..b868bc1 100644
> --- a/configs/am335x_hs_evm_uart_defconfig
> +++ b/configs/am335x_hs_evm_uart_defconfig
> @@ -6,7 +6,7 @@ CONFIG_AM33XX=y
> CONFIG_ISW_ENTRY_ADDR=0x40301950
> # CONFIG_SPL_MMC_SUPPORT is not set
> CONFIG_SPL=y
> -# CONFIG_SPL_FAT_SUPPORT is not set
> +# CONFIG_SPL_FS_FAT is not set
> # CONFIG_SPL_LIBDISK_SUPPORT is not set
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_FIT_IMAGE_POST_PROCESS=y
> diff --git a/configs/am335x_igep003x_defconfig
> b/configs/am335x_igep003x_defconfig
> index 16affb8..af7f34c 100644
> --- a/configs/am335x_igep003x_defconfig
> +++ b/configs/am335x_igep003x_defconfig
> @@ -9,7 +9,7 @@ CONFIG_TARGET_AM335X_IGEP003X=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_OF_BOARD_SETUP=y
> diff --git a/configs/am335x_pdu001_defconfig b/configs/am335x_pdu001_defconfig
> index 3cb38af..2e64baf 100644
> --- a/configs/am335x_pdu001_defconfig
> +++ b/configs/am335x_pdu001_defconfig
> @@ -7,7 +7,7 @@ CONFIG_TARGET_PDU001=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_LOCALVERSION="-EETS-1.0.0"
> CONFIG_DISTRO_DEFAULTS=y
> diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig
> index 25e1a4f..215ac61 100644
> --- a/configs/am335x_shc_defconfig
> +++ b/configs/am335x_shc_defconfig
> @@ -8,7 +8,7 @@ CONFIG_TARGET_AM335X_SHC=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_SERIES=y
> CONFIG_DISTRO_DEFAULTS=y
> diff --git a/configs/am335x_shc_ict_defconfig
> b/configs/am335x_shc_ict_defconfig
> index 9ebfe5e..a335d24 100644
> --- a/configs/am335x_shc_ict_defconfig
> +++ b/configs/am335x_shc_ict_defconfig
> @@ -8,7 +8,7 @@ CONFIG_TARGET_AM335X_SHC=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_SHC_ICT=y
> CONFIG_SERIES=y
> diff --git a/configs/am335x_shc_netboot_defconfig
> b/configs/am335x_shc_netboot_defconfig
> index 064b3c3..7c66740 100644
> --- a/configs/am335x_shc_netboot_defconfig
> +++ b/configs/am335x_shc_netboot_defconfig
> @@ -8,7 +8,7 @@ CONFIG_TARGET_AM335X_SHC=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_SHC_NETBOOT=y
> CONFIG_SERIES=y
> diff --git a/configs/am335x_shc_prompt_defconfig
> b/configs/am335x_shc_prompt_defconfig
> index dce8334..984c643 100644
> --- a/configs/am335x_shc_prompt_defconfig
> +++ b/configs/am335x_shc_prompt_defconfig
> @@ -8,7 +8,7 @@ CONFIG_TARGET_AM335X_SHC=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_SERIES=y
> CONFIG_DISTRO_DEFAULTS=y
> diff --git a/configs/am335x_shc_sdboot_defconfig
> b/configs/am335x_shc_sdboot_defconfig
> index e4e6ade..6fab356 100644
> --- a/configs/am335x_shc_sdboot_defconfig
> +++ b/configs/am335x_shc_sdboot_defconfig
> @@ -8,7 +8,7 @@ CONFIG_TARGET_AM335X_SHC=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_SHC_SDBOOT=y
> CONFIG_SERIES=y
> diff --git a/configs/am335x_shc_sdboot_prompt_defconfig
> b/configs/am335x_shc_sdboot_prompt_defconfig
> index e4e6ade..6fab356 100644
> --- a/configs/am335x_shc_sdboot_prompt_defconfig
> +++ b/configs/am335x_shc_sdboot_prompt_defconfig
> @@ -8,7 +8,7 @@ CONFIG_TARGET_AM335X_SHC=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_SHC_SDBOOT=y
> CONFIG_SERIES=y
> diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig
> index a45fd3d..8908b34 100644
> --- a/configs/am335x_sl50_defconfig
> +++ b/configs/am335x_sl50_defconfig
> @@ -8,7 +8,7 @@ CONFIG_TARGET_AM335X_SL50=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
> diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig
> index a17cf7c..8f6fd25 100644
> --- a/configs/am65x_evm_a53_defconfig
> +++ b/configs/am65x_evm_a53_defconfig
> @@ -9,7 +9,7 @@ CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
> CONFIG_SPL_STACK_R_ADDR=0x82000000
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_NR_DRAM_BANKS=2
> diff --git a/configs/am65x_evm_r5_defconfig b/configs/am65x_evm_r5_defconfig
> index 237b9e8..d2ec2dd 100644
> --- a/configs/am65x_evm_r5_defconfig
> +++ b/configs/am65x_evm_r5_defconfig
> @@ -10,7 +10,7 @@ CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
> CONFIG_SPL_STACK_R_ADDR=0x82000000
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_NR_DRAM_BANKS=2
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> diff --git a/configs/birdland_bav335a_defconfig
> b/configs/birdland_bav335a_defconfig
> index 89c7778..90e3bee 100644
> --- a/configs/birdland_bav335a_defconfig
> +++ b/configs/birdland_bav335a_defconfig
> @@ -8,7 +8,7 @@ CONFIG_TARGET_BAV335X=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_BAV_VERSION=1
> CONFIG_DISTRO_DEFAULTS=y
> diff --git a/configs/birdland_bav335b_defconfig
> b/configs/birdland_bav335b_defconfig
> index e3dc88b..05082b5 100644
> --- a/configs/birdland_bav335b_defconfig
> +++ b/configs/birdland_bav335b_defconfig
> @@ -8,7 +8,7 @@ CONFIG_TARGET_BAV335X=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_BAV_VERSION=2
> CONFIG_DISTRO_DEFAULTS=y
> diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig
> index 3de0223..f99bec6 100644
> --- a/configs/chiliboard_defconfig
> +++ b/configs/chiliboard_defconfig
> @@ -7,7 +7,7 @@ CONFIG_TARGET_CHILIBOARD=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_BOOTDELAY=1
> diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig
> index 134b093..04857bd 100644
> --- a/configs/cm_t335_defconfig
> +++ b/configs/cm_t335_defconfig
> @@ -8,7 +8,7 @@ CONFIG_TARGET_CM_T335=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DISTRO_DEFAULTS=y
> # CONFIG_USE_BOOTCOMMAND is not set
> diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig
> index eb4a8f5..356dbb2 100644
> --- a/configs/cm_t43_defconfig
> +++ b/configs/cm_t43_defconfig
> @@ -7,7 +7,7 @@ CONFIG_TARGET_CM_T43=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> diff --git a/configs/draco_defconfig b/configs/draco_defconfig
> index be64c1a..60f679c 100644
> --- a/configs/draco_defconfig
> +++ b/configs/draco_defconfig
> @@ -11,7 +11,7 @@ CONFIG_TARGET_DRACO=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
> index a6b03f9..525e0d9 100644
> --- a/configs/etamin_defconfig
> +++ b/configs/etamin_defconfig
> @@ -11,7 +11,7 @@ CONFIG_TARGET_ETAMIN=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> diff --git a/configs/novena_defconfig b/configs/novena_defconfig
> index 7eda3ac..6274e2f 100644
> --- a/configs/novena_defconfig
> +++ b/configs/novena_defconfig
> @@ -9,7 +9,7 @@ CONFIG_TARGET_KOSAGI_NOVENA=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_CMD_HDMIDETECT=y
> CONFIG_DISTRO_DEFAULTS=y
> diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig
> index 0be0caa..9d83a7b 100644
> --- a/configs/pcm051_rev1_defconfig
> +++ b/configs/pcm051_rev1_defconfig
> @@ -8,7 +8,7 @@ CONFIG_TARGET_PCM051=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_SYS_EXTRA_OPTIONS="REV1"
> diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig
> index 33e8225..53c4ece 100644
> --- a/configs/pcm051_rev3_defconfig
> +++ b/configs/pcm051_rev3_defconfig
> @@ -8,7 +8,7 @@ CONFIG_TARGET_PCM051=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_SYS_EXTRA_OPTIONS="REV3"
> diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig
> index 3c8684a..ce94b86 100644
> --- a/configs/pengwyn_defconfig
> +++ b/configs/pengwyn_defconfig
> @@ -8,7 +8,7 @@ CONFIG_TARGET_PENGWYN=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DISTRO_DEFAULTS=y
> # CONFIG_USE_BOOTCOMMAND is not set
> diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig
> index 1dc3944..edc5da5 100644
> --- a/configs/pepper_defconfig
> +++ b/configs/pepper_defconfig
> @@ -8,7 +8,7 @@ CONFIG_TARGET_PEPPER=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DISTRO_DEFAULTS=y
> # CONFIG_USE_BOOTCOMMAND is not set
> diff --git a/configs/picosam9g45_defconfig b/configs/picosam9g45_defconfig
> index 699e2e2..36ae439 100644
> --- a/configs/picosam9g45_defconfig
> +++ b/configs/picosam9g45_defconfig
> @@ -9,7 +9,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_NR_DRAM_BANKS=2
> CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC"
> diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
> index 4a5c3c6..086b6f0 100644
> --- a/configs/pxm2_defconfig
> +++ b/configs/pxm2_defconfig
> @@ -11,7 +11,7 @@ CONFIG_TARGET_PXM2=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
> index 09b64a3..7fbcdc3 100644
> --- a/configs/rastaban_defconfig
> +++ b/configs/rastaban_defconfig
> @@ -11,7 +11,7 @@ CONFIG_TARGET_RASTABAN=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> diff --git a/configs/rut_defconfig b/configs/rut_defconfig
> index 08eafc2..32d7143 100644
> --- a/configs/rut_defconfig
> +++ b/configs/rut_defconfig
> @@ -11,7 +11,7 @@ CONFIG_TARGET_RUT=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> diff --git a/configs/sama5d27_som1_ek_mmc1_defconfig
> b/configs/sama5d27_som1_ek_mmc1_defconfig
> index 13395ef..5f4abe8 100644
> --- a/configs/sama5d27_som1_ek_mmc1_defconfig
> +++ b/configs/sama5d27_som1_ek_mmc1_defconfig
> @@ -13,7 +13,7 @@ CONFIG_SPL=y
> CONFIG_DEBUG_UART_BOARD_INIT=y
> CONFIG_DEBUG_UART_BASE=0xf8020000
> CONFIG_DEBUG_UART_CLOCK=82000000
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DEBUG_UART=y
> CONFIG_ENV_VARS_UBOOT_CONFIG=y
> diff --git a/configs/sama5d27_som1_ek_mmc_defconfig
> b/configs/sama5d27_som1_ek_mmc_defconfig
> index e260554..5dcd80c 100644
> --- a/configs/sama5d27_som1_ek_mmc_defconfig
> +++ b/configs/sama5d27_som1_ek_mmc_defconfig
> @@ -13,7 +13,7 @@ CONFIG_SPL=y
> CONFIG_DEBUG_UART_BOARD_INIT=y
> CONFIG_DEBUG_UART_BASE=0xf8020000
> CONFIG_DEBUG_UART_CLOCK=82000000
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DEBUG_UART=y
> CONFIG_ENV_VARS_UBOOT_CONFIG=y
> diff --git a/configs/sama5d2_xplained_emmc_defconfig
> b/configs/sama5d2_xplained_emmc_defconfig
> index 4e61692..d6c30e2 100644
> --- a/configs/sama5d2_xplained_emmc_defconfig
> +++ b/configs/sama5d2_xplained_emmc_defconfig
> @@ -13,7 +13,7 @@ CONFIG_SPL=y
> CONFIG_DEBUG_UART_BOARD_INIT=y
> CONFIG_DEBUG_UART_BASE=0xf8020000
> CONFIG_DEBUG_UART_CLOCK=83000000
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DEBUG_UART=y
> CONFIG_ENV_VARS_UBOOT_CONFIG=y
> diff --git a/configs/sama5d2_xplained_mmc_defconfig
> b/configs/sama5d2_xplained_mmc_defconfig
> index fd25261..49e2a73 100644
> --- a/configs/sama5d2_xplained_mmc_defconfig
> +++ b/configs/sama5d2_xplained_mmc_defconfig
> @@ -13,7 +13,7 @@ CONFIG_SPL=y
> CONFIG_DEBUG_UART_BOARD_INIT=y
> CONFIG_DEBUG_UART_BASE=0xf8020000
> CONFIG_DEBUG_UART_CLOCK=83000000
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DEBUG_UART=y
> CONFIG_ENV_VARS_UBOOT_CONFIG=y
> diff --git a/configs/sama5d3_xplained_mmc_defconfig
> b/configs/sama5d3_xplained_mmc_defconfig
> index eab38ec..c7b7736 100644
> --- a/configs/sama5d3_xplained_mmc_defconfig
> +++ b/configs/sama5d3_xplained_mmc_defconfig
> @@ -13,7 +13,7 @@ CONFIG_SPL=y
> CONFIG_DEBUG_UART_BOARD_INIT=y
> CONFIG_DEBUG_UART_BASE=0xffffee00
> CONFIG_DEBUG_UART_CLOCK=132000000
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DEBUG_UART=y
> CONFIG_ENV_VARS_UBOOT_CONFIG=y
> diff --git a/configs/sama5d3xek_mmc_defconfig
> b/configs/sama5d3xek_mmc_defconfig
> index 6faea0e..a4f10fa 100644
> --- a/configs/sama5d3xek_mmc_defconfig
> +++ b/configs/sama5d3xek_mmc_defconfig
> @@ -13,7 +13,7 @@ CONFIG_SPL=y
> CONFIG_DEBUG_UART_BOARD_INIT=y
> CONFIG_DEBUG_UART_BASE=0xffffee00
> CONFIG_DEBUG_UART_CLOCK=132000000
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DEBUG_UART=y
> CONFIG_ENV_VARS_UBOOT_CONFIG=y
> diff --git a/configs/sama5d4_xplained_mmc_defconfig
> b/configs/sama5d4_xplained_mmc_defconfig
> index bfcea3f..9f15c97 100644
> --- a/configs/sama5d4_xplained_mmc_defconfig
> +++ b/configs/sama5d4_xplained_mmc_defconfig
> @@ -13,7 +13,7 @@ CONFIG_SPL=y
> CONFIG_DEBUG_UART_BOARD_INIT=y
> CONFIG_DEBUG_UART_BASE=0xfc00c000
> CONFIG_DEBUG_UART_CLOCK=100000000
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DEBUG_UART=y
> CONFIG_ENV_VARS_UBOOT_CONFIG=y
> diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig
> index 45e6539..9e2e1a9 100644
> --- a/configs/sama5d4ek_mmc_defconfig
> +++ b/configs/sama5d4ek_mmc_defconfig
> @@ -13,7 +13,7 @@ CONFIG_SPL=y
> CONFIG_DEBUG_UART_BOARD_INIT=y
> CONFIG_DEBUG_UART_BASE=0xfc00c000
> CONFIG_DEBUG_UART_CLOCK=88000000
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DEBUG_UART=y
> CONFIG_ENV_VARS_UBOOT_CONFIG=y
> diff --git a/configs/socfpga_arria10_defconfig
> b/configs/socfpga_arria10_defconfig
> index e5fc807..038a708 100644
> --- a/configs/socfpga_arria10_defconfig
> +++ b/configs/socfpga_arria10_defconfig
> @@ -33,7 +33,7 @@ CONFIG_SPL_DM=y
> CONFIG_SPL_DM_SEQ_ALIAS=y
> CONFIG_SPL_DM_MMC=y
> CONFIG_SPL_MMC_SUPPORT=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
> CONFIG_FS_LOADER=y
> CONFIG_FPGA_SOCFPGA=y
> diff --git a/configs/socfpga_stratix10_defconfig
> b/configs/socfpga_stratix10_defconfig
> index 5f3d733..bc3a3a3 100644
> --- a/configs/socfpga_stratix10_defconfig
> +++ b/configs/socfpga_stratix10_defconfig
> @@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
> CONFIG_TARGET_SOCFPGA_STRATIX10_SOCDK=y
> CONFIG_SPL=y
> CONFIG_IDENT_STRING="socfpga_stratix10"
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_BOOTDELAY=5
> CONFIG_SPL_SPI_LOAD=y
> diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
> index b856b9d..2adf156 100644
> --- a/configs/thuban_defconfig
> +++ b/configs/thuban_defconfig
> @@ -11,7 +11,7 @@ CONFIG_TARGET_THUBAN=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> diff --git a/configs/ti814x_evm_defconfig b/configs/ti814x_evm_defconfig
> index b78dc7e..1343d8f 100644
> --- a/configs/ti814x_evm_defconfig
> +++ b/configs/ti814x_evm_defconfig
> @@ -8,7 +8,7 @@ CONFIG_TARGET_TI814X_EVM=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_ENV_VARS_UBOOT_CONFIG=y
> CONFIG_NR_DRAM_BANKS=1
> diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig
> index 381f464..2e8a598 100644
> --- a/configs/ti816x_evm_defconfig
> +++ b/configs/ti816x_evm_defconfig
> @@ -8,7 +8,7 @@ CONFIG_TARGET_TI816X_EVM=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_SPL=y
> -CONFIG_SPL_FAT_SUPPORT=y
> +CONFIG_SPL_FS_FAT=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_BOOTDELAY=3
> diff --git a/configs/xilinx_zynqmp_zc1232_revA_defconfig
> b/configs/xilinx_zynqmp_zc1232_revA_defconfig
> index 7521fc4..8596bd8 100644
> --- a/configs/xilinx_zynqmp_zc1232_revA_defconfig
> +++ b/configs/xilinx_zynqmp_zc1232_revA_defconfig
> @@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x8000
> CONFIG_SPL=y
> CONFIG_DEBUG_UART_BASE=0xff000000
> CONFIG_DEBUG_UART_CLOCK=100000000
> -# CONFIG_SPL_FAT_SUPPORT is not set
> +# CONFIG_SPL_FS_FAT is not set
> # CONFIG_SPL_LIBDISK_SUPPORT is not set
> CONFIG_DEBUG_UART=y
> CONFIG_DISTRO_DEFAULTS=y
> diff --git a/configs/xilinx_zynqmp_zc1254_revA_defconfig
> b/configs/xilinx_zynqmp_zc1254_revA_defconfig
> index e0822b9..95ae16c 100644
> --- a/configs/xilinx_zynqmp_zc1254_revA_defconfig
> +++ b/configs/xilinx_zynqmp_zc1254_revA_defconfig
> @@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x8000
> CONFIG_SPL=y
> CONFIG_DEBUG_UART_BASE=0xff000000
> CONFIG_DEBUG_UART_CLOCK=100000000
> -# CONFIG_SPL_FAT_SUPPORT is not set
> +# CONFIG_SPL_FS_FAT is not set
> # CONFIG_SPL_LIBDISK_SUPPORT is not set
> CONFIG_DEBUG_UART=y
> CONFIG_DISTRO_DEFAULTS=y
> diff --git a/configs/xilinx_zynqmp_zc1275_revA_defconfig
> b/configs/xilinx_zynqmp_zc1275_revA_defconfig
> index 3afed69..7997047 100644
> --- a/configs/xilinx_zynqmp_zc1275_revA_defconfig
> +++ b/configs/xilinx_zynqmp_zc1275_revA_defconfig
> @@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x8000
> CONFIG_SPL=y
> CONFIG_DEBUG_UART_BASE=0xff000000
> CONFIG_DEBUG_UART_CLOCK=100000000
> -# CONFIG_SPL_FAT_SUPPORT is not set
> +# CONFIG_SPL_FS_FAT is not set
> # CONFIG_SPL_LIBDISK_SUPPORT is not set
> CONFIG_DEBUG_UART=y
> CONFIG_DISTRO_DEFAULTS=y
> diff --git a/configs/xilinx_zynqmp_zc1275_revB_defconfig
> b/configs/xilinx_zynqmp_zc1275_revB_defconfig
> index 7e31b11..e0e52f9 100644
> --- a/configs/xilinx_zynqmp_zc1275_revB_defconfig
> +++ b/configs/xilinx_zynqmp_zc1275_revB_defconfig
> @@ -6,7 +6,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x8000
> CONFIG_SPL=y
> CONFIG_DEBUG_UART_BASE=0xff000000
> CONFIG_DEBUG_UART_CLOCK=100000000
> -# CONFIG_SPL_FAT_SUPPORT is not set
> +# CONFIG_SPL_FS_FAT is not set
> # CONFIG_SPL_LIBDISK_SUPPORT is not set
> CONFIG_DEBUG_UART=y
> CONFIG_DISTRO_DEFAULTS=y
> diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> index c2b3d18..bb738ae 100644
> --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> @@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x8000
> CONFIG_SPL=y
> CONFIG_DEBUG_UART_BASE=0xff000000
> CONFIG_DEBUG_UART_CLOCK=100000000
> -# CONFIG_SPL_FAT_SUPPORT is not set
> +# CONFIG_SPL_FS_FAT is not set
> # CONFIG_SPL_LIBDISK_SUPPORT is not set
> CONFIG_ZYNQMP_USB=y
> CONFIG_DEBUG_UART=y
> diff --git a/configs/zynq_zc770_xm011_defconfig
> b/configs/zynq_zc770_xm011_defconfig
> index c15877d..70a76e6 100644
> --- a/configs/zynq_zc770_xm011_defconfig
> +++ b/configs/zynq_zc770_xm011_defconfig
> @@ -6,7 +6,7 @@ CONFIG_DEBUG_UART_BASE=0xe0001000
> CONFIG_DEBUG_UART_CLOCK=50000000
> CONFIG_IDENT_STRING=" Xilinx Zynq ZC770 XM011"
> CONFIG_SPL_STACK_R_ADDR=0x200000
> -# CONFIG_SPL_FAT_SUPPORT is not set
> +# CONFIG_SPL_FS_FAT is not set
> CONFIG_DEBUG_UART=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_FIT=y
> diff --git a/configs/zynq_zc770_xm011_x16_defconfig
> b/configs/zynq_zc770_xm011_x16_defconfig
> index 60627da..2a6ffa5 100644
> --- a/configs/zynq_zc770_xm011_x16_defconfig
> +++ b/configs/zynq_zc770_xm011_x16_defconfig
> @@ -6,7 +6,7 @@ CONFIG_DEBUG_UART_BASE=0xe0001000
> CONFIG_DEBUG_UART_CLOCK=50000000
> CONFIG_IDENT_STRING=" Xilinx Zynq ZC770 XM011 x16"
> CONFIG_SPL_STACK_R_ADDR=0x200000
> -# CONFIG_SPL_FAT_SUPPORT is not set
> +# CONFIG_SPL_FS_FAT is not set
> CONFIG_DEBUG_UART=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_FIT=y
> diff --git a/configs/zynq_zc770_xm012_defconfig
> b/configs/zynq_zc770_xm012_defconfig
> index aa20971..8c92505 100644
> --- a/configs/zynq_zc770_xm012_defconfig
> +++ b/configs/zynq_zc770_xm012_defconfig
> @@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x4000000
> CONFIG_SPL=y
> CONFIG_IDENT_STRING=" Xilinx Zynq ZC770 XM012"
> CONFIG_SPL_STACK_R_ADDR=0x200000
> -# CONFIG_SPL_FAT_SUPPORT is not set
> +# CONFIG_SPL_FS_FAT is not set
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> diff --git a/configs/zynq_zc770_xm013_defconfig
> b/configs/zynq_zc770_xm013_defconfig
> index a08bd29..630e392 100644
> --- a/configs/zynq_zc770_xm013_defconfig
> +++ b/configs/zynq_zc770_xm013_defconfig
> @@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x4000000
> CONFIG_SPL=y
> CONFIG_IDENT_STRING=" Xilinx Zynq ZC770 XM013"
> CONFIG_SPL_STACK_R_ADDR=0x200000
> -# CONFIG_SPL_FAT_SUPPORT is not set
> +# CONFIG_SPL_FS_FAT is not set
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> diff --git a/doc/README.SPL b/doc/README.SPL
> index fc1ca1a..48981bd 100644
> --- a/doc/README.SPL
> +++ b/doc/README.SPL
> @@ -53,7 +53,7 @@ CONFIG_SPL_MMC_SUPPORT (drivers/mmc/libmmc.o)
> CONFIG_SPL_SERIAL_SUPPORT (drivers/serial/libserial.o)
> CONFIG_SPL_SPI_FLASH_SUPPORT (drivers/mtd/spi/libspi_flash.o)
> CONFIG_SPL_SPI_SUPPORT (drivers/spi/libspi.o)
> -CONFIG_SPL_FAT_SUPPORT (fs/fat/libfat.o)
> +CONFIG_SPL_FS_FAT (fs/fat/libfat.o)
> CONFIG_SPL_EXT_SUPPORT
> CONFIG_SPL_LIBGENERIC_SUPPORT (lib/libgeneric.o)
> CONFIG_SPL_POWER_SUPPORT (drivers/power/libpower.o)
> diff --git a/fs/Makefile b/fs/Makefile
> index f21cd23..bebea6a 100644
> --- a/fs/Makefile
> +++ b/fs/Makefile
> @@ -6,7 +6,7 @@
>
> ifdef CONFIG_SPL_BUILD
> obj-$(CONFIG_FS_LOADER) += fs.o
> -obj-$(CONFIG_SPL_FAT_SUPPORT) += fat/
> +obj-$(CONFIG_SPL_FS_FAT) += fat/
> obj-$(CONFIG_SPL_EXT_SUPPORT) += ext4/
> else
> obj-y += fs.o
> diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h
> index 720ff04..60a925d 100644
> --- a/include/configs/imx6_spl.h
> +++ b/include/configs/imx6_spl.h
> @@ -43,7 +43,7 @@
> #endif
>
> /* Define the payload for FAT/EXT support */
> -#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
> +#if defined(CONFIG_SPL_FS_FAT) || defined(CONFIG_SPL_EXT_SUPPORT)
> # ifdef CONFIG_OF_CONTROL
> # define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img"
> # else
> diff --git a/include/configs/imx7_spl.h b/include/configs/imx7_spl.h
> index 1eb6cd8..116ea1a 100644
> --- a/include/configs/imx7_spl.h
> +++ b/include/configs/imx7_spl.h
> @@ -38,7 +38,7 @@
> #endif
>
> /* Define the payload for FAT/EXT support */
> -#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
> +#if defined(CONFIG_SPL_FS_FAT) || defined(CONFIG_SPL_EXT_SUPPORT)
> # ifdef CONFIG_OF_CONTROL
> # define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img"
> # else
> diff --git a/include/configs/socfpga_common.h
> b/include/configs/socfpga_common.h
> index bd8f5c8..735430a 100644
> --- a/include/configs/socfpga_common.h
> +++ b/include/configs/socfpga_common.h
> @@ -267,7 +267,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
>
> /* SPL SDMMC boot support */
> #ifdef CONFIG_SPL_MMC_SUPPORT
> -#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
> +#if defined(CONFIG_SPL_FS_FAT) || defined(CONFIG_SPL_EXT_SUPPORT)
> #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img"
> #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
> #endif
> diff --git a/include/part.h b/include/part.h
> index 0750aee..388e130 100644
> --- a/include/part.h
> +++ b/include/part.h
> @@ -246,7 +246,7 @@ static inline int blk_get_device_part_str(const char
> *ifname,
> */
> #ifdef CONFIG_SPL_BUILD
> # define part_print_ptr(x) NULL
> -# if defined(CONFIG_SPL_EXT_SUPPORT) || defined(CONFIG_SPL_FAT_SUPPORT) || \
> +# if defined(CONFIG_SPL_EXT_SUPPORT) || defined(CONFIG_SPL_FS_FAT) || \
> defined(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION)
> # define part_get_info_ptr(x) x
> # else
> --
> 2.2.0
>
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
