[meta-fsl-arm][PATCH 0/4] Wic support for mxs

[meta-fsl-arm][PATCH 0/4] Wic support for mxs

[Alexandre Belloni]

Hi,

The following patch were laying around since march and I still didn't send
them. They add wic support for mxs based boards. This has been tested with the
crystalfontz boards.

The first two patches add the necessary links to allow wic to easily find
barebox and its environment.

Then a patch adds support for ontrack DM6 aux3 partitions to parted. I'm not
sure how mainlinable this is.

The final patch is an example wks.


Alexandre Belloni (4):
  barebox: add generic symbolic links
  image_types_fsl: use generic links for barebox.mxsboot-sdcard
  parted: add ontrack DM6 aux3 support
  wic: add a wks for mxs-barebox

 classes/image_types_fsl.bbclass                    |   6 +-
 recipes-bsp/barebox/barebox.inc                    |   2 +
 .../parted/parted/Add_ontrackdm6aux3.patch         | 109 +++++++++++++++++++++
 recipes-extended/parted/parted_3.2.bbappend        |   3 +
 scripts/lib/image/canned-wks/mxs-barebox.wks       |  17 ++++
 5 files changed, 135 insertions(+), 2 deletions(-)
 create mode 100644 recipes-extended/parted/parted/Add_ontrackdm6aux3.patch
 create mode 100644 recipes-extended/parted/parted_3.2.bbappend
 create mode 100644 scripts/lib/image/canned-wks/mxs-barebox.wks

-- 
2.1.4

[meta-fsl-arm][PATCH 1/4] barebox: add generic symbolic links

[Alexandre Belloni]

