Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 7def6b34f910f08d7ef0a14646da067719237ca2

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

lib_{m68k,microblaze,mips,ppc}/: Remove obsolete references to CONFIG_COMMANDS 

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

Showing 5 changed files with 34 additions and 34 deletions Side-by-side Diff

... ... @@ -34,20 +34,20 @@
34 34 #include <asm/immap_5272.h>
35 35 #endif
36 36  
37   -#if (CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)
  37 +#if defined(CONFIG_CMD_IDE)
38 38 #include <ide.h>
39 39 #endif
40   -#if (CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI)
  40 +#if defined(CONFIG_CMD_SCSI)
41 41 #include <scsi.h>
42 42 #endif
43   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
  43 +#if defined(CONFIG_CMD_KGDB)
44 44 #include <kgdb.h>
45 45 #endif
46 46 #ifdef CONFIG_STATUS_LED
47 47 #include <status_led.h>
48 48 #endif
49 49 #include <net.h>
50   -#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG)
  50 +#if defined(CONFIG_CMD_BEDBUG)
51 51 #include <cmd_bedbug.h>
52 52 #endif
53 53 #ifdef CFG_ALLOC_DPRAM
... ... @@ -584,7 +584,7 @@
584 584 misc_init_r ();
585 585 #endif
586 586  
587   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
  587 +#if defined(CONFIG_CMD_KGDB)
588 588 WATCHDOG_RESET ();
589 589 puts ("KGDB: ");
590 590 kgdb_init ();
... ... @@ -620,7 +620,7 @@
620 620 if ((s = getenv ("loadaddr")) != NULL) {
621 621 load_addr = simple_strtoul (s, NULL, 16);
622 622 }
623   -#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
  623 +#if defined(CONFIG_CMD_NET)
624 624 if ((s = getenv ("bootfile")) != NULL) {
625 625 copy_filename (BootFile, s, sizeof (BootFile));
626 626 }
627 627  
628 628  
... ... @@ -628,19 +628,19 @@
628 628  
629 629 WATCHDOG_RESET ();
630 630  
631   -#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
  631 +#if defined(CONFIG_CMD_DOC)
632 632 WATCHDOG_RESET ();
633 633 puts ("DOC: ");
634 634 doc_init ();
635 635 #endif
636 636  
637   -#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
  637 +#if defined(CONFIG_CMD_NAND)
638 638 WATCHDOG_RESET ();
639 639 puts ("NAND: ");
640 640 nand_init(); /* go init the NAND */
641 641 #endif
642 642  
643   -#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(FEC_ENET)
  643 +#if defined(CONFIG_CMD_NET) && defined(FEC_ENET)
644 644 WATCHDOG_RESET();
645 645 eth_init(bd);
646 646 #endif
... ... @@ -659,7 +659,7 @@
659 659 last_stage_init ();
660 660 #endif
661 661  
662   -#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG)
  662 +#if defined(CONFIG_CMD_BEDBUG)
663 663 WATCHDOG_RESET ();
664 664 bedbug_init ();
665 665 #endif
lib_microblaze/board.c
Diff comments   View file @ 7def6b3
... ... @@ -40,7 +40,7 @@
40 40 #ifdef CFG_INTC_0
41 41 extern int interrupts_init (void);
42 42 #endif
43   -#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
  43 +#if defined(CONFIG_CMD_NET)
44 44 extern int eth_init (bd_t * bis);
45 45 extern int getenv_IPaddr (char *);
46 46 #endif
... ... @@ -108,7 +108,7 @@
108 108 bd_t *bd;
109 109 init_fnc_t **init_fnc_ptr;
110 110 gd = (gd_t *) CFG_GBL_DATA_OFFSET;
111   -#if (CONFIG_COMMANDS & CFG_CMD_FLASH) || defined(CONFIG_CMD_FLASH)
  111 +#if defined(CONFIG_CMD_FLASH)
112 112 ulong flash_size = 0;
113 113 #endif
114 114 asm ("nop"); /* FIXME gd is not initialize - wait */
... ... @@ -130,7 +130,7 @@
130 130 }
131 131 }
132 132  
133   -#if (CONFIG_COMMANDS & CFG_CMD_FLASH) || defined(CONFIG_CMD_FLASH)
  133 +#if defined(CONFIG_CMD_FLASH)
134 134 bd->bi_flashstart = CFG_FLASH_BASE;
135 135 if (0 < (flash_size = flash_init ())) {
136 136 bd->bi_flashsize = flash_size;
... ... @@ -143,7 +143,7 @@
143 143 }
144 144 #endif
145 145  
146   -#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
  146 +#if defined(CONFIG_CMD_NET)
147 147 char *s, *e;
148 148 int i;
149 149 /* board MAC address */
... ... @@ -399,7 +399,7 @@
399 399 if ((s = getenv ("loadaddr")) != NULL) {
400 400 load_addr = simple_strtoul (s, NULL, 16);
401 401 }
402   -#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
  402 +#if defined(CONFIG_CMD_NET)
403 403 if ((s = getenv ("bootfile")) != NULL) {
404 404 copy_filename (BootFile, s, sizeof (BootFile));
405 405 }
... ... @@ -410,7 +410,7 @@
410 410 misc_init_r ();
411 411 #endif
412 412  
413   -#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
  413 +#if defined(CONFIG_CMD_NET)
