rename CFG_ENV macros to CONFIG_ENV

[platform/kernel/u-boot.git] / include / configs / ETX094.h

diff --git a/include/configs/ETX094.h b/include/configs/ETX094.h
index b6e1941..adf79c7 100644 (file)
--- a/include/configs/ETX094.h
+++ b/include/configs/ETX094.h
@@ -51,7 +51,7 @@
 #define CONFIG_BOARD_TYPES     1       /* support board types          */
 
 #define        CONFIG_FLASH_16BIT              /* for board with 16bit wide flash      */
-#undef SB_ETX094                       /* only for SB-Board with 16MB SDRAM    */
+#undef SB_ETX094                       /* only for SB-Board with 16MB SDRAM    */
 #define        CONFIG_BOOTP_RANDOM_DELAY       /* graceful BOOTP recovery mode         */
 
 #define CONFIG_ETHADDR 08:00:06:00:00:00
@@ -66,12 +66,12 @@
        "setenv bootargs root=/dev/ram rw ramdisk_size=4690 "                   \
        "U-Boot_version=U-Boot-1.0.x-Date "                                     \
        "panic=1 "                                                              \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 #define CONFIG_NFSBOOTCOMMAND                                                  \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(nfsip):$(rootpath) "        \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${nfsip}:${rootpath} "        \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 #define CONFIG_BOOTCOMMAND CONFIG_RAMBOOTCOMMAND
 
@@ -82,17 +82,29 @@
 
 #define        CONFIG_STATUS_LED       1       /* Status LED enabled           */
 
-#define CONFIG_BOOTP_MASK      (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE)
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
 
 /*
  * Miscellaneous configurable options
  */
 #define        CFG_LONGHELP                    /* undef to save memory         */
 #define        CFG_PROMPT      "=> "           /* Monitor Command Prompt       */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define        CFG_CBSIZE      1024            /* Console I/O Buffer Size      */
 #else
 #define        CFG_CBSIZE      256             /* Console I/O Buffer Size      */
@@ -159,13 +171,13 @@
 #define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */
 #define CFG_FLASH_WRITE_TOUT   1000    /* Timeout for Flash Write (in ms)      */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 #ifdef CONFIG_FLASH_16BIT
-#define CFG_ENV_OFFSET         0x8000  /* Offset   of Environment Sector       */
-#define        CFG_ENV_SIZE            0x8000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_OFFSET              0x8000  /* Offset   of Environment Sector       */
+#define        CONFIG_ENV_SIZE         0x8000  /* Total Size of Environment Sector     */
 #else
-#define CFG_ENV_OFFSET         0x8000  /* Offset   of Environment Sector       */
-#define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_OFFSET              0x8000  /* Offset   of Environment Sector       */
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */
 #endif
 
 /*-----------------------------------------------------------------------
@@ -179,7 +191,7 @@
  * Cache Configuration
  */
 #define CFG_CACHELINE_SIZE     16      /* For all MPC8xx CPUs                  */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CFG_CACHELINE_SHIFT    4       /* log base 2 of the above value        */
 #endif
 
@@ -282,7 +294,7 @@
 
 /* FLASH timing: ACS = 11, TRLX = 1, CSNT = 0, SCY = 2, EHTR = 0       */
 #define CFG_OR_TIMING_FLASH    (OR_ACS_DIV2 | OR_BI | \
-                               OR_SCY_2_CLK | OR_TRLX )
+                              OR_SCY_2_CLK | OR_TRLX )
 
 #define CFG_OR0_REMAP  (CFG_REMAP_OR_AM  | CFG_OR_TIMING_FLASH)
 #define CFG_OR0_PRELIM (CFG_PRELIM_OR_AM | CFG_OR_TIMING_FLASH)