diff options
| author | Tom Rini <trini@konsulko.com> | 2022-12-13 09:26:25 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-12-13 09:26:25 -0500 |
| commit | ed6251187afabf811a5fd49a44ebd61c53c7b378 (patch) | |
| tree | 63645628d69f1fd70e197126bed3758ae4a292ac | |
| parent | c917865c7fd14420d25388bb3c8c24cb03911caf (diff) | |
| download | u-boot-ed6251187afabf811a5fd49a44ebd61c53c7b378.zip u-boot-ed6251187afabf811a5fd49a44ebd61c53c7b378.tar.gz u-boot-ed6251187afabf811a5fd49a44ebd61c53c7b378.tar.bz2 | |
Revert "cmd: pxe_utils: Check fdtcontroladdr in label_boot"
With the change here, all extlinux.conf files with only "KERNEL
/fitImage" don't work anymore. One common example of this would be those
files generated by thee Poky/OE WIC bootimg-partition bootloader
partition generator.
This reverts commit d5ba6188dfbf6bb68354bec86e483623f1f6dae2.
Reported-by: Neil Armstrong <neil.armstrong@linaro.org>
Reported-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Signed-off-by: Tom Rini <trini@konsulko.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 8133006..96528aa 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 d69a9ff..519ea14 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; |