[U-Boot] [PATCH 5/5] fs: fat: Drop CONFIG_SUPPORT_VFAT
Tuomas Tynkkynen
tuomas at tuxera.com
Fri Jan 5 00:45:21 UTC 2018
fat.h unconditionally defines CONFIG_SUPPORT_VFAT (and has done since
2003), so as a result VFAT support is always enabled regardless of
whether a board config defines it or not. Drop this unnecessary option.
Signed-off-by: Tuomas Tynkkynen <tuomas at tuxera.com>
---
fs/fat/fat.c | 12 +-----------
fs/fat/fat_write.c | 3 +--
include/configs/MPC8349ITX.h | 8 --------
include/configs/apf27.h | 1 -
include/configs/clearfog.h | 5 -----
include/configs/controlcenterdc.h | 3 ---
include/configs/db-88f6720.h | 3 ---
include/configs/db-88f6820-amc.h | 5 -----
include/configs/db-88f6820-gp.h | 5 -----
include/configs/db-mv784mp-gp.h | 3 ---
include/configs/ds414.h | 1 -
include/configs/edminiv2.h | 1 -
include/configs/gplugd.h | 2 --
include/configs/mv-common.h | 7 -------
include/configs/mvebu_armada-37xx.h | 2 --
include/configs/mvebu_armada-8k.h | 2 --
include/configs/nas220.h | 1 -
include/configs/pic32mzdask.h | 6 ------
include/configs/rcar-gen2-common.h | 3 ---
include/configs/rcar-gen3-common.h | 3 ---
include/configs/rk3128_common.h | 2 --
include/configs/rk3328_common.h | 2 --
include/configs/rk3399_common.h | 2 --
include/configs/theadorable.h | 3 ---
include/configs/turris_omnia.h | 3 ---
include/configs/vct.h | 1 -
include/configs/x600.h | 4 ----
include/configs/x86-common.h | 2 --
include/configs/zmx25.h | 1 -
include/configs/zynq-common.h | 4 ----
include/fat.h | 1 -
scripts/config_whitelist.txt | 1 -
32 files changed, 2 insertions(+), 100 deletions(-)
diff --git fs/fat/fat.c fs/fat/fat.c
index d16883fa10..a87034b24b 100644
--- fs/fat/fat.c
+++ fs/fat/fat.c
@@ -22,12 +22,6 @@
#include <linux/compiler.h>
#include <linux/ctype.h>
-#ifdef CONFIG_SUPPORT_VFAT
-static const int vfat_enabled = 1;
-#else
-static const int vfat_enabled = 0;
-#endif
-
/*
* Convert a string to lowercase. Converts at most 'len' characters,
* 'len' may be larger than the length of 'str' if 'str' is NULL
@@ -605,9 +599,6 @@ static int get_fs_info(fsdata *mydata)
return -1;
}
- if (vfat_enabled)
- debug("VFAT Support enabled\n");
-
debug("FAT%d, fat_sect: %d, fatlength: %d\n",
mydata->fatsize, mydata->fat_sect, mydata->fatlength);
debug("Rootdir begins at cluster: %d, sector: %d, offset: %x\n"
@@ -857,8 +848,7 @@ static int fat_itr_next(fat_itr *itr)
continue;
if (dent->attr & ATTR_VOLUME) {
- if (vfat_enabled &&
- (dent->attr & ATTR_VFAT) == ATTR_VFAT &&
+ if ((dent->attr & ATTR_VFAT) == ATTR_VFAT &&
(dent->name[0] & LAST_LONG_ENTRY_MASK)) {
dent = extract_vfat_name(itr);
if (!dent)
diff --git fs/fat/fat_write.c fs/fat/fat_write.c
index 9d2e0ed74c..2e0de8d50c 100644
--- fs/fat/fat_write.c
+++ fs/fat/fat_write.c
@@ -819,8 +819,7 @@ static dir_entry *find_directory_entry(fsdata *mydata, int startsect,
continue;
}
if ((dentptr->attr & ATTR_VOLUME)) {
- if (vfat_enabled &&
- (dentptr->attr & ATTR_VFAT) &&
+ if ((dentptr->attr & ATTR_VFAT) &&
(dentptr->name[0] & LAST_LONG_ENTRY_MASK)) {
get_long_file_name(mydata, curclust,
get_dentfromdir_block,
diff --git include/configs/MPC8349ITX.h include/configs/MPC8349ITX.h
index c88aa95632..e2807a6b4f 100644
--- include/configs/MPC8349ITX.h
+++ include/configs/MPC8349ITX.h
@@ -470,14 +470,6 @@ boards, we say we have two, but don't display a message if we find only one. */
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
-#if defined(CONFIG_COMPACT_FLASH) || defined(CONFIG_SATA_SIL3114) \
- || defined(CONFIG_USB_STORAGE)
- #define CONFIG_SUPPORT_VFAT
-#endif
-
-#if defined(CONFIG_SATA_SIL3114) || defined(CONFIG_USB_STORAGE)
-#endif
-
/* Watchdog */
#undef CONFIG_WATCHDOG /* watchdog disabled */
diff --git include/configs/apf27.h include/configs/apf27.h
index 8294101029..24afc84a02 100644
--- include/configs/apf27.h
+++ include/configs/apf27.h
@@ -204,7 +204,6 @@
*/
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
-#define CONFIG_SUPPORT_VFAT
/*
* Ethernet (on SOC imx FEC)
diff --git include/configs/clearfog.h include/configs/clearfog.h
index bf87bac300..512c4632f1 100644
--- include/configs/clearfog.h
+++ include/configs/clearfog.h
@@ -40,11 +40,6 @@
*/
#define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE
-/* Partition support */
-
-/* Additional FS support/configuration */
-#define CONFIG_SUPPORT_VFAT
-
/* USB/EHCI configuration */
#define CONFIG_EHCI_IS_TDI
diff --git include/configs/controlcenterdc.h include/configs/controlcenterdc.h
index a882fa650b..bf324bbbbd 100644
--- include/configs/controlcenterdc.h
+++ include/configs/controlcenterdc.h
@@ -54,9 +54,6 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN)
-/* Additional FS support/configuration */
-#define CONFIG_SUPPORT_VFAT
-
/* USB/EHCI configuration */
#define CONFIG_EHCI_IS_TDI
diff --git include/configs/db-88f6720.h include/configs/db-88f6720.h
index cdaaced2eb..67943bab3d 100644
--- include/configs/db-88f6720.h
+++ include/configs/db-88f6720.h
@@ -49,9 +49,6 @@
#define CONFIG_SYS_ALT_MEMTEST
-/* Additional FS support/configuration */
-#define CONFIG_SUPPORT_VFAT
-
/*
* mv-common.h should be defined after CMD configs since it used them
* to enable certain macros
diff --git include/configs/db-88f6820-amc.h include/configs/db-88f6820-amc.h
index b0e988d234..69ec662454 100644
--- include/configs/db-88f6820-amc.h
+++ include/configs/db-88f6820-amc.h
@@ -30,11 +30,6 @@
#define CONFIG_SF_DEFAULT_SPEED 1000000
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
-/* Partition support */
-
-/* Additional FS support/configuration */
-#define CONFIG_SUPPORT_VFAT
-
/* USB/EHCI configuration */
#define CONFIG_EHCI_IS_TDI
diff --git include/configs/db-88f6820-gp.h include/configs/db-88f6820-gp.h
index 32f93f2f46..a3ab6ef037 100644
--- include/configs/db-88f6820-gp.h
+++ include/configs/db-88f6820-gp.h
@@ -50,11 +50,6 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN)
-/* Partition support */
-
-/* Additional FS support/configuration */
-#define CONFIG_SUPPORT_VFAT
-
/* USB/EHCI configuration */
#define CONFIG_EHCI_IS_TDI
diff --git include/configs/db-mv784mp-gp.h include/configs/db-mv784mp-gp.h
index 3dcc28710b..524a1cabc6 100644
--- include/configs/db-mv784mp-gp.h
+++ include/configs/db-mv784mp-gp.h
@@ -51,9 +51,6 @@
#define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_LBA48
-/* Additional FS support/configuration */
-#define CONFIG_SUPPORT_VFAT
-
/* PCIe support */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_PCI_MVEBU
diff --git include/configs/ds414.h include/configs/ds414.h
index c201dbf4d3..c840c935b2 100644
--- include/configs/ds414.h
+++ include/configs/ds414.h
@@ -68,7 +68,6 @@
#endif
/* why is this only defined in mv-common.h if CONFIG_DM is undefined? */
-#define CONFIG_SUPPORT_VFAT
#define CONFIG_SYS_MVFS
/*
diff --git include/configs/edminiv2.h include/configs/edminiv2.h
index 2b7a5d7c5c..3473979c8f 100644
--- include/configs/edminiv2.h
+++ include/configs/edminiv2.h
@@ -166,7 +166,6 @@
*/
#ifdef CONFIG_CMD_USB
#define ORION5X_USB20_HOST_PORT_BASE ORION5X_USB20_PORT0_BASE
-#define CONFIG_SUPPORT_VFAT
#endif /* CONFIG_CMD_USB */
/*
diff --git include/configs/gplugd.h include/configs/gplugd.h
index dddd300fb5..67f06722f2 100644
--- include/configs/gplugd.h
+++ include/configs/gplugd.h
@@ -85,6 +85,4 @@
#define CONFIG_EHCI_IS_TDI
#endif /* CONFIG_CMD_USB */
-#define CONFIG_SUPPORT_VFAT
-
#endif /* __CONFIG_GPLUGD_H */
diff --git include/configs/mv-common.h include/configs/mv-common.h
index 7c2bab2fc6..1721fefd14 100644
--- include/configs/mv-common.h
+++ include/configs/mv-common.h
@@ -115,13 +115,6 @@
#ifdef CONFIG_CMD_SF
#endif
-/*
- * Common USB/EHCI configuration
- */
-#if defined(CONFIG_CMD_USB) && !defined(CONFIG_DM)
-#define CONFIG_SUPPORT_VFAT
-#endif /* CONFIG_CMD_USB */
-
/*
* File system
*/
diff --git include/configs/mvebu_armada-37xx.h include/configs/mvebu_armada-37xx.h
index af16b9454a..cd63133888 100644
--- include/configs/mvebu_armada-37xx.h
+++ include/configs/mvebu_armada-37xx.h
@@ -105,6 +105,4 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN)
-#define CONFIG_SUPPORT_VFAT
-
#endif /* _CONFIG_MVEBU_ARMADA_37XX_H */
diff --git include/configs/mvebu_armada-8k.h include/configs/mvebu_armada-8k.h
index 7f143164c3..86e0d43821 100644
--- include/configs/mvebu_armada-8k.h
+++ include/configs/mvebu_armada-8k.h
@@ -105,8 +105,6 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN)
-#define CONFIG_SUPPORT_VFAT
-
/*
* PCI configuration
*/
diff --git include/configs/nas220.h include/configs/nas220.h
index 089263f96f..90be7bd010 100644
--- include/configs/nas220.h
+++ include/configs/nas220.h
@@ -91,7 +91,6 @@
#ifdef CONFIG_CMD_USB
#define CONFIG_USB_EHCI_KIRKWOOD /* on Kirkwood platform */
#define CONFIG_EHCI_IS_TDI
-#define CONFIG_SUPPORT_VFAT
#endif /* CONFIG_CMD_USB */
/*
diff --git include/configs/pic32mzdask.h include/configs/pic32mzdask.h
index cf31a38c86..bb0eec66ff 100644
--- include/configs/pic32mzdask.h
+++ include/configs/pic32mzdask.h
@@ -82,12 +82,6 @@
*/
#define CONFIG_USB_MUSB_PIO_ONLY
-/*-----------------------------------------------------------------------
- * File System Configuration
- */
-/* FAT FS */
-#define CONFIG_SUPPORT_VFAT
-
/* -------------------------------------------------
* Environment
*/
diff --git include/configs/rcar-gen2-common.h include/configs/rcar-gen2-common.h
index 19c4c4c72b..d7792978f7 100644
--- include/configs/rcar-gen2-common.h
+++ include/configs/rcar-gen2-common.h
@@ -11,9 +11,6 @@
#include <asm/arch/rmobile.h>
-/* Support File sytems */
-#define CONFIG_SUPPORT_VFAT
-
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
diff --git include/configs/rcar-gen3-common.h include/configs/rcar-gen3-common.h
index 7e23b5e054..e9e5fecc12 100644
--- include/configs/rcar-gen3-common.h
+++ include/configs/rcar-gen3-common.h
@@ -17,9 +17,6 @@
/* boot option */
#define CONFIG_SUPPORT_RAW_INITRD
-/* Support File sytems */
-#define CONFIG_SUPPORT_VFAT
-
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
diff --git include/configs/rk3128_common.h include/configs/rk3128_common.h
index b83528edd1..8889046f2b 100644
--- include/configs/rk3128_common.h
+++ include/configs/rk3128_common.h
@@ -30,8 +30,6 @@
/* MMC/SD IP block */
#define CONFIG_BOUNCE_BUFFER
-#define CONFIG_SUPPORT_VFAT
-
/* RAW SD card / eMMC locations. */
#define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10)
diff --git include/configs/rk3328_common.h include/configs/rk3328_common.h
index 8c1a0e9260..eba5a22e06 100644
--- include/configs/rk3328_common.h
+++ include/configs/rk3328_common.h
@@ -24,8 +24,6 @@
/* MMC/SD IP block */
#define CONFIG_BOUNCE_BUFFER
-#define CONFIG_SUPPORT_VFAT
-
/* RAW SD card / eMMC locations. */
#define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10)
diff --git include/configs/rk3399_common.h include/configs/rk3399_common.h
index 21395bab8a..95f544ee58 100644
--- include/configs/rk3399_common.h
+++ include/configs/rk3399_common.h
@@ -38,8 +38,6 @@
#define CONFIG_BOUNCE_BUFFER
#define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000
-#define CONFIG_SUPPORT_VFAT
-
/* RAW SD card / eMMC locations. */
#define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10)
diff --git include/configs/theadorable.h include/configs/theadorable.h
index 6e95aa1626..438abf10cc 100644
--- include/configs/theadorable.h
+++ include/configs/theadorable.h
@@ -67,9 +67,6 @@
#define CONFIG_SYS_SATA_MAX_DEVICE 1
#define CONFIG_LBA48
-/* Additional FS support/configuration */
-#define CONFIG_SUPPORT_VFAT
-
/* PCIe support */
#ifdef CONFIG_CMD_PCI
#ifndef CONFIG_SPL_BUILD
diff --git include/configs/turris_omnia.h include/configs/turris_omnia.h
index 3dbd2cacba..40d94a2d24 100644
--- include/configs/turris_omnia.h
+++ include/configs/turris_omnia.h
@@ -59,9 +59,6 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN)
-/* Additional FS support/configuration */
-#define CONFIG_SUPPORT_VFAT
-
/* USB/EHCI configuration */
#define CONFIG_EHCI_IS_TDI
diff --git include/configs/vct.h include/configs/vct.h
index 00ad134382..a5b5aafb40 100644
--- include/configs/vct.h
+++ include/configs/vct.h
@@ -72,7 +72,6 @@
* Commands
*/
#if defined(CONFIG_CMD_USB)
-#define CONFIG_SUPPORT_VFAT
/*
* USB/EHCI
diff --git include/configs/x600.h include/configs/x600.h
index 7363057a5c..4aa5a2a924 100644
--- include/configs/x600.h
+++ include/configs/x600.h
@@ -96,10 +96,6 @@
#define CONFIG_USB_EHCI_SPEAR
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
-/* Filesystem support (for USB key) */
-#define CONFIG_SUPPORT_VFAT
-
-
/*
* U-Boot Environment placing definitions.
*/
diff --git include/configs/x86-common.h include/configs/x86-common.h
index 064c546403..994214ea48 100644
--- include/configs/x86-common.h
+++ include/configs/x86-common.h
@@ -58,8 +58,6 @@
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SUPPORT_VFAT
-
/*-----------------------------------------------------------------------
* Command line configuration.
*/
diff --git include/configs/zmx25.h include/configs/zmx25.h
index 1ae1ca4317..f9783a21c2 100644
--- include/configs/zmx25.h
+++ include/configs/zmx25.h
@@ -82,7 +82,6 @@
#define CONFIG_MXC_USB_PORTSC MXC_EHCI_MODE_SERIAL
#define CONFIG_MXC_USB_FLAGS (MXC_EHCI_INTERNAL_PHY | MXC_EHCI_IPPUE_DOWN)
#define CONFIG_EHCI_IS_TDI
-#define CONFIG_SUPPORT_VFAT
#endif /* CONFIG_CMD_USB */
/* SDRAM */
diff --git include/configs/zynq-common.h include/configs/zynq-common.h
index b10cb3f572..28cee15b37 100644
--- include/configs/zynq-common.h
+++ include/configs/zynq-common.h
@@ -124,10 +124,6 @@
# define DFU_ALT_INFO
#endif
-#if defined(CONFIG_MMC_SDHCI_ZYNQ) || defined(CONFIG_ZYNQ_USB)
-# define CONFIG_SUPPORT_VFAT
-#endif
-
#if defined(CONFIG_ZYNQ_I2C0) || defined(CONFIG_ZYNQ_I2C1)
#define CONFIG_SYS_I2C_ZYNQ
#endif
diff --git include/fat.h include/fat.h
index bdeda95e6d..fa956441c6 100644
--- include/fat.h
+++ include/fat.h
@@ -13,7 +13,6 @@
#include <asm/byteorder.h>
#include <fs.h>
-#define CONFIG_SUPPORT_VFAT
/* Maximum Long File Name length supported here is 128 UTF-16 code units */
#define VFAT_MAXLEN_BYTES 256 /* Maximum LFN buffer in bytes */
#define VFAT_MAXSEQ 9 /* Up to 9 of 13 2-byte UTF-16 entries */
diff --git scripts/config_whitelist.txt scripts/config_whitelist.txt
index 0433399a88..7f8bfefc6e 100644
--- scripts/config_whitelist.txt
+++ scripts/config_whitelist.txt
@@ -2214,7 +2214,6 @@ CONFIG_SUPERH_ON_CHIP_R8A66597
CONFIG_SUPPORT_EMMC_BOOT
CONFIG_SUPPORT_EMMC_RPMB
CONFIG_SUPPORT_RAW_INITRD
-CONFIG_SUPPORT_VFAT
CONFIG_SUVD3
CONFIG_SXNI855T
CONFIG_SYSCOUNTER_TIMER
--
2.15.0
More information about the U-Boot
mailing list