414 414 #if defined(CONFIG_NET_MULTI)
415 415 puts ("Net: ");
416 416 #endif
... ... @@ -35,13 +35,13 @@
35 35 #ifdef CONFIG_MPC5xxx
36 36 #include <mpc5xxx.h>
37 37 #endif
38   -#if (CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)
  38 +#if defined(CONFIG_CMD_IDE)
39 39 #include <ide.h>
40 40 #endif
41   -#if (CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI)
  41 +#if defined(CONFIG_CMD_SCSI)
42 42 #include <scsi.h>
43 43 #endif
44   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
  44 +#if defined(CONFIG_CMD_KGDB)
45 45 #include <kgdb.h>
46 46 #endif
47 47 #ifdef CONFIG_STATUS_LED
48 48  
... ... @@ -80,14 +80,14 @@
80 80 extern void sc3_read_eeprom(void);
81 81 #endif
82 82  
83   -#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
  83 +#if defined(CONFIG_CMD_DOC)
84 84 void doc_init (void);
85 85 #endif
86 86 #if defined(CONFIG_HARD_I2C) || \
87 87 defined(CONFIG_SOFT_I2C)
88 88 #include <i2c.h>
89 89 #endif
90   -#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
  90 +#if defined(CONFIG_CMD_NAND)
91 91 void nand_init (void);
92 92 #endif
93 93  
... ... @@ -118,7 +118,7 @@
118 118 extern ulong _end;
119 119 ulong monitor_flash_len;
120 120  
121   -#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG)
  121 +#if defined(CONFIG_CMD_BEDBUG)
122 122 #include <bedbug/type.h>
123 123 #endif
124 124  
... ... @@ -784,7 +784,7 @@
784 784 spi_init_r ();
785 785 #endif
786 786  
787   -#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
  787 +#if defined(CONFIG_CMD_NAND)
788 788 WATCHDOG_RESET ();
789 789 puts ("NAND: ");
790 790 nand_init(); /* go init the NAND */
... ... @@ -946,7 +946,7 @@
946 946 hermes_start_lxt980 ((int) bd->bi_ethspeed);
947 947 #endif
948 948  
949   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
  949 +#if defined(CONFIG_CMD_KGDB)
950 950 WATCHDOG_RESET ();
951 951 puts ("KGDB: ");
952 952 kgdb_init ();
... ... @@ -978,7 +978,7 @@
978 978 if ((s = getenv ("loadaddr")) != NULL) {
979 979 load_addr = simple_strtoul (s, NULL, 16);
980 980 }
981   -#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
  981 +#if defined(CONFIG_CMD_NET)
982 982 if ((s = getenv ("bootfile")) != NULL) {
983 983 copy_filename (BootFile, s, sizeof (BootFile));
984 984 }
985 985  
986 986  
... ... @@ -986,19 +986,19 @@
986 986  
987 987 WATCHDOG_RESET ();
988 988  
989   -#if (CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI)
  989 +#if defined(CONFIG_CMD_SCSI)
990 990 WATCHDOG_RESET ();
991 991 puts ("SCSI: ");
992 992 scsi_init ();
993 993 #endif
994 994  
995   -#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
  995 +#if defined(CONFIG_CMD_DOC)
996 996 WATCHDOG_RESET ();
997 997 puts ("DOC: ");
998 998 doc_init ();
999 999 #endif
1000 1000  
1001   -#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
  1001 +#if defined(CONFIG_CMD_NET)
1002 1002 #if defined(CONFIG_NET_MULTI)
1003 1003 WATCHDOG_RESET ();
1004 1004 puts ("Net: ");
... ... @@ -1006,7 +1006,7 @@
1006 1006 eth_initialize (bd);
1007 1007 #endif
1008 1008  
1009   -#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && ( \
  1009 +#if defined(CONFIG_CMD_NET) && ( \
1010 1010 defined(CONFIG_CCM) || \
1011 1011 defined(CONFIG_ELPT860) || \
1012 1012 defined(CONFIG_EP8260) || \
1013 1013  
... ... @@ -1031,14 +1031,14 @@
1031 1031 post_run (NULL, POST_RAM | post_bootmode_get(0));
1032 1032 #endif
1033 1033  
1034   -#if ((CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)) \
1035   - && !((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE))
  1034 +#if defined(CONFIG_CMD_PCMCIA) \
  1035 + && !defined(CONFIG_CMD_IDE)
1036 1036 WATCHDOG_RESET ();
1037 1037 puts ("PCMCIA:");
1038 1038 pcmcia_init ();
1039 1039 #endif
1040 1040  
1041   -#if (CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)
  1041 +#if defined(CONFIG_CMD_IDE)
1042 1042 WATCHDOG_RESET ();
1043 1043 # ifdef CONFIG_IDE_8xx_PCCARD
1044 1044 puts ("PCMCIA:");
... ... @@ -1063,7 +1063,7 @@
1063 1063 last_stage_init ();
1064 1064 #endif
1065 1065  
1066   -#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG)
  1066 +#if defined(CONFIG_CMD_BEDBUG)
1067 1067 WATCHDOG_RESET ();
1068 1068 bedbug_init ();
1069 1069 #endif
1 1 #include <common.h>
2 2 #include <command.h>
3 3  
4   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
  4 +#if defined(CONFIG_CMD_KGDB)
5 5  
6 6 #include <kgdb.h>
7 7 #include <asm/signal.h>