Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 37e4f24b87fa255ae456d193b7cd23c18dd1d56b

Authored by Jon Loeliger
Committed by Wolfgang Denk
1 parent ba2351f9d1
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

include/configs: Use new CONFIG_CMD_* in various c* named board config files. 

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

Showing 14 changed files with 187 additions and 139 deletions Side-by-side Diff

include/configs/c2mon.h
Diff comments   View file @ 37e4f24
... ... @@ -77,16 +77,19 @@
77 77  
78 78 #define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */
79 79  
80   -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
81   - CFG_CMD_DATE | \
82   - CFG_CMD_DHCP | \
83   - CFG_CMD_IDE | \
84   - CFG_CMD_NFS | \
85   - CFG_CMD_SNTP )
86 80  
87   -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
88   -#include <cmd_confdefs.h>
  81 +/*
  82 + * Command line configuration.
  83 + */
  84 +#include <config_cmd_default.h>
89 85  
  86 +#define CONFIG_CMD_DATE
  87 +#define CONFIG_CMD_DHCP
  88 +#define CONFIG_CMD_IDE
  89 +#define CONFIG_CMD_NFS
  90 +#define CONFIG_CMD_SNTP
  91 +
  92 +
90 93 /*
91 94 * Miscellaneous configurable options
92 95 */
... ... @@ -98,7 +101,7 @@
98 101 #define CFG_PROMPT_HUSH_PS2 "> "
99 102 #endif
100 103  
101   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
  104 +#if defined(CONFIG_CMD_KGDB)
102 105 #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
103 106 #else
104 107 #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
... ... @@ -174,7 +177,7 @@
174 177 * Cache Configuration
175 178 */
176 179 #define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */
177   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
  180 +#if defined(CONFIG_CMD_KGDB)
178 181 #define CFG_CACHELINE_SHIFT 4 /* log base 2 of the above value */
179 182 #endif
180 183  
include/configs/canmb.h
Diff comments   View file @ 37e4f24
... ... @@ -38,11 +38,6 @@
38 38 #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */
39 39 #define BOOTFLAG_WARM 0x02 /* Software reboot */
40 40  
41   -#define CFG_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */
42   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
43   -# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
44   -#endif
45   -
46 41 #define CONFIG_BOARD_EARLY_INIT_R
47 42  
48 43 /*
49 44  
50 45  
51 46  
52 47  
... ... @@ -52,22 +47,22 @@
52 47 #define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */
53 48 #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
54 49  
  50 +
55 51 /*
56   - * Supported commands
  52 + * Command line configuration.
57 53 */
58   -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
59   - CFG_CMD_ASKENV | \
60   - CFG_CMD_DATE | \
61   - CFG_CMD_DHCP | \
62   - CFG_CMD_IMMAP | \
63   - CFG_CMD_MII | \
64   - CFG_CMD_NFS | \
65   - CFG_CMD_REGINFO | \
66   - CFG_CMD_SNTP )
  54 +#include <config_cmd_default.h>
67 55  
68   -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
69   -#include <cmd_confdefs.h>
  56 +#define CONFIG_CMD_ASKENV
  57 +#define CONFIG_CMD_DATE
  58 +#define CONFIG_CMD_DHCP
  59 +#define CONFIG_CMD_IMMAP
  60 +#define CONFIG_CMD_MII
  61 +#define CONFIG_CMD_NFS
  62 +#define CONFIG_CMD_REGINFO
  63 +#define CONFIG_CMD_SNTP
70 64  
  65 +
71 66 /*
72 67 * MUST be low boot - HIGHBOOT is not supported anymore
73 68 */
... ... @@ -181,7 +176,7 @@
181 176 */
182 177 #define CFG_LONGHELP /* undef to save memory */
183 178 #define CFG_PROMPT "=> " /* Monitor Command Prompt */
184   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
  179 +#if defined(CONFIG_CMD_KGDB)
