diff options
| author | Hannes Schmelzer <oe5hpm@oevsv.at> | 2017-08-25 14:27:37 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-28 07:19:13 -0400 |
| commit | a223e2bc10ef2bdcf2415e4453e676a9c3d70f42 (patch) | |
| tree | f6c045a8211d68cc48fa552daa0c6887c9f10b7d /common | |
| parent | 5daf6e56d36ccbdb7a3b160f9bd0f0c572c18eaf (diff) | |
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 <oe5hpm@oevsv.at>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/bootm_os.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/common/bootm_os.c b/common/bootm_os.c index 1feea8af175..31b1878dc4a 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"); |