Skip to content
Snippets Groups Projects
Commit 283c2a65 authored by Fabio Estevam's avatar Fabio Estevam Committed by Stefano Babic
Browse files

warp: Use PARTUUID to specify the rootfs location


warp can run different kernel versions, such as NXP 4.1 or
mainline.

Currently the rootfs location is passed via mmcblk number and the
problem with this approach is that the mmcblk number for the eMMC
changes depending on the kernel version.

In order to avoid such issue, use UUID method to specify the rootfs
location.

Succesfully tested booting a NXP 4.1 and also a mainline 4.12 kernel.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Acked-by: default avatarOtavio Salvador <otavio@ossystems.com.br>
parent 0f29a61c
No related branches found
No related tags found
No related merge requests found
...@@ -10,6 +10,7 @@ CONFIG_CMD_BOOTZ=y ...@@ -10,6 +10,7 @@ CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_PART=y
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
......
...@@ -95,10 +95,10 @@ ...@@ -95,10 +95,10 @@
"ip_dyn=yes\0" \ "ip_dyn=yes\0" \
"mmcdev=0\0" \ "mmcdev=0\0" \
"mmcpart=1\0" \ "mmcpart=1\0" \
"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ "finduuid=part uuid mmc 0:2 uuid\0" \
"dfu_alt_info=boot raw 0x2 0x400 mmcpart 1\0" \ "dfu_alt_info=boot raw 0x2 0x400 mmcpart 1\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \ "mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \ "root=PARTUUID=${uuid} rootwait rw\0" \
"loadbootscript=" \ "loadbootscript=" \
"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
"bootscript=echo Running bootscript from mmc ...; " \ "bootscript=echo Running bootscript from mmc ...; " \
...@@ -106,6 +106,7 @@ ...@@ -106,6 +106,7 @@
"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
"mmcboot=echo Booting from mmc ...; " \ "mmcboot=echo Booting from mmc ...; " \
"run finduuid; " \
"run mmcargs; " \ "run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if run loadfdt; then " \ "if run loadfdt; then " \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment