aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFrancesco Dolcini <francesco.dolcini@toradex.com>2024-04-23 17:57:01 +0200
committerFabio Estevam <festevam@gmail.com>2024-04-28 11:55:26 -0300
commit8d0f2366c153f462ff004124af8c19dd8fe3c6a7 (patch)
treedd88ee7337efc019e3e1c5dae9f23a76104c06bb /include
parent174ac987655c888017c82df1883c0c2ea0dc2495 (diff)
downloadu-boot-8d0f2366c153f462ff004124af8c19dd8fe3c6a7.tar.gz
board: toradex: colibri-imx(6ull|imx7): Fix missing fdt_fixup boot error
In commit 51aaaf5e7975 ("board: toradex: imx: Remove not needed env variables") the empty definition of fdt_fixup variable was removed, however this was still referenced from the boot command leading to boot failures: ## Error: \"fdt_fixup\" not defined` Fix this by removing "run fdt_fixup" from the boot command and instead enable CONFIG_OF_ENV_SETUP in the defconfig that would achieve the same but in a more robust way (it works fine even if the variable is not defined). Fixes: 51aaaf5e7975 ("board: toradex: imx: Remove not needed env variables") Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/colibri-imx6ull.h2
-rw-r--r--include/configs/colibri_imx7.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 7c9d633b68d..8860ceec1a0 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -53,7 +53,7 @@
"ubi part ubi &&" \
"ubi read ${kernel_addr_r} kernel && " \
"ubi read ${fdt_addr_r} dtb && " \
- "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
#if defined(CONFIG_TARGET_COLIBRI_IMX6ULL_NAND)
/* Run Distro Boot script if ubiboot fails */
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index c34f1f903df..33133a0b96e 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -94,7 +94,7 @@
"ubi part ubi && run m4boot && " \
"ubi read ${kernel_addr_r} kernel && " \
"ubi read ${fdt_addr_r} dtb && " \
- "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
#if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
#define MODULE_EXTRA_ENV_SETTINGS \