From b7de88cd5cb8c213fb158b37fcf0662c1d2332cd Mon Sep 17 00:00:00 2001
From: Adam Ford <aford173@gmail.com>
Date: Sun, 3 Mar 2019 16:22:45 -0600
Subject: [PATCH] ARM: imx6q_logic: Enable UUID support

With UUID support, the root can now point to UUID.  This makes
swiching between mmc 0 and mmc 1 easier by simplying changing
mmcdev between 0 and 1.  From there, the scripts handle the rest.

Signed-off-by: Adam Ford <aford173@gmail.com>
---
 configs/imx6q_logic_defconfig |  1 +
 include/configs/imx6_logic.h  | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig
index 8a875a8716..385efcec4e 100644
--- a/configs/imx6q_logic_defconfig
+++ b/configs/imx6q_logic_defconfig
@@ -46,6 +46,7 @@ CONFIG_CMD_USB_SDP=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_CMD_CACHE=y
 # CONFIG_CMD_LED is not set
+CONFIG_CMD_UUID=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index a121064e37..ad45b106b0 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -23,7 +23,7 @@
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       2
-#define CONFIG_MMCROOT         "/dev/mmcblk1p2" /* Dev kit SD card */
+
 
 /* Ethernet Configs */
 #define CONFIG_FEC_XCV_TYPE            RMII
@@ -43,10 +43,10 @@
 	"console=" CONSOLE_DEV "\0" \
 	"mmcdev=1\0" \
 	"mmcpart=1\0" \
-	"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+	"finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
 	"nandroot=ubi0:rootfs rootfstype=ubifs\0" \
 	"mmcargs=setenv bootargs console=${console},${baudrate}" \
-	" root=${mmcroot} ${mtdparts}\0" \
+	" root=PARTUUID=${uuid} rootwait rw\0 ${mtdparts}\0" \
 	"nandargs=setenv bootargs console=${console},${baudrate}" \
 	" ubi.mtd=fs root=${nandroot} ${mtdparts}\0" \
 	"ramargs=setenv bootargs console=${console},${baudrate}" \
@@ -60,8 +60,8 @@
 	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdt_file}\0" \
 	"loadramdisk=fatload mmc ${mmcdev}:${mmcpart} ${ramdisk_addr_r}" \
 	" ${ramdisk_file}; setenv ramdisksize ${filesize}\0" \
-	"mmcboot=echo Booting from mmc...; run mmcargs; run loadimage;" \
-	" run loadfdt; bootz ${loadaddr} - ${fdt_addr_r}\0" \
+	"mmcboot=echo Booting from mmc...; run finduuid; run mmcargs;" \
+	"run loadimage; run loadfdt; bootz ${loadaddr} - ${fdt_addr_r}\0" \
 	"mmcramboot=run ramargs; run loadimage;" \
 	" run loadfdt; run loadramdisk;" \
 	" bootz ${loadaddr} ${ramdisk_addr_r} ${fdt_addr_r}\0" \
-- 
2.39.5