]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
ARM: zynq: Enable option to overwrite default variables
authorMichal Simek <michal.simek@xilinx.com>
Sat, 13 Feb 2016 10:50:03 +0000 (11:50 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Mon, 4 Apr 2016 18:10:44 +0000 (20:10 +0200)
Enable overwriting variables out of main config file.

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

index 9d81b1d334201e559e3efb3c3d011dee7cfbe721..0a0517ceecb49149bed9938a1b95fa8d03ba4649 100644 (file)
 #endif
 
 /* Default environment */
+#ifndef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "fit_image=fit.itb\0"           \
        "load_addr=0x2000000\0"         \
                        "load usb 0 ${load_addr} ${fit_image} && " \
                        "bootm ${load_addr}; fi\0" \
                DFU_ALT_INFO
+#endif
 
 #define CONFIG_BOOTCOMMAND             "run $modeboot"
 #define CONFIG_BOOTDELAY               3 /* -1 to Disable autoboot */