summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-12-01 15:01:38 -0800
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-01-11 21:27:13 +0100
commitff619321abe6344325b81658d2d7cfc90ceb6727 (patch)
treef799d31ff5ace6907aca8f6a28045ebf447de7db
parent441b5862072c2899eaf83f045f21ce72073f018f (diff)
colibri_imx7/vf: set fdtfile for distroboot
Set fdtfile to represent the current board. This allows distribution to load the correct device tree, which in the module case often deviates from the common fallback ${soc}-${board}${boardver}.dtb... Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--include/configs/colibri_imx7.h3
-rw-r--r--include/configs/colibri_vf.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index f1489dd63ef..3ac7db83659 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -104,7 +104,8 @@
"ubi read ${fdt_addr_r} dtb && " \
"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-#define CONFIG_BOOTCOMMAND "run ubiboot; run distro_bootcmd;"
+#define CONFIG_BOOTCOMMAND "run ubiboot; " \
+ "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;"
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index a0aab102da8..bbb236fdfd8 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -155,7 +155,8 @@
"ubi read ${fdt_addr_r} dtb && " \
"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-#define CONFIG_BOOTCOMMAND "run ubiboot; run distro_bootcmd;"
+#define CONFIG_BOOTCOMMAND "run ubiboot; " \
+ "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;"
#define BOOTENV_RUN_NET_USB_START ""
#define BOOT_TARGET_DEVICES(func) \
@@ -171,7 +172,6 @@
BOOTENV \
"kernel_file=zImage\0" \
"fdt_board=eval-v3\0" \
- "fdt_file=${soc}-colibri-${fdt_board}.dtb\0" \
"fdt_fixup=;\0" \
"defargs=\0" \
"console=ttyLP0\0" \