Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ab3abcbabd840928fb1eb5122118ca466b5e5013

Authored by Jon Loeliger
1 parent 3fe00109a5
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

board/[q-z]*: Remove obsolete references to CONFIG_COMMANDS 

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

Showing 22 changed files with 39 additions and 39 deletions Side-by-side Diff

board/r360mpi/pcmcia.c
Diff comments   View file @ ab3abcb
... ... @@ -4,11 +4,11 @@
4 4  
5 5 #undef CONFIG_PCMCIA
6 6  
7   -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
  7 +#if defined(CONFIG_CMD_PCMCIA)
8 8 #define CONFIG_PCMCIA
9 9 #endif
10 10  
11   -#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)) && defined(CONFIG_IDE_8xx_PCCARD)
  11 +#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
12 12 #define CONFIG_PCMCIA
13 13 #endif
14 14  
... ... @@ -123,7 +123,7 @@
123 123 }
124 124  
125 125  
126   -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
  126 +#if defined(CONFIG_CMD_PCMCIA)
127 127 int pcmcia_hardware_disable(int slot)
128 128 {
129 129 volatile immap_t *immap;
board/sacsng/sacsng.c
Diff comments   View file @ ab3abcb
... ... @@ -837,7 +837,7 @@
837 837 /*
838 838 * The following are used to control the SPI chip selects for the SPI command.
839 839 */
840   -#if (CONFIG_COMMANDS & CFG_CMD_SPI) || defined(CONFIG_CMD_SPI)
  840 +#if defined(CONFIG_CMD_SPI)
841 841  
842 842 #define SPI_ADC_CS_MASK 0x00000800
843 843 #define SPI_DAC_CS_MASK 0x00001000
board/sbc2410x/sbc2410x.c
Diff comments   View file @ ab3abcb
... ... @@ -31,7 +31,7 @@
31 31 #include <common.h>
32 32 #include <s3c2410.h>
33 33  
34   -#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
  34 +#if defined(CONFIG_CMD_NAND)
35 35 #include <linux/mtd/nand.h>
36 36 #endif
37 37  
... ... @@ -136,7 +136,7 @@
136 136 return 0;
137 137 }
138 138  
139   -#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
  139 +#if defined(CONFIG_CMD_NAND)
140 140 extern ulong nand_probe(ulong physadr);
141 141  
142 142 static inline void NF_Reset(void)
... ... @@ -180,5 +180,5 @@
180 180 #endif
181 181 printf ("%4lu MB\n", nand_probe((ulong)nand) >> 20);
182 182 }
183   -#endif /* CONFIG_COMMANDS & CFG_CMD_NAND */
  183 +#endif
... ... @@ -23,7 +23,7 @@
23 23  
24 24 #include <common.h>
25 25  
26   -#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
  26 +#if defined(CONFIG_CMD_NAND)
27 27  
28 28 #include <nand.h>
29 29 #include <asm/processor.h>
board/siemens/common/fpga.c
Diff comments   View file @ ab3abcb
... ... @@ -219,7 +219,7 @@
219 219 return 1;
220 220 }
221 221  
222   -#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
  222 +#if defined(CONFIG_CMD_BSP)
223 223  
224 224 /* . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . */
225 225  
... ... @@ -299,7 +299,7 @@
299 299 "fpga load [name] addr - load FPGA configuration data\n"
300 300 );
301 301  
302   -#endif /* CONFIG_COMMANDS & CFG_CMD_BSP */
  302 +#endif
303 303  
304 304 /* . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . */
305 305  
board/siemens/pcu_e/pcu_e.c
Diff comments   View file @ ab3abcb
... ... @@ -368,7 +368,7 @@
368 368 /*-----------------------------------------------------------------------
369 369 * Board Special Commands: access functions for "PUMA" FPGA
370 370 */
371   -#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
  371 +#if defined(CONFIG_CMD_BSP)
372 372  
373 373 #define PUMA_READ_MODE 0
374 374 #define PUMA_LOAD_MODE 1
board/sixnet/sixnet.c
Diff comments   View file @ ab3abcb
... ... @@ -33,7 +33,7 @@
33 33 # include <status_led.h>
34 34 #endif
35 35  
36   -#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
  36 +#if defined(CONFIG_CMD_NAND)
37 37 #include <linux/mtd/nand_legacy.h>
38 38 extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];
39 39 #endif
... ... @@ -75,7 +75,7 @@
75 75  
76 76 /* ------------------------------------------------------------------------- */
77 77  
78   -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
  78 +#if defined(CONFIG_CMD_PCMCIA)
79 79 #error "SXNI855T has no PCMCIA port"
80 80 #endif /* CFG_CMD_PCMCIA */
81 81  
... ... @@ -327,7 +327,7 @@
327 327 return (0);
328 328 }
329 329  
330   -#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
  330 +#if defined(CONFIG_CMD_NAND)
