Skip to contentSkip to conversation

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

PATCH In review Marek Vasut 3 participants 3 messages Dec 17, 2022 – Jan 6, 2023 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "Revert "cmd: pxe_utils: Check fdtcontroladdr in label_boot""

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.

---
Cc: Neil Armstrong <[email protected]>
Cc: Peter Hoyes <[email protected]>
Cc: Quentin Schulz <[email protected]>
Cc: Ramon Fried <[email protected]>
Cc: Simon Glass <[email protected]>
Cc: Tom Rini <[email protected]>
---
PW link for replacement patch:
https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/

---
 boot/pxe_utils.c   | 8 +++++++-
 drivers/net/tsec.c | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)
boot/pxe_utils.c +7 -1
index 96528aa14c0..8133006875f 100644
@@ -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] = "-";
drivers/net/tsec.c +1 -1
index 519ea14b070..d69a9ff4773 100644
@@ -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;
Signature · 1 line
2.35.1
Acked-by on v1 1/1
#1 lore raw
Quoted 53 lines · Marek Vasut

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.

---
Cc: Neil Armstrong <[email protected]>
Cc: Peter Hoyes <[email protected]>
Cc: Quentin Schulz <[email protected]>
Cc: Ramon Fried <[email protected]>
Cc: Simon Glass <[email protected]>
Cc: Tom Rini <[email protected]>
---
PW link for replacement patch:
https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/

---
  boot/pxe_utils.c   | 8 +++++++-
  drivers/net/tsec.c | 2 +-
  2 files changed, 8 insertions(+), 2 deletions(-)
boot/pxe_utils.c +7 -1
index 96528aa14c0..8133006875f 100644
@@ -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] = "-";
drivers/net/tsec.c +0 -0
index 519ea14b070..d69a9ff4773 100644

drivers/net/tsec.c static int tsec_mcast_addr(struct udevice *dev, const u8 *mcast_mac, int join) · line 162

Quoted 8 lines
drivers/net/tsec.c +1 -1
@@ -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;