Merge branch '070524_netstar' of git://linux-arm.org/u-boot-armdev

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

diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index 1fef94f..064650c 100644 (file)
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -73,13 +73,14 @@
 #endif
 
 /*
- * BOOTP/DHCP protocol configuration
- *
+ * BOOTP options
  */
-#define CONFIG_BOOTP_MASK      ( CONFIG_BOOTP_DEFAULT          | \
-                                 CONFIG_BOOTP_DNS2             | \
-                                 CONFIG_BOOTP_BOOTFILESIZE     )
-
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_DNS2
 
 
 /*
@@ -98,7 +99,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 
-
 /*
  * Serial download configuration
  *
@@ -289,14 +289,6 @@
 #define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
 
 /*
- * Cache configuration
- *
- */
-#define CFG_DCACHE_SIZE                16384   /* For AMCC 405 CPUs, older 405 ppc's */
-                                       /* have only 8kB, 16kB is save here  */
-#define CFG_CACHELINE_SIZE     32
-
-/*
  * Miscellaneous board specific definitions
  *
  */