summaryrefslogtreecommitdiff
path: root/include/configs/colibri_vf.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-12-18 13:54:25 -0500
committerTom Rini <trini@konsulko.com>2016-12-18 17:43:20 -0500
commit8ea05705a70135a94419b0d243666c1b51fe1f8d (patch)
tree495da728ccebe411445c144fb88ba35041db2096 /include/configs/colibri_vf.h
parent0b4bc1b3ab1850fccbade3e6103f2036f6bdb364 (diff)
parent854bb75be98ad792ff64c26ae38a1392ea185cd6 (diff)
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Migrate CONFIG_ARCH_USE_MEMSET/MEMCPY with this merge. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/colibri_vf.h')
-rw-r--r--include/configs/colibri_vf.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 47dea625ed..62131c7359 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -97,7 +97,7 @@
"${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
"load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \
"load mmc 0:2 ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \
- "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
#define NFS_BOOTCMD \
"nfsargs=ip=:::::eth0: root=/dev/nfs\0" \
@@ -106,7 +106,7 @@
"${setupargs} ${vidargs}; echo Booting from NFS...;" \
"dhcp ${kernel_addr_r} && " \
"tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
- "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
#define UBI_BOOTCMD \
"ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \
@@ -117,7 +117,7 @@
"ubi part ubi && " \
"ubi read ${kernel_addr_r} kernel && " \
"ubi read ${fdt_addr_r} dtb && " \
- "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot"
@@ -129,6 +129,7 @@
"kernel_file=zImage\0" \
"fdt_file=${soc}-colibri-${fdt_board}.dtb\0" \
"fdt_board=eval-v3\0" \
+ "fdt_fixup=;\0" \
"defargs=\0" \
"console=ttyLP0\0" \
"setup=setenv setupargs " \