summaryrefslogtreecommitdiffstats
path: root/include/configs
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2016-05-10 09:50:35 +0200
committerMichal Simek <michal.simek@xilinx.com>2016-05-24 11:15:01 +0200
commit27640fda55bf998d1eb5109b3410bf62e445e191 (patch)
tree14ca0b2e7186019fc81a9f20ae32437ccc5ee846 /include/configs
parent3a3b9147892cb47f96dff1075f1494dca17b6eaf (diff)
downloadtalos-obmc-uboot-27640fda55bf998d1eb5109b3410bf62e445e191.tar.gz
talos-obmc-uboot-27640fda55bf998d1eb5109b3410bf62e445e191.zip
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>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/xilinx_zynqmp.h2
1 files changed, 2 insertions, 0 deletions
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
OpenPOWER on IntegriCloud