On 17/12/2022 18:41, Marek Vasut wrote:

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 marex@denx.de

Cc: Neil Armstrong neil.armstrong@linaro.org Cc: Peter Hoyes Peter.Hoyes@arm.com Cc: Quentin Schulz quentin.schulz@theobroma-systems.com Cc: Ramon Fried rfried.dev@gmail.com Cc: Simon Glass sjg@chromium.org Cc: Tom Rini trini@konsulko.com

---

PW link for replacement patch: https://patchwork.ozlabs.org/project/uboot/patch/20221214064518.753432-1-mar...

---

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;

Acked-by: Neil Armstrong neil.armstrong@linaro.org