diff options
| author | Quentin Schulz <quentin.schulz@theobroma-systems.com> | 2022-10-18 16:05:01 +0200 |
|---|---|---|
| committer | Quentin Schulz <quentin.schulz@theobroma-systems.com> | 2022-10-19 12:13:04 +0200 |
| commit | afd158b8302be430728f73c21c2e4eb59dfb3a02 (patch) | |
| tree | aad62aab2a59789a83530af84074961e91cc7967 | |
| parent | 6ad51b70660b9e01182d621ab951bed3299f7218 (diff) | |
TSD: Revert "cmd: pxe_utils: Check fdtcontroladdr in label_boot"
This reverts commit d5ba6188dfbf6bb68354bec86e483623f1f6dae2 because it
breaks fitImage booting with extLinux which is used in Yocto by default.
See: https://lore.kernel.org/u-boot/cb2e873f-ea9e-82e7-aa5e-55eab55e70b2@baylibre.com/
for more information.
[TSD] A fix was proposed a few months back but broke some tests. c.f.
https://lore.kernel.org/u-boot/20220527143725.131742-1-narmstrong@baylibre.com/
This needs to be investigated and fixed upstream so this patch does not
get carried forever.
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
| -rw-r--r-- | boot/pxe_utils.c | 8 | ||||
| -rw-r--r-- | drivers/net/tsec.c | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index a364fa8bb5..bd8498ad04 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -616,10 +616,7 @@ 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: If there is an fdtcontroladdr specified, pass it along to - * bootm, and adjust argc appropriately. - * - * Scenario 4: fdt blob is not available. + * Scenario 3: fdt blob is not available. */ bootm_argv[3] = env_get("fdt_addr_r"); @@ -724,9 +721,6 @@ 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 d69a9ff477..519ea14b07 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 __maybe_unused tsec_set_promisc(struct udevice *dev, bool enable) +static int tsec_set_promisc(struct udevice *dev, bool enable) { struct tsec_private *priv = dev_get_priv(dev); struct tsec __iomem *regs = priv->regs; |