diff options
| author | Tien Fong Chee <tien.fong.chee@intel.com> | 2019-01-23 09:20:03 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-02-01 17:12:48 +0300 |
| commit | 0c3a9ed409a5efac27df762acb2af6271675b07d (patch) | |
| tree | 136a4939b1547181676ffde3662cb66fddacb730 /common | |
| parent | 0e036484db2cbb105d179a3b073e38abe65bab90 (diff) | |
| download | u-boot-0c3a9ed409a5efac27df762acb2af6271675b07d.tar.xz | |
spl: Kconfig: Replace CONFIG_SPL_FAT_SUPPORT with CONFIG_SPL_FS_FAT
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.chee@intel.com>
Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/Kconfig | 2 | ||||
| -rw-r--r-- | common/spl/Makefile | 2 | ||||
| -rw-r--r-- | common/spl/spl_mmc.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 54b0dc34f5..ab47c05c92 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -395,7 +395,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 6f8d7599ae..0569d7ea60 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) += spl_dfu.o diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 4d55dccc92..e5261679ac 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; |