summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2016-02-13 11:50:03 +0100
committerMichal Simek <michal.simek@xilinx.com>2016-04-04 20:10:44 +0200
commitb7b3efe75a46c3d6bff43b7b314d1fff90ca65ec (patch)
tree71fa5a2f7c73d0586ce4bd1cf5aeb4f042d43d17 /include
parent8964f241790181b08eae02b2da56fbadb0375930 (diff)
downloadu-boot-imx-b7b3efe75a46c3d6bff43b7b314d1fff90ca65ec.zip
u-boot-imx-b7b3efe75a46c3d6bff43b7b314d1fff90ca65ec.tar.gz
u-boot-imx-b7b3efe75a46c3d6bff43b7b314d1fff90ca65ec.tar.bz2
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>
Diffstat (limited to 'include')
-rw-r--r--include/configs/zynq-common.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 9d81b1d..0a0517c 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 */