Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 8bad6cb176a0e92ac8e7771fb68e5e0713edbf8e

Authored by Tuomas Tynkkynen
Committed by Tom Rini
1 parent e8df14d216
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

fs: fat: Drop CONFIG_SUPPORT_VFAT 

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>

Showing 32 changed files with 2 additions and 100 deletions Side-by-side Diff

... ... @@ -22,12 +22,6 @@
22 22 #include <linux/compiler.h>
23 23 #include <linux/ctype.h>
24 24  
25   -#ifdef CONFIG_SUPPORT_VFAT
26   -static const int vfat_enabled = 1;
27   -#else
28   -static const int vfat_enabled = 0;
29   -#endif
30   -
31 25 /*
32 26 * Convert a string to lowercase. Converts at most 'len' characters,
33 27 * 'len' may be larger than the length of 'str' if 'str' is NULL
... ... @@ -605,9 +599,6 @@
605 599 return -1;
606 600 }
607 601  
608   - if (vfat_enabled)
609   - debug("VFAT Support enabled\n");
610   -
611 602 debug("FAT%d, fat_sect: %d, fatlength: %d\n",
612 603 mydata->fatsize, mydata->fat_sect, mydata->fatlength);
613 604 debug("Rootdir begins at cluster: %d, sector: %d, offset: %x\n"
... ... @@ -857,8 +848,7 @@
857 848 continue;
858 849  
859 850 if (dent->attr & ATTR_VOLUME) {
860   - if (vfat_enabled &&
861   - (dent->attr & ATTR_VFAT) == ATTR_VFAT &&
  851 + if ((dent->attr & ATTR_VFAT) == ATTR_VFAT &&
862 852 (dent->name[0] & LAST_LONG_ENTRY_MASK)) {
863 853 dent = extract_vfat_name(itr);
864 854 if (!dent)
... ... @@ -819,8 +819,7 @@
819 819 continue;
820 820 }
821 821 if ((dentptr->attr & ATTR_VOLUME)) {
822   - if (vfat_enabled &&
823   - (dentptr->attr & ATTR_VFAT) &&
  822 + if ((dentptr->attr & ATTR_VFAT) &&
824 823 (dentptr->name[0] & LAST_LONG_ENTRY_MASK)) {
825 824 get_long_file_name(mydata, curclust,
826 825 get_dentfromdir_block,
include/configs/MPC8349ITX.h
Diff comments   View file @ 8bad6cb
... ... @@ -470,14 +470,6 @@
470 470 #define CONFIG_BOOTP_GATEWAY
471 471 #define CONFIG_BOOTP_HOSTNAME
472 472  
473   -#if defined(CONFIG_COMPACT_FLASH) || defined(CONFIG_SATA_SIL3114) \
474   - || defined(CONFIG_USB_STORAGE)
475   - #define CONFIG_SUPPORT_VFAT
476   -#endif
477   -
478   -#if defined(CONFIG_SATA_SIL3114) || defined(CONFIG_USB_STORAGE)
479   -#endif
480   -
481 473 /* Watchdog */
482 474 #undef CONFIG_WATCHDOG /* watchdog disabled */
483 475  
include/configs/apf27.h
Diff comments   View file @ 8bad6cb
... ... @@ -204,7 +204,6 @@
204 204 */
205 205 #define CONFIG_MTD_DEVICE
206 206 #define CONFIG_MTD_PARTITIONS
207   -#define CONFIG_SUPPORT_VFAT
208 207  
209 208 /*
210 209 * Ethernet (on SOC imx FEC)
include/configs/clearfog.h
Diff comments   View file @ 8bad6cb
... ... @@ -40,11 +40,6 @@
40 40 */
41 41 #define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE
42 42  
43   -/* Partition support */
44   -
45   -/* Additional FS support/configuration */
46   -#define CONFIG_SUPPORT_VFAT
47   -
48 43 /* USB/EHCI configuration */
49 44 #define CONFIG_EHCI_IS_TDI
50 45  
include/configs/controlcenterdc.h
Diff comments   View file @ 8bad6cb
... ... @@ -54,9 +54,6 @@
54 54 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
55 55 CONFIG_SYS_SCSI_MAX_LUN)
56 56  
57   -/* Additional FS support/configuration */
58   -#define CONFIG_SUPPORT_VFAT
59   -
60 57 /* USB/EHCI configuration */
61 58 #define CONFIG_EHCI_IS_TDI
62 59  
include/configs/db-88f6720.h
Diff comments   View file @ 8bad6cb
... ... @@ -49,9 +49,6 @@
49 49  
50 50 #define CONFIG_SYS_ALT_MEMTEST
51 51  
52   -/* Additional FS support/configuration */
53   -#define CONFIG_SUPPORT_VFAT
54   -
55 52 /*
56 53 * mv-common.h should be defined after CMD configs since it used them
57 54 * to enable certain macros
include/configs/db-88f6820-amc.h
Diff comments   View file @ 8bad6cb
... ... @@ -30,11 +30,6 @@
30 30 #define CONFIG_SF_DEFAULT_SPEED 1000000
31 31 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
32 32  
33   -/* Partition support */
34   -
35   -/* Additional FS support/configuration */
36   -#define CONFIG_SUPPORT_VFAT
37   -
38 33 /* USB/EHCI configuration */
39 34 #define CONFIG_EHCI_IS_TDI
40 35  
include/configs/db-88f6820-gp.h
Diff comments   View file @ 8bad6cb
... ... @@ -50,11 +50,6 @@
50 50 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
51 51 CONFIG_SYS_SCSI_MAX_LUN)
52 52  
53   -/* Partition support */
54   -
55   -/* Additional FS support/configuration */
56   -#define CONFIG_SUPPORT_VFAT
57   -
58 53 /* USB/EHCI configuration */
59 54 #define CONFIG_EHCI_IS_TDI
60 55  
include/configs/db-mv784mp-gp.h
Diff comments   View file @ 8bad6cb
... ... @@ -51,9 +51,6 @@
51 51 #define CONFIG_SYS_SATA_MAX_DEVICE 2
52 52 #define CONFIG_LBA48
53 53  
54   -/* Additional FS support/configuration */
55   -#define CONFIG_SUPPORT_VFAT
56   -
57 54 /* PCIe support */
58 55 #ifndef CONFIG_SPL_BUILD
59 56 #define CONFIG_PCI_MVEBU
include/configs/ds414.h
Diff comments   View file @ 8bad6cb
... ... @@ -68,7 +68,6 @@
68 68 #endif
69 69  
70 70 /* why is this only defined in mv-common.h if CONFIG_DM is undefined? */
71   -#define CONFIG_SUPPORT_VFAT
72 71 #define CONFIG_SYS_MVFS
73 72  
74 73 /*
include/configs/edminiv2.h
Diff comments   View file @ 8bad6cb
... ... @@ -165,7 +165,6 @@
165 165 */
166 166 #ifdef CONFIG_CMD_USB
167 167 #define ORION5X_USB20_HOST_PORT_BASE ORION5X_USB20_PORT0_BASE
168   -#define CONFIG_SUPPORT_VFAT
169 168 #endif /* CONFIG_CMD_USB */
170 169  
171 170 /*
include/configs/gplugd.h
Diff comments   View file @ 8bad6cb
... ... @@ -85,7 +85,5 @@
85 85 #define CONFIG_EHCI_IS_TDI
86 86 #endif /* CONFIG_CMD_USB */
87 87  
88   -#define CONFIG_SUPPORT_VFAT
89   -
90 88 #endif /* __CONFIG_GPLUGD_H */
include/configs/mv-common.h
Diff comments   View file @ 8bad6cb
... ... @@ -116,13 +116,6 @@
116 116 #endif
117 117  
118 118 /*
119   - * Common USB/EHCI configuration
120   - */
121   -#if defined(CONFIG_CMD_USB) && !defined(CONFIG_DM)
122   -#define CONFIG_SUPPORT_VFAT
123   -#endif /* CONFIG_CMD_USB */
124   -
125   -/*
126 119 * File system
127 120 */
128 121 #ifdef CONFIG_SYS_MVFS
include/configs/mvebu_armada-37xx.h
Diff comments   View file @ 8bad6cb
... ... @@ -102,8 +102,6 @@
102 102 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
103 103 CONFIG_SYS_SCSI_MAX_LUN)
104 104  
105   -#define CONFIG_SUPPORT_VFAT
106   -
107 105 #include <config_distro_defaults.h>
108 106  
109 107 #define BOOT_TARGET_DEVICES(func) \
include/configs/mvebu_armada-8k.h
Diff comments   View file @ 8bad6cb
... ... @@ -105,8 +105,6 @@
105 105 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
106 106 CONFIG_SYS_SCSI_MAX_LUN)
107 107  
108   -#define CONFIG_SUPPORT_VFAT
109   -
110 108 /*
111 109 * PCI configuration
112 110 */
include/configs/nas220.h
Diff comments   View file @ 8bad6cb
... ... @@ -91,7 +91,6 @@
91 91 #ifdef CONFIG_CMD_USB
92 92 #define CONFIG_USB_EHCI_KIRKWOOD /* on Kirkwood platform */
93 93 #define CONFIG_EHCI_IS_TDI
94   -#define CONFIG_SUPPORT_VFAT
95 94 #endif /* CONFIG_CMD_USB */
96 95  
97 96 /*
include/configs/pic32mzdask.h
Diff comments   View file @ 8bad6cb
... ... @@ -81,12 +81,6 @@
81 81 * USB Configuration
82 82 */
83 83  
84   -/*-----------------------------------------------------------------------
85   - * File System Configuration
86   - */
87   -/* FAT FS */
88   -#define CONFIG_SUPPORT_VFAT
89   -
90 84 /* -------------------------------------------------
91 85 * Environment
92 86 */
include/configs/rcar-gen2-common.h
Diff comments   View file @ 8bad6cb
... ... @@ -11,9 +11,6 @@
11 11  
12 12 #include <asm/arch/rmobile.h>
13 13  
14   -/* Support File sytems */
15   -#define CONFIG_SUPPORT_VFAT
16   -
17 14 #define CONFIG_CMDLINE_TAG
18 15 #define CONFIG_SETUP_MEMORY_TAGS
19 16 #define CONFIG_INITRD_TAG
include/configs/rcar-gen3-common.h
Diff comments   View file @ 8bad6cb
... ... @@ -17,9 +17,6 @@
17 17 /* boot option */
18 18 #define CONFIG_SUPPORT_RAW_INITRD
19 19  
20   -/* Support File sytems */
21   -#define CONFIG_SUPPORT_VFAT
22   -
23 20 #define CONFIG_CMDLINE_TAG
24 21 #define CONFIG_SETUP_MEMORY_TAGS
25 22 #define CONFIG_INITRD_TAG
include/configs/rk3128_common.h
Diff comments   View file @ 8bad6cb
... ... @@ -30,8 +30,6 @@
30 30 /* MMC/SD IP block */
31 31 #define CONFIG_BOUNCE_BUFFER
32 32  
33   -#define CONFIG_SUPPORT_VFAT
34   -
35 33 /* RAW SD card / eMMC locations. */
36 34 #define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10)
37 35  
include/configs/rk3328_common.h
Diff comments   View file @ 8bad6cb
... ... @@ -24,8 +24,6 @@
24 24 /* MMC/SD IP block */
25 25 #define CONFIG_BOUNCE_BUFFER
26 26  
27   -#define CONFIG_SUPPORT_VFAT
28   -
29 27 /* RAW SD card / eMMC locations. */
30 28 #define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10)
31 29  
include/configs/rk3399_common.h
Diff comments   View file @ 8bad6cb
... ... @@ -38,8 +38,6 @@
38 38 #define CONFIG_BOUNCE_BUFFER
39 39 #define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000
40 40  
41   -#define CONFIG_SUPPORT_VFAT
42   -
43 41 /* RAW SD card / eMMC locations. */
44 42 #define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10)
45 43  
include/configs/theadorable.h
Diff comments   View file @ 8bad6cb
... ... @@ -67,9 +67,6 @@
67 67 #define CONFIG_SYS_SATA_MAX_DEVICE 1
68 68 #define CONFIG_LBA48
69 69  
70   -/* Additional FS support/configuration */
71   -#define CONFIG_SUPPORT_VFAT
72   -
73 70 /* PCIe support */
74 71 #ifdef CONFIG_CMD_PCI
75 72 #ifndef CONFIG_SPL_BUILD
include/configs/turris_omnia.h
Diff comments   View file @ 8bad6cb
... ... @@ -59,9 +59,6 @@
59 59 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
60 60 CONFIG_SYS_SCSI_MAX_LUN)
61 61  
62   -/* Additional FS support/configuration */
63   -#define CONFIG_SUPPORT_VFAT
64   -
65 62 /* USB/EHCI configuration */
66 63 #define CONFIG_EHCI_IS_TDI
67 64  
include/configs/vct.h
Diff comments   View file @ 8bad6cb
... ... @@ -72,7 +72,6 @@
72 72 * Commands
73 73 */
74 74 #if defined(CONFIG_CMD_USB)
75   -#define CONFIG_SUPPORT_VFAT
76 75  
77 76 /*
78 77 * USB/EHCI
include/configs/x600.h
Diff comments   View file @ 8bad6cb
... ... @@ -96,10 +96,6 @@
96 96 #define CONFIG_USB_EHCI_SPEAR
97 97 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
98 98  
99   -/* Filesystem support (for USB key) */
100   -#define CONFIG_SUPPORT_VFAT
101   -
102   -
103 99 /*
104 100 * U-Boot Environment placing definitions.
105 101 */
include/configs/x86-common.h
Diff comments   View file @ 8bad6cb
... ... @@ -58,8 +58,6 @@
58 58 #define CONFIG_CMDLINE_EDITING
59 59 #define CONFIG_AUTO_COMPLETE
60 60  
61   -#define CONFIG_SUPPORT_VFAT
62   -
63 61 /*-----------------------------------------------------------------------
64 62 * Command line configuration.
65 63 */
include/configs/zmx25.h
Diff comments   View file @ 8bad6cb
... ... @@ -82,7 +82,6 @@
82 82 #define CONFIG_MXC_USB_PORTSC MXC_EHCI_MODE_SERIAL
83 83 #define CONFIG_MXC_USB_FLAGS (MXC_EHCI_INTERNAL_PHY | MXC_EHCI_IPPUE_DOWN)
84 84 #define CONFIG_EHCI_IS_TDI
85   -#define CONFIG_SUPPORT_VFAT
86 85 #endif /* CONFIG_CMD_USB */
87 86  
88 87 /* SDRAM */
include/configs/zynq-common.h
Diff comments   View file @ 8bad6cb
... ... @@ -124,10 +124,6 @@
124 124 # define DFU_ALT_INFO
125 125 #endif
126 126  
127   -#if defined(CONFIG_MMC_SDHCI_ZYNQ) || defined(CONFIG_ZYNQ_USB)
128   -# define CONFIG_SUPPORT_VFAT
129   -#endif
130   -
131 127 #if defined(CONFIG_ZYNQ_I2C0) || defined(CONFIG_ZYNQ_I2C1)
132 128 #define CONFIG_SYS_I2C_ZYNQ
133 129 #endif
... ... @@ -13,7 +13,6 @@
13 13 #include <asm/byteorder.h>
14 14 #include <fs.h>
15 15  
16   -#define CONFIG_SUPPORT_VFAT
17 16 /* Maximum Long File Name length supported here is 128 UTF-16 code units */
18 17 #define VFAT_MAXLEN_BYTES 256 /* Maximum LFN buffer in bytes */
19 18 #define VFAT_MAXSEQ 9 /* Up to 9 of 13 2-byte UTF-16 entries */
scripts/config_whitelist.txt
Diff comments   View file @ 8bad6cb
... ... @@ -2163,7 +2163,6 @@
2163 2163 CONFIG_SUPPORT_EMMC_BOOT
2164 2164 CONFIG_SUPPORT_EMMC_RPMB
2165 2165 CONFIG_SUPPORT_RAW_INITRD
2166   -CONFIG_SUPPORT_VFAT
2167 2166 CONFIG_SUVD3
2168 2167 CONFIG_SXNI855T
2169 2168 CONFIG_SYSFLAGS_ADDR