Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit a76adc8142c1d956385a109e0b70f9319ede4d66

Authored by Jon Loeliger
Committed by Wolfgang Denk
1 parent ec63b10b61
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/cmd_[a-f]* : Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*). 

This is a compatibility step that allows both the older form
and the new form to co-exist for a while until the older can
be removed entirely.

All transformations are of the form:
Before:
    #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
After:
    #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)

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

Showing 21 changed files with 51 additions and 50 deletions Side-by-side Diff

common/cmd_autoscript.c
Diff comments   View file @ a76adc8
... ... @@ -48,7 +48,7 @@
48 48 #endif
49 49  
50 50 #if defined(CONFIG_AUTOSCRIPT) || \
51   - (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT )
  51 + (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
52 52  
53 53 extern image_header_t header; /* from cmd_bootm.c */
54 54 int
... ... @@ -152,7 +152,7 @@
152 152  
153 153 #endif /* CONFIG_AUTOSCRIPT || CFG_CMD_AUTOSCRIPT */
154 154 /**************************************************/
155   -#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
  155 +#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
156 156 int
157 157 do_autoscript (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
158 158 {
... ... @@ -170,7 +170,7 @@
170 170 return rcode;
171 171 }
172 172  
173   -#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
  173 +#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
174 174 U_BOOT_CMD(
175 175 autoscr, 2, 0, do_autoscript,
176 176 "autoscr - run script from memory\n",
... ... @@ -30,7 +30,7 @@
30 30  
31 31 DECLARE_GLOBAL_DATA_PTR;
32 32  
33   -#if (CONFIG_COMMANDS & CFG_CMD_BDI)
  33 +#if (CONFIG_COMMANDS & CFG_CMD_BDI) || defined(CONFIG_CMD_BDI)
34 34 static void print_num(const char *, ulong);
35 35  
36 36 #ifndef CONFIG_ARM /* PowerPC and other */
... ... @@ -13,7 +13,7 @@
13 13  
14 14 DECLARE_GLOBAL_DATA_PTR;
15 15  
16   -#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG)
  16 +#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG)
17 17  
18 18 #ifndef MAX
19 19 #define MAX(a,b) ((a) > (b) ? (a) : (b))
... ... @@ -31,7 +31,7 @@
31 31 #include <asm/byteorder.h>
32 32 #include <malloc.h>
33 33  
34   -#if (CONFIG_COMMANDS & CFG_CMD_BMP)
  34 +#if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_CMD_BMP)
35 35  
36 36 static int bmp_info (ulong addr);
37 37 static int bmp_display (ulong addr, int x, int y);
... ... @@ -188,5 +188,5 @@
188 188 #endif
189 189 }
190 190  
191   -#endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) */
  191 +#endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_CMD_BMP) */
... ... @@ -48,7 +48,7 @@
48 48 /*cmd_boot.c*/
49 49 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
50 50  
51   -#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP)
  51 +#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
52 52 #include <rtc.h>
53 53 #endif
54 54  
55 55  
... ... @@ -89,11 +89,11 @@
89 89 static void *zalloc(void *, unsigned, unsigned);
90 90 static void zfree(void *, void *, unsigned);
91 91  
92   -#if (CONFIG_COMMANDS & CFG_CMD_IMI)
  92 +#if (CONFIG_COMMANDS & CFG_CMD_IMI) || defined(CONFIG_CMD_IMI)
93 93 static int image_info (unsigned long addr);
94 94 #endif
95 95  
96   -#if (CONFIG_COMMANDS & CFG_CMD_IMLS)
  96 +#if (CONFIG_COMMANDS & CFG_CMD_IMLS) || defined(CONFIG_CMD_IMLS)
97 97 #include <flash.h>
98 98 extern flash_info_t flash_info[]; /* info for FLASH chips */
99 99 static int do_imls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
... ... @@ -133,7 +133,7 @@
133 133 #endif
134 134 static boot_os_Fcn do_bootm_netbsd;
135 135 static boot_os_Fcn do_bootm_rtems;
136   -#if (CONFIG_COMMANDS & CFG_CMD_ELF)
  136 +#if (CONFIG_COMMANDS & CFG_CMD_ELF) || defined(CONFIG_CMD_ELF)
137 137 static boot_os_Fcn do_bootm_vxworks;
138 138 static boot_os_Fcn do_bootm_qnxelf;
139 139 int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] );
... ... @@ -440,7 +440,7 @@
440 440 addr, len_ptr, verify);
441 441 break;
442 442  
443   -#if (CONFIG_COMMANDS & CFG_CMD_ELF)
  443 +#if (CONFIG_COMMANDS & CFG_CMD_ELF) || defined(CONFIG_CMD_ELF)
