ti_armv7_common: env: Fix hard coded mmc device for uuid

PATCH New Ravi Babu 4 participants 7 messages Jun 2, 2016 – Jun 3, 2016

lore

Share & tools

lore

Ravi Babu

author

2016-06-02 12:44 UTC #0 lore raw

PATCH 1/1 ti_armv7_common: env: Fix hard coded mmc device for uuid

Avoid use of hard coded mmcdev value so finduuid works based on current mmcdev selected.

Signed-off-by Ravi Babu <[email protected]>

---
 include/configs/ti_armv7_common.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

include/configs/ti_armv7_common.h +1 -1

index 7db0881..bbff06b 100644
@@ -59,7 +59,7 @@
 #define DEFAULT_MMC_TI_ARGS \
 	"mmcdev=0\0" \
 	"mmcrootfstype=ext4 rootwait\0" \
-	"finduuid=part uuid mmc 0:2 uuid\0" \
+	"finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
 	"args_mmc=run finduuid;setenv bootargs console=${console} " \
 		"${optargs} " \
 		"root=PARTUUID=${uuid} rw " \

Signature · 1 line

1.7.9.5

Lokesh Vutla

2016-06-02 14:07 UTC #1 lore raw

PATCH 1/1 ti_armv7_common: env: Fix hard coded mmc device for uuid

Quoted 2 lines · Ravi Babu

Avoid use of hard coded mmcdev value so finduuid works based on current mmcdev selected.

Acked-by Lokesh Vutla <[email protected]>

Thanks and regards,
Lokesh

Quoted 20 lines

Signed-off-by Ravi Babu <[email protected]>

---
  include/configs/ti_armv7_common.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

include/configs/ti_armv7_common.h +1 -1

index 7db0881..bbff06b 100644
@@ -59,7 +59,7 @@
  #define DEFAULT_MMC_TI_ARGS \
  	"mmcdev=0\0" \
  	"mmcrootfstype=ext4 rootwait\0" \
-	"finduuid=part uuid mmc 0:2 uuid\0" \
+	"finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
  	"args_mmc=run finduuid;setenv bootargs console=${console} " \
  		"${optargs} " \
  		"root=PARTUUID=${uuid} rw " \

Tom Rini

2016-06-02 19:54 UTC #2 lore raw

PATCH 1/1 ti_armv7_common: env: Fix hard coded mmc device for uuid

In reply to Ravi Babu

Quoted 13 lines · Ravi Babu

Avoid use of hard coded mmcdev value so finduuid works based on current mmcdev selected.
Signed-off-by Ravi Babu <[email protected]>
---
 include/configs/ti_armv7_common.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/ti_armv7_common.h +0 -0
index 7db0881..bbff06b 100644

include/configs/ti_armv7_common.h line 65

Quoted 8 lines

include/configs/ti_armv7_common.h +1 -1

@@ -59,7 +59,7 @@
 #define DEFAULT_MMC_TI_ARGS \
 	"mmcdev=0\0" \
 	"mmcrootfstype=ext4 rootwait\0" \
-	"finduuid=part uuid mmc 0:2 uuid\0" \
+	"finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
 	"args_mmc=run finduuid;setenv bootargs console=${console} " \
 		"${optargs} " \
 		"root=PARTUUID=${uuid} rw " \

Good, but incomplete find. am33xx doesn't, but other TI families do, "common"-out the bootpart variable and this is what should be used here, after making sure everyone that uses this has a bootpart set.

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160602/85d7c49b/attachment.sig>

B

2016-06-03 07:51 UTC #3 lore raw

PATCH 1/1 ti_armv7_common: env: Fix hard coded mmc device for uuid

Hi Tom

Quoted 8 lines

Quoted 8 lines
Avoid use of hard coded mmcdev value so finduuid works based on current mmcdev selected.
Signed-off-by Ravi Babu <[email protected]>
---
 include/configs/ti_armv7_common.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Quoted 16 lines

Quoted 6 lines
include/configs/ti_armv7_common.h +0 -0
index 7db0881..bbff06b 100644
include/configs/ti_armv7_common.h line 65
Quoted 8 lines
include/configs/ti_armv7_common.h +1 -1
@@ -59,7 +59,7 @@
 #define DEFAULT_MMC_TI_ARGS \
 	"mmcdev=0\0" \
 	"mmcrootfstype=ext4 rootwait\0" \
-	"finduuid=part uuid mmc 0:2 uuid\0" \
+	"finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
 	"args_mmc=run finduuid;setenv bootargs console=${console} " \
 		"${optargs} " \
 		"root=PARTUUID=${uuid} rw " \
Good, but incomplete find. am33xx doesn't, but other TI families do, "common"-out the bootpart variable and this is what should be used here, after making sure everyone that uses this has a bootpart set.

If I understand you correctly, are you saying to use *bootpart* as common variable and define "bootpart=${mmcdev}:2" But you cannot define "bootpart=${mmcdev}:2" like this and use ${bootpart} in finduuid. "finduuid=part uuid mmc ${bootpart} uuid\0" - this will _NOT_ work.

In order to make finduuid work, bootpart must be hard coded with mmcdev:partition as "bootpart=0:2" or "bootpart=1:2".

Please correct me if I understood your idea correctly.

Regards
Ravi

B

2016-06-03 08:05 UTC #4 lore raw

PATCH 1/1 ti_armv7_common: env: Fix hard coded mmc device for uuid

In reply to Tom Rini

Quoted 11 lines

Quoted 10 lines
Review
Quoted 8 lines
#define DEFAULT_MMC_TI_ARGS \
(quoted diff) +1 -1
 	"mmcdev=0\0" \
 	"mmcrootfstype=ext4 rootwait\0" \
