From patchwork Thu Mar 23 17:02:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Tjernlund X-Patchwork-Id: 742793 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3vptCr4KLFz9s3w for ; Fri, 24 Mar 2017 04:03:04 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2EF8CC21C62; Thu, 23 Mar 2017 17:02:57 +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 2B3ADC21C28; Thu, 23 Mar 2017 17:02:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 96459C21C28; Thu, 23 Mar 2017 17:02:53 +0000 (UTC) Received: from smtp.transmode.se (smtp.transmode.se [31.15.61.139]) by lists.denx.de (Postfix) with ESMTP id 38D53C21C27 for ; Thu, 23 Mar 2017 17:02:53 +0000 (UTC) Received: from gentoo-jocke.infinera.com (gentoo-jocke.infinera.com [10.210.73.155]) by smtp.transmode.se (Postfix) with ESMTP id BA444118706E; Thu, 23 Mar 2017 18:02:52 +0100 (CET) Received: from gentoo-jocke.infinera.com (gentoo-jocke.infinera.com [127.0.0.1]) by gentoo-jocke.infinera.com (8.14.9/8.14.9) with ESMTP id v2NH2qkZ019533; Thu, 23 Mar 2017 18:02:52 +0100 Received: (from jocke@localhost) by gentoo-jocke.infinera.com (8.14.9/8.14.9/Submit) id v2NH2qIu019532; Thu, 23 Mar 2017 18:02:52 +0100 From: Joakim Tjernlund To: Simon Glass , u-boot@lists.denx.de Date: Thu, 23 Mar 2017 18:02:41 +0100 Message-Id: <20170323170241.19485-1-joakim.tjernlund@infinera.com> X-Mailer: git-send-email 2.10.2 Subject: [U-Boot] [PATCH] Remove extra fdt_fixup_ethernet() call 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" ft_cpu_setup() already calls fdt_fixup_ethernet(), calling it in image_setup_libfdt() is both redundant and breaks any modifications done by ft_board_setup(). Restore the old behavior by removing the call in image_setup_libfdt() Signed-off-by: Joakim Tjernlund --- common/image-fdt.c | 1 - 1 file changed, 1 deletion(-) diff --git a/common/image-fdt.c b/common/image-fdt.c index 80e3e63..b8f5654 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -498,7 +498,6 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, goto err; } } - fdt_fixup_ethernet(blob); /* Delete the old LMB reservation */ lmb_free(lmb, (phys_addr_t)(u32)(uintptr_t)blob,