From: Michal Simek <michal.simek@xilinx.com>
Date: Tue, 10 May 2016 07:50:35 +0000 (+0200)
Subject: ARM64: zynqmp: Enable option to overwrite default variables
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb20facc0d37078629ad02a438d2d218ada1d953;p=thirdparty%2Fu-boot.git

ARM64: zynqmp: Enable option to overwrite default variables

Enable overwriting variables out of main config file.

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

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 146ab2502b7..5ae08aa85c6 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -180,6 +180,7 @@
 #endif
 
 /* Initial environment variables */
+#ifndef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"kernel_addr=0x200000\0" \
 	"initrd_addr=0xa00000\0" \
@@ -234,6 +235,7 @@
 		     "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"