-	"finduuid=part uuid mmc 0:2 uuid\0" \
+	"finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
 	"args_mmc=run finduuid;setenv bootargs console=${console} " \
 		"${optargs} " \
 		"root=PARTUUID=${uuid} rw " \
Good, but incomplete find. am33xx doesn't, but other TI families do, "common"-out the bootpart variable and this is what should be used here, after making sure everyone that uses this has a bootpart set.

Quoted 7 lines

If I understand you correctly, are you saying to use *bootpart* as common variable and define "bootpart=${mmcdev}:2" But you cannot define "bootpart=${mmcdev}:2" like this and use ${bootpart} in finduuid. "finduuid=part uuid mmc ${bootpart} uuid\0" - this will _NOT_ work.
In order to make finduuid work, bootpart must be hard coded with mmcdev:partition as "bootpart=0:2" or "bootpart=1:2".
Please correct me if I understood your idea correctly.

You are right, use of bootpart would be more ideal than use mmcdev. The bootpart will be set based on platform specific boot device:partition.

include/configs/ti_armv7_common.h +1 -1

index 7db0881..bbff06b 100644
@@ -59,7 +59,7 @@
 #define DEFAULT_MMC_TI_ARGS \
 	"mmcdev=0\0" \
 	"mmcrootfstype=ext4 rootwait\0" \
-	"finduuid=part uuid mmc 0:2 uuid\0" \
+	"finduuid=part uuid mmc ${bootpart} uuid\0" \
 	"args_mmc=run finduuid;setenv bootargs console=${console} " \
 		"${optargs} " \
 		"root=PARTUUID=${uuid} rw " \

Regards
Ravi

Tom Rini

2016-06-03 13:50 UTC #5 lore raw

PATCH 1/1 ti_armv7_common: env: Fix hard coded mmc device for uuid

Quoted 28 lines · Ravi

Hi
Quoted 11 lines
Quoted 10 lines
include/configs/ti_armv7_common.h line 65
Quoted 8 lines
#define DEFAULT_MMC_TI_ARGS \
include/configs/ti_armv7_common.h +1 -1
 	"mmcdev=0\0" \
 	"mmcrootfstype=ext4 rootwait\0" \
-	"finduuid=part uuid mmc 0:2 uuid\0" \
+	"finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
 	"args_mmc=run finduuid;setenv bootargs console=${console} " \
 		"${optargs} " \
 		"root=PARTUUID=${uuid} rw " \
Good, but incomplete find. am33xx doesn't, but other TI families do, "common"-out the bootpart variable and this is what should be used here, after making sure everyone that uses this has a bootpart set.
Quoted 7 lines
If I understand you correctly, are you saying to use *bootpart* as common variable and define "bootpart=${mmcdev}:2" But you cannot define "bootpart=${mmcdev}:2" like this and use ${bootpart} in finduuid. "finduuid=part uuid mmc ${bootpart} uuid\0" - this will _NOT_ work.
In order to make finduuid work, bootpart must be hard coded with mmcdev:partition as "bootpart=0:2" or "bootpart=1:2".
Please correct me if I understood your idea correctly.
You are right, use of bootpart would be more ideal than use mmcdev. The bootpart will be set based on platform specific boot device:partition.
include/configs/ti_armv7_common.h +0 -0
index 7db0881..bbff06b 100644

include/configs/ti_armv7_common.h line 65

Quoted 8 lines

include/configs/ti_armv7_common.h +1 -1

@@ -59,7 +59,7 @@
 #define DEFAULT_MMC_TI_ARGS \
 	"mmcdev=0\0" \
 	"mmcrootfstype=ext4 rootwait\0" \
-	"finduuid=part uuid mmc 0:2 uuid\0" \
+	"finduuid=part uuid mmc ${bootpart} uuid\0" \
 	"args_mmc=run finduuid;setenv bootargs console=${console} " \
 		"${optargs} " \
 		"root=PARTUUID=${uuid} rw " \

Right. But not everyone that uses ti_armv7_common.h and DEFAULT_MMC_TI_ARGS has bootpart set I believe. Use buildman to build all of the TI stuff and run 'strings' on u-boot.img to find cases of 'part uuid' but not having bootpart set.

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160603/c802ede5/attachment.sig>

B

2016-06-03 14:18 UTC #6 lore raw

PATCH 1/1 ti_armv7_common: env: Fix hard coded mmc device for uuid

Hi Tom

Quoted 8 lines

Quoted 8 lines
include/configs/ti_armv7_common.h +0 -0
index 7db0881..bbff06b 100644
@@ -59,7 +59,7 @@
 #define DEFAULT_MMC_TI_ARGS \
 	"mmcdev=0\0" \

Quoted 8 lines

include/configs/ti_armv7_common.h line 65
Quoted 6 lines
include/configs/ti_armv7_common.h +1 -1
 	"mmcrootfstype=ext4 rootwait\0" \
-	"finduuid=part uuid mmc 0:2 uuid\0" \
+	"finduuid=part uuid mmc ${bootpart} uuid\0" \
 	"args_mmc=run finduuid;setenv bootargs console=${console} " \
 		"${optargs} " \
 		"root=PARTUUID=${uuid} rw " \
Right. But not everyone that uses ti_armv7_common.h and DEFAULT_MMC_TI_ARGS has bootpart set I believe. Use buildman to build all of the TI stuff and run 'strings' on u-boot.img to find cases of 'part uuid' but not having bootpart set.

Yes, you are correct, not all platform uses ti_armv7_common.h, bootpart is defined as part of DEFAULT_MMC_TI_ARGS. I have run 'strings' on u-boot.img, I did not find 'part uuid' without ${bootpart}.

I will post rework of this patch (v1). Thanks for review.

Regards
Ravi