Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 902531788376046da212afd1661cffb62f3daa1c

Authored by Jon Loeliger
1 parent d39b574158
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.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

common/: Remove lingering references to CFG_CMD_* symbols. 

Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always compiled
even when IDE really wasn't defined/wanted.

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

Showing 35 changed files with 69 additions and 67 deletions Side-by-side Diff

common/cmd_autoscript.c
Diff comments   View file @ 9025317
... ... @@ -149,7 +149,8 @@
149 149 return rcode;
150 150 }
151 151  
152   -#endif /* CONFIG_AUTOSCRIPT || CFG_CMD_AUTOSCRIPT */
  152 +#endif
  153 +
153 154 /**************************************************/
154 155 #if defined(CONFIG_CMD_AUTOSCRIPT)
155 156 int
156 157  
... ... @@ -176,7 +177,7 @@
176 177 "[addr] - run script starting at addr"
177 178 " - A valid autoscr header must be present\n"
178 179 );
179   -#endif /* CFG_CMD_AUTOSCRIPT */
  180 +#endif
180 181  
181   -#endif /* CFG_CMD_AUTOSCRIPT */
  182 +#endif
... ... @@ -167,7 +167,7 @@
167 167 print_num ("sram size", (ulong)bd->bi_sramsize);
168 168 #endif
169 169  
170   -#if defined(CFG_CMD_NET)
  170 +#if defined(CONFIG_CMD_NET)
171 171 puts ("ethaddr =");
172 172 for (i=0; i<6; ++i) {
173 173 printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
... ... @@ -195,7 +195,7 @@
195 195 print_num ("sram start ", (ulong)bd->bi_sramstart);
196 196 print_num ("sram size ", (ulong)bd->bi_sramsize);
197 197 #endif
198   -#if defined(CFG_CMD_NET)
  198 +#if defined(CONFIG_CMD_NET)
199 199 puts ("ethaddr =");
200 200 for (i=0; i<6; ++i) {
201 201 printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
... ... @@ -285,5 +285,5 @@
285 285 "bdinfo - print Board Info structure\n",
286 286 NULL
287 287 );
288   -#endif /* CFG_CMD_BDI */
  288 +#endif
... ... @@ -413,7 +413,7 @@
413 413 U_BOOT_CMD (rdump, 1, 1, do_bedbug_rdump,
414 414 "rdump - Show registers.\n", " - Show registers.\n");
415 415 /* ====================================================================== */
416   -#endif /* CFG_CMD_BEDBUG */
  416 +#endif
417 417  
418 418  
419 419 /*
... ... @@ -138,7 +138,7 @@
138 138 static boot_os_Fcn do_bootm_qnxelf;
139 139 int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] );
140 140 int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] );
141   -#endif /* CFG_CMD_ELF */
  141 +#endif
142 142 #if defined(CONFIG_ARTOS) && defined(CONFIG_PPC)
143 143 static boot_os_Fcn do_bootm_artos;
144 144 #endif
... ... @@ -449,7 +449,7 @@
449 449 do_bootm_qnxelf (cmdtp, flag, argc, argv,
450 450 addr, len_ptr, verify);
451 451 break;
452   -#endif /* CFG_CMD_ELF */
  452 +#endif
453 453 #ifdef CONFIG_ARTOS
454 454 case IH_OS_ARTOS:
455 455 do_bootm_artos (cmdtp, flag, argc, argv,
... ... @@ -1315,7 +1315,7 @@
1315 1315 " image contents (magic number, header and payload checksums)\n"
1316 1316 );
1317 1317  
1318   -#endif /* CFG_CMD_IMI */
  1318 +#endif
1319 1319  
1320 1320 #if defined(CONFIG_CMD_IMLS)
1321 1321 /*-----------------------------------------------------------------------
... ... @@ -1373,7 +1373,7 @@
1373 1373 " - Prints information about all images found at sector\n"
1374 1374 " boundaries in flash.\n"
1375 1375 );
1376   -#endif /* CFG_CMD_IMLS */
  1376 +#endif
1377 1377  
1378 1378 void
1379 1379 print_image_hdr (image_header_t *hdr)
... ... @@ -1389,7 +1389,7 @@
1389 1389 printf (" Created: %4d-%02d-%02d %2d:%02d:%02d UTC\n",
1390 1390 tm.tm_year, tm.tm_mon, tm.tm_mday,
1391 1391 tm.tm_hour, tm.tm_min, tm.tm_sec);
1392   -#endif /* CFG_CMD_DATE, CONFIG_TIMESTAMP */
  1392 +#endif
1393 1393 puts (" Image Type: "); print_type(hdr);
1394 1394 printf ("\n Data Size: %d Bytes = ", ntohl(hdr->ih_size));
1395 1395 print_size (ntohl(hdr->ih_size), "\n");
... ... @@ -1614,7 +1614,7 @@
1614 1614 local_args[1] = str; /* and provide it via the arguments */
1615 1615 do_bootelf(cmdtp, 0, 2, local_args);
1616 1616 }
1617   -#endif /* CFG_CMD_ELF */
  1617 +#endif
