diff mbox series

[v3,19/46] pxe_utils: Simplify default fdt in label_run_boot()

Message ID 20241206023626.2456858-20-sjg@chromium.org
State Changes Requested
Delegated to: Tom Rini
Headers show
Series pxe: Support read_all() for extlinux and PXE | expand

Commit Message

Simon Glass Dec. 6, 2024, 2:35 a.m. UTC 
Tidy up this code a little to avoid two calls to env_get() for both
fdt_addr and fdtcontroladdr

Signed-off-by: Simon Glass <sjg@chromium.org>
Suggested-by: Quentin Schulz <quentin.schulz@cherry.de>
---

(no changes since v2)

Changes in v2:
- Add new patch to simplify the code reading fdtcontroladdr and fdt_addr

 boot/pxe_utils.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

Comments

Simon Glass Dec. 20, 2024, 4:06 a.m. UTC | #1 
Tidy up this code a little to avoid two calls to env_get() for both
fdt_addr and fdtcontroladdr

Signed-off-by: Simon Glass <sjg@chromium.org>
Suggested-by: Quentin Schulz <quentin.schulz@cherry.de>
---

(no changes since v2)

Changes in v2:
- Add new patch to simplify the code reading fdtcontroladdr and fdt_addr

 boot/pxe_utils.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

Applied to sjg/master, thanks!
diff mbox series

Patch

diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c
index bbb6ff203b6..37306f37009 100644
--- a/boot/pxe_utils.c
+++ b/boot/pxe_utils.c
@@ -612,24 +612,18 @@  static int label_run_boot(struct pxe_context *ctx, struct pxe_label *label,
 	}
 
 	if (!bmi.conf_fdt) {
-		if (IS_ENABLED(CONFIG_SUPPORT_PASSING_ATAGS)) {
-			if (strcmp("-", label->fdt))
-				bmi.conf_fdt = env_get("fdt_addr");
-		} else {
+		if (!IS_ENABLED(CONFIG_SUPPORT_PASSING_ATAGS) ||
+		    strcmp("-", label->fdt))
 			bmi.conf_fdt = env_get("fdt_addr");
-		}
 	}
 
 	kernel_addr_r = genimg_get_kernel_addr(kernel_addr);
 	buf = map_sysmem(kernel_addr_r, 0);
 
 	if (!bmi.conf_fdt && genimg_get_format(buf) != IMAGE_FORMAT_FIT) {
-		if (IS_ENABLED(CONFIG_SUPPORT_PASSING_ATAGS)) {
-			if (strcmp("-", label->fdt))
-				bmi.conf_fdt = env_get("fdtcontroladdr");
-		} else {
+		if (!IS_ENABLED(CONFIG_SUPPORT_PASSING_ATAGS) ||
+		    strcmp("-", label->fdt))
 			bmi.conf_fdt = env_get("fdtcontroladdr");
-		}
 	}
 
 	/* Try bootm for legacy and FIT format image */