diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-03-16 16:01:35 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-03-16 16:01:35 +0100 |
| commit | 5b32f0b4698c4cd250774bf71eae467502c47e88 (patch) | |
| tree | d09e70e37156e1c1a503148b909696a370d98743 | |
| parent | 34ecf4954755085de6846a8cc07486aea7484eba (diff) | |
apalis-imx8: Fix hardware version detection in recovery mode
Make sure recent version detection implementation is also used during
recovery mode.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | board/toradex/apalis-imx8/apalis-imx8.c | 13 | ||||
| -rw-r--r-- | include/configs/apalis-imx8.h | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c index 8bc656dd31..36dea9ab4a 100644 --- a/board/toradex/apalis-imx8/apalis-imx8.c +++ b/board/toradex/apalis-imx8/apalis-imx8.c @@ -335,7 +335,7 @@ static pcb_rev_t get_pcb_revision(void) } } -static int select_dt_from_module_version(void) +static void select_dt_from_module_version(void) { char *fdt_env = env_get("fdtfile"); @@ -355,6 +355,17 @@ static int select_dt_from_module_version(void) } } +static int do_select_dt_from_module_version(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) { + select_dt_from_module_version(); + return 0; +} + +U_BOOT_CMD( + select_dt_from_module_version, CONFIG_SYS_MAXARGS, 1, do_select_dt_from_module_version, + "\n", " - select devicetree from module version" +); + int board_late_init(void) { #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 0bfc7ba4a2..5877d7d212 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -112,7 +112,7 @@ BOOTENV \ M4_BOOT_ENV \ MEM_LAYOUT_ENV_SETTINGS \ - "bootcmd_mfg=fastboot 0\0" \ + "bootcmd_mfg=select_dt_from_module_version && fastboot 0\0" \ "script=boot.scr\0" \ "image=Image\0" \ "panel=NULL\0" \ |