arm64: zynqmp: Separate standard variables from xilinx one

Prepare repository for removing xilinx boot commands.

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

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index ccbfd14b289277913a98f8a41e874c9e721c1b5c..2331b52630a501e664b6c08da9e0e7bfc7ea7373 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -102,9 +102,9 @@
 # define PARTS_DEFAULT
 #endif
 
-/* Initial environment variables */
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+/* Xilinx initial environment variables */
+#ifndef CONFIG_EXTRA_ENV_BOARD_SETTINGS
+#define CONFIG_EXTRA_ENV_BOARD_SETTINGS \
        "kernel_addr=0x80000\0" \
        "initrd_addr=0xa00000\0" \
        "initrd_size=0x2000000\0" \
@@ -181,8 +181,7 @@
        "usbhostboot=usb start && load usb 0 $fdt_addr system.dtb && " \
                     "load usb 0 $kernel_addr Image && " \
                     "booti $kernel_addr - $fdt_addr\0" \
-       PARTS_DEFAULT \
-       DFU_ALT_INFO
+       PARTS_DEFAULT
 #endif
 
 /* Monitor Command Prompt */
@@ -267,6 +266,7 @@
 /* Initial environment variables */
 #ifndef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS \
+       CONFIG_EXTRA_ENV_BOARD_SETTINGS \
        ENV_MEM_LAYOUT_SETTINGS \
        BOOTENV \
        DFU_ALT_INFO