Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit dd60d1223b99a88a7216f3e041fe40634ad4c2bb

Authored by Jon Loeliger
1 parent c91898bbc5
Exists in master and in 56 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, imx_v2015.04_4.1.15_1.0.0_ga, 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-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.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, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

fs/: Remove obsolete references to CONFIG_COMMANDS 

Signed-off-by: Jon Loeliger <jdl@freescale.com>

Showing 23 changed files with 42 additions and 42 deletions Side-by-side Diff

... ... @@ -27,7 +27,7 @@
27 27 #include <common.h>
28 28 #include <malloc.h>
29 29  
30   -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
  30 +#if defined(CONFIG_CMD_JFFS2)
31 31  
32 32 #include <asm/byteorder.h>
33 33 #include <linux/stat.h>
fs/cramfs/uncompress.c
Diff comments   View file @ dd60d12
... ... @@ -25,7 +25,7 @@
25 25 #include <watchdog.h>
26 26 #include <zlib.h>
27 27  
28   -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
  28 +#if defined(CONFIG_CMD_JFFS2)
29 29  
30 30 static z_stream stream;
31 31  
... ... @@ -25,7 +25,7 @@
25 25  
26 26  
27 27 #include <common.h>
28   -#if (CONFIG_COMMANDS & CFG_CMD_EXT2) || defined(CONFIG_CMD_EXT2)
  28 +#if defined(CONFIG_CMD_EXT2)
29 29  
30 30 #include <config.h>
31 31 #include <ext2fs.h>
... ... @@ -25,7 +25,7 @@
25 25  
26 26 #include <common.h>
27 27  
28   -#if (CONFIG_COMMANDS & CFG_CMD_EXT2) || defined(CONFIG_CMD_EXT2)
  28 +#if defined(CONFIG_CMD_EXT2)
29 29 #include <ext2fs.h>
30 30 #include <malloc.h>
31 31 #include <asm/byteorder.h>
... ... @@ -31,7 +31,7 @@
31 31 #include <asm/byteorder.h>
32 32 #include <part.h>
33 33  
34   -#if (CONFIG_COMMANDS & CFG_CMD_FAT) || defined(CONFIG_CMD_FAT)
  34 +#if defined(CONFIG_CMD_FAT)
35 35  
36 36 /*
37 37 * Convert a string to lowercase.
... ... @@ -90,9 +90,9 @@
90 90 part_offset=0;
91 91 }
92 92 else {
93   -#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE) || \
94   - (CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI) || \
95   - (CONFIG_COMMANDS & CFG_CMD_USB) || defined(CONFIG_CMD_USB) || \
  93 +#if (defined(CONFIG_CMD_IDE) || \
  94 + defined(CONFIG_CMD_SCSI) || \
  95 + defined(CONFIG_CMD_USB) || \
96 96 (defined(CONFIG_MMC) && defined(CONFIG_LPC2292)) || \
97 97 defined(CONFIG_SYSTEMACE) )
98 98 disk_partition_t info;
... ... @@ -975,9 +975,9 @@
975 975 printf("No current device\n");
976 976 return 1;
977 977 }
978   -#if (CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE) || \
979   - (CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI) || \
980   - (CONFIG_COMMANDS & CFG_CMD_USB) || defined(CONFIG_CMD_USB) || \
  978 +#if defined(CONFIG_CMD_IDE) || \
  979 + defined(CONFIG_CMD_SCSI) || \
  980 + defined(CONFIG_CMD_USB) || \
981 981 (CONFIG_MMC)
982 982 printf("Interface: ");
983 983 switch(cur_dev->if_type) {
... ... @@ -1019,5 +1019,5 @@
1019 1019 return do_fat_read(filename, buffer, maxsize, LS_NO);
1020 1020 }
1021 1021  
1022   -#endif /* #if (CONFIG_COMMANDS & CFG_CMD_FAT) */
  1022 +#endif
... ... @@ -32,7 +32,7 @@
32 32 #include <linux/stat.h>
33 33 #include <linux/time.h>
34 34  
35   -#if (CONFIG_COMMANDS & CFG_CMD_FAT) || defined(CONFIG_CMD_FAT)
  35 +#if defined(CONFIG_CMD_FAT)
36 36  
37 37 /* Supported filesystems */
38 38 static const struct filesystem filesystems[] = {
... ... @@ -205,5 +205,5 @@
205 205 return filesystems[current_filesystem].read(arg, buffer, maxsize);
206 206 }
207 207  
208   -#endif /* #if (CONFIG_COMMANDS & CFG_CMD_FAT) */
  208 +#endif
... ... @@ -28,7 +28,7 @@
28 28 #include "dos.h"
29 29 #include "fdos.h"
30 30  
31   -#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
  31 +#if defined(CONFIG_CMD_FDOS)
