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>
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 @@
* 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 @@
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] = "-";