Merge branch 'for-1.3.2-ver2'

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

diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h
index 627c0c8..2356858 100644 (file)
--- a/include/configs/CRAYL1.h
+++ b/include/configs/CRAYL1.h
@@ -101,16 +101,16 @@
 
 
 /*
- * optional BOOTP / DHCP fields
+ * BOOTP options
  */
-#define CONFIG_BOOTP_MASK (\
-       CONFIG_BOOTP_VENDOREX|\
-       CONFIG_BOOTP_SUBNETMASK|\
-       CONFIG_BOOTP_GATEWAY|\
-       CONFIG_BOOTP_DNS|\
-       CONFIG_BOOTP_HOSTNAME|\
-       CONFIG_BOOTP_BOOTFILESIZE|\
-       CONFIG_BOOTP_BOOTPATH)
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_VENDOREX
+#define CONFIG_BOOTP_DNS
+#define CONFIG_BOOTP_BOOTFILESIZE
+
 
 /*
  * how many time to fail & restart a net-TFTP before giving up & resetting
@@ -192,12 +192,6 @@
 #define CFG_MEMTEST_END                (CFG_SDRAM_SIZE * 1024 * 1024 - CFG_MEM_END_USAGE)
 /* END ENVIRONNEMENT FLASH */
 
-/*-----------------------------------------------------------------------
- * Cache Configuration.  Only used to ..?? clear it, I guess..
- */
-#define CFG_DCACHE_SIZE                16384
-#define CFG_CACHELINE_SIZE     32
-
 /*
  * Init Memory Controller:
  *