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 git://git.denx.de/u-boot-socfpga
[platform/kernel/u-boot.git]
/
include
/
configs
/
apalis_imx6.h
diff --git
a/include/configs/apalis_imx6.h
b/include/configs/apalis_imx6.h
index
96169f5
..
91054d8
100644
(file)
--- a/
include/configs/apalis_imx6.h
+++ b/
include/configs/apalis_imx6.h
@@
-138,12
+138,12
@@
#define MEM_LAYOUT_ENV_SETTINGS \
"bootm_size=0x20000000\0" \
#define MEM_LAYOUT_ENV_SETTINGS \
"bootm_size=0x20000000\0" \
- "fdt_addr_r=0x12
0
00000\0" \
+ "fdt_addr_r=0x12
1
00000\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
"kernel_addr_r=0x11000000\0" \
"pxefile_addr_r=0x17100000\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
"kernel_addr_r=0x11000000\0" \
"pxefile_addr_r=0x17100000\0" \
- "ramdisk_addr_r=0x12
1
00000\0" \
+ "ramdisk_addr_r=0x12
2
00000\0" \
"scriptaddr=0x17000000\0"
#define NFS_BOOTCMD \
"scriptaddr=0x17000000\0"
#define NFS_BOOTCMD \