From: Jagan Teki jagan@amarulasolutions.com
Move spl load fit code into common/spl
Signed-off-by: Jagan Teki jagan@amarulasolutions.com --- board/engicam/common/spl.c | 16 ++++++++++++++++ board/engicam/icorem6/icorem6.c | 12 ------------ board/engicam/icorem6_rqs/icorem6_rqs.c | 12 ------------ 3 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c index 6964c13..0a79ffd 100644 --- a/board/engicam/common/spl.c +++ b/board/engicam/common/spl.c @@ -39,6 +39,22 @@ static iomux_v3_cfg_t const uart_pads[] = { #endif };
+#ifdef CONFIG_SPL_LOAD_FIT +int board_fit_config_name_match(const char *name) +{ + if (is_mx6dq() && !strcmp(name, "imx6q-icore")) + return 0; + else if (is_mx6dq() && !strcmp(name, "imx6q-icore-rqs")) + return 0; + else if ((is_mx6dl() || is_mx6solo()) && !strcmp(name, "imx6dl-icore")) + return 0; + else if ((is_mx6dl() || is_mx6solo()) && !strcmp(name, "imx6dl-icore-rqs")) + return 0; + else + return -1; +} +#endif + #ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot(void) { diff --git a/board/engicam/icorem6/icorem6.c b/board/engicam/icorem6/icorem6.c index 59c085b..e173124 100644 --- a/board/engicam/icorem6/icorem6.c +++ b/board/engicam/icorem6/icorem6.c @@ -264,16 +264,4 @@ int board_mmc_init(bd_t *bis) return 0; } #endif - -#ifdef CONFIG_SPL_LOAD_FIT -int board_fit_config_name_match(const char *name) -{ - if (is_mx6dq() && !strcmp(name, "imx6q-icore")) - return 0; - else if ((is_mx6dl() || is_mx6solo()) && !strcmp(name, "imx6dl-icore")) - return 0; - else - return -1; -} -#endif #endif /* CONFIG_SPL_BUILD */ diff --git a/board/engicam/icorem6_rqs/icorem6_rqs.c b/board/engicam/icorem6_rqs/icorem6_rqs.c index edf9d086..599cea3 100644 --- a/board/engicam/icorem6_rqs/icorem6_rqs.c +++ b/board/engicam/icorem6_rqs/icorem6_rqs.c @@ -148,16 +148,4 @@ void board_boot_order(u32 *spl_boot_list) } #endif #endif - -#ifdef CONFIG_SPL_LOAD_FIT -int board_fit_config_name_match(const char *name) -{ - if (is_mx6dq() && !strcmp(name, "imx6q-icore-rqs")) - return 0; - else if ((is_mx6dl() || is_mx6solo()) && !strcmp(name, "imx6dl-icore-rqs")) - return 0; - else - return -1; -} -#endif #endif /* CONFIG_SPL_BUILD */