1618 1618  
1619 1619 #ifdef CONFIG_LYNXKDI
1620 1620 static void
... ... @@ -109,5 +109,5 @@
109 109 " - enable or disable data (writethrough) cache\n"
110 110 );
111 111  
112   -#endif /* CFG_CMD_CACHE */
  112 +#endif
common/cmd_console.c
Diff comments   View file @ 9025317
... ... @@ -68,5 +68,5 @@
68 68 ""
69 69 );
70 70  
71   -#endif /* CFG_CMD_CONSOLE */
  71 +#endif
... ... @@ -211,5 +211,5 @@
211 211 " - with 'reset' argument: reset the RTC\n"
212 212 );
213 213  
214   -#endif /* CFG_CMD_DATE */
  214 +#endif
... ... @@ -246,5 +246,5 @@
246 246 "adr_dcrn[.dat_dcrn] offset value - write offset to adr_dcrn, write value to dat_dcrn.\n"
247 247 );
248 248  
249   -#endif /* CONFIG_4xx & CFG_CMD_SETGETDCR */
  249 +#endif
... ... @@ -77,5 +77,5 @@
77 77 " - run specified tests\n"
78 78 );
79 79  
80   -#endif /* CFG_CMD_DIAG */
  80 +#endif
common/cmd_display.c
Diff comments   View file @ 9025317
... ... @@ -79,5 +79,5 @@
79 79 " - without arguments: clear dot matrix display\n"
80 80 );
81 81  
82   -#endif /* CFG_CMD_DISPLAY */
  82 +#endif
... ... @@ -110,7 +110,7 @@
110 110 printf ("Usage:\n%s\n", cmdtp->usage);
111 111 return 1;
112 112 }
113   -#endif /* CFG_CMD_EEPROM */
  113 +#endif
114 114  
115 115 /*-----------------------------------------------------------------------
116 116 *
... ... @@ -422,7 +422,8 @@
422 422 }
423 423 /*-----------------------------------------------------------------------
424 424 */
425   -#endif /* CFG_CMD_EEPROM */
  425 +#endif
  426 +
426 427 /***************************************************/
427 428  
428 429 #if defined(CONFIG_CMD_EEPROM)
... ... @@ -445,5 +446,5 @@
445 446 );
446 447 #endif /* CFG_I2C_MULTI_EEPROMS */
447 448  
448   -#endif /* CFG_CMD_EEPROM */
  449 +#endif
... ... @@ -324,5 +324,5 @@
324 324 " [address] - load address of vxWorks ELF image.\n"
325 325 );
326 326  
327   -#endif /* CFG_CMD_ELF */
  327 +#endif
... ... @@ -324,5 +324,5 @@
324 324 }
325 325 #endif /* NOT_IMPLEMENTED_YET */
326 326  
327   -#endif /* CFG_CMD_FAT */
  327 +#endif
... ... @@ -732,5 +732,5 @@
732 732 #undef TMP_PROT_ON
733 733 #undef TMP_PROT_OFF
734 734  
735   -#endif /* CFG_CMD_FLASH */
  735 +#endif