185 180 # define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
186 181 #else
187 182 # define CFG_CBSIZE 256 /* Console I/O Buffer Size */
... ... @@ -198,6 +193,11 @@
198 193 #define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */
199 194  
200 195 #define CONFIG_RTC_MPC5200 1 /* use internal MPC5200 RTC */
  196 +
  197 +#define CFG_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */
  198 +#if defined(CONFIG_CMD_KGDB)
  199 +# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
  200 +#endif
201 201  
202 202 /*
203 203 * Various low-level settings
include/configs/cerf250.h
Diff comments   View file @ 37e4f24
... ... @@ -61,11 +61,13 @@
61 61  
62 62 /* allow to overwrite serial and ethaddr */
63 63 #define CONFIG_ENV_OVERWRITE
64   -#define CONFIG_COMMANDS (CONFIG_CMD_DFL)
65 64  
66   -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
67   -#include <cmd_confdefs.h>
  65 +/*
  66 + * Command line configuration.
  67 + */
  68 +#include <config_cmd_default.h>
68 69  
  70 +
69 71 #define CONFIG_BOOTDELAY 3
70 72 #define CONFIG_ETHADDR 00:D0:CA:F1:3C:D2
71 73 #define CONFIG_NETMASK 255.255.255.0
... ... @@ -75,7 +77,7 @@
75 77 #define CONFIG_BOOTARGS "root=/dev/mtdblock3 rootfstype=jffs2 console=ttyS0,38400"
76 78 #define CONFIG_CMDLINE_TAG
77 79  
78   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
  80 +#if defined(CONFIG_CMD_KGDB)
79 81 #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */
80 82 #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
81 83 #endif
include/configs/cm4008.h
Diff comments   View file @ 37e4f24
... ... @@ -58,10 +58,14 @@
58 58 #define CONFIG_BAUDRATE 115200
59 59 #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
60 60  
61   -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
62   -#include <cmd_confdefs.h>
63   -#undef CONFIG_COMMANDS
64   -#define CONFIG_COMMANDS (CONFIG_CMD_DFL & ~(CFG_CMD_NONSTD | CFG_CMD_ENV))
  61 +
  62 +/*
  63 + * Command line configuration.
  64 + */
  65 +#include <config_cmd_default.h>
  66 +
  67 +#undef CONFIG_CMD_ENV
  68 +
65 69  
66 70 #define CONFIG_BOOTDELAY 0
67 71 #define CONFIG_BOOTARGS "mem=16M console=ttyAM0,115200"
include/configs/cm41xx.h
Diff comments   View file @ 37e4f24
... ... @@ -58,10 +58,14 @@
58 58 #define CONFIG_BAUDRATE 115200
59 59 #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
60 60  
61   -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
62   -#include <cmd_confdefs.h>
63   -#undef CONFIG_COMMANDS
64   -#define CONFIG_COMMANDS (CONFIG_CMD_DFL & ~(CFG_CMD_NONSTD | CFG_CMD_ENV))
  61 +
  62 +/*
  63 + * Command line configuration.
  64 + */
  65 +#include <config_cmd_default.h>
  66 +
  67 +#undef CONFIG_CMD_ENV
  68 +
65 69  
66 70 #define CONFIG_BOOTDELAY 0
67 71 #define CONFIG_BOOTARGS "mem=32M console=ttyAM0,115200"
include/configs/cmc_pu2.h
Diff comments   View file @ 37e4f24
... ... @@ -104,35 +104,35 @@
104 104 #define CFG_I2C_EEPROM_ADDR 0x50
105 105 #define CFG_I2C_EEPROM_ADDR_LEN 1
106 106 #define CFG_I2C_EEPROM_ADDR_OVERFLOW
  107 +#else
  108 +#define CONFIG_TIMESTAMP
107 109 #endif
108 110 /* still about 20 kB free with this defined */
109 111 #define CFG_LONGHELP
110 112  
111 113 #define CONFIG_BOOTDELAY 1
112 114  
113   -#ifdef CONFIG_HARD_I2C
114   -#define CONFIG_COMMANDS \
115   - ((CONFIG_CMD_DFL | \
116   - CFG_CMD_DATE | \
117   - CFG_CMD_DHCP | \
118   - CFG_CMD_EEPROM | \
119   - CFG_CMD_I2C | \
120   - CFG_CMD_NFS | \
121   - CFG_CMD_SNTP ) & \
122   - ~(CFG_CMD_FPGA | CFG_CMD_MISC) )
123   -#else
124   -#define CONFIG_COMMANDS \
125   - ((CONFIG_CMD_DFL | \
126   - CFG_CMD_DHCP | \
127   - CFG_CMD_NFS | \
128   - CFG_CMD_SNTP ) & \
129   - ~(CFG_CMD_FPGA | CFG_CMD_MISC) )
130   -#define CONFIG_TIMESTAMP
  115 +
  116 +/*
  117 + * Command line configuration.
  118 + */
  119 +#include <config_cmd_default.h>
  120 +
  121 +#define CONFIG_CMD_DHCP
  122 +#define CONFIG_CMD_NFS
  123 +#define CONFIG_CMD_SNTP
  124 +
  125 +#undef CONFIG_CMD_FPGA
  126 +#undef CONFIG_CMD_MISC
  127 +
  128 +#if defined(CONFIG_HARD_I2C)
  129 + #define CONFIG_CMD_DATE
  130 + #define CONFIG_CMD_EEPROM
  131 + #define CONFIG_CMD_I2C
131 132 #endif
132   -#define CFG_LONGHELP
133 133  
134   -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
135   -#include <cmd_confdefs.h>
  134 +
  135 +#define CFG_LONGHELP
136 136  
137 137 #define AT91_SMART_MEDIA_ALE (1 << 22) /* our ALE is AD22 */
138 138 #define AT91_SMART_MEDIA_CLE (1 << 21) /* our CLE is AD21 */
include/configs/cobra5272.h
Diff comments   View file @ 37e4f24
... ... @@ -130,17 +130,19 @@
130 130 #define CFG_ENV_IS_IN_FLASH 1
131 131 #endif
132 132  
133   -/* ---
134   - * Define which commmands should be available at u-boot command prompt
135   - * ---
  133 +
  134 +/*
  135 + * Command line configuration.
136 136 */
  137 +#include <config_cmd_default.h>
137 138  
138   -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | CFG_CMD_PING & ~(CFG_CMD_LOADS | \
139   -CFG_CMD_LOADB) | CFG_CMD_MII)
  139 +#define CONFIG_CMD_PING
140 140  
141   -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
142   -#include <cmd_confdefs.h>
  141 +#undef CONFIG_CMD_LOADS
  142 +#undef CONFIG_CMD_LOADB
  143 +#undef CONFIG_CMD_MII
143 144  
  145 +
144 146 /*
145 147 *-----------------------------------------------------------------------------
146 148 * Define user parameters that have to be customized most likely
... ... @@ -184,7 +186,7 @@
184 186  
185 187 #define CFG_LONGHELP /* undef to save memory */
186 188  
187   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
  189 +#if defined(CONFIG_CMD_KGDB)
188 190 #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
189 191 #else
190 192 #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
include/configs/cogent_mpc8260.h
Diff comments   View file @ 37e4f24
... ... @@ -88,11 +88,17 @@
88 88 #define CONFIG_BAUDRATE 9600
89 89 #endif
90 90  
91   -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL|CFG_CMD_KGDB)&~CFG_CMD_NET)
92 91  
93   -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
94   -#include <cmd_confdefs.h>
  92 +/*
  93 + * Command line configuration.
  94 + */
  95 +#include <config_cmd_default.h>
95 96  
  97 +#define CONFIG_CMD_KGDB
  98 +
  99 +#undef CONFIG_CMD_NET
  100 +
  101 +
96 102 #ifdef DEBUG
97 103 #define CONFIG_BOOTDELAY -1 /* autoboot disabled */
98 104 #else
... ... @@ -102,7 +108,7 @@
102 108  
103 109 #define CONFIG_BOOTARGS "root=/dev/ram rw"
104 110  
105   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
  111 +#if defined(CONFIG_CMD_KGDB)