Add generic symbolic link to barebox.bin and bareboxenv.bin to ease
access from scripts that don't use $MACHINE. The binaries are deployed
in a machine specific directory anyway.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 recipes-bsp/barebox/barebox.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-bsp/barebox/barebox.inc b/recipes-bsp/barebox/barebox.inc
index 0d5c127b24ff..805331335984 100644
--- a/recipes-bsp/barebox/barebox.inc
+++ b/recipes-bsp/barebox/barebox.inc
@@ -43,6 +43,7 @@ do_deploy () {
 	cd ${DEPLOY_DIR_IMAGE}
 	rm -f ${BAREBOX_SYMLINK}
 	ln -sf ${BAREBOX_IMAGE} ${BAREBOX_SYMLINK}
+	ln -sf ${BAREBOX_SYMLINK} barebox.bin
 
 	install -d ${STAGING_BINDIR_NATIVE}
 	cd ${S}
@@ -59,5 +60,6 @@ do_env_deploy() {
 	cd ${DEPLOY_DIR_IMAGE}
 	rm -f ${BAREBOXENV_SYMLINK}
 	ln -sf ${BAREBOXENV_BIN} ${BAREBOXENV_SYMLINK}
+	ln -sf ${BAREBOXENV_SYMLINK} bareboxenv.bin
 }
 addtask env_deploy before do_build after do_deploy
-- 
2.1.4

[meta-fsl-arm][PATCH 2/4] image_types_fsl: use generic links for barebox.mxsboot-sdcard

[Alexandre Belloni]

Add generic links for barebox.mxsboot-sdcard as it actually doesn't
really depend on the image being generated. This allows to access the
binary from scripts not using $IMAGE_NAME.

The previous link is kept to provide an upgrade path.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 classes/image_types_fsl.bbclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index b542549dab9d..4e73174f2703 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -47,9 +47,11 @@ IMAGE_CMD_barebox.mxsboot-sdcard () {
 	barebox_bd_file=imx-bootlets-barebox_ivt.bd-${MACHINE}
 
 	# Ensure the files are generated
-	(cd ${DEPLOY_DIR_IMAGE}; rm -f ${IMAGE_NAME}.barebox.sb ${IMAGE_NAME}.barebox.mxsboot-sdcard; \
+	(cd ${DEPLOY_DIR_IMAGE}; \
+	 rm -f ${IMAGE_NAME}.barebox.sb ${IMAGE_NAME}.barebox.mxsboot-sdcard barebox.mxsboot-sdcard; \
 	 elftosb -f mx28 -z -c $barebox_bd_file -o ${IMAGE_NAME}.barebox.sb; \
-	 mxsboot sd ${IMAGE_NAME}.barebox.sb ${IMAGE_NAME}.barebox.mxsboot-sdcard)
+	 mxsboot sd ${IMAGE_NAME}.barebox.sb ${IMAGE_NAME}.barebox.mxsboot-sdcard; \
+	 ln -s ${IMAGE_NAME}.barebox.mxsboot-sdcard barebox.mxsboot-sdcard)
 }
 
 # U-Boot mxsboot generation to SD-Card
-- 
2.1.4

Re: [meta-fsl-arm][PATCH 2/4] image_types_fsl: use generic links for barebox.mxsboot-sdcard

[Otavio Salvador]

On Thu, Jul 23, 2015 at 9:54 AM, Alexandre Belloni
<alexandre.belloni@free-electrons.com> wrote:
> Add generic links for barebox.mxsboot-sdcard as it actually doesn't
> really depend on the image being generated. This allows to access the
> binary from scripts not using $IMAGE_NAME.
>
> The previous link is kept to provide an upgrade path.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

I understand the need to do this and I agree with the concept. However
it highlighted a design issue we have:

The mxsboot-sdcard and mxsboot-nand images ought to be generated in
do_deploy of barebox and u-boot, not during the image generation.

Are you willing to rework this?

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

Re: [meta-fsl-arm][PATCH 2/4] image_types_fsl: use generic links for barebox.mxsboot-sdcard

[Alexandre Belloni]

On 23/07/2015 at 14:01:36 -0300, Otavio Salvador wrote :
> On Thu, Jul 23, 2015 at 9:54 AM, Alexandre Belloni
> <alexandre.belloni@free-electrons.com> wrote:
> > Add generic links for barebox.mxsboot-sdcard as it actually doesn't
> > really depend on the image being generated. This allows to access the
> > binary from scripts not using $IMAGE_NAME.
> >
> > The previous link is kept to provide an upgrade path.
> >
> > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> 
> I understand the need to do this and I agree with the concept. However
> it highlighted a design issue we have:
> 
> The mxsboot-sdcard and mxsboot-nand images ought to be generated in
> do_deploy of barebox and u-boot, not during the image generation.
> 
> Are you willing to rework this?
> 

I probably don't have the time now but yes, my final goal is to get rid
of the whole image_types_fsl.bbclass

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [meta-fsl-arm][PATCH 2/4] image_types_fsl: use generic links for barebox.mxsboot-sdcard

[Otavio Salvador]

On Thu, Jul 23, 2015 at 7:41 PM, Alexandre Belloni
<alexandre.belloni@free-electrons.com> wrote:
> On 23/07/2015 at 14:01:36 -0300, Otavio Salvador wrote :
>> On Thu, Jul 23, 2015 at 9:54 AM, Alexandre Belloni
>> <alexandre.belloni@free-electrons.com> wrote:
>> > Add generic links for barebox.mxsboot-sdcard as it actually doesn't
>> > really depend on the image being generated. This allows to access the
>> > binary from scripts not using $IMAGE_NAME.
>> >
>> > The previous link is kept to provide an upgrade path.
>> >
>> > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
>>
>> I understand the need to do this and I agree with the concept. However
>> it highlighted a design issue we have:
>>
>> The mxsboot-sdcard and mxsboot-nand images ought to be generated in
>> do_deploy of barebox and u-boot, not during the image generation.
>>
>> Are you willing to rework this?
>>
>
> I probably don't have the time now but yes, my final goal is to get rid
> of the whole image_types_fsl.bbclass

I am wondering if the link should be included or not. Currently it is
tied to the image and a common link would be misleading. Is it
possible to make wic work without it?

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

Re: [meta-fsl-arm][PATCH 2/4] image_types_fsl: use generic links for barebox.mxsboot-sdcard

[Alexandre Belloni]

On 24/07/2015 at 09:35:11 -0300, Otavio Salvador wrote :
> >
> > I probably don't have the time now but yes, my final goal is to get rid
> > of the whole image_types_fsl.bbclass
> 
> I am wondering if the link should be included or not. Currently it is
> tied to the image and a common link would be misleading. Is it
> possible to make wic work without it?
> 

It would work but you'd have to change the wks each time to give the
correct path to the bootloader.

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [meta-fsl-arm][PATCH 2/4] image_types_fsl: use generic links for barebox.mxsboot-sdcard

[Otavio Salvador]

On Fri, Jul 24, 2015 at 9:56 AM, Alexandre Belloni
<alexandre.belloni@free-electrons.com> wrote:
> On 24/07/2015 at 09:35:11 -0300, Otavio Salvador wrote :
>> >
>> > I probably don't have the time now but yes, my final goal is to get rid
>> > of the whole image_types_fsl.bbclass
>>
>> I am wondering if the link should be included or not. Currently it is
>> tied to the image and a common link would be misleading. Is it
>> possible to make wic work without it?
>>
>
> It would work but you'd have to change the wks each time to give the
> correct path to the bootloader.

Agreed; please send the patchset v2 so, we can rework this later.

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

[meta-fsl-arm][PATCH 3/4] parted: add ontrack DM6 aux3 support

[Alexandre Belloni]

Add ontrack DM6 aux3 partition support to enable creating partitions
required to boot mxs based platforms.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 .../parted/parted/Add_ontrackdm6aux3.patch         | 109 +++++++++++++++++++++
 recipes-extended/parted/parted_3.2.bbappend        |   3 +
 2 files changed, 112 insertions(+)
 create mode 100644 recipes-extended/parted/parted/Add_ontrackdm6aux3.patch
 create mode 100644 recipes-extended/parted/parted_3.2.bbappend

diff --git a/recipes-extended/parted/parted/Add_ontrackdm6aux3.patch b/recipes-extended/parted/parted/Add_ontrackdm6aux3.patch
new file mode 100644
index 000000000000..0fc36cdd3894
--- /dev/null
+++ b/recipes-extended/parted/parted/Add_ontrackdm6aux3.patch
@@ -0,0 +1,109 @@
+diff -Nburp parted-3.2.orig/libparted/fs/Makefile.am parted-3.2/libparted/fs/Makefile.am
+--- parted-3.2.orig/libparted/fs/Makefile.am	2014-07-28 04:29:16.000000000 +0200
++++ parted-3.2/libparted/fs/Makefile.am	2015-03-25 19:51:38.912544030 +0100
+@@ -42,6 +42,7 @@ libfs_la_SOURCES =		\
+   linux_swap/linux_swap.c	\
+   nilfs2/nilfs2.c		\
+   ntfs/ntfs.c			\
++  ontrack/ontrack.c		\
+   reiserfs/reiserfs.c		\
+   reiserfs/reiserfs.h		\
+   ufs/ufs.c			\
+diff -Nburp parted-3.2.orig/libparted/fs/ontrack/ontrack.c parted-3.2/libparted/fs/ontrack/ontrack.c
+--- parted-3.2.orig/libparted/fs/ontrack/ontrack.c	1970-01-01 01:00:00.000000000 +0100
++++ parted-3.2/libparted/fs/ontrack/ontrack.c	2015-03-25 19:55:01.342048099 +0100
+@@ -0,0 +1,39 @@
++#include <config.h>
++
++#include <parted/parted.h>
++#include <parted/crc32.h>
++#include <parted/endian.h>
++
++PedGeometry*
++ontrackdm6aux3_probe (PedGeometry* geom)
++{
++	PedSector length = geom->length;
++
++	/* ignore if sector size is not 512bytes for now  */
++	if (geom->dev->sector_size != PED_SECTOR_SIZE_DEFAULT)
++		return NULL;
++
++	return ped_geometry_new(geom->dev, geom->start, length);
++}
++
++static PedFileSystemOps ontrackdm6aux3_ops = {
++	probe:			ontrackdm6aux3_probe,
++};
++
++static PedFileSystemType ontrackdm6aux3_type = {
++	next:   NULL,
++	ops:    &ontrackdm6aux3_ops,
++	name:   "ontrackdm6aux3",
++};
++
++void
++ped_file_system_ontrack_init ()
++{
++	ped_file_system_type_register (&ontrackdm6aux3_type);
++}
++
++void
++ped_file_system_ontrack_done ()
++{
++	ped_file_system_type_unregister (&ontrackdm6aux3_type);
++}
+diff -Nburp parted-3.2.orig/libparted/labels/dos.c parted-3.2/libparted/labels/dos.c
+--- parted-3.2.orig/libparted/labels/dos.c	2014-06-15 20:17:43.000000000 +0200
++++ parted-3.2/libparted/labels/dos.c	2015-03-25 19:51:38.916543965 +0100
+@@ -83,6 +83,7 @@ static const char MBR_BOOT_CODE[] = {
+ #define PARTITION_COMPAQ_DIAG	0x12
+ #define PARTITION_MSFT_RECOVERY	0x27
+ #define PARTITION_LDM		0x42
++#define PARTITION_ONTRACK_DM6_AUX3	0x53
+ #define PARTITION_LINUX_SWAP	0x82
+ #define PARTITION_LINUX		0x83
+ #define PARTITION_IRST		0x84
+@@ -1500,6 +1501,8 @@ msdos_partition_set_system (PedPartition
+ 		dos_data->system = PARTITION_HFS;
+ 	else if (!strcmp (fs_type->name, "sun-ufs"))
+ 		dos_data->system = PARTITION_SUN_UFS;
++	else if (!strcmp (fs_type->name, "ontrackdm6aux3"))
++		dos_data->system = PARTITION_ONTRACK_DM6_AUX3;
+ 	else if (is_linux_swap (fs_type->name))
+ 		dos_data->system = PARTITION_LINUX_SWAP;
+ 	else
+diff -Nburp parted-3.2.orig/libparted/libparted.c parted-3.2/libparted/libparted.c
+--- parted-3.2.orig/libparted/libparted.c	2014-06-15 20:17:43.000000000 +0200
++++ parted-3.2/libparted/libparted.c	2015-03-25 19:51:38.912544030 +0100
+@@ -110,6 +110,7 @@ extern void ped_file_system_fat_init (vo
+ extern void ped_file_system_ext2_init (void);
+ extern void ped_file_system_nilfs2_init (void);
+ extern void ped_file_system_btrfs_init (void);
++extern void ped_file_system_ontrack_init (void);
+ 
+ static void
+ init_file_system_types ()
+@@ -126,6 +127,7 @@ init_file_system_types ()
+ 	ped_file_system_ext2_init ();
+ 	ped_file_system_nilfs2_init ();
+ 	ped_file_system_btrfs_init ();
++	ped_file_system_ontrack_init ();
+ }
+ 
+ extern void ped_disk_aix_done ();
+@@ -177,6 +179,7 @@ _init()
+ #endif
+ }
+ 
++extern void ped_file_system_ontrack_done (void);
+ extern void ped_file_system_nilfs2_done (void);
+ extern void ped_file_system_ext2_done (void);
+ extern void ped_file_system_fat_done (void);
+@@ -193,6 +196,7 @@ extern void ped_file_system_btrfs_done (
+ static void
+ done_file_system_types ()
+ {
++	ped_file_system_ontrack_done ();
+ 	ped_file_system_nilfs2_done ();
+ 	ped_file_system_ext2_done ();
+ 	ped_file_system_fat_done ();
diff --git a/recipes-extended/parted/parted_3.2.bbappend b/recipes-extended/parted/parted_3.2.bbappend
new file mode 100644
index 000000000000..f4bc6271a926
--- /dev/null
+++ b/recipes-extended/parted/parted_3.2.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://Add_ontrackdm6aux3.patch"
-- 
2.1.4

Re: [meta-fsl-arm][PATCH 3/4] parted: add ontrack DM6 aux3 support

[Otavio Salvador]

On Thu, Jul 23, 2015 at 9:54 AM, Alexandre Belloni
<alexandre.belloni@free-electrons.com> wrote:
> Add ontrack DM6 aux3 partition support to enable creating partitions
> required to boot mxs based platforms.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

The upstream is easy, I can assist on this if needed.

Free Electrons needs to have FSF copyright assignments for Parted but
besides that it is trivial.

I can help you privately with the details (I am a former Parted
release manager :P).

Specifically about this patch, add proper patch header (description,
upstream-status) and resend, please.

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

Re: [meta-fsl-arm][PATCH 3/4] parted: add ontrack DM6 aux3 support

[Alexandre Belloni]

On 23/07/2015 at 14:05:04 -0300, Otavio Salvador wrote :
> On Thu, Jul 23, 2015 at 9:54 AM, Alexandre Belloni
> <alexandre.belloni@free-electrons.com> wrote:
> > Add ontrack DM6 aux3 partition support to enable creating partitions
> > required to boot mxs based platforms.
> >
> > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> 
> The upstream is easy, I can assist on this if needed.
> 
> Free Electrons needs to have FSF copyright assignments for Parted but
> besides that it is trivial.
> 

This is done on my spare time so I can take that ;).

> I can help you privately with the details (I am a former Parted
> release manager :P).
> 
> Specifically about this patch, add proper patch header (description,
> upstream-status) and resend, please.
> 

Ok, so you are willing to carry this patch until it lands upstream?

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [meta-fsl-arm][PATCH 3/4] parted: add ontrack DM6 aux3 support

[Otavio Salvador]

On Thu, Jul 23, 2015 at 7:43 PM, Alexandre Belloni
<alexandre.belloni@free-electrons.com> wrote:
> On 23/07/2015 at 14:05:04 -0300, Otavio Salvador wrote :
...
>> Specifically about this patch, add proper patch header (description,
>> upstream-status) and resend, please.
>>
>
> Ok, so you are willing to carry this patch until it lands upstream?

Sure. Please address the patch header issue and we carry it.

I would prefer to get it merged in OE-Core though as it is a generic fix.

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

[meta-fsl-arm][PATCH 4/4] wic: add a wks for mxs-barebox

[Alexandre Belloni]

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 scripts/lib/image/canned-wks/mxs-barebox.wks | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 scripts/lib/image/canned-wks/mxs-barebox.wks

diff --git a/scripts/lib/image/canned-wks/mxs-barebox.wks b/scripts/lib/image/canned-wks/mxs-barebox.wks
new file mode 100644
index 000000000000..52bfecc35d27
--- /dev/null
+++ b/scripts/lib/image/canned-wks/mxs-barebox.wks
@@ -0,0 +1,17 @@
+# short-description: Create SD card image with a boot partition
+# long-description:
+# Create an image that can be written onto a SD card using dd for use
+# with i.MX SoC family
+# It uses barebox
+#
+# The disk layout used is:
+#  - --------- ------------ ---------
+# | | barebox | bareboxenv | rootfs  |
+#  - --------- ------------ ---------
+# ^ ^         ^            ^         ^
+# | |         |            |         |
+# 0 1MiB      2MiB       4MiB   4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+#
+part barebox --source rawcopy --sourceparams="file=barebox.mxsboot-sdcard" --ondisk mmcblk --align 1024 --size 1M --fstype=ontrackdm6aux3
+part bareboxenv --source rawcopy --sourceparams="file=bareboxenv.bin" --ondisk mmcblk --align 1024 --size 512k
+part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
-- 
2.1.4