From d8c3ea99826f652efa5e8843f7fb98dfd6f8d194 Mon Sep 17 00:00:00 2001 From: Tien Fong Chee Date: Wed, 23 Jan 2019 14:20:04 +0800 Subject: [PATCH] spl: fat/fs: Add option to include/exclude FAT write build in SPL Most of the time SPL only needs very simple FAT reading, so having CONFIG_IS_ENABLED(FAT_WRITE) to exclude it from SPL build would help to save 64KiB default max clustersize from memory. Signed-off-by: Tien Fong Chee Reviewed-by: Simon Goldschmidt Reviewed-by: Tom Rini --- common/spl/Kconfig | 7 +++++++ fs/fat/Makefile | 4 ++-- fs/fat/fat.c | 3 ++- fs/fs.c | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index ab47c05c92..eac50ac7f7 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -404,6 +404,13 @@ config SPL_FS_FAT filesystem from within SPL. Support for the underlying block device (e.g. MMC or USB) must be enabled separately. +config SPL_FAT_WRITE + bool "Support write for FAT filesystems" + help + Enable write support for FAT and VFAT filesystems with SPL. + Support for the underlying block device (e.g. MMC or USB) must be + enabled separately. + config SPL_FPGA_SUPPORT bool "Support FPGAs" help diff --git a/fs/fat/Makefile b/fs/fat/Makefile index e64b61a0b4..f84efaccc7 100644 --- a/fs/fat/Makefile +++ b/fs/fat/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_FS_FAT) := fat.o -obj-$(CONFIG_FAT_WRITE):= fat_write.o +obj-$(CONFIG_$(SPL_)FS_FAT) = fat.o +obj-$(CONFIG_$(SPL_)FAT_WRITE) = fat_write.o diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 179bf4f3d8..dac86ea516 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -145,7 +145,8 @@ static void get_name(dir_entry *dirent, char *s_name) } static int flush_dirty_fat_buffer(fsdata *mydata); -#if !defined(CONFIG_FAT_WRITE) + +#if !CONFIG_IS_ENABLED(FAT_WRITE) /* Stub for read only operation */ int flush_dirty_fat_buffer(fsdata *mydata) { diff --git a/fs/fs.c b/fs/fs.c index 7fd22101ef..1a6a64ea7f 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -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, -- 2.25.1