summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/console.c4
-rw-r--r--common/spl/Kconfig9
2 files changed, 12 insertions, 1 deletions
diff --git a/common/console.c b/common/console.c
index 07c483f820..8e50af1f9d 100644
--- a/common/console.c
+++ b/common/console.c
@@ -635,10 +635,12 @@ void console_record_reset(void)
membuff_purge((struct membuff *)&gd->console_in);
}
-void console_record_reset_enable(void)
+int console_record_reset_enable(void)
{
console_record_reset();
gd->flags |= GD_FLG_RECORD;
+
+ return 0;
}
int console_record_readline(char *str, int maxlen)
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 10605f1bab..af8255a8d6 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -577,6 +577,15 @@ config SPL_FS_EXT4
filesystem from within SPL. Support for the underlying block
device (e.g. MMC or USB) must be enabled separately.
+config SPL_FS_SQUASHFS
+ bool "Support SquashFS filesystems"
+ select FS_SQUASHFS
+ help
+ Enable support for SquashFS filesystems with SPL. This permits
+ U-Boot (or Linux in Falcon mode) to be loaded from a SquashFS
+ filesystem from within SPL. Support for the underlying block
+ device (e.g. MMC or USB) must be enabled separately.
+
config SPL_FS_FAT
bool "Support FAT filesystems"
select FS_FAT