]> git.ipfire.org Git - thirdparty/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>
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/zynq-common.h

index 166f64e0d32533a01367d97a593f2c5fde5812d3..a623c543163f95e98cc3c03c4fad7e195f480290 100644 (file)
 #endif
 
 /* Default environment */
+#ifndef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "ethaddr=00:0a:35:00:01:22\0"   \
        "kernel_image=uImage\0" \
                "zynqrsa 0x100000 && " \
                "bootm ${kernel_load_address} ${ramdisk_load_address} ${devicetree_load_address}\0" \
                DFU_ALT_INFO
+#endif
 
 /* Default environment */
 #define CONFIG_IPADDR  10.10.70.102