diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-04 12:57:41 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-04 12:57:41 -0500 |
| commit | 73b6e6ad254b36763419cdd3fdf406c0094517b7 (patch) | |
| tree | f432e1b568809834c52389b5075815700bc68026 /arch/arm/mach-imx/init.c | |
| parent | 3b02d614b429442333ec3d82eef0bba527be4f8c (diff) | |
| parent | ae8a53ece0ff3b1ed686c3e0af14e59973d25db8 (diff) | |
Merge tag 'u-boot-imx-20191104' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-20191104
-------------------
- i.MX NAND: nandbcb support for MX6UL / i.MX7
- i.MX8: support for HAB
- Convert to DM (opos6ul, mccmon6)
- Toradex i.MX6ull colibri
- sync DTS with kernel
Travis : https://travis-ci.org/sbabic/u-boot-imx/builds/606853416
Diffstat (limited to 'arch/arm/mach-imx/init.c')
| -rw-r--r-- | arch/arm/mach-imx/init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/init.c b/arch/arm/mach-imx/init.c index b8d8d123729..693b7244299 100644 --- a/arch/arm/mach-imx/init.c +++ b/arch/arm/mach-imx/init.c @@ -108,9 +108,9 @@ void boot_mode_apply(unsigned cfg_val) writel(cfg_val, &psrc->gpr9); reg = readl(&psrc->gpr10); if (cfg_val) - reg |= 1 << 28; + reg |= IMX6_SRC_GPR10_BMODE; else - reg &= ~(1 << 28); + reg &= ~IMX6_SRC_GPR10_BMODE; writel(reg, &psrc->gpr10); } #endif @@ -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); |