commit cc991fc4dbf3b38913f7838994d37176b67d236b
author Michal Simek <michal.simek@xilinx.com> Tue May 10 09:50:35 2016 +0200
committer Michal Simek <michal.simek@xilinx.com> Tue May 24 11:15:01 2016 +0200
tree 14ca0b2e7186019fc81a9f20ae32437ccc5ee846
parent 7a8465b537b5d3f86c57499e36ffb7d1c478a988

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>

include/configs/xilinx_zynqmp.h

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index e6c38a5..1a1892d 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