projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert CONFIG_SYS_SPL_MALLOC_SIZE et al to Kconfig
[platform/kernel/u-boot.git]
/
fs
/
fs.c
diff --git
a/fs/fs.c
b/fs/fs.c
index
c67a1c7
..
6de1a3e
100644
(file)
--- a/
fs/fs.c
+++ b/
fs/fs.c
@@
-36,6
+36,11
@@
static int fs_dev_part;
static struct disk_partition fs_partition;
static int fs_type = FS_TYPE_ANY;
static struct disk_partition fs_partition;
static int fs_type = FS_TYPE_ANY;
+void fs_set_type(int type)
+{
+ fs_type = type;
+}
+
static inline int fs_probe_unsupported(struct blk_desc *fs_dev_desc,
struct disk_partition *fs_partition)
{
static inline int fs_probe_unsupported(struct blk_desc *fs_dev_desc,
struct disk_partition *fs_partition)
{
@@
-288,6
+293,7
@@
static struct fstype_info fstypes[] = {
},
#endif
#endif
},
#endif
#endif
+#ifndef CONFIG_SPL_BUILD
#ifdef CONFIG_FS_BTRFS
{
.fstype = FS_TYPE_BTRFS,
#ifdef CONFIG_FS_BTRFS
{
.fstype = FS_TYPE_BTRFS,
@@
-307,7
+313,8
@@
static struct fstype_info fstypes[] = {
.ln = fs_ln_unsupported,
},
#endif
.ln = fs_ln_unsupported,
},
#endif
-#if IS_ENABLED(CONFIG_FS_SQUASHFS)
+#endif
+#if CONFIG_IS_ENABLED(FS_SQUASHFS)
{
.fstype = FS_TYPE_SQUASHFS,
.name = "squashfs",
{
.fstype = FS_TYPE_SQUASHFS,
.name = "squashfs",