diff options
| author | Tom Rini <trini@konsulko.com> | 2019-02-02 10:08:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-02-02 10:08:50 -0500 |
| commit | 1b0769f2ed17ffc1cf9b32ad057bc8b160cbcbae (patch) | |
| tree | af6e0bc4de02a443cb08b09e26b472ddc030967c /arch/arm/mach-socfpga/spl_a10.c | |
| parent | db4a29993d207fec33c07de8b8cb8a3fd22c9e6c (diff) | |
| parent | d5512a32f683120f7e2d88b148bad1836f667a3c (diff) | |
Merge branch '2019-02-01-master-imports'
- Various TI platforms have been updated and DTS files re-synced and
options disabled if not used or migrated to the DM versions
- Improvements to the dumpimage tool
- Rename SPL FAT/EXT filesystem support symbols for consistency and then
allow them to be used to save more space in SPL.
- More lmb fixes
- Partial migration of CONFIG_BUILD_TARGET
Diffstat (limited to 'arch/arm/mach-socfpga/spl_a10.c')
| -rw-r--r-- | arch/arm/mach-socfpga/spl_a10.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach-socfpga/spl_a10.c index 3ea64f7e94..c97eacb424 100644 --- a/arch/arm/mach-socfpga/spl_a10.c +++ b/arch/arm/mach-socfpga/spl_a10.c @@ -58,7 +58,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_FS_EXT4) return MMCSD_MODE_FS; #else return MMCSD_MODE_RAW; |