From 12f9b4d08628c75a02f68a45eb8193efbe8ebb2f Mon Sep 17 00:00:00 2001 From: Harald Seiler Date: Wed, 1 Dec 2021 10:11:47 +0100 Subject: [PATCH] mx6: Use imx6_src_get_boot_mode() to check boot device Use imx6_src_get_boot_mode() instead of manually reading SBMR1. The existing function has proper handling for software overrides of the bootdevice which can happen, for example, when booting from an alternate source using `bmode`. Signed-off-by: Harald Seiler Reviewed-by: Fabio Estevam --- arch/arm/mach-imx/mx6/soc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index aacfc854a2..bc56ef2b0b 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -498,8 +498,7 @@ __weak int board_mmc_get_env_dev(int devno) static int mmc_get_boot_dev(void) { - struct src *src_regs = (struct src *)SRC_BASE_ADDR; - u32 soc_sbmr = readl(&src_regs->sbmr1); + u32 soc_sbmr = imx6_src_get_boot_mode(); u32 bootsel; int devno; -- 2.39.5