... ... @@ -877,7 +877,7 @@
877 877  
878 878 return 0;
879 879 }
880   -#endif /* CFG_CMD_SDRAM */
  880 +#endif
881 881  
882 882 #if defined(CONFIG_I2C_CMD_TREE)
883 883 #if defined(CONFIG_I2C_MULTI_BUS)
... ... @@ -941,7 +941,7 @@
941 941 #if defined(CONFIG_CMD_SDRAM)
942 942 if (!strncmp(argv[1], "sd", 2))
943 943 return do_sdram(cmdtp, flag, --argc, ++argv);
944   -#endif /* CFG_CMD_SDRAM */
  944 +#endif
945 945 else
946 946 printf ("Usage:\n%s\n", cmdtp->usage);
947 947 return 0;
... ... @@ -967,7 +967,7 @@
967 967 "i2c loop chip address[.0, .1, .2] [# of objects] - looping read of device\n"
968 968 #if defined(CONFIG_CMD_SDRAM)
969 969 "i2c sdram chip - print SDRAM configuration information\n"
970   -#endif /* CFG_CMD_SDRAM */
  970 +#endif
971 971 );
972 972 #endif /* CONFIG_I2C_CMD_TREE */
973 973 U_BOOT_CMD(
... ... @@ -1025,5 +1025,5 @@
1025 1025 );
1026 1026 #endif
1027 1027  
1028   -#endif /* CFG_CMD_I2C */
  1028 +#endif
... ... @@ -720,5 +720,5 @@
720 720 );
721 721  
722 722  
723   -#endif /* CFG_CMD_IMMAP && (CONFIG_8xx || CONFIG_8260) */
  723 +#endif
... ... @@ -2192,5 +2192,5 @@
2192 2192  
2193 2193 /***************************************************/
2194 2194  
2195   -#endif /* CFG_CMD_JFFS2 */
  2195 +#endif
... ... @@ -43,10 +43,10 @@
43 43 # if defined(CONFIG_CMD_SAVES)
44 44 static int save_serial (ulong offset, ulong size);
45 45 static int write_record (char *buf);
46   -# endif /* CFG_CMD_SAVES */
  46 +#endif
47 47  
48 48 static int do_echo = 1;
49   -#endif /* CFG_CMD_LOADS */
  49 +#endif
50 50  
51 51 /* -------------------------------------------------------------------- */
52 52  
53 53  
... ... @@ -399,9 +399,9 @@
399 399 }
400 400 return (0);
401 401 }
402   -# endif /* CFG_CMD_SAVES */
  402 +# endif
403 403  
404   -#endif /* CFG_CMD_LOADS */
  404 +#endif
405 405  
406 406  
407 407 #if defined(CONFIG_CMD_LOADB)
... ... @@ -1038,7 +1038,7 @@
1038 1038 return offset;
1039 1039 }
1040 1040  
1041   -#endif /* CFG_CMD_LOADB */
  1041 +#endif
1042 1042  
1043 1043 /* -------------------------------------------------------------------- */
1044 1044  
... ... @@ -1084,8 +1084,8 @@
1084 1084 " - save S-Record file over serial line with offset 'off' and size 'size'\n"
1085 1085 );
1086 1086 #endif /* CFG_LOADS_BAUD_CHANGE */
1087   -#endif /* CFG_CMD_SAVES */
1088   -#endif /* CFG_CMD_LOADS */
  1087 +#endif
  1088 +#endif
1089 1089  
1090 1090  
1091 1091 #if defined(CONFIG_CMD_LOADB)
... ... @@ -1105,7 +1105,7 @@
1105 1105 " with offset 'off' and baudrate 'baud'\n"
1106 1106 );
1107 1107  
1108   -#endif /* CFG_CMD_LOADB */
  1108 +#endif
1109 1109  
1110 1110 /* -------------------------------------------------------------------- */
1111 1111  
... ... @@ -1135,5 +1135,5 @@
1135 1135 "[on|off]\n - change RTS/CTS hardware flow control over serial line\n"
1136 1136 );
1137 1137  
1138   -#endif /* CFG_CMD_HWFLOW */
  1138 +#endif
