mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-09-27 00:31:26 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bootvx_fdt: fix missing 'fdt_fixup_ethernet(...)' on vxWorks boot

Browse Source 
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>
This commit is contained in:
Hannes Schmelzer 2017-08-25 14:27:37 +02:00 committed by Tom Rini
parent 5daf6e56d3
commit a223e2bc10
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/bootm_os.c
View File

@ -276,6 +276,9 @@ void do_bootvx_fdt(bootm_headers_t *images)
if (ret) if (ret)
return; return;
/* Update ethernet nodes */
fdt_fixup_ethernet(*of_flat_tree);
ret = fdt_add_subnode(*of_flat_tree, 0, "chosen"); ret = fdt_add_subnode(*of_flat_tree, 0, "chosen");
if ((ret >= 0 || ret == -FDT_ERR_EXISTS)) { if ((ret >= 0 || ret == -FDT_ERR_EXISTS)) {
bootline = env_get("bootargs"); bootline = env_get("bootargs");