444 444 case IH_OS_VXWORKS:
445 445 do_bootm_vxworks (cmdtp, flag, argc, argv,
446 446 addr, len_ptr, verify);
... ... @@ -1219,7 +1219,7 @@
1219 1219 #endif
1220 1220  
1221 1221  
1222   -#if (CONFIG_COMMANDS & CFG_CMD_BOOTD)
  1222 +#if (CONFIG_COMMANDS & CFG_CMD_BOOTD) || defined(CONFIG_CMD_BOOTD)
1223 1223 int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
1224 1224 {
1225 1225 int rcode = 0;
... ... @@ -1247,7 +1247,7 @@
1247 1247  
1248 1248 #endif
1249 1249  
1250   -#if (CONFIG_COMMANDS & CFG_CMD_IMI)
  1250 +#if (CONFIG_COMMANDS & CFG_CMD_IMI) || defined(CONFIG_CMD_IMI)
1251 1251 int do_iminfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
1252 1252 {
1253 1253 int arg;
... ... @@ -1317,7 +1317,7 @@
1317 1317  
1318 1318 #endif /* CFG_CMD_IMI */
1319 1319  
1320   -#if (CONFIG_COMMANDS & CFG_CMD_IMLS)
  1320 +#if (CONFIG_COMMANDS & CFG_CMD_IMLS) || defined(CONFIG_CMD_IMLS)
1321 1321 /*-----------------------------------------------------------------------
1322 1322 * List all images found in flash.
1323 1323 */
1324 1324  
... ... @@ -1378,13 +1378,13 @@
1378 1378 void
1379 1379 print_image_hdr (image_header_t *hdr)
1380 1380 {
1381   -#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP)
  1381 +#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
1382 1382 time_t timestamp = (time_t)ntohl(hdr->ih_time);
1383 1383 struct rtc_time tm;
1384 1384 #endif
1385 1385  
1386 1386 printf (" Image Name: %.*s\n", IH_NMLEN, hdr->ih_name);
1387   -#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP)
  1387 +#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
1388 1388 to_tm (timestamp, &tm);
1389 1389 printf (" Created: %4d-%02d-%02d %2d:%02d:%02d UTC\n",
1390 1390 tm.tm_year, tm.tm_mon, tm.tm_mday,
... ... @@ -1588,7 +1588,7 @@
1588 1588 (*entry_point ) ( gd->bd );
1589 1589 }
1590 1590  
1591   -#if (CONFIG_COMMANDS & CFG_CMD_ELF)
  1591 +#if (CONFIG_COMMANDS & CFG_CMD_ELF) || defined(CONFIG_CMD_ELF)
1592 1592 static void
1593 1593 do_bootm_vxworks (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
1594 1594 ulong addr, ulong *len_ptr, int verify)
... ... @@ -27,7 +27,7 @@
27 27 #include <common.h>
28 28 #include <command.h>
29 29  
30   -#if (CONFIG_COMMANDS & CFG_CMD_CACHE)
  30 +#if (CONFIG_COMMANDS & CFG_CMD_CACHE) || defined(CONFIG_CMD_CACHE)
31 31  
32 32 static int on_off (const char *);
33 33  
common/cmd_console.c
Diff comments   View file @ a76adc8
... ... @@ -28,7 +28,7 @@
28 28 #include <command.h>
29 29 #include <devices.h>
30 30  
31   -#if (CONFIG_COMMANDS & CFG_CMD_CONSOLE)
  31 +#if (CONFIG_COMMANDS & CFG_CMD_CONSOLE) || defined(CONFIG_CMD_CONSOLE)
32 32  
33 33 extern void _do_coninfo (void);
34 34 int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char *argv[])
... ... @@ -31,7 +31,7 @@
31 31  
32 32 DECLARE_GLOBAL_DATA_PTR;
33 33  
34   -#if (CONFIG_COMMANDS & CFG_CMD_DATE)
  34 +#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE)
35 35  
36 36 const char *weekdays[] = {
37 37 "Sun", "Mon", "Tues", "Wednes", "Thurs", "Fri", "Satur",
... ... @@ -29,7 +29,7 @@
29 29 #include <config.h>
30 30 #include <command.h>
31 31  
32   -#if defined(CONFIG_4xx) && (CONFIG_COMMANDS & CFG_CMD_SETGETDCR)
  32 +#if defined(CONFIG_4xx) && ((CONFIG_COMMANDS & CFG_CMD_SETGETDCR) || defined(CONFIG_CMD_SETGETDCR))
33 33  
34 34 unsigned long get_dcr (unsigned short);
35 35 unsigned long set_dcr (unsigned short, unsigned long);
... ... @@ -28,7 +28,7 @@
28 28 #include <command.h>
29 29 #include <post.h>
30 30  
31   -#if (CONFIG_COMMANDS & CFG_CMD_DIAG) && defined(CONFIG_POST)
  31 +#if ((CONFIG_COMMANDS & CFG_CMD_DIAG) || defined(CONFIG_CMD_DIAG)) && defined(CONFIG_POST)
32 32  
33 33 int do_diag (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
34 34 {
common/cmd_display.c
Diff comments   View file @ a76adc8
... ... @@ -24,7 +24,7 @@
24 24 #include <common.h>
25 25 #include <command.h>
26 26  
27   -#if (CONFIG_COMMANDS & CFG_CMD_DISPLAY)
  27 +#if (CONFIG_COMMANDS & CFG_CMD_DISPLAY) || defined(CONFIG_CMD_DISPLAY)
28 28  
29 29 #undef DEBUG_DISP
30 30  
... ... @@ -19,7 +19,7 @@
19 19 # define SHOW_BOOT_PROGRESS(arg)
20 20 #endif
21 21  
22   -#if (CONFIG_COMMANDS & CFG_CMD_DOC)
  22 +#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
23 23  
24 24 #include <linux/mtd/nftl.h>
25 25 #include <linux/mtd/doc2000.h>
... ... @@ -25,7 +25,7 @@
25 25 #include <config.h>
26 26 #include <command.h>
27 27  
28   -#if (CONFIG_COMMANDS & CFG_CMD_DTT)
  28 +#if (CONFIG_COMMANDS & CFG_CMD_DTT) || defined(CONFIG_CMD_DTT)
29 29  
30 30 #include <dtt.h>
31 31 #include <i2c.h>
... ... @@ -42,7 +42,7 @@
42 42 #include <command.h>
43 43 #include <i2c.h>
44 44  
45   -#if (CONFIG_COMMANDS & CFG_CMD_EEPROM) || defined(CFG_ENV_IS_IN_EEPROM)
  45 +#if (CONFIG_COMMANDS & CFG_CMD_EEPROM) || defined(CFG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
46 46  
47 47 extern void eeprom_init (void);
48 48 extern int eeprom_read (unsigned dev_addr, unsigned offset,
... ... @@ -62,7 +62,7 @@
62 62  
63 63 /* ------------------------------------------------------------------------- */
64 64  
65   -#if (CONFIG_COMMANDS & CFG_CMD_EEPROM)
  65 +#if (CONFIG_COMMANDS & CFG_CMD_EEPROM) || defined(CONFIG_CMD_EEPROM)
66 66 int do_eeprom ( cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
67 67 {
68 68 const char *const fmt =
... ... @@ -121,7 +121,7 @@
121 121 * 0x00000nxx for EEPROM address selectors and page number at n.
122 122 */
123 123  
124   -#if (CONFIG_COMMANDS & CFG_CMD_EEPROM) || defined(CFG_ENV_IS_IN_EEPROM)
  124 +#if (CONFIG_COMMANDS & CFG_CMD_EEPROM) || defined(CFG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
125 125  
126 126 #ifndef CONFIG_SPI
127 127 #if !defined(CFG_I2C_EEPROM_ADDR_LEN) || CFG_I2C_EEPROM_ADDR_LEN < 1 || CFG_I2C_EEPROM_ADDR_LEN > 2
... ... @@ -425,7 +425,7 @@
425 425 #endif /* CFG_CMD_EEPROM */
426 426 /***************************************************/
427 427  
428   -#if (CONFIG_COMMANDS & CFG_CMD_EEPROM)
  428 +#if (CONFIG_COMMANDS & CFG_CMD_EEPROM) || defined(CONFIG_CMD_EEPROM)
429 429  
430 430 #ifdef CFG_I2C_MULTI_EEPROMS
431 431 U_BOOT_CMD(
... ... @@ -23,7 +23,7 @@
23 23 DECLARE_GLOBAL_DATA_PTR;
24 24 #endif
25 25  
26   -#if (CONFIG_COMMANDS & CFG_CMD_ELF)
  26 +#if (CONFIG_COMMANDS & CFG_CMD_ELF) || defined(CONFIG_CMD_ELF)
27 27  
28 28 #ifndef MAX
29 29 #define MAX(a,b) ((a) > (b) ? (a) : (b))
... ... @@ -101,7 +101,7 @@
101 101 else
102 102 addr = simple_strtoul (argv[1], NULL, 16);
103 103  
104   -#if (CONFIG_COMMANDS & CFG_CMD_NET)
  104 +#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
105 105 /* Check to see if we need to tftp the image ourselves before starting */
106 106  
107 107 if ((argc == 2) && (strcmp (argv[1], "tftp") == 0)) {
... ... @@ -35,14 +35,14 @@
35 35 #include <common.h>
36 36 #include <part.h>
37 37  
38   -#if (CONFIG_COMMANDS & CFG_CMD_EXT2)
  38 +#if (CONFIG_COMMANDS & CFG_CMD_EXT2) || defined(CONFIG_CMD_EXT2)
39 39 #include <config.h>
40 40 #include <command.h>
41 41 #include <image.h>
42 42 #include <linux/ctype.h>
43 43 #include <asm/byteorder.h>
44 44 #include <ext2fs.h>
45   -#if ((CONFIG_COMMANDS & CFG_CMD_USB) && defined(CONFIG_USB_STORAGE))
  45 +#if (((CONFIG_COMMANDS & CFG_CMD_USB) || defined(CONFIG_CMD_USB)) && defined(CONFIG_USB_STORAGE))
46 46 #include <usb.h>
47 47 #endif
48 48  
... ... @@ -31,7 +31,7 @@
31 31 #include <ata.h>
32 32 #include <part.h>
33 33  
34   -#if (CONFIG_COMMANDS & CFG_CMD_FAT)
  34 +#if (CONFIG_COMMANDS & CFG_CMD_FAT) || defined(CONFIG_CMD_FAT)
35 35  
36 36 #undef DEBUG
37 37  
... ... @@ -47,11 +47,12 @@
47 47 #endif
48 48  
49 49  
50   -/*#if (CONFIG_COMMANDS & CFG_CMD_DATE) */
  50 +/*#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE) */
51 51 /*#include <rtc.h> */
52 52 /*#endif */
53 53  
54   -#if ((CONFIG_COMMANDS & CFG_CMD_FDC) || (CONFIG_COMMANDS & CFG_CMD_FDOS))
  54 +#if (CONFIG_COMMANDS & CFG_CMD_FDC) || defined(CONFIG_CMD_FDC) \
  55 + || (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
55 56  
56 57  
57 58 typedef struct {
... ... @@ -709,7 +710,7 @@
709 710 }
710 711 #endif /* ((CONFIG_COMMANDS & CFG_CMD_FDC)||(CONFIG_COMMANDS & CFG_CMD_FDOS))*/
711 712  
712   -#if (CONFIG_COMMANDS & CFG_CMD_FDOS)
  713 +#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
713 714  
714 715 /* Low level functions for the Floppy-DOS layer */
715 716  
... ... @@ -774,7 +775,7 @@
774 775 }
775 776 #endif /* (CONFIG_COMMANDS & CFG_CMD_FDOS) */
776 777  
777   -#if (CONFIG_COMMANDS & CFG_CMD_FDC)
  778 +#if (CONFIG_COMMANDS & CFG_CMD_FDC) || defined(CONFIG_CMD_FDC)
778 779 /****************************************************************************
779 780 * main routine do_fdcboot
780 781 */
... ... @@ -886,7 +887,7 @@
886 887 /***************************************************/
887 888  
888 889  
889   -#if (CONFIG_COMMANDS & CFG_CMD_FDC)
  890 +#if (CONFIG_COMMANDS & CFG_CMD_FDC) || defined(CONFIG_CMD_FDC)
890 891  
891 892 U_BOOT_CMD(
892 893 fdcboot, 3, 1, do_fdcboot,
... ... @@ -31,7 +31,7 @@
31 31 #include <command.h>
32 32 #include <fdc.h>
33 33  
34   -#if (CONFIG_COMMANDS & CFG_CMD_FDOS)
  34 +#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
35 35  
36 36 /*-----------------------------------------------------------------------------
37 37 * do_fdosboot --
... ... @@ -31,9 +31,9 @@
31 31 #include <dataflash.h>
32 32 #endif
33 33  
34   -#if (CONFIG_COMMANDS & CFG_CMD_FLASH)
  34 +#if (CONFIG_COMMANDS & CFG_CMD_FLASH) || defined(CONFIG_CMD_FLASH)
35 35  
36   -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
  36 +#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_CMDLINE)
37 37 #include <jffs2/jffs2.h>
38 38  
39 39 /* parition handling routines */
... ... @@ -311,7 +311,7 @@
311 311 flash_info_t *info;
312 312 ulong bank, addr_first, addr_last;
313 313 int n, sect_first, sect_last;
314   -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
  314 +#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_CMDLINE)
315 315 struct mtd_device *dev;
316 316 struct part_info *part;
317 317 u8 dev_type, dev_num, pnum;
... ... @@ -343,7 +343,7 @@
343 343 return rcode;
344 344 }
345 345  
346   -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
  346 +#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_CMDLINE)
347 347 /* erase <part-id> - erase partition */
348 348 if ((argc == 2) && (id_parse(argv[1], NULL, &dev_type, &dev_num) == 0)) {
349 349 mtdparts_init();
... ... @@ -447,7 +447,7 @@
447 447 flash_info_t *info;
448 448 ulong bank, addr_first, addr_last;
449 449 int i, p, n, sect_first, sect_last;
450   -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
  450 +#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_CMDLINE)
451 451 struct mtd_device *dev;
452 452 struct part_info *part;
453 453 u8 dev_type, dev_num, pnum;
... ... @@ -539,7 +539,7 @@
539 539 return rcode;
540 540 }
541 541  
542   -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
  542 +#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_CMDLINE)
543 543 /* protect on/off <part-id> */
544 544 if ((argc == 3) && (id_parse(argv[2], NULL, &dev_type, &dev_num) == 0)) {
545 545 mtdparts_init();
... ... @@ -672,7 +672,7 @@
672 672  
673 673  
674 674 /**************************************************/
675   -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
  675 +#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_CMDLINE)
676 676 # define TMP_ERASE "erase <part-id>\n - erase partition\n"
677 677 # define TMP_PROT_ON "protect on <part-id>\n - protect partition\n"
678 678 # define TMP_PROT_OFF "protect off <part-id>\n - make partition writable\n"
... ... @@ -27,7 +27,7 @@
27 27 */
28 28 #include <common.h>
29 29 #include <command.h>
30   -#if (CONFIG_COMMANDS & CFG_CMD_NET)
  30 +#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
31 31 #include <net.h>
32 32 #endif
33 33 #include <fpga.h>
... ... @@ -43,7 +43,7 @@
43 43 #define PRINTF(fmt,args...)
44 44 #endif
45 45  
46   -#if defined (CONFIG_FPGA) && ( CONFIG_COMMANDS & CFG_CMD_FPGA )
  46 +#if defined (CONFIG_FPGA) && ((CONFIG_COMMANDS & CFG_CMD_FPGA ) || defined(CONFIG_CMD_FPGA))
47 47  
48 48 /* Local functions */
49 49 static void fpga_usage (cmd_tbl_t * cmdtp);