32 32  
33 33 #define NB_HEADS 2
34 34 #define NB_TRACKS 80
... ... @@ -26,7 +26,7 @@
26 26 #include <config.h>
27 27 #include <malloc.h>
28 28  
29   -#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
  29 +#if defined(CONFIG_CMD_FDOS)
30 30  
31 31 #include "dos.h"
32 32 #include "fdos.h"
... ... @@ -25,7 +25,7 @@
25 25 #include <common.h>
26 26 #include <config.h>
27 27  
28   -#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
  28 +#if defined(CONFIG_CMD_FDOS)
29 29 #include <malloc.h>
30 30 #include "dos.h"
31 31 #include "fdos.h"
... ... @@ -26,7 +26,7 @@
26 26 #include <config.h>
27 27 #include <malloc.h>
28 28  
29   -#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
  29 +#if defined(CONFIG_CMD_FDOS)
30 30  
31 31 #include "dos.h"
32 32 #include "fdos.h"
... ... @@ -26,7 +26,7 @@
26 26 #include <config.h>
27 27 #include <malloc.h>
28 28  
29   -#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
  29 +#if defined(CONFIG_CMD_FDOS)
30 30  
31 31 #include "dos.h"
32 32 #include "fdos.h"
... ... @@ -25,7 +25,7 @@
25 25 #include <common.h>
26 26 #include <config.h>
27 27  
28   -#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
  28 +#if defined(CONFIG_CMD_FDOS)
29 29 #include <linux/ctype.h>
30 30  
31 31 #include "dos.h"
fs/jffs2/compr_lzari.c
Diff comments   View file @ dd60d12
... ... @@ -50,7 +50,7 @@
50 50  
51 51  
52 52 #include <config.h>
53   -#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_LZO_LZARI)
  53 +#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_LZO_LZARI)
54 54  
55 55 #include <linux/stddef.h>
56 56 #include <jffs2/jffs2.h>
... ... @@ -259,5 +259,5 @@
259 259 {
260 260 return Decode(data_in, cpage_out, srclen, destlen);
261 261 }
262   -#endif /* ((CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_LZO_LZARI)) */
  262 +#endif
fs/jffs2/compr_lzo.c
Diff comments   View file @ dd60d12
... ... @@ -67,7 +67,7 @@
67 67  
68 68  
69 69 #include <config.h>
70   -#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_LZO_LZARI)
  70 +#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_LZO_LZARI)
71 71  
72 72 #include <linux/stddef.h>
73 73 #include <jffs2/jffs2.h>
... ... @@ -402,5 +402,5 @@
402 402 return lzo1x_decompress (data_in, srclen, cpage_out, &outlen, NULL);
403 403 }
404 404  
405   -#endif /* ((CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_LZO_LZARI)) */
  405 +#endif
fs/jffs2/compr_rtime.c
Diff comments   View file @ dd60d12
... ... @@ -46,7 +46,7 @@
46 46 */
47 47  
48 48 #include <config.h>
49   -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
  49 +#if defined(CONFIG_CMD_JFFS2)
50 50  
51 51 #include <jffs2/jffs2.h>
52 52  
fs/jffs2/compr_rubin.c
Diff comments   View file @ dd60d12
... ... @@ -39,7 +39,7 @@
39 39 */
40 40  
41 41 #include <config.h>
42   -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
  42 +#if defined(CONFIG_CMD_JFFS2)
43 43  
44 44 #include <jffs2/jffs2.h>
45 45 #include <jffs2/compr_rubin.h>
fs/jffs2/compr_zlib.c
Diff comments   View file @ dd60d12
... ... @@ -37,7 +37,7 @@
37 37  
38 38 #include <common.h>
39 39 #include <config.h>
40   -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
  40 +#if defined(CONFIG_CMD_JFFS2)
41 41  
42 42 #include <jffs2/jffs2.h>
43 43 #include <jffs2/mini_inflate.h>
fs/jffs2/jffs2_1pass.c
Diff comments   View file @ dd60d12
... ... @@ -117,7 +117,7 @@
117 117 #include <linux/stat.h>
118 118 #include <linux/time.h>
119 119  
120   -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
  120 +#if defined(CONFIG_CMD_JFFS2)
121 121  
122 122 #include <jffs2/jffs2.h>
123 123 #include <jffs2/jffs2_1pass.h>
... ... @@ -144,7 +144,7 @@
144 144 static struct part_info *current_part;
145 145  
146 146 #if (defined(CONFIG_JFFS2_NAND) && \
147   - ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) )
  147 + defined(CONFIG_CMD_NAND) )
148 148 #if defined(CFG_NAND_LEGACY)
149 149 #include <linux/mtd/nand_legacy.h>
150 150 #else
151 151  
... ... @@ -275,10 +275,10 @@
275 275 {
276 276 free(buf);
277 277 }
278   -#endif /* #if defined(CONFIG_JFFS2_NAND) && (CONFIG_COMMANDS & CFG_CMD_NAND) */
  278 +#endif
