projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
colibri_imx6.h
diff --git
a/include/configs/colibri_imx6.h
b/include/configs/colibri_imx6.h
index
c2322d8
..
0b58e5b
100644
(file)
--- a/
include/configs/colibri_imx6.h
+++ b/
include/configs/colibri_imx6.h
@@
-170,6
+170,7
@@
"${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
#define MEM_LAYOUT_ENV_SETTINGS \
+ "bootm_size=0x10000000\0" \
"fdt_addr_r=0x12000000\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \