From a223e2bc10ef2bdcf2415e4453e676a9c3d70f42 Mon Sep 17 00:00:00 2001 From: Hannes Schmelzer Date: Fri, 25 Aug 2017 14:27:37 +0200 Subject: [PATCH] bootvx_fdt: fix missing 'fdt_fixup_ethernet(...)' on vxWorks boot Before commit 26d6119 (fdt: Move fdt_fixup_ethernet to a common place) the fdt_fixup_ethernet(...) was called during do_bootvx_fdt(...). Afterwards the only (common) place for this fixup is during image_setup_libfdt(...) and this is only called, at least on ARM platform, from image_setup_linux(...). All this ends up in the fact, that the fdt_fixup_ethernet(...) is only called on booting a linux image and not on booting a vxWorks image. We fix this with adding the fdt_fixup_ethernet(...) call again to do_bootvx_fdt(...) Signed-off-by: Hannes Schmelzer Reviewed-by: Bin Meng --- common/bootm_os.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/bootm_os.c b/common/bootm_os.c index 1feea8af17..31b1878dc4 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -276,6 +276,9 @@ void do_bootvx_fdt(bootm_headers_t *images) if (ret) return; + /* Update ethernet nodes */ + fdt_fixup_ethernet(*of_flat_tree); + ret = fdt_add_subnode(*of_flat_tree, 0, "chosen"); if ((ret >= 0 || ret == -FDT_ERR_EXISTS)) { bootline = env_get("bootargs"); -- 2.25.1