projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8964f24
)
ARM: zynq: Enable option to overwrite default variables
author
Michal Simek
<michal.simek@xilinx.com>
Sat, 13 Feb 2016 10:50:03 +0000
(11:50 +0100)
committer
Michal Simek
<michal.simek@xilinx.com>
Mon, 4 Apr 2016 18:10:44 +0000
(20:10 +0200)
Enable overwriting variables out of main config file.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
include/configs/zynq-common.h
patch
|
blob
|
history
diff --git
a/include/configs/zynq-common.h
b/include/configs/zynq-common.h
index 9d81b1d334201e559e3efb3c3d011dee7cfbe721..0a0517ceecb49149bed9938a1b95fa8d03ba4649 100644
(file)
--- 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 */