xilinx: Remove ip and serverip address setup

This setting is board dependent and not acceptable for mainline
submission.

Error log on zcu102:
setenv ipaddr 10.10.70.1 && setenv partid auto" (type: i)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 159c5bc424d4f5483b9da832b903b3a2d23caa56..4d6c8fcad6a4754a0bd6142acbd04eb403e886ee 100644 (file)
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -215,11 +215,11 @@ int board_late_init(void)
                setenv("setup", "setenv baudrate 4800 && setenv bootcmd run veloce");
        case ZYNQMP_CSU_VERSION_EP108:
        case ZYNQMP_CSU_VERSION_SILICON:
-               setenv("setup", "setenv serverip 10.10.70.101 && setenv ipaddr 10.10.70.1 && setenv partid auto");
+               setenv("setup", "setenv partid auto");
                break;
        case ZYNQMP_CSU_VERSION_QEMU:
        default:
-               setenv("setup", "setenv serverip 10.0.2.2 && setenv ipaddr 10.0.2.15 && setenv partid 0");
+               setenv("setup", "setenv partid 0");
        }
 
        reg = readl(&crlapb_base->boot_mode);

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index bf46755018d0a1168648005118f4ef24090f9d62..ab82a5ed8eff5cb28a3c89153c58c3a45c7b2b1a 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -243,9 +243,6 @@
 #define        CONFIG_BOOTARGS         "root=romfs"
 #define        CONFIG_HOSTNAME         XILINX_BOARD_NAME
 #define        CONFIG_BOOTCOMMAND      "base 0;tftp 11000000 image.img;bootm"
-#define        CONFIG_IPADDR           192.168.0.3
-#define        CONFIG_SERVERIP         192.168.0.5
-#define        CONFIG_GATEWAYIP        192.168.0.1
 
 /* architecture dependent code */
 #define        CONFIG_SYS_USR_EXCEP    /* user exception */

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 4c3ef06a58e51e75dee212eeff2d087188e4598f..70418940cb549a9bf34834a4be4f726e94519a0c 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -311,10 +311,6 @@
                DFU_ALT_INFO
 #endif
 
-/* Default environment */
-#define CONFIG_IPADDR  10.10.70.102
-#define CONFIG_SERVERIP        10.10.70.101
-
 /* default boot is according to the bootmode switch settings */
 #if defined(CONFIG_CMD_ZYNQ_RSA)
 #define CONFIG_BOOTCOMMAND             "run rsa_$modeboot"