summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerard Salvatella <gerard.salvatella@toradex.com>2018-07-27 14:46:41 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-09-13 14:08:00 +0200
commitc5bbdb4ea5fe4ead0e0c9e5e2fb49749c84d8eed (patch)
tree3d60f4ad24241a245b6b160bb327036ddb0414dc
parent5717b9a050a123d3e1eafa7c0883810847e74d2c (diff)
colibri_vf: Fix sdboot in vf modules
Currently Vybrids sdboot variable tries to load the kernel from /boot of the root partition (typically second partition when using the sdcard image). However, since we moved to flash the kernel in a separate UBI volume, we no longer deploy the kernel/device tree to /boot, hence sdboot does not work in its current state. Load the kernel and device tree from the first (typically FAT) partition as customary on all Toradex modules. Signed-off-by: Gerard Salvatella <gerard.salvatella@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
-rw-r--r--include/configs/colibri_vf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index db610d53f1c..0579bfdc4ef 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -131,8 +131,8 @@
"sdargs=root=/dev/mmcblk0p2 ro rootwait\0" \
"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
"${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 && " \
+ "load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \
+ "load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
#define NFS_BOOTCMD \