Merge with git://www.denx.de/git/u-boot.git

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

diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 90fe8a5..e1d8f74 100644 (file)
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -108,8 +108,11 @@
 #define CONFIG_OVERWRITE_ETHADDR_ONCE  1
 #define CONFIG_NET_MULTI               1
 
-#define CONFIG_BOOTP_MASK              (CONFIG_BOOTP_SUBNETMASK        \
-                                        | CONFIG_BOOTP_GATEWAY)
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
 
 
 /*
@@ -129,8 +132,6 @@
 #undef CONFIG_CMD_SETGETDCR
 #undef CONFIG_CMD_XIMG
 
-
-
 #define CONFIG_ATMEL_USART             1
 #define CONFIG_MACB                    1
 #define CONFIG_PIO2                    1