106 112 #define CONFIG_KGDB_ON_SMC /* define if kgdb on SMC */
107 113 #undef CONFIG_KGDB_ON_SCC /* define if kgdb on SCC */
108 114 #undef CONFIG_KGDB_NONE /* define if kgdb on something else */
... ... @@ -124,7 +130,7 @@
124 130 */
125 131 #define CFG_LONGHELP /* undef to save memory */
126 132 #define CFG_PROMPT "=> " /* Monitor Command Prompt */
127   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
  133 +#if defined(CONFIG_CMD_KGDB)
128 134 #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
129 135 #else
130 136 #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
... ... @@ -256,7 +262,7 @@
256 262 * Cache Configuration
257 263 */
258 264 #define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPU */
259   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
  265 +#if defined(CONFIG_CMD_KGDB)
260 266 # define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value*/
261 267 #endif
262 268  
include/configs/cogent_mpc8xx.h
Diff comments   View file @ 37e4f24
... ... @@ -59,11 +59,17 @@
59 59 #define CFG_I2C_SLAVE 0x7F
60 60  
61 61  
62   -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_KGDB | CFG_CMD_I2C) & ~CFG_CMD_NET)
  62 +/*
  63 + * Command line configuration.
  64 + */
  65 +#include <config_cmd_default.h>
63 66  
64   -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
65   -#include <cmd_confdefs.h>
  67 +#define CONFIG_CMD_KGDB
  68 +#define CONFIG_CMD_I2C
66 69  
  70 +#undef CONFIG_CMD_NET
  71 +
  72 +
67 73 #if 0
68 74 #define CONFIG_BOOTDELAY -1 /* autoboot disabled */
69 75 #else
... ... @@ -73,7 +79,7 @@
73 79  
74 80 #define CONFIG_BOOTARGS "root=/dev/ram rw"
75 81  
76   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
  82 +#if defined(CONFIG_CMD_KGDB)
77 83 #undef CONFIG_KGDB_ON_SMC /* define if kgdb on SMC */
78 84 #undef CONFIG_KGDB_ON_SCC /* define if kgdb on SCC */
79 85 #define CONFIG_KGDB_NONE /* define if kgdb on something else */
... ... @@ -88,7 +94,7 @@
88 94 */
89 95 #define CFG_LONGHELP /* undef to save memory */
90 96 #define CFG_PROMPT "=> " /* Monitor Command Prompt */
91   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
  97 +#if defined(CONFIG_CMD_KGDB)
92 98 #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
93 99 #else
94 100 #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
... ... @@ -200,7 +206,7 @@
200 206 * Cache Configuration
201 207 */
202 208 #define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */
203   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
  209 +#if defined(CONFIG_CMD_KGDB)
204 210 #define CFG_CACHELINE_SHIFT 4 /* log base 2 of the above value */
205 211 #endif
206 212  
include/configs/cradle.h
Diff comments   View file @ 37e4f24
... ... @@ -61,10 +61,12 @@
61 61  
62 62 #define CONFIG_BAUDRATE 115200
63 63  
64   -#define CONFIG_COMMANDS (CONFIG_CMD_DFL)
65 64  
66   -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
67   -#include <cmd_confdefs.h>
  65 +/*
  66 + * Command line configuration.
  67 + */
  68 +#include <config_cmd_default.h>
  69 +
68 70  
69 71 #define CONFIG_BOOTDELAY 3
70 72 #define CONFIG_BOOTARGS "root=/dev/mtdblock2 console=ttyS0,115200"
include/configs/csb226.h
Diff comments   View file @ 37e4f24
... ... @@ -57,11 +57,26 @@
57 57 #define CONFIG_BAUDRATE 19200
58 58 #undef CONFIG_MISC_INIT_R /* not used yet */
59 59  
60   -#define CONFIG_COMMANDS (CFG_CMD_BDI|CFG_CMD_LOADB|CFG_CMD_IMI|CFG_CMD_FLASH|CFG_CMD_MEMORY|CFG_CMD_NET|CFG_CMD_ENV|CFG_CMD_RUN|CFG_CMD_ASKENV|CFG_CMD_ECHO|CFG_CMD_DHCP|CFG_CMD_CACHE)
61 60  
62   -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
63   -#include <cmd_confdefs.h>
  61 +/*
  62 + * Command line configuration.
  63 + */
  64 +#include <config_cmd_default.h>
