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 af9877f..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 */
 
 /*
@@ -99,7 +99,14 @@
 #define CONFIG_CMD_DHCP
 
 
-#define CONFIG_BOOTP_MASK         CONFIG_BOOTP_DEFAULT
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+
 
 #include <configs/omap730.h>
 #include <configs/h2_p2_dbg_board.h>
@@ -186,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 */