rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h
index fda55cf..b1c4a30 100644 (file)
--- a/include/configs/omap730p2.h
+++ b/include/configs/omap730p2.h
@@ -58,7 +58,7 @@
  * Size of malloc() pool
  */
 
-#define CFG_MALLOC_LEN            (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN            (CONFIG_ENV_SIZE + 128*1024)
 #define CFG_GBL_DATA_SIZE         128       /* size in bytes reserved for initial data */
 
 /*
@@ -90,14 +90,24 @@
 #define CONFIG_BAUDRATE                   115200
 #define CFG_BAUDRATE_TABLE        { 9600, 19200, 38400, 57600, 115200 }
 
-#define CONFIG_COMMANDS                   (CONFIG_CMD_DFL | CFG_CMD_DHCP)
-#define CONFIG_BOOTP_MASK         CONFIG_BOOTP_DEFAULT
 
 /*
- * This must be included AFTER the definition of CONFIG_COMMANDS (if any)
+ * Command line configuration.
  */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_DHCP
+
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+
 
-#include <cmd_confdefs.h>
 #include <configs/omap730.h>
 #include <configs/h2_p2_dbg_board.h>
 
@@ -112,7 +122,7 @@
 #define CONFIG_SERVERIP                   192.150.0.100
 #define CONFIG_BOOTFILE                   "uImage"  /* File to load */
 
-#if defined (CONFIG_COMMANDS) && defined (CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE      115200    /* Speed to run kgdb serial port */
 #define CONFIG_KGDB_SER_INDEX     1         /* Which serial port to use */
 #endif
@@ -183,14 +193,14 @@
 #define PHYS_FLASH_SIZE                   0x02000000     /* 32MB */
 #define CFG_MAX_FLASH_SECT        (259)          /* max number of sectors on one chip */
 /* addr of environment */
-#define CFG_ENV_ADDR              (CFG_FLASH_BASE + 0x020000)
+#define CONFIG_ENV_ADDR                   (CFG_FLASH_BASE + 0x020000)
 
 /* timeout values are in ticks */
 #define CFG_FLASH_ERASE_TOUT       (20*CFG_HZ)   /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT       (20*CFG_HZ)   /* Timeout for Flash Write */
 
-#define CFG_ENV_IS_IN_FLASH       1
-#define CFG_ENV_SIZE              0x20000        /* Total Size of Environment Sector */
-#define CFG_ENV_OFFSET            0x20000        /* environment starts here  */
+#define CONFIG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_SIZE                   0x20000        /* Total Size of Environment Sector */
+#define CONFIG_ENV_OFFSET                 0x20000        /* environment starts here  */
 
 #endif   /* ! __CONFIG_H */