From a3552a8619953fedaf893660d08b08e2e10347f0 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 24 Sep 2012 11:42:45 +0200 Subject: [PATCH] zynq: Remove ipaddr from board specific conf files Just keep it in common. Signed-off-by: Michal Simek --- include/configs/zynq_common.h | 4 ++++ include/configs/zynq_cseflash.h | 4 ---- include/configs/zynq_ep107.h | 4 ---- include/configs/zynq_zc70x.h | 4 ---- include/configs/zynq_zc770.h | 4 ---- include/configs/zynq_zed.h | 4 ---- 6 files changed, 4 insertions(+), 20 deletions(-) diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h index 5c6086cffe8..1b97b1608ce 100644 --- 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 #define CONFIG_SYS_TEXT_BASE 0x04000000 diff --git a/include/configs/zynq_cseflash.h b/include/configs/zynq_cseflash.h index 0476c2e1a49..ac218fdfa9f 100644 --- a/include/configs/zynq_cseflash.h +++ b/include/configs/zynq_cseflash.h @@ -6,10 +6,6 @@ #include -/* 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 eb90d43ee43..e47d1df08be 100644 --- a/include/configs/zynq_ep107.h +++ b/include/configs/zynq_ep107.h @@ -22,10 +22,6 @@ #include -/* 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 c9238bb3f01..40ebcfff306 100644 --- a/include/configs/zynq_zc70x.h +++ b/include/configs/zynq_zc70x.h @@ -20,10 +20,6 @@ #include -/* 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 dcd5a3cf549..f71a9fec845 100644 --- a/include/configs/zynq_zc770.h +++ b/include/configs/zynq_zc770.h @@ -20,10 +20,6 @@ #include -/* 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 554759fde95..6ad6887be3e 100644 --- a/include/configs/zynq_zed.h +++ b/include/configs/zynq_zed.h @@ -20,10 +20,6 @@ #include -/* 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 */ -- 2.47.3