dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "cmd: pxe_utils: Check fdtcontroladdr in label_boot""

Browse Source 
This reverts commit ed6251187a.

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>
Acked-by: Neil Armstrong <neil.armstrong@linaro.org>
This commit is contained in:
Marek Vasut
2022-12-17 18:41:13 +01:00
committed by Tom Rini
parent ab644db9ba
commit bee3551e00
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
boot/pxe_utils.c
View File

@@ -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 * Scenario 2: If there is an fdt_addr specified, pass it along to
* bootm, and adjust argc appropriately. * 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"); 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]) if (!bootm_argv[3])
bootm_argv[3] = env_get("fdt_addr"); bootm_argv[3] = env_get("fdt_addr");
if (!bootm_argv[3])
bootm_argv[3] = env_get("fdtcontroladdr");
if (bootm_argv[3]) { if (bootm_argv[3]) {
if (!bootm_argv[2]) if (!bootm_argv[2])
bootm_argv[2] = "-"; bootm_argv[2] = "-";

2
drivers/net/tsec.c
View File

@@ -156,7 +156,7 @@ static int tsec_mcast_addr(struct udevice *dev, const u8 *mcast_mac, int join)
return 0; 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_private *priv = dev_get_priv(dev);
struct tsec __iomem *regs = priv->regs; struct tsec __iomem *regs = priv->regs;