From: Miao Yan Date: Wed, 2 Dec 2015 07:39:01 +0000 (-0800) Subject: VxWorks: fixup MAC address for VxWorks X-Git-Tag: v2016.01-rc3~32 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b3b522f247d3f19c4f2309ab0e6a02b3dd82de45;p=u-boot VxWorks: fixup MAC address for VxWorks VxWorks 7 kernels retrieve 'local-mac-addr' from dtb and use that for NIC MAC address. As a result, when booting the same kernel image on multiple boards, there will be address conflicts. So fixup MAC address when booting VxWorks 7 kernels Signed-off-by: Miao Yan Reviewed-by: Bin Meng --- diff --git a/common/bootm_os.c b/common/bootm_os.c index 72477f0b81..cb83f4a9bd 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -288,6 +288,8 @@ void do_bootvx_fdt(bootm_headers_t *images) if (ret) return; + fdt_fixup_ethernet(*of_flat_tree); + ret = fdt_add_subnode(*of_flat_tree, 0, "chosen"); if ((ret >= 0 || ret == -FDT_ERR_EXISTS)) { bootline = getenv("bootargs");