[PATCH 0/5] Multi uImage support on ARM

[PATCH 0/5] Multi uImage support on ARM

[Jean-Christophe PLAGNIOL-VILLARD]

Hi,

	This the final patch seires to add the Multi uImage support to
	barebox

	This does not support yet the script type but allow us to boot a uImage
	with a kernel and an initrd inside

	It will be easy to add the DT support too

	And enable it on arm.

Jean-Christophe PLAGNIOL-VILLARD (5):
      bootm: ensure the uImage is mapped first to allow option to used it
      get_fake_image_handle: set nb_data_entries to 1 and update the header size
      bootm: add -L option to specify the initrd load address
      arm/bootm: enable multi uimage support
      defaultenv: add bootm_opt var to allow the board to pass parameter to bootm

 arch/arm/lib/bootm.c |    5 -----
 commands/bootm.c     |   42 +++++++++++++++++++++++++++++++++++-------
 defaultenv/bin/boot  |    2 +-
 3 files changed, 36 insertions(+), 13 deletions(-)

Best Regards,
J.

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 1/5] bootm: ensure the uImage is mapped first to allow option to used it

[Jean-Christophe PLAGNIOL-VILLARD]

needed for multi image support

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 commands/bootm.c |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/commands/bootm.c b/commands/bootm.c
index 755932b..f0f64cf 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -274,10 +274,7 @@ static int do_bootm(struct command *cmdtp, int argc, char *argv[])
 
 			return 0;
 		default:
-			if (!handler_parse_options(&data, opt, optarg))
-				continue;
-
-			return 1;
+			break;
 		}
 	}
 
@@ -297,6 +294,21 @@ static int do_bootm(struct command *cmdtp, int argc, char *argv[])
 		goto err_out;
 	}
 
+	optind = 0;
+
+	while((opt = getopt(argc, argv, options)) > 0) {
+		switch(opt) {
+		case 'h':
+		case 'n':
+			break;
+		default:
+			if (!handler_parse_options(&data, opt, optarg))
+				continue;
+
+			return 1;
+		}
+	}
+
 	/*
 	 * We have reached the point of no return: we are going to
 	 * overwrite all exception vector code, so we cannot easily
-- 
1.7.6.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/5] get_fake_image_handle: set nb_data_entries to 1 and update the header size

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 commands/bootm.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/commands/bootm.c b/commands/bootm.c
index f0f64cf..afb9e06 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -181,6 +181,8 @@ static struct image_handle *get_fake_image_handle(struct image_data *data, int n
 	handle = xzalloc(sizeof(struct image_handle));
 	header = &handle->header;
 	handle->data_entries = gen_image_handle_data(iha->data, iha->len);
+	handle->nb_data_entries = 1;
+	header->ih_size = cpu_to_uimage(iha->len);
 	handle->data = handle->data_entries[0].data;
 
 	return handle;
-- 
1.7.6.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/5] bootm: add -L option to specify the initrd load address

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 commands/bootm.c |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/commands/bootm.c b/commands/bootm.c
index afb9e06..f11138a 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -191,7 +191,18 @@ static struct image_handle *get_fake_image_handle(struct image_data *data, int n
 static int initrd_handler_parse_options(struct image_data *data, int opt,
 		char *optarg)
 {
+	uint32_t initrd_start;
+
 	switch(opt) {
+	case 'L':
+		if (!data->initrd) {
+			eprintf("Warning -L ingnored. Specify the initrd first\n");
+			break;
+		}
+		initrd_start = simple_strtoul(optarg, NULL, 0);
+		printf("initrd_start=0x%x\n", initrd_start);
+		data->initrd->header.ih_load = cpu_to_uimage(initrd_start);
+		break;
 	case 'r':
 		printf("use initrd %s\n", optarg);
 		/* check for multi image @<num> */
@@ -204,16 +215,19 @@ static int initrd_handler_parse_options(struct image_data *data, int opt,
 		}
 		if (!data->initrd)
 			return -1;
-		return 0;
+		break;
 	default:
 		return 1;
 	}
+
+	return 0;
 }
 
 static struct image_handler initrd_handler = {
-	.cmdline_options = "r:",
+	.cmdline_options = "r:L:",
 	.cmdline_parse = initrd_handler_parse_options,
-	.help_string = " -r <initrd>    specify an initrd image",
+	.help_string = " -r <initrd>    specify an initrd image\n"
+		       " -L <load addr> specify initrd load address",
 };
 
 static int initrd_register_image_handler(void)
-- 
1.7.6.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 4/5] arm/bootm: enable multi uimage support

[Jean-Christophe PLAGNIOL-VILLARD]

tested on imx53 loco board with a Multi uImage file

generate like this

mkimage -A arm -O linux -T multi -C none -a 0x70008000 -e 0x70008000 -n Linux-2.6.35.3-00745-gce4c61a-dirty -d zImage:rootfs.cpio.lzma uImage.Multi

