[PATCH] uImage/bootm fixes

[PATCH] uImage/bootm fixes

[Sascha Hauer]

One important fix to make oftree kernels on Arm work, one less important
fix to print the correct error message in bootm.

Sascha Hauer (2):
      ARM: Fix oftree booting
      uimage: Fix error message

 arch/arm/lib/armlinux.c |    1 +
 commands/bootm.c        |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

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

[PATCH 1/2] ARM: Fix oftree booting

[Sascha Hauer]

We forgot to initialize params to the oftree to actually
boot a kernel with devicetree.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/lib/armlinux.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c
index 1d210d1..85fe2b9 100644
--- a/arch/arm/lib/armlinux.c
+++ b/arch/arm/lib/armlinux.c
@@ -258,6 +258,7 @@ void start_linux(void *adr, int swap, unsigned long initrd_address,
 
 	if (oftree) {
 		printf("booting Linux kernel with devicetree\n");
+		params = oftree;
 	} else {
 		setup_tags(initrd_address, initrd_size, swap);
 		params = armlinux_bootparams;
-- 
1.7.9


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

[PATCH 2/2] uimage: Fix error message

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 commands/bootm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/commands/bootm.c b/commands/bootm.c
index c23f4f3..e96665a 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -324,7 +324,7 @@ static int do_bootm(struct command *cmdtp, int argc, char *argv[])
 	if (os_type == filetype_uimage) {
 		ret = bootm_open_os_uimage(&data);
 		if (ret) {
-			printf("loading initrd failed with %s\n",
+			printf("loading os image failed with %s\n",
 					strerror(-ret));
 			goto err_out;
 		}
-- 
1.7.9


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