
On Mon, Jan 31, 2022 at 10:59 AM Tommaso Merciai tommaso.merciai@amarulasolutions.com wrote:
This function defined for two architecture is not really generic and can generate problem when people add a new board.
This actually fixes some issues I was trying to solve on the imx8mn-beacon board, so thank you for doing this.
Tested-by: Adam Ford aford173@gmail.com #imx8mn-beacon
Signed-off-by: Tommaso Merciai tommaso.merciai@amarulasolutions.com
arch/arm/mach-imx/imx8m/soc.c | 39 ----------------------------------- 1 file changed, 39 deletions(-)
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 863508776d..f0030a557a 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -1313,45 +1313,6 @@ void do_error(struct pt_regs *pt_regs, unsigned int esr) #endif
#if defined(CONFIG_IMX8MN) || defined(CONFIG_IMX8MP) -enum env_location env_get_location(enum env_operation op, int prio) -{
enum boot_device dev = get_boot_device();
enum env_location env_loc = ENVL_UNKNOWN;
if (prio)
return env_loc;
switch (dev) {
-#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
case QSPI_BOOT:
env_loc = ENVL_SPI_FLASH;
break;
-#endif -#ifdef CONFIG_ENV_IS_IN_NAND
case NAND_BOOT:
env_loc = ENVL_NAND;
break;
-#endif -#ifdef CONFIG_ENV_IS_IN_MMC
case SD1_BOOT:
case SD2_BOOT:
case SD3_BOOT:
case MMC1_BOOT:
case MMC2_BOOT:
case MMC3_BOOT:
env_loc = ENVL_MMC;
break;
-#endif
default:
-#if defined(CONFIG_ENV_IS_NOWHERE)
env_loc = ENVL_NOWHERE;
-#endif
break;
}
return env_loc;
-}
#ifndef ENV_IS_EMBEDDED long long env_get_offset(long long defautl_offset) { -- 2.25.1