From: Michal Simek <michal.simek@xilinx.com>
Date: Sat, 13 Feb 2016 10:50:03 +0000 (+0100)
Subject: ARM: zynq: Enable option to overwrite default variables
X-Git-Tag: v2016.05-rc1~34^2~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b7b3efe75a46c3d6bff43b7b314d1fff90ca65ec;p=oweals%2Fu-boot.git

ARM: zynq: 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/zynq-common.h b/include/configs/zynq-common.h
index 9d81b1d334..0a0517ceec 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -204,6 +204,7 @@
 #endif
 
 /* Default environment */
+#ifndef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS	\
 	"fit_image=fit.itb\0"		\
 	"load_addr=0x2000000\0"		\
@@ -226,6 +227,7 @@
 			"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 */