zynqmp: Setup different IP address for EP108 and QEMU

This patch will be reverted in near future.

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

diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 5120160c70e251f8183379b3108bb9918b716f4d..846a40359100bdc60c9b2602587a85998168f475 100644 (file)
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -75,6 +75,19 @@ int board_late_init(void)
 {
        u32 reg = 0;
        u8 bootmode;
+       u32 ver = zynqmp_get_silicon_version();
+
+       switch (ver) {
+       case ZYNQMP_CSU_VERSION_VELOCE:
+       case ZYNQMP_CSU_VERSION_EP108:
+               setenv("serverip", "10.10.70.101");
+               setenv("ipaddr", "10.10.71.100");
+               break;
+       case ZYNQMP_CSU_VERSION_QEMU:
+       default:
+               setenv("serverip", "10.0.2.2");
+               setenv("ipaddr", "10.0.2.15");
+       }
 
        reg = readl(&crlapb_base->boot_mode);
        bootmode = reg & BOOT_MODES_MASK;

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index feb6bd1eb70347e910d3ecd983ff3e05a29cc6dc..38071310a148edf81f8fa0fc0e41521d4ee3353f 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -127,8 +127,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS       \
        "ethaddr=00:0a:35:00:01:22\0"   \
        "kernel_addr=0x200000\0"        \
-       "serverip=10.0.2.2\0"   \
-       "ipaddr=10.0.2.15\0"            \
        "initrd_addr=0xa00000\0"        \
        "initrd_size=0x2000000\0"       \
        "fdt_addr=0x100000\0"           \