From: Simon Glass <sjg@chromium.org>
Date: Thu, 6 Mar 2025 00:25:13 +0000 (-0700)
Subject: pxe_utils: Simplify default fdt in label_run_boot()
X-Git-Tag: v2025.07-rc1~18^2~21^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=feb8d7fd749413e889ba2c396654f473ba32034d;p=pandora-u-boot.git

pxe_utils: Simplify default fdt in label_run_boot()

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>
---

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 */