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 /fs/fs.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 'fs/fs.c')
| -rw-r--r-- | fs/fs.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -168,7 +168,7 @@ static struct fstype_info fstypes[] = { .exists = fat_exists, .size = fat_size, .read = fat_read_file, -#ifdef CONFIG_FAT_WRITE +#if CONFIG_IS_ENABLED(FAT_WRITE) .write = file_fat_write, .unlink = fat_unlink, .mkdir = fat_mkdir, @@ -183,7 +183,8 @@ static struct fstype_info fstypes[] = { .closedir = fat_closedir, }, #endif -#ifdef CONFIG_FS_EXT4 + +#if CONFIG_IS_ENABLED(FS_EXT4) { .fstype = FS_TYPE_EXT, .name = "ext4", @@ -453,8 +454,7 @@ static int fs_read_lmb_check(const char *filename, ulong addr, loff_t offset, if (len && len < read_len) read_len = len; - lmb_init_and_reserve(&lmb, gd->bd->bi_dram[0].start, - gd->bd->bi_dram[0].size, (void *)gd->fdt_blob); + lmb_init_and_reserve(&lmb, gd->bd, (void *)gd->fdt_blob); lmb_dump_all(&lmb); if (lmb_alloc_addr(&lmb, addr, read_len) == addr) |