]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
ARM64: zynqmp: Enable option to overwrite default variables
authorMichal Simek <michal.simek@xilinx.com>
Tue, 10 May 2016 07:50:35 +0000 (09:50 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Tue, 10 May 2016 07:51:06 +0000 (09:51 +0200)
Enable overwriting variables out of main config file.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
include/configs/xilinx_zynqmp.h

index 146ab2502b75492601ee23426752f16223ae3171..5ae08aa85c6eb952d1e5859eb2e48d5f1fe4bd62 100644 (file)
 #endif
 
 /* Initial environment variables */
+#ifndef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "kernel_addr=0x200000\0" \
        "initrd_addr=0xa00000\0" \
                     "load usb 0 $kernel_addr Image && " \
                     "booti $kernel_addr - $fdt_addr\0" \
        DFU_ALT_INFO
+#endif
 
 #define CONFIG_PREBOOT         "run setup"
 #define CONFIG_BOOTCOMMAND     "run $modeboot"