Skip to contentSkip to conversation

Upstream environment changes being used in Yocto/OE

PATCH New Otavio Salvador 5 participants 17 messages Jun 28, 2013 – Jul 12, 2013

lore
Share & tools
lore
#0 lore raw

cover Upstream environment changes being used in Yocto/OE

This changes were being done in every version of U-Boot and it makes sense to try to merge them upstream.

Please review them and ack/nack them.

Otavio Salvador (6):
mx53loco: Change default environment to cope with OE changes
mx6qsabrelite: Change default environment to cope with OE changes
mx6slevk: Change default environment to cope with OE changes
wandboard: Change default environment to cope with OE changes
mx51evk: Change default environment to cope with OE changes
mx53ard: Change default environment to cope with OE changes

 include/configs/mx51evk.h       | 4 ++--
 include/configs/mx53ard.h       | 4 ++--
 include/configs/mx53loco.h      | 4 ++--
 include/configs/mx6qsabrelite.h | 4 ++--
 include/configs/mx6slevk.h      | 4 ++--
 include/configs/wandboard.h     | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/6 mx53loco: Change default environment to cope with OE changes

OpenEmbedded has change partitioning layout of generated image so it does not raise warnings during the boot regarding unkown partition being used for U-Boot.

---
 include/configs/mx53loco.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/configs/mx53loco.h +2 -2
index a4b610f..cc31e9b 100644
@@ -124,8 +124,8 @@
 	"boot_fdt=try\0" \
 	"ip_dyn=yes\0" \
 	"mmcdev=0\0" \
-	"mmcpart=2\0" \
-	"mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
+	"mmcpart=1\0" \
+	"mmcroot=/dev/mmcblk0p2 rw rootwait\0" \
 	"mmcargs=setenv bootargs console=ttymxc0,${baudrate} root=${mmcroot}\0" \
 	"loadbootscript=" \
 		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
Signature · 1 line
1.8.3.1
#2 lore raw

PATCH 2/6 mx6qsabrelite: Change default environment to cope with OE changes

In reply to Otavio Salvador

OpenEmbedded has change partitioning layout of generated image so it does not raise warnings during the boot regarding unkown partition being used for U-Boot.

---
 include/configs/mx6qsabrelite.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/configs/mx6qsabrelite.h +2 -2
index b814418..c7db81d 100644
@@ -170,8 +170,8 @@
 	"boot_fdt=try\0" \
 	"ip_dyn=yes\0" \
 	"mmcdev=0\0" \
-	"mmcpart=2\0" \
-	"mmcroot=/dev/mmcblk0p3 rootwait rw\0" \
+	"mmcpart=1\0" \
+	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
 		"root=${mmcroot}\0" \
 	"loadbootscript=" \
Signature · 1 line
1.8.3.1
#3 lore raw

PATCH 3/6 mx6slevk: Change default environment to cope with OE changes

In reply to Otavio Salvador

OpenEmbedded has change partitioning layout of generated image so it does not raise warnings during the boot regarding unkown partition being used for U-Boot.

---
 include/configs/mx6slevk.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/configs/mx6slevk.h +2 -2
index 19dcdd6..55e3ad9 100644
@@ -73,8 +73,8 @@
 	"boot_fdt=try\0" \
 	"ip_dyn=yes\0" \
 	"mmcdev=0\0" \
-	"mmcpart=2\0" \
-	"mmcroot=/dev/mmcblk0p3 rootwait rw\0" \
+	"mmcpart=1\0" \
+	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
 		"root=${mmcroot}\0" \
 	"loadbootscript=" \
Signature · 1 line
1.8.3.1
#4 lore raw

PATCH 4/6 wandboard: Change default environment to cope with OE changes

In reply to Otavio Salvador

OpenEmbedded has change partitioning layout of generated image so it does not raise warnings during the boot regarding unkown partition being used for U-Boot.

---
 include/configs/wandboard.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/configs/wandboard.h +2 -2
index b2995d8..ee6bf21 100644
@@ -120,8 +120,8 @@
 	"boot_fdt=try\0" \
 	"ip_dyn=yes\0" \
 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-	"mmcpart=2\0" \
-	"mmcroot=/dev/mmcblk0p3 rootwait rw\0" \
+	"mmcpart=1\0" \
+	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
 	"update_sd_firmware_filename=u-boot.imx\0" \
 	"update_sd_firmware=" \
 		"if test ${ip_dyn} = yes; then " \
Signature · 1 line
1.8.3.1
#5 lore raw

PATCH 5/6 mx51evk: Change default environment to cope with OE changes

In reply to Otavio Salvador