64 65  
  66 +#define CONFIG_CMD_BDI
  67 +#define CONFIG_CMD_LOADB
  68 +#define CONFIG_CMD_IMI
  69 +#define CONFIG_CMD_FLASH
  70 +#define CONFIG_CMD_MEMORY
  71 +#define CONFIG_CMD_NET
  72 +#define CONFIG_CMD_ENV
  73 +#define CONFIG_CMD_RUN
  74 +#define CONFIG_CMD_ASKENV
  75 +#define CONFIG_CMD_ECHO
  76 +#define CONFIG_CMD_DHCP
  77 +#define CONFIG_CMD_CACHE
  78 +
  79 +
65 80 #define CONFIG_BOOTDELAY 3
66 81 #define CONFIG_BOOTARGS "console=ttyS0,19200 ip=192.168.1.10,192.168.1.5,,255,255,255,0,csb root=/dev/nfs, ether=0,0x08000000,eth0"
67 82 #define CONFIG_ETHADDR FF:FF:FF:FF:FF:FF
... ... @@ -73,7 +88,7 @@
73 88  
74 89 #define CONFIG_CMDLINE_TAG 1
75 90  
76   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
  91 +#if defined(CONFIG_CMD_KGDB)
77 92 #define CONFIG_KGDB_BAUDRATE 19200 /* speed to run kgdb serial port */
78 93 #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
79 94 #endif
include/configs/csb272.h
Diff comments   View file @ 37e4f24
... ... @@ -79,25 +79,25 @@
79 79 #define CONFIG_BOOTP_MASK ( CONFIG_BOOTP_DEFAULT | \
80 80 CONFIG_BOOTP_DNS2 | \
81 81 CONFIG_BOOTP_BOOTFILESIZE )
  82 +
  83 +
82 84 /*
83   - * U-Boot Monitor Command Line Functions Configuration
84   - *
  85 + * Command line configuration.
85 86 */
86   -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
87   - CFG_CMD_ASKENV | \
88   - CFG_CMD_BEDBUG | \
89   - CFG_CMD_ELF | \
90   - CFG_CMD_IRQ | \
91   - CFG_CMD_I2C | \
92   - CFG_CMD_PCI | \
93   - CFG_CMD_DATE | \
94   - CFG_CMD_MII | \
95   - CFG_CMD_PING | \
96   - CFG_CMD_DHCP )
  87 +#include <config_cmd_default.h>
97 88  
98   -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
99   -#include <cmd_confdefs.h>
  89 +#define CONFIG_CMD_ASKENV
  90 +#define CONFIG_CMD_BEDBUG
  91 +#define CONFIG_CMD_ELF
  92 +#define CONFIG_CMD_IRQ
  93 +#define CONFIG_CMD_I2C
  94 +#define CONFIG_CMD_PCI
  95 +#define CONFIG_CMD_DATE
  96 +#define CONFIG_CMD_MII
  97 +#define CONFIG_CMD_PING
  98 +#define CONFIG_CMD_DHCP
100 99  
  100 +
101 101 /*
102 102 * Serial download configuration
103 103 *
... ... @@ -109,7 +109,7 @@
109 109 * KGDB Configuration
110 110 *
111 111 */
112   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
  112 +#if defined(CONFIG_CMD_KGDB)
113 113 #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */
114 114 #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
115 115 #endif
... ... @@ -125,7 +125,7 @@
125 125  
126 126 #define CFG_LONGHELP /* undef to save memory */
127 127 #define CFG_PROMPT "=> " /* Monitor Command Prompt */
128   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
  128 +#if defined(CONFIG_CMD_KGDB)
129 129 #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
130 130 #else
131 131 #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
include/configs/csb472.h
Diff comments   View file @ 37e4f24
... ... @@ -79,25 +79,26 @@
79 79 #define CONFIG_BOOTP_MASK ( CONFIG_BOOTP_DEFAULT | \
80 80 CONFIG_BOOTP_DNS2 | \
81 81 CONFIG_BOOTP_BOOTFILESIZE )
  82 +
  83 +
  84 +
82 85 /*
83   - * U-Boot Monitor Command Line Functions Configuration
84   - *
  86 + * Command line configuration.
85 87 */
86   -#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
87   - CFG_CMD_ASKENV | \
88   - CFG_CMD_BEDBUG | \
89   - CFG_CMD_ELF | \
90   - CFG_CMD_IRQ | \
91   - CFG_CMD_I2C | \
92   - CFG_CMD_PCI | \
93   - CFG_CMD_DATE | \
94   - CFG_CMD_MII | \
95   - CFG_CMD_PING | \
96   - CFG_CMD_DHCP )
  88 +#include <config_cmd_default.h>
97 89  
98   -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
99   -#include <cmd_confdefs.h>
  90 +#define CONFIG_CMD_ASKENV
  91 +#define CONFIG_CMD_BEDBUG
  92 +#define CONFIG_CMD_ELF
  93 +#define CONFIG_CMD_IRQ
  94 +#define CONFIG_CMD_I2C
  95 +#define CONFIG_CMD_PCI
  96 +#define CONFIG_CMD_DATE
  97 +#define CONFIG_CMD_MII
  98 +#define CONFIG_CMD_PING
  99 +#define CONFIG_CMD_DHCP
100 100  
  101 +
101 102 /*
102 103 * Serial download configuration
103 104 *
... ... @@ -109,7 +110,7 @@
109 110 * KGDB Configuration
110 111 *
111 112 */
112   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
  113 +#if defined(CONFIG_CMD_KGDB)
113 114 #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */
114 115 #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
115 116 #endif
... ... @@ -125,7 +126,7 @@
125 126  
126 127 #define CFG_LONGHELP /* undef to save memory */
127 128 #define CFG_PROMPT "=> " /* Monitor Command Prompt */
128   -#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
  129 +#if defined(CONFIG_CMD_KGDB)
129 130 #define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
130 131 #else
131 132 #define CFG_CBSIZE 256 /* Console I/O Buffer Size */
include/configs/csb637.h
Diff comments   View file @ 37e4f24
... ... @@ -99,20 +99,23 @@
99 99 #define CONFIG_BOOTDELAY 3
100 100 /* #define CONFIG_ENV_OVERWRITE 1 */
101 101  
102   -#define CONFIG_COMMANDS \
103   - ((CONFIG_CMD_DFL | \
104   - CFG_CMD_JFFS2 | \
105   - CFG_CMD_DHCP | \
106   - CFG_CMD_PING ) & \
107   - ~(CFG_CMD_BDI | \
108   - CFG_CMD_IMI | \
109   - CFG_CMD_AUTOSCRIPT | \
110   - CFG_CMD_FPGA | \
111   - CFG_CMD_MISC | \
112   - CFG_CMD_LOADS ))
113 102  
114   -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
115   -#include <cmd_confdefs.h>
  103 +/*
  104 + * Command line configuration.
  105 + */
  106 +#include <config_cmd_default.h>
  107 +
  108 +#define CONFIG_CMD_JFFS2
  109 +#define CONFIG_CMD_DHCP
  110 +#define CONFIG_CMD_PING
  111 +
  112 +#undef CONFIG_CMD_BDI
  113 +#undef CONFIG_CMD_IMI
  114 +#undef CONFIG_CMD_AUTOSCRIPT
  115 +#undef CONFIG_CMD_FPGA
  116 +#undef CONFIG_CMD_MISC
  117 +#undef CONFIG_CMD_LOADS
  118 +
116 119  
117 120 #define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
118 121 #define SECTORSIZE 512