rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h
index f7e1c4d..0edd51a 100644 (file)
--- a/include/configs/DB64360.h
+++ b/include/configs/DB64360.h
@@ -169,7 +169,7 @@ if we use PCI it has its own MAC addr */
 
 
 #undef CONFIG_BOOTARGS
-/*#define CONFIG_PREBOOT       "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo" */
+/*#define CONFIG_PREBOOT       "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo" */
 
 /* ronen - autoboot using tftp */
 #if (CONFIG_BOOTDELAY >= 0)
@@ -215,8 +215,16 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
 #undef CONFIG_ALTIVEC                  /* undef to disable             */
 
-#define CONFIG_BOOTP_MASK      (CONFIG_BOOTP_DEFAULT | \
-                                CONFIG_BOOTP_BOOTFILESIZE)
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+
+
 /*
  * JFFS2 partitions
  *
@@ -551,11 +559,11 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
 #define CFG_FLASH_LOCK_TOUT    500     /* Timeout for Flash Lock (in ms) */
 #define CFG_FLASH_CFI          1
 
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_SIZE           0x1000  /* Total Size of Environment Sector */
-#define CFG_ENV_SECT_SIZE      0x10000
-#define CFG_ENV_ADDR         0xFFF78000 /* Marvell 8-Bit Bootflash last sector */
-/* #define CFG_ENV_ADDR           (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE) */
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_SIZE                0x1000  /* Total Size of Environment Sector */
+#define CONFIG_ENV_SECT_SIZE   0x10000
+#define CONFIG_ENV_ADDR              0xFFF78000 /* Marvell 8-Bit Bootflash last sector */
+/* #define CONFIG_ENV_ADDR        (CFG_FLASH_BASE+CFG_MONITOR_LEN-CONFIG_ENV_SECT_SIZE) */
 
 /*-----------------------------------------------------------------------
  * Cache Configuration