ARM: omap3_logic: Enable UUID
PATCH 1/1 ARM: omap3_logic: Enable UUID
Instead of hardcoding the mmcroot to /dev/mmcblkX, use the UUID method.
configs/omap35_logic_defconfig +1 -0
@@ -30,6 +30,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y CONFIG_CMD_CACHE=y +CONFIG_CMD_UUID=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)"
configs/omap35_logic_somlv_defconfig +1 -0
@@ -29,6 +29,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y CONFIG_CMD_CACHE=y +CONFIG_CMD_UUID=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0,nor0=physmap-flash.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs);physmap-flash.0:-(nor)"
configs/omap3_logic_defconfig +1 -0
@@ -29,6 +29,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y CONFIG_CMD_CACHE=y +CONFIG_CMD_UUID=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)"
configs/omap3_logic_somlv_defconfig +1 -0
@@ -29,6 +29,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y CONFIG_CMD_CACHE=y +CONFIG_CMD_UUID=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0,nor0=physmap-flash.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs);physmap-flash.0:-(nor)"
include/configs/omap3_logic.h +4 -2
@@ -67,7 +67,7 @@"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \"mmcdev=0\0" \ -"mmcroot=/dev/mmcblk0p2 rw\0" \ +"finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \"mmcrootfstype=ext4 rootwait\0" \"nandroot=ubi0:rootfs rw ubi.mtd=fs noinitrd\0" \"nandrootfstype=ubifs rootwait\0" \
@@ -106,7 +106,8 @@"ramargs=setenv bootargs " \"root=/dev/ram rw ramdisk_size=${ramdisksize}\0" \"mmcargs=setenv bootargs " \ -"root=${mmcroot} rootfstype=${mmcrootfstype}\0" \ +"root=PARTUUID=${uuid} " \ +"rootfstype=${mmcrootfstype} rw\0" \"nandargs=setenv bootargs " \"root=${nandroot} " \"rootfstype=${nandrootfstype}\0" \
@@ -120,6 +121,7 @@"loadfdt=mmc rescan; " \"load mmc ${mmcdev} ${fdtaddr} ${fdtimage}\0" \"mmcbootcommon=echo Booting with DT from mmc${mmcdev} ...; " \ +"run finduuid; " \"run mmcargs; " \"run common_bootargs; " \"run dump_bootargs; " \
Signature · 1 line
2.17.1
Quoted 75 lines
Instead of hardcoding the mmcroot to
/dev/mmcblkX, use the UUID method.Signed-off-by Adam Ford <[email protected]>configs/omap35_logic_defconfig +1
-0@@ -30,6 +30,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y CONFIG_CMD_CACHE=y +CONFIG_CMD_UUID=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)"configs/omap35_logic_somlv_defconfig +1
-0@@ -29,6 +29,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y CONFIG_CMD_CACHE=y +CONFIG_CMD_UUID=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0,nor0=physmap-flash.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs);physmap-flash.0:-(nor)"configs/omap3_logic_defconfig +1
-0@@ -29,6 +29,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y CONFIG_CMD_CACHE=y +CONFIG_CMD_UUID=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)"configs/omap3_logic_somlv_defconfig +1
-0@@ -29,6 +29,7 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y CONFIG_CMD_CACHE=y +CONFIG_CMD_UUID=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0,nor0=physmap-flash.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs);physmap-flash.0:-(nor)"include/configs/omap3_logic.h +3
-2@@ -67,7 +67,7 @@"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \"mmcdev=0\0" \ -"mmcroot=/dev/mmcblk0p2 rw\0" \ +"finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \"mmcrootfstype=ext4 rootwait\0" \"nandroot=ubi0:rootfs rw ubi.mtd=fs noinitrd\0" \"nandrootfstype=ubifs rootwait\0" \@@ -106,7 +106,8 @@"ramargs=setenv bootargs " \"root=/dev/ram rw ramdisk_size=${ramdisksize}\0" \"mmcargs=setenv bootargs " \ -"root=${mmcroot} rootfstype=${mmcrootfstype}\0" \ +"root=PARTUUID=${uuid} " \ +"rootfstype=${mmcrootfstype} rw\0" \"nandargs=setenv bootargs " \"root=${nandroot} " \"rootfstype=${nandrootfstype}\0" \
include/configs/omap3_logic.h line 127
Quoted 7 lines
include/configs/omap3_logic.h +1
-0@@ -120,6 +121,7 @@"loadfdt=mmc rescan; " \"load mmc ${mmcdev} ${fdtaddr} ${fdtimage}\0" \"mmcbootcommon=echo Booting with DT from mmc${mmcdev} ...; " \ +"run finduuid; " \"run mmcargs; " \"run common_bootargs; " \"run dump_bootargs; " \
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
Hi Stefano,
Quoted 10 lines · On Fri, Apr 26, 2019 at 7:11 AM <[email protected]> wrote:
configs/omap35_logic_defconfig
Quoted 8 lines
Instead of hardcoding the mmcroot to
/dev/mmcblkX, use the UUID method.Signed-off-by Adam Ford <[email protected]>configs/omap35_logic_defconfig +0
-0Applied to u-boot-imx, master, thanks !
Was this applied to the u-boot-imx tree by mistake?
This patch is for omap, not i.MX :-)
Quoted 14 lines · Fabio Estevam
Hi Stefano,
Quoted 10 lines · On Fri, Apr 26, 2019 at 7:11 AM <[email protected]> wrote:
configs/omap35_logic_defconfig
Quoted 8 lines
Instead of hardcoding the mmcroot to
/dev/mmcblkX, use the UUID method.Signed-off-by Adam Ford <[email protected]>configs/omap35_logic_defconfig +0
-0Applied to u-boot-imx, master, thanks !
Quoted 4 lines
Was this applied to the u-boot-imx tree by mistake?
This patch is for omap, not i.MX :-)
Right, but the patch was assigned to me, it was just a small change in config and then I applied on u-boot-imx. Maybe the correct way for next time is simply to change delegate in Patchwork and reassign the patch (in this case, directly to Tom).
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
Quoted 19 lines · Stefano Babic
Quoted 16 lines · Fabio Estevam
Hi Stefano,
Quoted 10 lines · On Fri, Apr 26, 2019 at 7:11 AM <[email protected]> wrote:
configs/omap35_logic_defconfig
Quoted 8 lines
Instead of hardcoding the mmcroot to
/dev/mmcblkX, use the UUID method.Signed-off-by Adam Ford <[email protected]>configs/omap35_logic_defconfig +0
-0Applied to u-boot-imx, master, thanks !
Was this applied to the u-boot-imx tree by mistake?
Quoted 7 lines
Quoted 2 lines
This patch is for omap, not i.MX :-)
Right, but the patch was assigned to me, it was just a small change in config and then I applied on u-boot-imx. Maybe the correct way for next time is simply to change delegate in Patchwork and reassign the patch (in this case, directly to Tom).
heh, oops. I think it must have been sent around the same time as a bunch of Adam's other patches that were for i.MX. Either way, going that tree or just assigning it back to me when I goof up is fine :) Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190505/c292e58e/attachment.sig>