Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs: fat: Drop CONFIG_SUPPORT_VFAT

Browse Source 
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@tuxera.com>
master
Tuomas Tynkkynen 6 years ago committed by Tom Rini
parent e8df14d216
commit 8bad6cb176
32 changed files with 2 additions and 100 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      fs/fat/fat.c
  2. 3
      fs/fat/fat_write.c
  3. 8
      include/configs/MPC8349ITX.h
  4. 1
      include/configs/apf27.h
  5. 5
      include/configs/clearfog.h
  6. 3
      include/configs/controlcenterdc.h
  7. 3
      include/configs/db-88f6720.h
  8. 5
      include/configs/db-88f6820-amc.h
  9. 5
      include/configs/db-88f6820-gp.h
  10. 3
      include/configs/db-mv784mp-gp.h
  11. 1
      include/configs/ds414.h
  12. 1
      include/configs/edminiv2.h
  13. 2
      include/configs/gplugd.h
  14. 7
      include/configs/mv-common.h
  15. 2
      include/configs/mvebu_armada-37xx.h
  16. 2
      include/configs/mvebu_armada-8k.h
  17. 1
      include/configs/nas220.h
  18. 6
      include/configs/pic32mzdask.h
  19. 3
      include/configs/rcar-gen2-common.h
  20. 3
      include/configs/rcar-gen3-common.h
  21. 2
      include/configs/rk3128_common.h
  22. 2
      include/configs/rk3328_common.h
  23. 2
      include/configs/rk3399_common.h
  24. 3
      include/configs/theadorable.h
  25. 3
      include/configs/turris_omnia.h
  26. 1
      include/configs/vct.h
  27. 4
      include/configs/x600.h
  28. 2
      include/configs/x86-common.h
  29. 1
      include/configs/zmx25.h
  30. 4
      include/configs/zynq-common.h
  31. 1
      include/fat.h
  32. 1
      scripts/config_whitelist.txt

12
fs/fat/fat.c
Unescape View File

