rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

[karo-tx-uboot.git] / include / configs / ADCIOP.h

diff --git a/include/configs/ADCIOP.h b/include/configs/ADCIOP.h
index f79fad18612020402a89bba6104f61a30b87e33c..0069aabab7cf13269a5230a2040f1af08e9dfc6e 100644 (file)
--- a/include/configs/ADCIOP.h
+++ b/include/configs/ADCIOP.h
@@ -59,6 +59,15 @@
 #define CONFIG_IPADDR          10.0.18.222
 #define CONFIG_SERVERIP                10.0.18.190
 
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
 /*
  * Command line configuration.
  */
@@ -151,7 +160,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM    1       /* use NVRAM for environment vars       */
+#define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
 #define CFG_NVRAM_BASE_ADDR    0x10000000              /* NVRAM base address   */
 #define CFG_NVRAM_SIZE         (32*1024)               /* NVRAM size           */
 #define CFG_ENV_SIZE           0x0400          /* Size of Environment vars     */
@@ -161,7 +170,7 @@
 
 #else /* Use FLASH for environment variables */
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_OFFSET         0x00010000      /* Offset of Environment Sector */
 #define CFG_ENV_SIZE           0x1000  /* Total Size of Environment Sector     */
 
@@ -182,15 +191,6 @@
 #define CFG_ETH_DEV_FN      0x0000
 #define CFG_ETH_IOBASE      0x0fff0000
 
-/*-----------------------------------------------------------------------
- * Cache Configuration
- */
-#define CFG_DCACHE_SIZE                2048    /* For PLX IOP480                       */
-#define CFG_CACHELINE_SIZE     16      /* For AMCC 401/403 CPUs                */
-#if defined(CONFIG_CMD_KGDB)
-#define CFG_CACHELINE_SHIFT    4       /* log base 2 of the above value        */
-#endif
-
 /*
  * Init Memory Controller:
  *