[PATCH 1/2] bootm: restore load DT message for plain oftree files

[PATCH 1/2] bootm: restore load DT message for plain oftree files

[Lucas Stach]

This message was dropped when reorganizing the DT loading code,
and it's really confusing to miss this.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 common/bootm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/bootm.c b/common/bootm.c
index 79833e045dc8..671f93f615cb 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -336,6 +336,7 @@ int bootm_load_devicetree(struct image_data *data, unsigned long load_address)
 			ret = bootm_open_oftree_uimage(data, &size, &oftree);
 			break;
 		case filetype_oftree:
+			printf("Loading devicetree from '%s'\n", data->oftree_file);
 			ret = read_file_2(data->oftree_file, &size, (void *)&oftree,
 					  FILESIZE_MAX);
 			break;
-- 
2.1.4


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

[PATCH 2/2] bootm: parse initrd and oftree into correct struct members

[Lucas Stach]

The code parsing the oftree and initrd file names is clearly wrong,
leading to bootm not loading oftree or initrd files any more.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 common/bootm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/bootm.c b/common/bootm.c
index 671f93f615cb..acf814dfe32c 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -505,8 +505,8 @@ int bootm_boot(struct bootm_data *bootm_data)
 	data = xzalloc(sizeof(*data));
 
 	bootm_image_name_and_part(bootm_data->os_file, &data->os_file, &data->os_part);
-	bootm_image_name_and_part(bootm_data->oftree_file, &data->oftree_part, &data->os_part);
-	bootm_image_name_and_part(bootm_data->initrd_file, &data->initrd_part, &data->os_part);
+	bootm_image_name_and_part(bootm_data->oftree_file, &data->oftree_file, &data->oftree_part);
+	bootm_image_name_and_part(bootm_data->initrd_file, &data->initrd_file, &data->initrd_part);
 	data->verbose = bootm_data->verbose;
 	data->verify = bootm_data->verify;
 	data->force = bootm_data->force;
-- 
2.1.4


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

Re: [PATCH 1/2] bootm: restore load DT message for plain oftree files

[Sascha Hauer]

On Fri, Feb 12, 2016 at 05:58:22PM +0100, Lucas Stach wrote:
> This message was dropped when reorganizing the DT loading code,
> and it's really confusing to miss this.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  common/bootm.c | 1 +
>  1 file changed, 1 insertion(+)

Applied both to master, thanks

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