zynq: Remove ipaddr from board specific conf files

Just keep it in common.

Signed-off-by: Michal Simek <monstr@monstr.eu>

diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h
index 5c6086cffe86e9d8a58e116093a8b84c114d6c04..1b97b1608ce6621fbe5a62945398c08c49277101 100644 (file)
--- a/include/configs/zynq_common.h
+++ b/include/configs/zynq_common.h
@@ -23,6 +23,10 @@
 #define CONFIG_ARMV7 /* CPU */
 #define CONFIG_ZYNQ /* SoC */
 
+/* Default environment */
+#define CONFIG_IPADDR   192.168.0.99
+#define CONFIG_SERVERIP 192.168.0.101
+
 #include <asm/arch/xparameters.h>
 
 #define CONFIG_SYS_TEXT_BASE 0x04000000

diff --git a/include/configs/zynq_cseflash.h b/include/configs/zynq_cseflash.h
index 0476c2e1a49e639d679a78e48cddd35ed41d07ef..ac218fdfa9f46f54836b7fcdf0bf8933221ca529 100644 (file)
--- a/include/configs/zynq_cseflash.h
+++ b/include/configs/zynq_cseflash.h
@@ -6,10 +6,6 @@
 
 #include <configs/zynq_common.h>
 
-/* Default environment */
-#define CONFIG_IPADDR   10.10.70.102
-#define CONFIG_SERVERIP 10.10.70.101
-
 #define CONFIG_ARM_DCC
 #define CONFIG_CPU_V6 /* Required by CONFIG_ARM_DCC */
 

diff --git a/include/configs/zynq_ep107.h b/include/configs/zynq_ep107.h
index eb90d43ee43f57c942cb4f48fe7c1391393f8002..e47d1df08be0363a0fb6482cbaeebf4af4c58241 100644 (file)
--- a/include/configs/zynq_ep107.h
+++ b/include/configs/zynq_ep107.h
@@ -22,10 +22,6 @@
 
 #include <configs/zynq_common.h>
 
-/* Default environment */
-#define CONFIG_IPADDR   10.10.70.102
-#define CONFIG_SERVERIP 10.10.70.101
-
 #undef CONFIG_ZYNQ_XIL_LQSPI
 
 #undef CONFIG_EXTRA_ENV_SETTINGS

diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index c9238bb3f0147c06a533bc45ccf1aae4e3b9c2c7..40ebcfff306fd69ac2dea2184ba093f648920cc2 100644 (file)
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -20,10 +20,6 @@
 
 #include <configs/zynq_common.h>
 
-/* Default environment */
-#define CONFIG_IPADDR   10.10.70.102
-#define CONFIG_SERVERIP 10.10.70.101
-
 #undef CONFIG_ZYNQ_XIL_LQSPI
 
 /* no NOR on zc702 */

diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index dcd5a3cf549f534b7f13e91d63ba25976db47db5..f71a9fec845b1ee054de433185a6372659315f25 100644 (file)
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -20,10 +20,6 @@
 
 #include <configs/zynq_common.h>
 
-/* Default environment */
-#define CONFIG_IPADDR   10.10.70.102
-#define CONFIG_SERVERIP 10.10.70.101
-
 #if defined(CONFIG_ZC770_XM012)
 #undef CONFIG_SYS_NO_FLASH
 #else

diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index 554759fde954ba504f827e2b3cfc5232a0f4b360..6ad6887be3ee7d48c11b6a5097ee5cc411f72a0b 100644 (file)
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -20,10 +20,6 @@
 
 #include <configs/zynq_common.h>
 
-/* Default environment */
-#define CONFIG_IPADDR   192.168.1.10
-#define CONFIG_SERVERIP 192.168.1.50
-
 #undef CONFIG_ZYNQ_XIL_LQSPI
 
 /* No NOR Flash available on ZedBoard */