On 11/07/2015 05:38, Peng Fan wrote:
> 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....@freescale.com>
> Reviewed-by: Fabio Estevam <fabio.este...@freescale.com>
> Acked-by: Stefano Babic <sba...@denx.de>
> ---
>
> Changes v5:
> Add Stefano's Acked-by
> Changes v4:
> Add Fabio's Reviewed-by
> Changes v3:
> New patch
> Changes v2:
> none
>
> board/freescale/mx6qsabreauto/mx6qsabreauto.c | 9 +++++++++
> board/freescale/mx6sabresd/mx6sabresd.c | 10 ++++++++++
> include/configs/mx6qsabreauto.h | 5 -----
> include/configs/mx6sabre_common.h | 21 +++++++++++++++++++--
> include/configs/mx6sabresd.h | 5 -----
> 5 files changed, 38 insertions(+), 12 deletions(-)
>
> diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c
> b/board/freescale/mx6qsabreauto/mx6qsabreauto.c
> index b76e4eb..943a4bd 100644
> --- 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 23f8f6b..4f0694a 100644
> --- a/board/freescale/mx6sabresd/mx6sabresd.c
> +++ b/board/freescale/mx6sabresd/mx6sabresd.c
> @@ -679,6 +679,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 2260344..11cf538 100644
> --- a/include/configs/mx6qsabreauto.h
> +++ b/include/configs/mx6qsabreauto.h
> @@ -12,11 +12,6 @@
> #define CONFIG_MACH_TYPE 3529
> #define CONFIG_MXC_UART_BASE UART4_BASE
> #define CONFIG_CONSOLE_DEV "ttymxc3"
> -#if defined CONFIG_MX6Q
> -#define CONFIG_DEFAULT_FDT_FILE "imx6q-sabreauto.dtb"
> -#elif defined CONFIG_MX6DL
> -#define CONFIG_DEFAULT_FDT_FILE "imx6dl-sabreauto.dtb"
> -#endif
> #define CONFIG_MMCROOT "/dev/mmcblk0p2"
> #define PHYS_SDRAM_SIZE (2u * 1024 * 1024 * 1024)
>
> diff --git a/include/configs/mx6sabre_common.h
> b/include/configs/mx6sabre_common.h
> index e42dfc9..903ab18 100644
> --- a/include/configs/mx6sabre_common.h
> +++ b/include/configs/mx6sabre_common.h
> @@ -70,10 +70,12 @@
> #define EMMC_ENV ""
> #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" \
> @@ -143,9 +145,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 41162ca..5f635ca 100644
> --- a/include/configs/mx6sabresd.h
> +++ b/include/configs/mx6sabresd.h
> @@ -19,11 +19,6 @@
> #define CONFIG_MXC_UART_BASE UART1_BASE
> #define CONFIG_CONSOLE_DEV "ttymxc0"
> #define CONFIG_MMCROOT "/dev/mmcblk1p2"
> -#if defined(CONFIG_MX6Q)
> -#define CONFIG_DEFAULT_FDT_FILE "imx6q-sabresd.dtb"
> -#elif defined(CONFIG_MX6DL)
> -#define CONFIG_DEFAULT_FDT_FILE "imx6dl-sabresd.dtb"
> -#endif
> #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
>
> #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
>
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de
=====================================================================
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