and boot via bootm

bootm -r @1 -L 0x72000000 /dev/ram0.kernel

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 arch/arm/lib/bootm.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 7156eea..87bf3b3 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -24,11 +24,6 @@ static int do_bootm_linux(struct image_data *data)
 	void (*theKernel)(int zero, int arch, void *params);
 	image_header_t *os_header = &data->os->header;
 
-	if (image_get_type(os_header) == IH_TYPE_MULTI) {
-		printf("Multifile images not handled at the moment\n");
-		return -1;
-	}
-
 	theKernel = (void *)image_get_ep(os_header);
 
 	debug("## Transferring control to Linux (at address 0x%p) ...\n",
-- 
1.7.6.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 5/5] defaultenv: add bootm_opt var to allow the board to pass parameter to bootm

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 defaultenv/bin/boot |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
index 652ae0c..6761d84 100644
--- a/defaultenv/bin/boot
+++ b/defaultenv/bin/boot
@@ -115,7 +115,7 @@ fi
 echo "booting kernel of type $kernelimage_type from $kdev"
 
 if [ x$kernelimage_type = xuimage ]; then
-	bootm $kdev
+	bootm $bootm_opt $kdev
 elif [ x$kernelimage_type = xzimage ]; then
 	bootz $kdev
 elif [ x$kernelimage_type = xraw ]; then
-- 
1.7.6.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 0/5] Multi uImage support on ARM

[Sascha Hauer]

On Sat, Oct 08, 2011 at 04:17:22PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Hi,
> 
> 	This the final patch seires to add the Multi uImage support to
> 	barebox
> 
> 	This does not support yet the script type but allow us to boot a uImage
> 	with a kernel and an initrd inside
> 
> 	It will be easy to add the DT support too
> 
> 	And enable it on arm.
> 
> Jean-Christophe PLAGNIOL-VILLARD (5):
>       bootm: ensure the uImage is mapped first to allow option to used it
>       get_fake_image_handle: set nb_data_entries to 1 and update the header size
>       bootm: add -L option to specify the initrd load address
>       arm/bootm: enable multi uimage support
>       defaultenv: add bootm_opt var to allow the board to pass parameter to bootm

Applied to next.

Sascha

> 
>  arch/arm/lib/bootm.c |    5 -----
>  commands/bootm.c     |   42 +++++++++++++++++++++++++++++++++++-------
>  defaultenv/bin/boot  |    2 +-
>  3 files changed, 36 insertions(+), 13 deletions(-)
> 
> Best Regards,
> J.
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 0/5] Multi uImage support on ARM

[Jean-Christophe PLAGNIOL-VILLARD]

On 11:37 Sun 09 Oct     , Sascha Hauer wrote:
> On Sat, Oct 08, 2011 at 04:17:22PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > Hi,
> > 
> > 	This the final patch seires to add the Multi uImage support to
> > 	barebox
> > 
> > 	This does not support yet the script type but allow us to boot a uImage
> > 	with a kernel and an initrd inside
> > 
> > 	It will be easy to add the DT support too
> > 
> > 	And enable it on arm.
> > 
> > Jean-Christophe PLAGNIOL-VILLARD (5):
> >       bootm: ensure the uImage is mapped first to allow option to used it
> >       get_fake_image_handle: set nb_data_entries to 1 and update the header size
> >       bootm: add -L option to specify the initrd load address
> >       arm/bootm: enable multi uimage support
> >       defaultenv: add bootm_opt var to allow the board to pass parameter to bootm
> 
> Applied to next.
can we have it on the master it's the second part of the Multi uImage patch
series already present in the master

Best Regards,
J.

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 0/5] Multi uImage support on ARM

[Sascha Hauer]

On Tue, Oct 11, 2011 at 12:06:36AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 11:37 Sun 09 Oct     , Sascha Hauer wrote:
> > On Sat, Oct 08, 2011 at 04:17:22PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > Hi,
> > > 
> > > 	This the final patch seires to add the Multi uImage support to
> > > 	barebox
> > > 
> > > 	This does not support yet the script type but allow us to boot a uImage
> > > 	with a kernel and an initrd inside
> > > 
> > > 	It will be easy to add the DT support too
> > > 
> > > 	And enable it on arm.
> > > 
> > > Jean-Christophe PLAGNIOL-VILLARD (5):
> > >       bootm: ensure the uImage is mapped first to allow option to used it
> > >       get_fake_image_handle: set nb_data_entries to 1 and update the header size
> > >       bootm: add -L option to specify the initrd load address
> > >       arm/bootm: enable multi uimage support
> > >       defaultenv: add bootm_opt var to allow the board to pass parameter to bootm
> > 
> > Applied to next.
> can we have it on the master it's the second part of the Multi uImage patch
> series already present in the master

No. It changes the bootm command which most boards use. A little bit
more testing is a good thing for this kind of stuff.

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox