projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3a3b914
)
ARM64: zynqmp: Enable option to overwrite default variables
author
Michal Simek
<michal.simek@xilinx.com>
Tue, 10 May 2016 07:50:35 +0000
(09:50 +0200)
committer
Michal Simek
<michal.simek@xilinx.com>
Tue, 24 May 2016 09:15:01 +0000
(11:15 +0200)
Enable overwriting variables out of main config file.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
include/configs/xilinx_zynqmp.h
patch
|
blob
|
history
diff --git
a/include/configs/xilinx_zynqmp.h
b/include/configs/xilinx_zynqmp.h
index
e6c38a5
..
1a1892d
100644
(file)
--- 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