diff options
| author | Tom Rini <trini@konsulko.com> | 2015-09-24 12:28:10 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-09-24 12:28:10 -0400 |
| commit | 1a9c229bf754c89f42b085451ad506693f326427 (patch) | |
| tree | 288106d7498591ac889fa972d0c24fc5c9b811f9 /arch/arm/imx-common/init.c | |
| parent | d0f30211e9823694c1c2c79f471dbe9d498a40fd (diff) | |
| parent | f697c2acca9ff02c9b0cf480a4a726ed9626a53a (diff) | |
| download | u-boot-imx-1a9c229bf754c89f42b085451ad506693f326427.zip u-boot-imx-1a9c229bf754c89f42b085451ad506693f326427.tar.gz u-boot-imx-1a9c229bf754c89f42b085451ad506693f326427.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/imx-common/init.c')
| -rw-r--r-- | arch/arm/imx-common/init.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/imx-common/init.c b/arch/arm/imx-common/init.c index 56d5010..15dab1d 100644 --- a/arch/arm/imx-common/init.c +++ b/arch/arm/imx-common/init.c @@ -44,8 +44,7 @@ void init_aips(void) writel(0x00000000, &aips2->opacr3); writel(0x00000000, &aips2->opacr4); - if (is_cpu_type(MXC_CPU_MX6SX) || is_soc_type(MXC_SOC_MX7)) - { + if (is_cpu_type(MXC_CPU_MX6SX) || is_soc_type(MXC_SOC_MX7)) { /* * Set all MPROTx to be non-bufferable, trusted for R/W, * not forced to user-mode. @@ -103,6 +102,7 @@ void init_src(void) writel(val, &src_regs->scr); } +#ifdef CONFIG_CMD_BMODE void boot_mode_apply(unsigned cfg_val) { unsigned reg; @@ -115,3 +115,4 @@ void boot_mode_apply(unsigned cfg_val) reg &= ~(1 << 28); writel(reg, &psrc->gpr10); } +#endif |