Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 38463C4332F for ; Sat, 17 Dec 2022 17:41:28 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8398585362; Sat, 17 Dec 2022 18:41:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1671298886; bh=bdnRcoQEh93Y5TACorsP4Zm8iiWK7tpszfPYWqRG4bI=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=ExAIeei7KGRyn2Lf7h2Ur2WbIORI+M87DrqsR1gV4BG7Lt+1gH5N0mS4389a+VYSE mzk3S6C7B3viSII8p0kq6yuMZA6BxEj1uLS+ZDC5gffjBUhaV9V0Azl6XD65Fzhq+4 84ek17DHlnEYadSlunEpAl6R9lbY8O3+PKSwx8XYN76JeHGfDgbKnJgLXBjEoGCjhi 7QcphgEouh3uLsWT2O1bYzuTBW/s7EHWRRlpsgIiEN/BzIYi9MlkJq3hC0nULFD7rx Jr13ksyIUJQIiAzN7VkOSXgRVtCOaD4oFbQtHDuBdF91qQVYy3Xt/0yfdGsgHtmsjB 2dEZDiy1Nwq1Q== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id D8E5585237; Sat, 17 Dec 2022 18:41:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1671298885; bh=bdnRcoQEh93Y5TACorsP4Zm8iiWK7tpszfPYWqRG4bI=; h=From:To:Cc:Subject:Date:From; b=IUeIDguh6s0VJjgYY4TKRgHIeb5piN3hncqqtglA9V6j+wLrgQGXXRM/67G1pHKAo 9m6Ee0nEVgEqFcnG33H46gERIiGWUIu169+t34krxr9074XnO6eW/m9ifUa+K8caCx uaqe7JxTodANGjjkDLCI1bLaAQrw3PDp55JFOQ+63AX8P1u6zBx6wpRCPdMdyhumUN 79mLqAtTSk+VoE8olqybamEPajuLTBkVMiNGYfyfZP8I9QqtLSs4Y8FOVfg9WYvXiH yu1jPt5H/IEf2g8ZWPUyGvVV9QQyFLjsdllfpRxlfzOv7k8bNEdN6Sy3F9z9+B5dsc qHJ9dEyLWEacw== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Neil Armstrong , Peter Hoyes , Quentin Schulz , Ramon Fried , Simon Glass , Tom Rini Subject: [PATCH] Revert "Revert "cmd: pxe_utils: Check fdtcontroladdr in label_boot"" Date: Sat, 17 Dec 2022 18:41:13 +0100 Message-Id: <20221217174113.7459-1-marex@denx.de> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This reverts commit ed6251187afabf811a5fd49a44ebd61c53c7b378. Superseded by "cmd: pxe_utils: Limit fdtcontroladdr usage to non-fitImage" which is less heavy-handed approach and retains part of the original behavior for non-fitImage. Signed-off-by: Marek Vasut --- Cc: Neil Armstrong Cc: Peter Hoyes Cc: Quentin Schulz Cc: Ramon Fried Cc: Simon Glass Cc: Tom Rini --- PW link for replacement patch: https://patchwork.ozlabs.org/project/uboot/patch/20221214064518.753432-1-marex@denx.de/ --- boot/pxe_utils.c | 8 +++++++- drivers/net/tsec.c | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index 96528aa14c0..8133006875f 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -616,7 +616,10 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) * Scenario 2: If there is an fdt_addr specified, pass it along to * bootm, and adjust argc appropriately. * - * Scenario 3: fdt blob is not available. + * Scenario 3: If there is an fdtcontroladdr specified, pass it along to + * bootm, and adjust argc appropriately. + * + * Scenario 4: fdt blob is not available. */ bootm_argv[3] = env_get("fdt_addr_r"); @@ -721,6 +724,9 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) if (!bootm_argv[3]) bootm_argv[3] = env_get("fdt_addr"); + if (!bootm_argv[3]) + bootm_argv[3] = env_get("fdtcontroladdr"); + if (bootm_argv[3]) { if (!bootm_argv[2]) bootm_argv[2] = "-"; diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 519ea14b070..d69a9ff4773 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -156,7 +156,7 @@ static int tsec_mcast_addr(struct udevice *dev, const u8 *mcast_mac, int join) return 0; } -static int tsec_set_promisc(struct udevice *dev, bool enable) +static int __maybe_unused tsec_set_promisc(struct udevice *dev, bool enable) { struct tsec_private *priv = dev_get_priv(dev); struct tsec __iomem *regs = priv->regs; -- 2.35.1