... ... @@ -1253,5 +1253,5 @@
1253 1253 #endif /* CONFIG_MX_CYCLIC */
1254 1254  
1255 1255 #endif
1256   -#endif /* CFG_CMD_MEMORY */
  1256 +#endif
... ... @@ -414,5 +414,5 @@
414 414 " 1 - EAR - Exception address register\n"
415 415 " 2 - ESR - Exception status register\n");
416 416  
417   -#endif /* CONFIG_MICROBLAZE & CFG_CMD_MFSL */
  417 +#endif
... ... @@ -595,5 +595,5 @@
595 595  
596 596 #endif /* CONFIG_TERSE_MII */
597 597  
598   -#endif /* CFG_CMD_MII */
  598 +#endif
... ... @@ -69,5 +69,5 @@
69 69 " - delay execution for N seconds (N is _decimal_ !!!)\n"
70 70 );
71 71  
72   -#endif /* CFG_CMD_MISC */
  72 +#endif
... ... @@ -43,5 +43,5 @@
43 43 NULL
44 44 );
45 45  
46   -#endif /* CFG_CMD_MMC */
  46 +#endif
... ... @@ -79,7 +79,7 @@
79 79 "dhcp\t- invoke DHCP client to obtain IP/boot params\n",
80 80 "\n"
81 81 );
82   -#endif /* CFG_CMD_DHCP */
  82 +#endif
83 83  
84 84 #if defined(CONFIG_CMD_NFS)
85 85 int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
... ... @@ -92,7 +92,7 @@
92 92 "nfs\t- boot image via network using NFS protocol\n",
93 93 "[loadAddress] [host ip addr:bootfilename]\n"
94 94 );
95   -#endif /* CFG_CMD_NFS */
  95 +#endif
96 96  
97 97 static void netboot_update_env (void)
98 98 {
... ... @@ -249,7 +249,7 @@
249 249 "ping\t- send ICMP ECHO_REQUEST to network host\n",
250 250 "pingAddress\n"
251 251 );
252   -#endif /* CFG_CMD_PING */
  252 +#endif
253 253  
254 254 #if defined(CONFIG_CMD_CDP)
255 255  
... ... @@ -292,7 +292,7 @@
292 292 cdp, 1, 1, do_cdp,
293 293 "cdp\t- Perform CDP network configuration\n",
294 294 );
295   -#endif /* CFG_CMD_CDP */
  295 +#endif
296 296  
297 297 #if defined(CONFIG_CMD_SNTP)
298 298 int do_sntp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
299 299  
... ... @@ -330,7 +330,7 @@
330 330 "sntp\t- synchronize RTC via network\n",
331 331 "[NTP server IP]\n"
332 332 );
333   -#endif /* CFG_CMD_SNTP */
  333 +#endif
334 334  
335   -#endif /* CFG_CMD_NET */
  335 +#endif
... ... @@ -372,7 +372,7 @@
372 372 copy_filename (BootFile, argv[2], sizeof(BootFile));
373 373 return 0;
374 374 }
375   -#endif /* CFG_CMD_NET */
  375 +#endif
376 376  
377 377 #ifdef CONFIG_AMIGAONEG3SE
378 378 if (strcmp(argv[1], "vga_fg_color") == 0 ||
... ... @@ -483,7 +483,7 @@
483 483 /* Continue calling setenv code */
484 484 return _do_setenv (flag, len, local_args);
485 485 }
486   -#endif /* CFG_CMD_ASKENV */
  486 +#endif
487 487  
488 488 /************************************************************************
489 489 * Look up variable from environment,
... ... @@ -603,7 +603,7 @@
603 603 NULL
604 604 );
605 605  
606   -#endif /* CFG_CMD_ENV */
  606 +#endif
607 607  
608 608 #if defined(CONFIG_CMD_ASKENV)
609 609  
... ... @@ -620,7 +620,7 @@
620 620 " - display 'message' string and get environment variable 'name'"
621 621 "from stdin (max 'size' chars)\n"
622 622 );
623   -#endif /* CFG_CMD_ASKENV */
  623 +#endif
