From patchwork Fri Aug 25 09:32:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Schmelzer X-Patchwork-Id: 805813 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xdwsz3557z9sNd for ; Fri, 25 Aug 2017 19:32:07 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 11AE7C21E60; Fri, 25 Aug 2017 09:32:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 60444C21E60; Fri, 25 Aug 2017 09:32:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F3E45C21E60; Fri, 25 Aug 2017 09:31:58 +0000 (UTC) Received: from mail.schmelzer.or.at (mail.schmelzer.or.at [87.106.47.214]) by lists.denx.de (Postfix) with ESMTP id B8CF3C21E5B for ; Fri, 25 Aug 2017 09:31:58 +0000 (UTC) Received: from localhost (s15287728.onlinehome-server.info [127.0.0.1]) by hamspirit.at (Postfix) with ESMTP id 70B2E8F48CB6; Fri, 25 Aug 2017 09:31:58 +0000 (UTC) Received: from mail.schmelzer.or.at ([127.0.0.1]) by localhost (s15287728.onlinehome-server.info [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1rbAFbte5cQr; Fri, 25 Aug 2017 09:31:53 +0000 (UTC) Received: from scm-ws7.ad.schmelzer.or.at (192-164-18-188.adsl.highway.telekom.at [192.164.18.188]) by hamspirit.at (Postfix) with ESMTP id C2FE68F488B9; Fri, 25 Aug 2017 09:31:52 +0000 (UTC) From: Hannes Schmelzer To: u-boot@lists.denx.de Date: Fri, 25 Aug 2017 11:32:37 +0200 Message-Id: <1503653557-10384-1-git-send-email-oe5hpm@oevsv.at> X-Mailer: git-send-email 2.7.4 Cc: trini@konsulko.com, Hannes Schmelzer , Stefan Roese Subject: [U-Boot] [PATCH v2] bootvx_fdt: fix missing 'fdt_fixup_ethernet(...)' on vxWorks boot X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-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 --- Changes in v2: - restore original behaviour from b3b522f247d3f19c4f2309ab0e6a02b3dd82de45 with moving the fdt_fixup_ethernet(...) call after boot_relocate_fdt(...) common/bootm_os.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/bootm_os.c b/common/bootm_os.c index 1feea8a..934019f 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -275,6 +275,8 @@ void do_bootvx_fdt(bootm_headers_t *images) ret = boot_relocate_fdt(lmb, of_flat_tree, &of_size); 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)) {