diff options
| author | Peng Fan <peng.fan@nxp.com> | 2018-06-12 16:07:24 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-06-13 22:03:30 -0700 |
| commit | c2ba2460d8985aa0b084f7beef2d0bc8773d90e3 (patch) | |
| tree | aad91a704f1f892ea216d7523f3e86106e25d963 /arch/arm/include | |
| parent | 695ae513cdf6c671cda5c32e4a2974e3119450d0 (diff) | |
MLK-18577-5 imx8: update soc code to support uboot in XEN VM
Update SOC code to support U-Boot in a XEN VM. Currently
we only support to boot android using uboot in a VM,
so there is hardcode that using MMC1_BOOT boot.
There are a few small fixes included.
For the mmu configuration, the mem map is used from xen
guest VM and our iomem space in vm cfg file.
The VM use a different MU, so use a wrap for SC_IPC_CH.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 533087bc1bce0c35fead0956b0613971862c280f)
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/mach-imx/sci/sci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/mach-imx/sci/sci.h b/arch/arm/include/asm/mach-imx/sci/sci.h index dad3907ac5..717741bffe 100644 --- a/arch/arm/include/asm/mach-imx/sci/sci.h +++ b/arch/arm/include/asm/mach-imx/sci/sci.h @@ -38,7 +38,9 @@ #define SC_IPC_AP_CH3 (MU_BASE_ADDR(3)) #define SC_IPC_AP_CH4 (MU_BASE_ADDR(4)) +#ifndef SC_IPC_CH #define SC_IPC_CH SC_IPC_AP_CH1 +#endif /* Types */ |