imx: mx6sabresd/sabreauto runtime setting fdt_file

Detect the SOC and board variant at runtime and change the dtb name,
but not hardcoding the fdt_file env variable.

Take the following patch as a reference.
Íd58699b157df75f1aa0b363ea9c21add21a0c
"mx6cuboxi: Load the correct 'fdtfile' variable"

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>

diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6qsabreauto/mx6qsabreauto.c
index 594214c246c54f627be546fd4c67878ebb433b6b..5e97a1c63dddfa1cc6de00bf4b28792025352624 100644 (file)
--- a/board/freescale/mx6qsabreauto/mx6qsabreauto.c
+++ b/board/freescale/mx6qsabreauto/mx6qsabreauto.c
@@ -522,6 +522,15 @@ int board_late_init(void)
        add_board_boot_modes(board_boot_modes);
 #endif
 
+#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+       setenv("board_name", "SABREAUTO");
+
+       if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D))
+               setenv("board_rev", "MX6Q");
+       else if (is_cpu_type(MXC_CPU_MX6DL) || is_cpu_type(MXC_CPU_MX6SOLO))
+               setenv("board_rev", "MX6DL");
+#endif
+
        return 0;
 }
 

diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index c6c48adb83bb34a95fd7e01ad257f0c4d8fc709f..b24ef23ac8de03484e2bb3298389fab60bcba6f6 100644 (file)
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -680,6 +680,16 @@ int board_late_init(void)
 #ifdef CONFIG_CMD_BMODE
        add_board_boot_modes(board_boot_modes);
 #endif
+
+#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+       setenv("board_name", "SABRESD");
+
+       if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D))
+               setenv("board_rev", "MX6Q");
+       else if (is_cpu_type(MXC_CPU_MX6DL) || is_cpu_type(MXC_CPU_MX6SOLO))
+               setenv("board_rev", "MX6DL");
+#endif
+
        return 0;
 }
 

diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
index 1d417afdb022bd37838e468748d955716aff3fe1..11cf538b0adfcc63c3fd248e4718875dcc3cb263 100644 (file)
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@ -12,10 +12,7 @@
 #define CONFIG_MACH_TYPE       3529
 #define CONFIG_MXC_UART_BASE   UART4_BASE
 #define CONFIG_CONSOLE_DEV             "ttymxc3"
-#define CONFIG_DEFAULT_FDT_FILE        "imx6q-sabreauto.dtb"
-#define CONFIG_DEFAULT_FDT_FILE        "imx6dl-sabreauto.dtb"
-#endif
-#define CONFIG_MMCROOT                 "/dev/mmcblk2p2"
+#define CONFIG_MMCROOT                 "/dev/mmcblk0p2"
 #define PHYS_SDRAM_SIZE                (2u * 1024 * 1024 * 1024)
 
 /* USB Configs */

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 6c6c1c068248481ae55a3c32c4b7b320e1c193e4..75e8db17228afec5d5470ca5010dcb2a653402dd 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -70,18 +70,12 @@
 #define EMMC_ENV ""
 #endif
 
-#ifndef VIDEO_ARGS
-#define VIDEO_ARGS ""
-#endif
-
-#ifndef VIDEO_ARGS_SCRIPT
-#define VIDEO_ARGS_SCRIPT ""
-#endif
+#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "image=zImage\0" \
-       "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
+       "fdt_file=undefined\0" \
        "fdt_addr=0x18000000\0" \
        "boot_fdt=try\0" \
        "ip_dyn=yes\0" \
@@ -166,9 +160,24 @@
                        "fi; " \
                "else " \
                        "bootz; " \
-               "fi;\0"
+               "fi;\0" \
+               "findfdt="\
+                       "if test $fdt_file = undefined; then " \
+                               "if test $board_name = SABREAUTO && test $board_rev = MX6Q; then " \
+                                       "setenv fdt_file imx6q-sabreauto.dtb; fi; " \
+                               "if test $board_name = SABREAUTO && test $board_rev = MX6DL; then " \
+                                       "setenv fdt_file imx6dl-sabreauto.dtb; fi; " \
+                               "if test $board_name = SABRESD && test $board_rev = MX6Q; then " \
+                                       "setenv fdt_file imx6q-sabresd.dtb; fi; " \
+                               "if test $board_name = SABRESD && test $board_rev = MX6DL; then " \
+                                       "setenv fdt_file imx6dl-sabresd.dtb; fi; " \
+                               "if test $fdt_file = undefined; then " \
+                                       "echo WARNING: Could not determine dtb to use; fi; " \
+                       "fi;\0" \
+
 
 #define CONFIG_BOOTCOMMAND \
+       "run findfdt;" \
        "mmc dev ${mmcdev};" \
        "if mmc rescan; then " \
                "if run loadbootscript; then " \

diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index e87b4d7f2693f74ccf5e987f173cda62fab0b5fb..723e090ac1521a53840548f88ab122632d952827 100644 (file)
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -18,12 +18,7 @@
 #define CONFIG_MACH_TYPE       3980
 #define CONFIG_MXC_UART_BASE   UART1_BASE
 #define CONFIG_CONSOLE_DEV             "ttymxc0"
-#define CONFIG_MMCROOT                 "/dev/mmcblk2p2"
-#if defined(CONFIG_SOC_MX6Q)
-#define CONFIG_DEFAULT_FDT_FILE        "imx6q-sabresd-ldo.dtb"
-#elif defined(CONFIG_SOC_MX6DL)
-#define CONFIG_DEFAULT_FDT_FILE        "imx6dl-sabresd-ldo.dtb"
-#endif
+#define CONFIG_MMCROOT                 "/dev/mmcblk1p2"
 #define PHYS_SDRAM_SIZE                (1u * 1024 * 1024 * 1024)
 
 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */