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

[oweals/u-boot.git] / include / configs / csb637.h

diff --git a/include/configs/csb637.h b/include/configs/csb637.h
index d2c305dafdd35c42db01726bf25c4a166b8c0db0..ac2fe54409d5a44bcfe150536bf2dffa9705a04f 100644 (file)
--- a/include/configs/csb637.h
+++ b/include/configs/csb637.h
@@ -34,6 +34,7 @@
 
 #define CONFIG_ARM920T         1       /* This is an ARM920T Core      */
 #define CONFIG_AT91RM9200      1       /* It's an Atmel AT91RM9200 SoC */
+#define CONFIG_CSB637          1       /* on a CSB637 board            */
 #undef  CONFIG_USE_IRQ                 /* we don't need IRQ/FIQ stuff  */
 #define USE_920T_MMU           1
 
@@ -78,7 +79,7 @@
 #define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
-#define CONFIG_BAUDRATE 38400
+#define CONFIG_BAUDRATE 115200
 
 #define CFG_AT91C_BRGR_DIVISOR 75      /* hardcode so no __divsi3 : AT91C_MASTER_CLOCK / baudrate / 16 */
 
@@ -98,20 +99,23 @@
 #define CONFIG_BOOTDELAY      3
 /* #define CONFIG_ENV_OVERWRITE        1 */
 
-#define CONFIG_COMMANDS                \
-                      ((CONFIG_CMD_DFL | \
-                       CFG_CMD_JFFS2 | \
-                       CFG_CMD_DHCP | \
-                       CFG_CMD_PING ) & \
-                     ~(CFG_CMD_BDI | \
-                       CFG_CMD_IMI | \
-                       CFG_CMD_AUTOSCRIPT | \
-                       CFG_CMD_FPGA | \
-                       CFG_CMD_MISC | \
-                       CFG_CMD_LOADS ))
-
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_PING
+
+#undef CONFIG_CMD_BDI
+#undef CONFIG_CMD_IMI
+#undef CONFIG_CMD_AUTOSCRIPT
+#undef CONFIG_CMD_FPGA
+#undef CONFIG_CMD_MISC
+#undef CONFIG_CMD_LOADS
+
 
 #define CFG_MAX_NAND_DEVICE    1       /* Max number of NAND devices           */
 #define SECTORSIZE 512