@ -22,12 +22,6 @@
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/ctype.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, * Convert a string to lowercase. Converts at most 'len' characters,
* 'len' may be larger than the length of 'str' if 'str' is NULL * '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; return -1;
} }
if (vfat_enabled)
debug("VFAT Support enabled\n");
debug("FAT%d, fat_sect: %d, fatlength: %d\n", debug("FAT%d, fat_sect: %d, fatlength: %d\n",
mydata->fatsize, mydata->fat_sect, mydata->fatlength); mydata->fatsize, mydata->fat_sect, mydata->fatlength);
debug("Rootdir begins at cluster: %d, sector: %d, offset: %x\n" debug("Rootdir begins at cluster: %d, sector: %d, offset: %x\n"
@ -857,8 +848,7 @@ static int fat_itr_next(fat_itr *itr)
continue; continue;
if (dent->attr & ATTR_VOLUME) { if (dent->attr & ATTR_VOLUME) {
if (vfat_enabled && if ((dent->attr & ATTR_VFAT) == ATTR_VFAT &&
(dent->attr & ATTR_VFAT) == ATTR_VFAT &&
(dent->name[0] & LAST_LONG_ENTRY_MASK)) { (dent->name[0] & LAST_LONG_ENTRY_MASK)) {
dent = extract_vfat_name(itr); dent = extract_vfat_name(itr);
if (!dent) if (!dent)

3
fs/fat/fat_write.c
Unescape View File

@ -819,8 +819,7 @@ static dir_entry *find_directory_entry(fsdata *mydata, int startsect,
continue; continue;
} }
if ((dentptr->attr & ATTR_VOLUME)) { if ((dentptr->attr & ATTR_VOLUME)) {
if (vfat_enabled && if ((dentptr->attr & ATTR_VFAT) &&
(dentptr->attr & ATTR_VFAT) &&
(dentptr->name[0] & LAST_LONG_ENTRY_MASK)) { (dentptr->name[0] & LAST_LONG_ENTRY_MASK)) {
get_long_file_name(mydata, curclust, get_long_file_name(mydata, curclust,
get_dentfromdir_block, get_dentfromdir_block,

8
include/configs/MPC8349ITX.h
Unescape View File

@ -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_GATEWAY
#define CONFIG_BOOTP_HOSTNAME #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 */ /* Watchdog */
#undef CONFIG_WATCHDOG /* watchdog disabled */ #undef CONFIG_WATCHDOG /* watchdog disabled */

1
include/configs/apf27.h
Unescape View File

@ -204,7 +204,6 @@
*/ */
#define CONFIG_MTD_DEVICE #define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS #define CONFIG_MTD_PARTITIONS
#define CONFIG_SUPPORT_VFAT
/* /*
* Ethernet (on SOC imx FEC) * Ethernet (on SOC imx FEC)

5
include/configs/clearfog.h
Unescape View File

@ -40,11 +40,6 @@
*/ */
#define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE #define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE
/* Partition support */
/* Additional FS support/configuration */
#define CONFIG_SUPPORT_VFAT
/* USB/EHCI configuration */ /* USB/EHCI configuration */
#define CONFIG_EHCI_IS_TDI #define CONFIG_EHCI_IS_TDI

3
include/configs/controlcenterdc.h
Unescape View File

@ -54,9 +54,6 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN) CONFIG_SYS_SCSI_MAX_LUN)
/* Additional FS support/configuration */
#define CONFIG_SUPPORT_VFAT
/* USB/EHCI configuration */ /* USB/EHCI configuration */
#define CONFIG_EHCI_IS_TDI #define CONFIG_EHCI_IS_TDI

3
include/configs/db-88f6720.h
Unescape View File

@ -49,9 +49,6 @@
#define CONFIG_SYS_ALT_MEMTEST #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 * mv-common.h should be defined after CMD configs since it used them
* to enable certain macros * to enable certain macros

5
include/configs/db-88f6820-amc.h
Unescape View File

@ -30,11 +30,6 @@
#define CONFIG_SF_DEFAULT_SPEED 1000000 #define CONFIG_SF_DEFAULT_SPEED 1000000
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
/* Partition support */
/* Additional FS support/configuration */
#define CONFIG_SUPPORT_VFAT
/* USB/EHCI configuration */ /* USB/EHCI configuration */
#define CONFIG_EHCI_IS_TDI #define CONFIG_EHCI_IS_TDI

5
include/configs/db-88f6820-gp.h
Unescape View File

@ -50,11 +50,6 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN) CONFIG_SYS_SCSI_MAX_LUN)
/* Partition support */
/* Additional FS support/configuration */
#define CONFIG_SUPPORT_VFAT
/* USB/EHCI configuration */ /* USB/EHCI configuration */
#define CONFIG_EHCI_IS_TDI #define CONFIG_EHCI_IS_TDI

3
include/configs/db-mv784mp-gp.h
Unescape View File

@ -51,9 +51,6 @@
#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_LBA48 #define CONFIG_LBA48
/* Additional FS support/configuration */
#define CONFIG_SUPPORT_VFAT
/* PCIe support */ /* PCIe support */
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#define CONFIG_PCI_MVEBU #define CONFIG_PCI_MVEBU

1
include/configs/ds414.h
Unescape View File

@ -68,7 +68,6 @@
#endif #endif
/* why is this only defined in mv-common.h if CONFIG_DM is undefined? */ /* why is this only defined in mv-common.h if CONFIG_DM is undefined? */
#define CONFIG_SUPPORT_VFAT
#define CONFIG_SYS_MVFS #define CONFIG_SYS_MVFS
/* /*

1
include/configs/edminiv2.h
Unescape View File

@ -165,7 +165,6 @@
*/ */
#ifdef CONFIG_CMD_USB #ifdef CONFIG_CMD_USB
#define ORION5X_USB20_HOST_PORT_BASE ORION5X_USB20_PORT0_BASE #define ORION5X_USB20_HOST_PORT_BASE ORION5X_USB20_PORT0_BASE
#define CONFIG_SUPPORT_VFAT
#endif /* CONFIG_CMD_USB */ #endif /* CONFIG_CMD_USB */
/* /*

2
include/configs/gplugd.h
Unescape View File

@ -85,6 +85,4 @@
#define CONFIG_EHCI_IS_TDI #define CONFIG_EHCI_IS_TDI
#endif /* CONFIG_CMD_USB */ #endif /* CONFIG_CMD_USB */
#define CONFIG_SUPPORT_VFAT
#endif /* __CONFIG_GPLUGD_H */ #endif /* __CONFIG_GPLUGD_H */

7
include/configs/mv-common.h
Unescape View File

@ -116,13 +116,6 @@
#endif #endif
/* /*
* Common USB/EHCI configuration
*/
#if defined(CONFIG_CMD_USB) && !defined(CONFIG_DM)
#define CONFIG_SUPPORT_VFAT
#endif /* CONFIG_CMD_USB */
/*
* File system * File system
*/ */
#ifdef CONFIG_SYS_MVFS #ifdef CONFIG_SYS_MVFS

2
include/configs/mvebu_armada-37xx.h
Unescape View File

@ -102,8 +102,6 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN) CONFIG_SYS_SCSI_MAX_LUN)
#define CONFIG_SUPPORT_VFAT
#include <config_distro_defaults.h> #include <config_distro_defaults.h>
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \

2
include/configs/mvebu_armada-8k.h
Unescape View File

@ -105,8 +105,6 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN) CONFIG_SYS_SCSI_MAX_LUN)
#define CONFIG_SUPPORT_VFAT
/* /*
* PCI configuration * PCI configuration
*/ */

1
include/configs/nas220.h
Unescape View File

@ -91,7 +91,6 @@
#ifdef CONFIG_CMD_USB #ifdef CONFIG_CMD_USB
#define CONFIG_USB_EHCI_KIRKWOOD /* on Kirkwood platform */ #define CONFIG_USB_EHCI_KIRKWOOD /* on Kirkwood platform */
#define CONFIG_EHCI_IS_TDI #define CONFIG_EHCI_IS_TDI
#define CONFIG_SUPPORT_VFAT
#endif /* CONFIG_CMD_USB */ #endif /* CONFIG_CMD_USB */
/* /*

6
include/configs/pic32mzdask.h
Unescape View File

@ -81,12 +81,6 @@
* USB Configuration * USB Configuration
*/ */
/*-----------------------------------------------------------------------
* File System Configuration
*/
/* FAT FS */
#define CONFIG_SUPPORT_VFAT
/* ------------------------------------------------- /* -------------------------------------------------
* Environment * Environment
*/ */

3
include/configs/rcar-gen2-common.h
Unescape View File

@ -11,9 +11,6 @@
#include <asm/arch/rmobile.h> #include <asm/arch/rmobile.h>
/* Support File sytems */
#define CONFIG_SUPPORT_VFAT
#define CONFIG_CMDLINE_TAG #define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG #define CONFIG_INITRD_TAG

3
include/configs/rcar-gen3-common.h
Unescape View File

@ -17,9 +17,6 @@
/* boot option */ /* boot option */
#define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_SUPPORT_RAW_INITRD
/* Support File sytems */
#define CONFIG_SUPPORT_VFAT
#define CONFIG_CMDLINE_TAG #define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG #define CONFIG_INITRD_TAG

2
include/configs/rk3128_common.h
Unescape View File

@ -30,8 +30,6 @@
/* MMC/SD IP block */ /* MMC/SD IP block */
#define CONFIG_BOUNCE_BUFFER #define CONFIG_BOUNCE_BUFFER
#define CONFIG_SUPPORT_VFAT
/* RAW SD card / eMMC locations. */ /* RAW SD card / eMMC locations. */
#define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10) #define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10)

2
include/configs/rk3328_common.h
Unescape View File

@ -24,8 +24,6 @@
/* MMC/SD IP block */ /* MMC/SD IP block */
#define CONFIG_BOUNCE_BUFFER #define CONFIG_BOUNCE_BUFFER
#define CONFIG_SUPPORT_VFAT
/* RAW SD card / eMMC locations. */ /* RAW SD card / eMMC locations. */
#define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10) #define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10)

2
include/configs/rk3399_common.h
Unescape View File

@ -38,8 +38,6 @@
#define CONFIG_BOUNCE_BUFFER #define CONFIG_BOUNCE_BUFFER
#define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000 #define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000
#define CONFIG_SUPPORT_VFAT
/* RAW SD card / eMMC locations. */ /* RAW SD card / eMMC locations. */
#define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10) #define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10)

3
include/configs/theadorable.h
Unescape View File

@ -67,9 +67,6 @@
#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_SYS_SATA_MAX_DEVICE 1
#define CONFIG_LBA48 #define CONFIG_LBA48
/* Additional FS support/configuration */
#define CONFIG_SUPPORT_VFAT
/* PCIe support */ /* PCIe support */
#ifdef CONFIG_CMD_PCI #ifdef CONFIG_CMD_PCI
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD

3
include/configs/turris_omnia.h
Unescape View File

@ -59,9 +59,6 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN) CONFIG_SYS_SCSI_MAX_LUN)
/* Additional FS support/configuration */
#define CONFIG_SUPPORT_VFAT
/* USB/EHCI configuration */ /* USB/EHCI configuration */
#define CONFIG_EHCI_IS_TDI #define CONFIG_EHCI_IS_TDI

1
include/configs/vct.h
Unescape View File

@ -72,7 +72,6 @@
* Commands * Commands
*/ */
#if defined(CONFIG_CMD_USB) #if defined(CONFIG_CMD_USB)
#define CONFIG_SUPPORT_VFAT
/* /*
* USB/EHCI * USB/EHCI

4
include/configs/x600.h
Unescape View File

@ -96,10 +96,6 @@
#define CONFIG_USB_EHCI_SPEAR #define CONFIG_USB_EHCI_SPEAR
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
/* Filesystem support (for USB key) */
#define CONFIG_SUPPORT_VFAT
/* /*
* U-Boot Environment placing definitions. * U-Boot Environment placing definitions.
*/ */

2
include/configs/x86-common.h
Unescape View File

@ -58,8 +58,6 @@
#define CONFIG_CMDLINE_EDITING #define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE #define CONFIG_AUTO_COMPLETE
#define CONFIG_SUPPORT_VFAT
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Command line configuration. * Command line configuration.
*/ */

1
include/configs/zmx25.h
Unescape View File

@ -82,7 +82,6 @@
#define CONFIG_MXC_USB_PORTSC MXC_EHCI_MODE_SERIAL #define CONFIG_MXC_USB_PORTSC MXC_EHCI_MODE_SERIAL
#define CONFIG_MXC_USB_FLAGS (MXC_EHCI_INTERNAL_PHY | MXC_EHCI_IPPUE_DOWN) #define CONFIG_MXC_USB_FLAGS (MXC_EHCI_INTERNAL_PHY | MXC_EHCI_IPPUE_DOWN)
#define CONFIG_EHCI_IS_TDI #define CONFIG_EHCI_IS_TDI
#define CONFIG_SUPPORT_VFAT
#endif /* CONFIG_CMD_USB */ #endif /* CONFIG_CMD_USB */
/* SDRAM */ /* SDRAM */

4
include/configs/zynq-common.h
Unescape View File

@ -124,10 +124,6 @@
# define DFU_ALT_INFO # define DFU_ALT_INFO
#endif #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) #if defined(CONFIG_ZYNQ_I2C0) || defined(CONFIG_ZYNQ_I2C1)
#define CONFIG_SYS_I2C_ZYNQ #define CONFIG_SYS_I2C_ZYNQ
#endif #endif

1
include/fat.h
Unescape View File

@ -13,7 +13,6 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <fs.h> #include <fs.h>
#define CONFIG_SUPPORT_VFAT
/* Maximum Long File Name length supported here is 128 UTF-16 code units */ /* 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_MAXLEN_BYTES 256 /* Maximum LFN buffer in bytes */
#define VFAT_MAXSEQ 9 /* Up to 9 of 13 2-byte UTF-16 entries */ #define VFAT_MAXSEQ 9 /* Up to 9 of 13 2-byte UTF-16 entries */

1
scripts/config_whitelist.txt
Unescape View File

@ -2163,7 +2163,6 @@ CONFIG_SUPERH_ON_CHIP_R8A66597
CONFIG_SUPPORT_EMMC_BOOT CONFIG_SUPPORT_EMMC_BOOT
CONFIG_SUPPORT_EMMC_RPMB CONFIG_SUPPORT_EMMC_RPMB
CONFIG_SUPPORT_RAW_INITRD CONFIG_SUPPORT_RAW_INITRD
CONFIG_SUPPORT_VFAT
CONFIG_SUVD3 CONFIG_SUVD3
CONFIG_SXNI855T CONFIG_SXNI855T
CONFIG_SYSFLAGS_ADDR CONFIG_SYSFLAGS_ADDR

Write Preview
Loading…
Cancel
Save