apalis-tk1: use UUID for rootfs

1. Replace usage of "/dev/mmcblk*p*" with a proper UUID of rootfs
partition. This fixes the issue, when MMC controllers are probed in
a different order in U-boot and Linux kernel.
2. Fix legacy USB command (both sdboot and usbboot can be used now).

Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>

diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 9c8c8979f046fcaa0dc3d9f120da2698594e5946..490ca64b1007efe2001876204d036799733e1e3f 100644 (file)
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -48,15 +48,22 @@
                                "tegra124-apalis-eval.dtb fat 0 1 mmcpart 0"
 
 #define EMMC_BOOTCMD \
-       "emmcargs=ip=off root=/dev/mmcblk0p2 rw rootfstype=ext3 rootwait\0" \
-       "emmcboot=run setup; setenv bootargs ${defargs} ${emmcargs} " \
-               "${setupargs} ${vidargs}; echo Booting from internal eMMC " \
-               "chip...; run emmcdtbload; load mmc 0:1 ${kernel_addr_r} " \
+       "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} " \
+               "ro rootfstype=ext4 rootwait\0" \
+       "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \
+               "setenv bootargs ${defargs} ${emmcargs} " \
+               "${setupargs} ${vidargs}; echo Booting from internal eMMC; " \
+               "run emmcdtbload; " \
+               "load mmc ${emmcdev}:${emmcbootpart} ${kernel_addr_r} " \
                "${boot_file} && run fdt_fixup && " \
                "bootm ${kernel_addr_r} - ${dtbparam}\0" \
-       "emmcdtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \
-               "${soc}-apalis-${fdt_board}.dtb && " \
-               "setenv dtbparam ${fdt_addr_r}\0"
+       "emmcbootpart=1\0" \
+       "emmcdev=0\0" \
+       "emmcdtbload=setenv dtbparam; load mmc ${emmcdev}:${emmcbootpart} " \
+               "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb && " \
+               "setenv dtbparam ${fdt_addr_r}\0" \
+       "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \
+       "emmcrootpart=2\0"
 
 #define NFS_BOOTCMD \
        "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \
@@ -69,26 +76,38 @@
                "&& setenv dtbparam ${fdt_addr_r}\0"
 
 #define SD_BOOTCMD \
-       "sdargs=ip=off root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait\0" \
-       "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
+       "set_sdargs=setenv sdargs ip=off root=PARTUUID=${uuid} ro " \
+       "rootfstype=ext4 rootwait\0" \
+       "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
+               "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
                "${vidargs}; echo Booting from SD card in 8bit slot...; " \
-               "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
-               "${boot_file} && run fdt_fixup && " \
+               "run sddtbload; load mmc ${sddev}:${sdbootpart} " \
+               "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
                "bootm ${kernel_addr_r} - ${dtbparam}\0" \
-       "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
-               "${soc}-apalis-${fdt_board}.dtb " \
-               "&& setenv dtbparam ${fdt_addr_r}\0"
+       "sdbootpart=1\0" \
+       "sddev=1\0" \
+       "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \
+               "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb " \
+               "&& setenv dtbparam ${fdt_addr_r}\0" \
+       "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
+       "sdrootpart=2\0"
 
 #define USB_BOOTCMD \
-       "usbargs=ip=off root=/dev/sda2 rw rootfstype=ext4 rootwait\0" \
-       "usbboot=run setup; setenv bootargs ${defargs} ${setupargs} " \
+       "set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid} ro " \
+               "rootfstype=ext4 rootwait\0" \
+       "usbboot=run setup; usb start; run usbfinduuid; run set_usbargs; " \
+               "setenv bootargs ${defargs} ${setupargs} " \
                "${usbargs} ${vidargs}; echo Booting from USB stick...; " \
-               "usb start && run usbdtbload; load usb 0:1 ${kernel_addr_r} " \
-               "${boot_file} && run fdt_fixup && " \
+               "run usbdtbload; load usb ${usbdev}:${usbbootpart} " \
+               "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
                "bootm ${kernel_addr_r} - ${dtbparam}\0" \
-       "usbdtbload=setenv dtbparam; load usb 0:1 ${fdt_addr_r} " \
-               "${soc}-apalis-${fdt_board}.dtb " \
-               "&& setenv dtbparam ${fdt_addr_r}\0"
+       "usbbootpart=1\0" \
+       "usbdev=0\0" \
+       "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart} " \
+               "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb " \
+               "&& setenv dtbparam ${fdt_addr_r}\0" \
+       "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \
+       "usbrootpart=2\0"
 
 #define BOARD_EXTRA_ENV_SETTINGS \
        "boot_file=uImage\0" \
@@ -101,6 +120,7 @@
        "fdt_fixup=;\0" \
        NFS_BOOTCMD \
        SD_BOOTCMD \
+       USB_BOOTCMD \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; pci enum && tftpboot ${loadaddr} " \
                "flash_eth.img && source ${loadaddr}\0" \