diff options
| author | Tom Rini <trini@konsulko.com> | 2022-04-15 08:04:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-04-15 08:04:16 -0400 |
| commit | 74ae732d80f54540d3a244e0e28e66d263e6a57e (patch) | |
| tree | e0ac006d78607573b9e00c1213a8e7bb56cf15a0 /fs/fs.c | |
| parent | 42a2d90cf51acea56bf19006ed5688c93c099ff0 (diff) | |
| parent | b8617df6d5c8afb74ae8bb4b732a8b56b4f5e9ee (diff) | |
Merge branch '2022-04-14-assorted-updates'
- Apple M1 Ultra support, TI power domain fix, atsha204a big endian
support, LED cleanups and support for default-state, increase malloc
pool on sandbox, ubifs bugfix, further serial cleanup / semihost
support, fix a few cases around enabling/disabling FS support in SPL,
clean up duplication of table_compute_checksum()
Diffstat (limited to 'fs/fs.c')
| -rw-r--r-- | fs/fs.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -177,7 +177,7 @@ struct fstype_info { }; static struct fstype_info fstypes[] = { -#ifdef CONFIG_FS_FAT +#if CONFIG_IS_ENABLED(FS_FAT) { .fstype = FS_TYPE_FAT, .name = "fat", @@ -267,6 +267,7 @@ static struct fstype_info fstypes[] = { .ln = fs_ln_unsupported, }, #endif +#ifndef CONFIG_SPL_BUILD #ifdef CONFIG_CMD_UBIFS { .fstype = FS_TYPE_UBIFS, @@ -286,6 +287,7 @@ static struct fstype_info fstypes[] = { .ln = fs_ln_unsupported, }, #endif +#endif #ifdef CONFIG_FS_BTRFS { .fstype = FS_TYPE_BTRFS, |