diff options
| author | Claudius Heine | 2019-10-29 13:08:43 +0100 |
|---|---|---|
| committer | Stefano Babic | 2019-11-03 17:04:16 +0100 |
| commit | e01c8cfe5769353f520fe99db80dd588fa357f44 (patch) | |
| tree | 69defa7fb6acccf609c440b455cdf092143a0f8c /arch/arm/mach-imx/init.c | |
| parent | 7f8a6a66af850a143c5524f703bcc726d43d43ef (diff) | |
ARM: imx: Fix bmode detection from grp10
imx6_is_bmode_from_gpr9 always returns false, because
IMX6_SRC_GPR10_BMODE is 1<<28 and gets casted to u8 on return.
This moves the function body into imx6_src_get_boot_mode, since that is the
only one using it and it is on the same abstraction level (accessing
registers directly).
Signed-off-by: Claudius Heine <ch@denx.de>
Diffstat (limited to 'arch/arm/mach-imx/init.c')
| -rw-r--r-- | arch/arm/mach-imx/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/init.c b/arch/arm/mach-imx/init.c index b8d8d123729..d18e3c740a2 100644 --- a/arch/arm/mach-imx/init.c +++ b/arch/arm/mach-imx/init.c @@ -118,7 +118,7 @@ void boot_mode_apply(unsigned cfg_val) #if defined(CONFIG_MX6) u32 imx6_src_get_boot_mode(void) { - if (imx6_is_bmode_from_gpr9()) + if (readl(&src_base->gpr10) & IMX6_SRC_GPR10_BMODE) return readl(&src_base->gpr9); else return readl(&src_base->sbmr1); |