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-Tag: v2016.07-rc1~175^2~16
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=27640fda55bf998d1eb5109b3410bf62e445e191;p=u-boot

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 e6c38a5819..1a1892dff6 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -148,6 +148,7 @@
 #endif
 
 /* Initial environment variables */
+#ifndef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"kernel_addr=0x80000\0" \
 	"fdt_addr=0x7000000\0" \
@@ -158,6 +159,7 @@
 		"load mmc $sdbootdev:$partid $kernel_addr Image && " \
 		"booti $kernel_addr - $fdt_addr\0" \
 	DFU_ALT_INFO
+#endif
 
 #define CONFIG_BOOTCOMMAND	"run $modeboot"
 #define CONFIG_BOOTDELAY	3