Merge branch 'master' of /home/stefan/git/u-boot/u-boot

[oweals/u-boot.git] / include / configs / CCM.h

diff --git a/include/configs/CCM.h b/include/configs/CCM.h
index 199b01f0cc89ef02bdd65e1b8c929c47e495a87b..6194c5c6e2677d7118fac476f60b7ff1ac20ecf3 100644 (file)
--- a/include/configs/CCM.h
+++ b/include/configs/CCM.h
@@ -94,7 +94,14 @@
 #define CONFIG_MAC_PARTITION           /* nod used yet                 */
 #define CONFIG_DOS_PARTITION
 
-#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
 
 
 /*
@@ -130,7 +137,7 @@
 #define        CFG_LOAD_ADDR           0x00100000      /* default load address */
 
 /* Ethernet hardware configuration done using port pins */
-#define CFG_PA_ETH_RESET       0x0200          /* PA  6        */
+#define CFG_PA_ETH_RESET       0x0200          /* PA  6        */
 #define CFG_PA_ETH_MDDIS       0x4000          /* PA  1        */
 #define CFG_PB_ETH_POWERDOWN   0x00000800      /* PB 20        */
 #define CFG_PB_ETH_CFG1                0x00000400      /* PB 21        */