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

[u-boot] / include / configs / CRAYL1.h

diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h
index fd8594493b84c2814d7b5b74d731b63bef835d70..627c0c820149a69ae760fce7efb5d1d5b6ab7527 100644 (file)
--- a/include/configs/CRAYL1.h
+++ b/include/configs/CRAYL1.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000, 2001
+ * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  * David Updegraff, Cray, Inc.  dave@cray.com: our 405 is walnut-lite..
  *
@@ -41,7 +41,7 @@
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 #define CONFIG_MII                 1   /* MII PHY management */
 #define        CONFIG_PHY_ADDR         1       /* PHY address; handling of ENET */
-#define CONFIG_BOARD_PRE_INIT 1 /* early setup for 405gp */
+#define CONFIG_BOARD_EARLY_INIT_F 1    /* early setup for 405gp */
 #define CONFIG_MISC_INIT_R     1       /* so that a misc_init_r() is called */
 
 /* set PRAM to keep U-Boot out, mem= to keep linux out, and initrd_hi to
@@ -75,26 +75,30 @@
 #define CONFIG_AUTOSCRIPT              1
 
 
-#define CONFIG_COMMANDS         (\
-       CFG_CMD_BDI|\
-       CFG_CMD_IMI|\
-       CFG_CMD_FLASH|\
-       CFG_CMD_MEMORY|\
-       CFG_CMD_NET|\
-       CFG_CMD_ENV|\
-       CFG_CMD_CONSOLE|\
-       CFG_CMD_ASKENV|\
-       CFG_CMD_ECHO|\
-       CFG_CMD_IMMAP|\
-       CFG_CMD_REGINFO|\
-       CFG_CMD_DHCP|\
-       CFG_CMD_DATE|\
-       CFG_CMD_RUN|\
-       CFG_CMD_I2C|\
-       CFG_CMD_EEPROM|\
-       CFG_CMD_DIAG|\
-       CFG_CMD_AUTOSCRIPT|\
-       CFG_CMD_SETGETDCR)
+/*
+ * Command line configuration.
+ */
+
+#define CONFIG_CMD_BDI
+#define CONFIG_CMD_IMI
+#define CONFIG_CMD_FLASH
+#define CONFIG_CMD_MEMORY
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_CONSOLE
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_ECHO
+#define CONFIG_CMD_IMMAP
+#define CONFIG_CMD_REGINFO
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_RUN
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_DIAG
+#define CONFIG_CMD_AUTOSCRIPT
+#define CONFIG_CMD_SETGETDCR
+
 
 /*
  * optional BOOTP / DHCP fields
@@ -123,9 +127,6 @@
 #define CFG_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
-
 /*
  * Miscellaneous configurable options
  */