diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-09-15 17:27:12 +0200 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-09-15 17:46:21 +0200 |
commit | 7e07b4e87bea7e58bb3279baf45590da87ce35b7 (patch) | |
tree | 4a362e0d83b04588412853a0dbdc10abeced8298 | |
parent | 187a488db6e220c9faeadae85fcd746c9a19640b (diff) |
board: apalis-imx8: re-add select_dt_from_module_version to board_late_init
Re-add select_dt_from_module_version to board_late_init which got
dropped when moving to the later downstream U-Boot version.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r-- | board/toradex/apalis-imx8/apalis-imx8.c | 62 |
1 files changed, 32 insertions, 30 deletions
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c index 8984e1b336..5fbbbb3af4 100644 --- a/board/toradex/apalis-imx8/apalis-imx8.c +++ b/board/toradex/apalis-imx8/apalis-imx8.c @@ -196,6 +196,37 @@ static pcb_rev_t get_pcb_revision(void) } } +static void select_dt_from_module_version(void) +{ + char *fdt_env = env_get("fdtfile"); + + switch(get_pcb_revision()) { + case PCB_VERSION_1_0: + if (strcmp(FDT_FILE_V1_0, fdt_env)) { + env_set("fdtfile", FDT_FILE_V1_0); + printf("Detected a V1.0 module, setting " \ + "correct devicetree\n"); +#ifndef CONFIG_ENV_IS_NOWHERE + env_save(); +#endif + } + break; + default: + break; + } +} + +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_init(void) { #ifdef CONFIG_MXC_GPIO @@ -285,36 +316,7 @@ int board_late_init(void) #endif #endif /* CONFIG_IMX_LOAD_HDMI_FIMRWARE_RX || CONFIG_IMX_LOAD_HDMI_FIMRWARE_TX */ - return 0; -} - -static void select_dt_from_module_version(void) -{ - char *fdt_env = env_get("fdtfile"); - - switch(get_pcb_revision()) { - case PCB_VERSION_1_0: - if (strcmp(FDT_FILE_V1_0, fdt_env)) { - env_set("fdtfile", FDT_FILE_V1_0); - printf("Detected a V1.0 module, setting " \ - "correct devicetree\n"); -#ifndef CONFIG_ENV_IS_NOWHERE - env_save(); -#endif - } - break; - default: - break; - } -} - -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" -); |