* [U-Boot] [PATCH] ARM: omap3_logic: Enable UUID
@ 2019-04-11 20:24 Adam Ford
2019-04-26 9:45 ` [U-Boot] " sbabic at denx.de
0 siblings, 1 reply; 5+ messages in thread
From: Adam Ford @ 2019-04-11 20:24 UTC (permalink / raw)
To: u-boot
Instead of hardcoding the mmcroot to /dev/mmcblkX, use the UUID
method.
Signed-off-by: Adam Ford <aford173@gmail.com>
diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig
index 5b5f3eb7b4..9a1596c89b 100644
--- a/configs/omap35_logic_defconfig
+++ b/configs/omap35_logic_defconfig
@@ -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)"
diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig
index 396f321699..961be13399 100644
--- a/configs/omap35_logic_somlv_defconfig
+++ b/configs/omap35_logic_somlv_defconfig
@@ -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)"
diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index b38b6fd75a..41fb0341b9 100644
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -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)"
diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig
index c6106c5d23..c5e6a29e47 100644
--- a/configs/omap3_logic_somlv_defconfig
+++ b/configs/omap3_logic_somlv_defconfig
@@ -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)"
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index fe557f91ca..9db9668703 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -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; " \
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] ARM: omap3_logic: Enable UUID
2019-04-11 20:24 [U-Boot] [PATCH] ARM: omap3_logic: Enable UUID Adam Ford
@ 2019-04-26 9:45 ` sbabic at denx.de
2019-05-03 18:32 ` Fabio Estevam
0 siblings, 1 reply; 5+ messages in thread
From: sbabic at denx.de @ 2019-04-26 9:45 UTC (permalink / raw)
To: u-boot
> Instead of hardcoding the mmcroot to /dev/mmcblkX, use the UUID
> method.
> Signed-off-by: Adam Ford <aford173@gmail.com>
> diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig
> index 5b5f3eb7b4..9a1596c89b 100644
> --- a/configs/omap35_logic_defconfig
> +++ b/configs/omap35_logic_defconfig
> @@ -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)"
> diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig
> index 396f321699..961be13399 100644
> --- a/configs/omap35_logic_somlv_defconfig
> +++ b/configs/omap35_logic_somlv_defconfig
> @@ -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)"
> diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
> index b38b6fd75a..41fb0341b9 100644
> --- a/configs/omap3_logic_defconfig
> +++ b/configs/omap3_logic_defconfig
> @@ -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)"
> diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig
> index c6106c5d23..c5e6a29e47 100644
> --- a/configs/omap3_logic_somlv_defconfig
> +++ b/configs/omap3_logic_somlv_defconfig
> @@ -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)"
> diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
> index fe557f91ca..9db9668703 100644
> --- a/include/configs/omap3_logic.h
> +++ b/include/configs/omap3_logic.h
> @@ -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; " \
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] ARM: omap3_logic: Enable UUID
2019-04-26 9:45 ` [U-Boot] " sbabic at denx.de
@ 2019-05-03 18:32 ` Fabio Estevam
2019-05-05 9:28 ` Stefano Babic
0 siblings, 1 reply; 5+ messages in thread
From: Fabio Estevam @ 2019-05-03 18:32 UTC (permalink / raw)
To: u-boot
Hi Stefano,
On Fri, Apr 26, 2019 at 7:11 AM <sbabic@denx.de> wrote:
>
> > Instead of hardcoding the mmcroot to /dev/mmcblkX, use the UUID
> > method.
> > Signed-off-by: Adam Ford <aford173@gmail.com>
> > diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig
> > index 5b5f3eb7b4..9a1596c89b 100644
> > --- a/configs/omap35_logic_defconfig
> > +++ b/configs/omap35_logic_defconfig
> Applied 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 :-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] ARM: omap3_logic: Enable UUID
2019-05-03 18:32 ` Fabio Estevam
@ 2019-05-05 9:28 ` Stefano Babic
2019-05-05 22:46 ` Tom Rini
0 siblings, 1 reply; 5+ messages in thread
From: Stefano Babic @ 2019-05-05 9:28 UTC (permalink / raw)
To: u-boot
On 03/05/19 20:32, Fabio Estevam wrote:
> Hi Stefano,
>
> On Fri, Apr 26, 2019 at 7:11 AM <sbabic@denx.de> wrote:
>>
>>> Instead of hardcoding the mmcroot to /dev/mmcblkX, use the UUID
>>> method.
>>> Signed-off-by: Adam Ford <aford173@gmail.com>
>>> diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig
>>> index 5b5f3eb7b4..9a1596c89b 100644
>>> --- a/configs/omap35_logic_defconfig
>>> +++ b/configs/omap35_logic_defconfig
>
>> Applied 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 :-)
>
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
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] ARM: omap3_logic: Enable UUID
2019-05-05 9:28 ` Stefano Babic
@ 2019-05-05 22:46 ` Tom Rini
0 siblings, 0 replies; 5+ messages in thread
From: Tom Rini @ 2019-05-05 22:46 UTC (permalink / raw)
To: u-boot
On Sun, May 05, 2019 at 11:28:01AM +0200, Stefano Babic wrote:
>
>
> On 03/05/19 20:32, Fabio Estevam wrote:
> > Hi Stefano,
> >
> > On Fri, Apr 26, 2019 at 7:11 AM <sbabic@denx.de> wrote:
> >>
> >>> Instead of hardcoding the mmcroot to /dev/mmcblkX, use the UUID
> >>> method.
> >>> Signed-off-by: Adam Ford <aford173@gmail.com>
> >>> diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig
> >>> index 5b5f3eb7b4..9a1596c89b 100644
> >>> --- a/configs/omap35_logic_defconfig
> >>> +++ b/configs/omap35_logic_defconfig
> >
> >> Applied 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 :-)
> >
>
> 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!
--
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>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-05-05 22:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-11 20:24 [U-Boot] [PATCH] ARM: omap3_logic: Enable UUID Adam Ford
2019-04-26 9:45 ` [U-Boot] " sbabic at denx.de
2019-05-03 18:32 ` Fabio Estevam
2019-05-05 9:28 ` Stefano Babic
2019-05-05 22:46 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.