Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm

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

diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h
index 53d6af28cc6050cde3372bf93a816d1c5649b2bc..098b92b4749e67efcf31fc23fe3962f1bee0db08 100644 (file)
--- a/include/configs/kvme080.h
+++ b/include/configs/kvme080.h
@@ -60,7 +60,15 @@
 
 #undef CONFIG_WATCHDOG
 
-#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
+
 
 #define CONFIG_MAC_PARTITION
 #define CONFIG_DOS_PARTITION
@@ -134,7 +142,7 @@
 #define CFG_BOOTMAPSZ          (8 << 20)
 
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_USE_BUFFER_WRITE
 #define CFG_FLASH_PROTECTION
 #define CFG_FLASH_EMPTY_INFO
@@ -149,12 +157,12 @@
 #define CFG_JFFS2_FIRST_BANK   0
 #define CFG_JFFS2_NUM_BANKS    1
 
-#define CFG_ENV_IS_IN_NVRAM    1
+#define CONFIG_ENV_IS_IN_NVRAM 1
 #define CONFIG_ENV_OVERWRITE   1
 #define CFG_NVRAM_ACCESS_ROUTINE
-#define CFG_ENV_ADDR           CFG_NVRAM_BASE_ADDR
-#define CFG_ENV_SIZE           0x400
-#define CFG_ENV_OFFSET         0
+#define CONFIG_ENV_ADDR                CFG_NVRAM_BASE_ADDR
+#define CONFIG_ENV_SIZE                0x400
+#define CONFIG_ENV_OFFSET              0
 
 #define CFG_NS16550
 #define CFG_NS16550_SERIAL