OpenEmbedded has change partitioning layout of generated image so it does not raise warnings during the boot regarding unkown partition being used for U-Boot.

---
 include/configs/mx51evk.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/configs/mx51evk.h +2 -2
index 13d1839..4383375d 100644
@@ -162,8 +162,8 @@
 	"boot_fdt=try\0" \
 	"ip_dyn=yes\0" \
 	"mmcdev=0\0" \
-	"mmcpart=2\0" \
-	"mmcroot=/dev/mmcblk0p3 rootwait rw\0" \
+	"mmcpart=1\0" \
+	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
 	"mmcargs=setenv bootargs console=ttymxc0,${baudrate} " \
 		"root=${mmcroot}\0" \
 	"loadbootscript=" \
Signature · 1 line
1.8.3.1
#6 lore raw

PATCH 5/6 mx51evk: Change default environment to cope with OE changes

Quoted 15 lines · Otavio Salvador

OpenEmbedded has change partitioning layout of generated image so it does not raise warnings during the boot regarding unkown partition being used for U-Boot.

---
 include/configs/mx51evk.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/configs/mx51evk.h +0 -0
index 13d1839..4383375d 100644

include/configs/mx51evk.h line 169

Quoted 10 lines
include/configs/mx51evk.h +2 -2
@@ -162,8 +162,8 @@
 	"boot_fdt=try\0" \
 	"ip_dyn=yes\0" \
 	"mmcdev=0\0" \
-	"mmcpart=2\0" \
-	"mmcroot=/dev/mmcblk0p3 rootwait rw\0" \
+	"mmcpart=1\0" \
+	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
 	"mmcargs=setenv bootargs console=ttymxc0,${baudrate} " \
 		"root=${mmcroot}\0" \
 	"loadbootscript=" \

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
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
=====================================================================
#7 lore raw

PATCH 6/6 mx53ard: Change default environment to cope with OE changes

In reply to Otavio Salvador

OpenEmbedded has change partitioning layout of generated image so it does not raise warnings during the boot regarding unkown partition being used for U-Boot.

---
 include/configs/mx53ard.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/configs/mx53ard.h +2 -2
index b0a965f..fa160e4 100644
@@ -118,8 +118,8 @@
 	"boot_fdt=try\0" \
 	"ip_dyn=yes\0" \
 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-	"mmcpart=2\0" \
-	"mmcroot=/dev/mmcblk0p3 rootwait rw\0" \
+	"mmcpart=1\0" \
+	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
 	"update_sd_firmware_filename=u-boot.imx\0" \
 	"update_sd_firmware=" \
 		"if test ${ip_dyn} = yes; then " \
Signature · 1 line
1.8.3.1
#9 lore raw

cover Upstream environment changes being used in Yocto/OE

Quoted 10 lines · Fabio Estevam
Quoted 4 lines · Otavio Salvador

This changes were being done in every version of U-Boot and it makes sense to try to merge them upstream.

Please review them and ack/nack them.

I think the series look good:

We aren't breaking compat with other distros, are we? In TI-land where (for better or worse) we often have a FAT partition we're dealing with too, we use (and can have OE spit out) a uEnv.txt file that's user-editable and imported to the environment that would update these variables. I suspect there's not an easy analog here but I thought I'd bring it up.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130701/67431f42/attachment.pgp>
#10 lore raw

cover Upstream environment changes being used in Yocto/OE

Quoted 11 lines · Tom Rini
Quoted 9 lines · Fabio Estevam
Quoted 4 lines · Otavio Salvador

This changes were being done in every version of U-Boot and it makes sense to try to merge them upstream.

Please review them and ack/nack them.

I think the series look good:

Quoted 8 lines
Quoted 1 line

We aren't breaking compat with other distros, are we? In TI-land where (for better or worse) we often have a FAT partition we're dealing with too, we use (and can have OE spit out) a uEnv.txt file that's user-editable and imported to the environment that would update these variables. I suspect there's not an easy analog here but I thought I'd bring it up.

We've not used uEnv.txt files for this in Freescale's Yocto support but patched the U-Boot source code to make it work out of box. I think these patches could go in now that Freescale is using Yocto more extensivelly for ARM platforms so we avoid same patches to be ported for every new U-Boot release.

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750

#11 lore raw

cover Upstream environment changes being used in Yocto/OE

Quoted 21 lines · Otavio Salvador
Quoted 11 lines · Tom Rini
Quoted 9 lines · Fabio Estevam
Quoted 4 lines · Otavio Salvador

This changes were being done in every version of U-Boot and it makes sense to try to merge them upstream.

Please review them and ack/nack them.

I think the series look good:

Quoted 8 lines
Quoted 1 line

We aren't breaking compat with other distros, are we? In TI-land where (for better or worse) we often have a FAT partition we're dealing with too, we use (and can have OE spit out) a uEnv.txt file that's user-editable and imported to the environment that would update these variables. I suspect there's not an easy analog here but I thought I'd bring it up.

Quoted 5 lines

We've not used uEnv.txt files for this in Freescale's Yocto support but patched the U-Boot source code to make it work out of box. I think these patches could go in now that Freescale is using Yocto more extensivelly for ARM platforms so we avoid same patches to be ported for every new U-Boot release.

Right well and good. But part of the reason we use it here is that meta-various-ti-things may use a different layout from meta-community-oriented-distro and this lets us handle both with just a tweak in the various-ti-things layer to add a text file. Again, may not apply here and that's fine. Heck, we're trying to move more towards always just using the community layout.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130701/50f7315c/attachment.pgp>
#12 lore raw

cover Upstream environment changes being used in Yocto/OE

Quoted 28 lines · Tom Rini
Quoted 21 lines · Otavio Salvador
Quoted 11 lines · Tom Rini
Quoted 9 lines · Fabio Estevam
Quoted 4 lines · Otavio Salvador

This changes were being done in every version of U-Boot and it makes sense to try to merge them upstream.

Please review them and ack/nack them.

I think the series look good:

Quoted 8 lines
Quoted 1 line

We aren't breaking compat with other distros, are we? In TI-land where (for better or worse) we often have a FAT partition we're dealing with too, we use (and can have OE spit out) a uEnv.txt file that's user-editable and imported to the environment that would update these variables. I suspect there's not an easy analog here but I thought I'd bring it up.

Quoted 5 lines

We've not used uEnv.txt files for this in Freescale's Yocto support but patched the U-Boot source code to make it work out of box. I think these patches could go in now that Freescale is using Yocto more extensivelly for ARM platforms so we avoid same patches to be ported for every new U-Boot release.

Quoted 6 lines

Right well and good. But part of the reason we use it here is that meta-various-ti-things may use a different layout from meta-community-oriented-distro and this lets us handle both with just a tweak in the various-ti-things layer to add a text file. Again, may not apply here and that's fine. Heck, we're trying to move more towards always just using the community layout.

Yes and we also have support to read a user provided file, but we leave it for customizations not to use by default.

... yes, community layout is the way to go ;)

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750

#13 lore raw

cover Upstream environment changes being used in Yocto/OE

In reply to Fabio Estevam

Hi Fabio,

Quoted 7 lines · Fabio Estevam
Quoted 4 lines · Otavio Salvador

This changes were being done in every version of U-Boot and it makes sense to try to merge them upstream.

Please review them and ack/nack them.

Quoted 7 lines

I think the series look good:

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Cc:ing maintainers Jason Liu (mx53loco and mx6qsabrelite) and Sefano Babic (mx51evk).

(/me thinks the MAINTAINERS file is going to endure a radical format change after 2013.07 is out, in order to make it script-friendly.)

Amicalement,

Signature · 1 line
Albert.
#14 lore raw

cover Upstream environment changes being used in Yocto/OE

In reply to Otavio Salvador

Hi Fabio, hi Jason,

Quoted 6 lines · Otavio Salvador

This changes were being done in every version of U-Boot and it makes sense to try to merge them upstream.

Please review them and ack/nack them.

these are small fixes in the default environment and I have no problem to merge them for 2013.07, but I have not seen yet ACK or NACk for them. If you think these should flow into the release, please send your ACK.

Thanks,
Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
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
=====================================================================
#15 lore raw

cover Upstream environment changes being used in Yocto/OE

Hi Stefano,

Quoted 6 lines · Stefano Babic

Hi Fabio, hi Jason,

Quoted 3 lines · Otavio Salvador

This changes were being done in every version of U-Boot and it makes sense to try to merge them upstream.

Quoted 7 lines
Quoted 3 lines

Please review them and ack/nack them.

these are small fixes in the default environment and I have no problem to merge them for 2013.07, but I have not seen yet ACK or NACk for them. If you think these should flow into the release, please send your ACK.

I am happy with this series:

I have also updated Jason's email on Cc (not sure if his Linaro's email is still valid).

Thanks,

Fabio Estevam

#16 lore raw

cover Upstream environment changes being used in Yocto/OE

In reply to Otavio Salvador
Quoted 6 lines · Otavio Salvador

This changes were being done in every version of U-Boot and it makes sense to try to merge them upstream.

Please review them and ack/nack them.

Whole series applied to u-boot-imx (fix), thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
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
=====================================================================