331 331 void nand_init(void)
332 332 {
333 333 unsigned long totlen = nand_probe(CFG_DFLASH_BASE);
board/ssv/adnpesc1/adnpesc1.c
Diff comments   View file @ ab3abcb
... ... @@ -65,7 +65,7 @@
65 65 /*
66 66 * The following are used to control the SPI chip selects for the SPI command.
67 67 */
68   -#if ((CONFIG_COMMANDS & CFG_CMD_SPI) || defined(CONFIG_CMD_SPI)) && CONFIG_NIOS_SPI
  68 +#if defined(CONFIG_CMD_SPI) && CONFIG_NIOS_SPI
69 69  
70 70 #define SPI_RTC_CS_MASK 0x00000001
71 71  
board/ssv/common/cmd_sled.c
Diff comments   View file @ ab3abcb
... ... @@ -46,7 +46,7 @@
46 46  
47 47 extern led_dev_t led_dev[];
48 48  
49   -#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
  49 +#if defined(CONFIG_CMD_BSP)
50 50 int do_sled (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
51 51 {
52 52 int led_id = 0;
board/ssv/common/wd_pio.c
Diff comments   View file @ ab3abcb
... ... @@ -112,7 +112,7 @@
112 112 enable_interrupts ();
113 113 }
114 114  
115   -#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
  115 +#if defined(CONFIG_CMD_BSP)
116 116 int do_wd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
117 117 {
118 118 nios_pio_t *ena_piop = (nios_pio_t*)CONFIG_HW_WDENA_BASE;
board/stxxtc/stxxtc.c
Diff comments   View file @ ab3abcb
... ... @@ -574,7 +574,7 @@
574 574 return 0;
575 575 }
576 576  
577   -#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
  577 +#if defined(CONFIG_CMD_NAND)
578 578  
579 579 #include <linux/mtd/nand_legacy.h>
580 580  
board/svm_sc8xx/svm_sc8xx.c
Diff comments   View file @ ab3abcb
... ... @@ -153,7 +153,7 @@
153 153 return (size_b0 );
154 154 }
155 155  
156   -#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
  156 +#if defined(CONFIG_CMD_DOC)
157 157 extern void doc_probe (ulong physadr);
158 158 void doc_init (void)
159 159 {
board/tqm5200/cmd_stk52xx.c
Diff comments   View file @ ab3abcb
... ... @@ -29,7 +29,7 @@
29 29 #include <common.h>
30 30 #include <command.h>
31 31  
32   -#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
  32 +#if defined(CONFIG_CMD_BSP)
33 33  
34 34 #if defined(CONFIG_STK52XX) || defined(CONFIG_FO300)
35 35 #define DEFAULT_VOL 45
board/tqm5200/cmd_tb5200.c
Diff comments   View file @ ab3abcb
... ... @@ -29,7 +29,7 @@
29 29 #include <common.h>
30 30 #include <command.h>
31 31  
32   -#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
  32 +#if defined(CONFIG_CMD_BSP)
33 33 #if defined (CONFIG_TB5200)
34 34  
35 35 #define SM501_PANEL_DISPLAY_CONTROL 0x00080000UL
board/tqm8272/tqm8272.c
Diff comments   View file @ ab3abcb
... ... @@ -1065,7 +1065,7 @@
1065 1065 }
1066 1066 #endif
1067 1067  
1068   -#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
  1068 +#if defined(CONFIG_CMD_NAND)
1069 1069  
1070 1070 #include <nand.h>
1071 1071 #include <linux/mtd/mtd.h>
board/trab/auto_update.c
Diff comments   View file @ ab3abcb
... ... @@ -46,7 +46,7 @@
46 46 #error "must define CFG_HUSH_PARSER"
47 47 #endif
48 48  
49   -#if !((CONFIG_COMMANDS & CFG_CMD_FAT) || defined(CONFIG_CMD_FAT))
  49 +#if !defined(CONFIG_CMD_FAT)
50 50 #error "must define CFG_CMD_FAT"
51 51 #endif
52 52  
board/trab/cmd_trab.c
Diff comments   View file @ ab3abcb
... ... @@ -32,7 +32,7 @@
32 32 * TRAB board specific commands. Especially commands for burn-in and function
33 33 * test.
34 34 */
35   -#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
  35 +#if defined(CONFIG_CMD_BSP)
36 36  
37 37 /* limits for valid range of VCC5V in mV */
38 38 #define VCC5V_MIN 4500
... ... @@ -846,7 +846,7 @@
846 846 {
847 847 int contact_temp;
848 848 int delay = 0;
849   -#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE)
  849 +#if defined(CONFIG_CMD_DATE)
850 850 struct rtc_time tm;
851 851 #endif
852 852  
... ... @@ -862,7 +862,7 @@
862 862 spi_init ();
863 863 while (1) {
864 864  
865   -#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE)
  865 +#if defined(CONFIG_CMD_DATE)
866 866 rtc_get (&tm);
867 867 printf ("%4d-%02d-%02d %2d:%02d:%02d - ",
868 868 tm.tm_year, tm.tm_mon, tm.tm_mday,
board/trab/trab_fkt.c
Diff comments   View file @ ab3abcb
... ... @@ -148,7 +148,7 @@
148 148 static unsigned short updcrc(unsigned short icrc, unsigned char *icp,
149 149 unsigned int icnt);
150 150  
151   -#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C)
  151 +#if defined(CONFIG_CMD_I2C)
152 152 static int trab_eeprom_read (char **argv);
153 153 static int trab_eeprom_write (char **argv);
154 154 int i2c_write_multiple (uchar chip, uint addr, int alen, uchar *buffer,
... ... @@ -959,7 +959,7 @@
959 959  
960 960 static int touch_write_clibration_values (int calib_point, int x, int y)
961 961 {
962   -#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C)
  962 +#if defined(CONFIG_CMD_I2C)
963 963 int x_verify = 0;
964 964 int y_verify = 0;
965 965  
... ... @@ -1105,7 +1105,7 @@
1105 1105  
1106 1106 int do_serial_number (char **argv)
1107 1107 {
1108   -#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C)
  1108 +#if defined(CONFIG_CMD_I2C)
1109 1109 unsigned int serial_number;
1110 1110  
1111 1111 if (strcmp (argv[2], "read") == 0) {
... ... @@ -1139,7 +1139,7 @@
1139 1139  
1140 1140 int do_crc16 (void)
1141 1141 {
1142   -#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C)
  1142 +#if defined(CONFIG_CMD_I2C)
1143 1143 int crc;
1144 1144 unsigned char buf[EEPROM_MAX_CRC_BUF];
1145 1145  
... ... @@ -1260,7 +1260,7 @@
1260 1260  
1261 1261 int do_eeprom (char **argv)
1262 1262 {
1263   -#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C)
  1263 +#if defined(CONFIG_CMD_I2C)
1264 1264 if (strcmp (argv[2], "read") == 0) {
1265 1265 return (trab_eeprom_read (argv));
1266 1266 }
... ... @@ -1278,7 +1278,7 @@
1278 1278 #endif /* CFG_CMD_I2C */
1279 1279 }
1280 1280  
1281   -#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C)
  1281 +#if defined(CONFIG_CMD_I2C)
1282 1282 static int trab_eeprom_read (char **argv)
1283 1283 {
1284 1284 int i;
board/uc100/pcmcia.c
Diff comments   View file @ ab3abcb
... ... @@ -4,11 +4,11 @@
4 4  
5 5 #undef CONFIG_PCMCIA
6 6  
7   -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
  7 +#if defined(CONFIG_CMD_PCMCIA)
8 8 #define CONFIG_PCMCIA
9 9 #endif
10 10  
11   -#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)) && defined(CONFIG_IDE_8xx_PCCARD)
  11 +#if (defined(CONFIG_CMD_IDE)) && defined(CONFIG_IDE_8xx_PCCARD)
12 12 #define CONFIG_PCMCIA
13 13 #endif
14 14  
... ... @@ -123,7 +123,7 @@
123 123 }
124 124  
125 125  
126   -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
  126 +#if defined(CONFIG_CMD_PCMCIA)
127 127 int pcmcia_hardware_disable(int slot)
128 128 {
129 129 volatile immap_t *immap;
... ... @@ -24,7 +24,7 @@
24 24 #include <common.h>
25 25 #include <command.h>
26 26  
27   -#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
  27 +#if defined(CONFIG_CMD_BSP)
28 28  
29 29 #include "vpd.h"
30 30  
... ... @@ -63,5 +63,5 @@
63 63 " - Read VPD Data from default address, or device address 'dev_addr'.\n"
64 64 );
65 65  
66   -#endif /* (CONFIG_COMMANDS & CFG_CMD_BSP) */
  66 +#endif
board/xilinx/ml300/serial.c
Diff comments   View file @ ab3abcb
... ... @@ -122,7 +122,7 @@
122 122 }
123 123 }
124 124  
125   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
  125 +#if defined(CONFIG_CMD_KGDB)
126 126 void
127 127 kgdb_serial_init(void)
128 128 {
board/zylonite/nand.c
Diff comments   View file @ ab3abcb
... ... @@ -22,7 +22,7 @@
22 22  
23 23 #include <common.h>
24 24  
25   -#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
  25 +#if defined(CONFIG_CMD_NAND)
26 26 #ifdef CONFIG_NEW_NAND_CODE
27 27  
28 28 #include <nand.h>