279 279  
280 280  
281   -#if (CONFIG_COMMANDS & CFG_CMD_FLASH) || defined(CONFIG_CMD_FLASH)
  281 +#if defined(CONFIG_CMD_FLASH)
282 282 /*
283 283 * Support for jffs2 on top of NOR-flash
284 284 *
... ... @@ -301,7 +301,7 @@
301 301 {
302 302 return (void*)get_fl_mem_nor(off);
303 303 }
304   -#endif /* #if (CONFIG_COMMANDS & CFG_CMD_FLASH) */
  304 +#endif
305 305  
306 306  
307 307 /*
308 308  
... ... @@ -312,12 +312,12 @@
312 312 {
313 313 struct mtdids *id = current_part->dev->id;
314 314  
315   -#if (CONFIG_COMMANDS & CFG_CMD_FLASH) || defined(CONFIG_CMD_FLASH)
  315 +#if defined(CONFIG_CMD_FLASH)
316 316 if (id->type == MTD_DEV_TYPE_NOR)
317 317 return get_fl_mem_nor(off);
318 318 #endif
319 319  
320   -#if defined(CONFIG_JFFS2_NAND) && ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND))
  320 +#if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)
321 321 if (id->type == MTD_DEV_TYPE_NAND)
322 322 return get_fl_mem_nand(off, size, ext_buf);
323 323 #endif
324 324  
... ... @@ -330,13 +330,13 @@
330 330 {
331 331 struct mtdids *id = current_part->dev->id;
332 332  
333   -#if (CONFIG_COMMANDS & CFG_CMD_FLASH) || defined(CONFIG_CMD_FLASH)
  333 +#if defined(CONFIG_CMD_FLASH)
334 334 if (id->type == MTD_DEV_TYPE_NOR)
335 335 return get_node_mem_nor(off);
336 336 #endif
337 337  
338 338 #if defined(CONFIG_JFFS2_NAND) && \
339   - (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
  339 + defined(CONFIG_CMD_NAND)
340 340 if (id->type == MTD_DEV_TYPE_NAND)
341 341 return get_node_mem_nand(off);
342 342 #endif
... ... @@ -348,7 +348,7 @@
348 348 static inline void put_fl_mem(void *buf)
349 349 {
350 350 #if defined(CONFIG_JFFS2_NAND) && \
351   - (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
  351 + defined(CONFIG_CMD_NAND)
352 352 struct mtdids *id = current_part->dev->id;
353 353  
354 354 if (id->type == MTD_DEV_TYPE_NAND)
fs/jffs2/jffs2_nand_1pass.c
Diff comments   View file @ dd60d12
1 1 #include <common.h>
2 2  
3   -#if !defined(CFG_NAND_LEGACY) && ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2))
  3 +#if !defined(CFG_NAND_LEGACY) && defined(CONFIG_CMD_JFFS2)
4 4  
5 5 #include <malloc.h>
6 6 #include <linux/stat.h>
fs/jffs2/mini_inflate.c
Diff comments   View file @ dd60d12
... ... @@ -25,7 +25,7 @@
25 25  
26 26 #include <config.h>
27 27  
28   -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
  28 +#if defined(CONFIG_CMD_JFFS2)
29 29  
30 30 #include <jffs2/mini_inflate.h>
31 31  
... ... @@ -19,7 +19,7 @@
19 19  
20 20  
21 21 #include <common.h>
22   -#if (CONFIG_COMMANDS & CFG_CMD_REISER) || defined(CONFIG_CMD_REISER)
  22 +#if defined(CONFIG_CMD_REISER)
23 23  
24 24 #include <config.h>
25 25 #include <reiserfs.h>
fs/reiserfs/mode_string.c
Diff comments   View file @ dd60d12
... ... @@ -26,7 +26,7 @@
26 26  
27 27  
28 28 #include <common.h>
29   -#if (CONFIG_COMMANDS & CFG_CMD_REISER) || defined(CONFIG_CMD_REISER)
  29 +#if defined(CONFIG_CMD_REISER)
30 30 #include <linux/stat.h>
31 31  
32 32 #if ( S_ISUID != 04000 ) || ( S_ISGID != 02000 ) || ( S_ISVTX != 01000 ) \
fs/reiserfs/reiserfs.c
Diff comments   View file @ dd60d12
... ... @@ -29,7 +29,7 @@
29 29 */
30 30  
31 31 #include <common.h>
32   -#if (CONFIG_COMMANDS & CFG_CMD_REISER) || defined(CONFIG_CMD_REISER)
  32 +#if defined(CONFIG_CMD_REISER)
33 33  
34 34 #include <malloc.h>
35 35 #include <linux/ctype.h>