[U-Boot] [PATCH 4/5] i.MX6: nitrogen6x/sabrelite: initialize imx_type and board_name values

Eric Nelson eric.nelson at boundarydevices.com
Sun Nov 17 18:17:46 CET 2013


Use them to produce FDT file name in mx6qsabrelite_config.

Signed-off-by: Eric Nelson <eric.nelson at boundarydevices.com>
---
 include/configs/nitrogen6x.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 3df8de0..361e69d 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -188,7 +188,6 @@
 	"console=ttymxc1\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
-	"fdt_file=imx6q-sabrelite.dtb\0" \
 	"fdt_addr=0x11000000\0" \
 	"boot_fdt=try\0" \
 	"ip_dyn=yes\0" \
@@ -244,6 +243,12 @@
 		"fi;\0"
 
 #define CONFIG_BOOTCOMMAND \
+	   "if itest.s x6Q == x${imx_type}; then " \
+		"fdt_file=imx6q ; " \
+	   "else " \
+		"fdt_file=imx6dl ; " \
+	   "fi; " \
+	   "fdt_file=${fdt_file}-${board_name}.dtb;" \
 	   "mmc dev ${mmcdev}; if mmc rescan; then " \
 		   "if run loadbootscript; then " \
 			   "run bootscript; " \
@@ -361,4 +366,6 @@
 #define CONFIG_SUPPORT_RAW_INITRD
 #define CONFIG_CMD_FS_GENERIC
 
+#define CONFIG_ARCH_MISC_INIT
+
 #endif	       /* __CONFIG_H */
-- 
1.8.1.2



More information about the U-Boot mailing list