624 624  
625 625 #if defined(CONFIG_CMD_RUN)
626 626 int do_run (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
... ... @@ -630,5 +630,5 @@
630 630 "var [...]\n"
631 631 " - run the commands in the environment variable(s) 'var'\n"
632 632 );
633   -#endif /* CFG_CMD_RUN */
  633 +#endif
... ... @@ -166,5 +166,5 @@
166 166 " - read datum from IO port\n"
167 167 );
168 168  
169   -#endif /* CFG_CMD_PORTIO */
  169 +#endif
... ... @@ -140,5 +140,5 @@
140 140 "<dout> - Hexadecimal string that gets sent\n"
141 141 );
142 142  
143   -#endif /* CFG_CMD_SPI */
  143 +#endif
... ... @@ -73,7 +73,7 @@
73 73 "vfd ADDR\n"
74 74 " - load bitmap at address ADDR\n"
75 75 );
76   -#endif /* CFG_CMD_VFD */
  76 +#endif
77 77  
78 78 #ifdef CONFIG_VFD
79 79 int trab_vfd (ulong bitmap)
... ... @@ -76,7 +76,7 @@
76 76 " - echo args to console; \\c suppresses newline\n"
77 77 );
78 78  
79   -#endif /* CFG_CMD_ECHO */
  79 +#endif
80 80  
81 81 #ifdef CFG_HUSH_PARSER
82 82  
... ... @@ -40,7 +40,7 @@
40 40 #if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)
41 41 #define CMD_SAVEENV
42 42 #elif defined(CFG_ENV_ADDR_REDUND)
43   -#error Cannot use CFG_ENV_ADDR_REDUND without CFG_CMD_ENV & CFG_CMD_FLASH
  43 +#error Cannot use CFG_ENV_ADDR_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_FLASH
44 44 #endif
45 45  
46 46 #if defined(CFG_ENV_SIZE_REDUND) && (CFG_ENV_SIZE_REDUND < CFG_ENV_SIZE)
... ... @@ -42,7 +42,7 @@
42 42 #if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)
43 43 #define CMD_SAVEENV
44 44 #elif defined(CFG_ENV_OFFSET_REDUND)
45   -#error Cannot use CFG_ENV_OFFSET_REDUND without CFG_CMD_ENV & CFG_CMD_NAND
  45 +#error Cannot use CFG_ENV_OFFSET_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_NAND
46 46 #endif
47 47  
48 48 #if defined(CFG_ENV_SIZE_REDUND) && (CFG_ENV_SIZE_REDUND != CFG_ENV_SIZE)
... ... @@ -1694,7 +1694,7 @@
1694 1694 else
1695 1695 flag |= CMD_FLAG_BOOTD;
1696 1696 }
1697   -#endif /* CFG_CMD_BOOTD */
  1697 +#endif
1698 1698 /* found - check max args */
1699 1699 if ((child->argc - i) > cmdtp->maxargs) {
1700 1700 printf ("Usage:\n%s\n", cmdtp->usage);
... ... @@ -591,5 +591,5 @@
591 591  
592 592 int kgdb_not_configured = 1;
593 593  
594   -#endif /* CFG_CMD_KGDB */
  594 +#endif
... ... @@ -1325,7 +1325,7 @@
1325 1325 flag |= CMD_FLAG_BOOTD;
1326 1326 }
1327 1327 }
1328   -#endif /* CFG_CMD_BOOTD */
  1328 +#endif
1329 1329  
1330 1330 /* OK - call function to do the command */
1331 1331 if ((cmdtp->cmd) (cmdtp, flag, argc, argv) != 0) {
... ... @@ -1372,5 +1372,5 @@
1372 1372 }
1373 1373 return 0;
1374 1374 }
1375   -#endif /* CFG_CMD_RUN */
  1375 +#endif
common/usb_storage.c
Diff comments   View file @ 9025317
... ... @@ -1249,5 +1249,5 @@
1249 1249 }
1250 1250  
1251 1251 #endif /* CONFIG_USB_STORAGE */
1252   -#endif /* CFG_CMD_USB */
  1252 +#endif