diff options
| author | Peng Fan <peng.fan@nxp.com> | 2018-09-12 14:32:27 +0800 |
|---|---|---|
| committer | Peng Fan <peng.fan@nxp.com> | 2018-09-12 15:34:49 +0800 |
| commit | 884cada50b9a9fcda09d259cf145d87a29122cac (patch) | |
| tree | 3d4df6b50a71892c2631936c0753ff20cb138fb9 | |
| parent | d37cfb9d07f77d35d06dc160f035dcf62de26fbb (diff) | |
MLK-19552 imx8qm: xen: fix memory map
Fixes 9486251ced24("MLK-19494 configs: imx8qm mek android audo: correct xen physical memory")
correct text base, IPC address, memmap.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
| -rw-r--r-- | arch/arm/dts/fsl-imx8qm-mek-xen.dts | 7 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx8/cpu.c | 8 | ||||
| -rw-r--r-- | configs/imx8qm_mek_androidauto_xen_defconfig | 2 | ||||
| -rw-r--r-- | include/configs/imx8qm_mek_android_auto_xen.h | 8 |
4 files changed, 9 insertions, 16 deletions
diff --git a/arch/arm/dts/fsl-imx8qm-mek-xen.dts b/arch/arm/dts/fsl-imx8qm-mek-xen.dts index f23b7683d5..50cb188803 100644 --- a/arch/arm/dts/fsl-imx8qm-mek-xen.dts +++ b/arch/arm/dts/fsl-imx8qm-mek-xen.dts @@ -14,14 +14,7 @@ #include "fsl-imx8qm-mek.dts" -&usdhc1 { - /* Need to be same as iomem for sdhc1 in domu.cfg */ - reg = <0x1 0x5b010000 0x0 0x10000>; -}; - &usdhc2 { - /* Need to be same as iomem for sdhc2 in domu.cfg */ - reg = <0x1 0x5b020000 0x0 0x10000>; status = "disabled"; }; diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index 2715596082..c0bcfb2028 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -1547,12 +1547,12 @@ void enable_caches(void) if (IS_ENABLED(CONFIG_XEN)) { imx8_mem_map[0].virt = 0x00000000UL; imx8_mem_map[0].phys = 0x00000000UL; - imx8_mem_map[0].size = 0x40000000UL; + imx8_mem_map[0].size = 0x80000000UL; imx8_mem_map[0].attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN; - imx8_mem_map[1].virt = 0x40000000UL; - imx8_mem_map[1].phys = 0x40000000UL; - imx8_mem_map[1].size = 0xC0000000UL; + imx8_mem_map[1].virt = 0x80000000UL; + imx8_mem_map[1].phys = 0x80000000UL; + imx8_mem_map[1].size = 0x80000000UL; imx8_mem_map[1].attrs = (PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE); imx8_mem_map[2].virt = 0x100000000UL; diff --git a/configs/imx8qm_mek_androidauto_xen_defconfig b/configs/imx8qm_mek_androidauto_xen_defconfig index 74b02da26b..1352874c48 100644 --- a/configs/imx8qm_mek_androidauto_xen_defconfig +++ b/configs/imx8qm_mek_androidauto_xen_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_IMX8=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-xen" CONFIG_SYS_EXTRA_OPTIONS="ANDROID_AUTO_SUPPORT" CONFIG_TARGET_IMX8QM_MEK=y -CONFIG_SYS_TEXT_BASE=0x40080000 +CONFIG_SYS_TEXT_BASE=0x80080000 CONFIG_EFI_PARTITION=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DM=y diff --git a/include/configs/imx8qm_mek_android_auto_xen.h b/include/configs/imx8qm_mek_android_auto_xen.h index 047651e445..86f836c6a4 100644 --- a/include/configs/imx8qm_mek_android_auto_xen.h +++ b/include/configs/imx8qm_mek_android_auto_xen.h @@ -14,7 +14,7 @@ #undef PHYS_SDRAM_1_SIZE #undef PHYS_SDRAM_2_SIZE -#define CONFIG_SYS_SDRAM_BASE 0x40000000 +#define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 0x80000000 #define PHYS_SDRAM_2 0x200000000 @@ -22,9 +22,9 @@ #define PHYS_SDRAM_2_SIZE 0x60000000 /* 1536 MB */ #undef CONFIG_LOADADDR -#define CONFIG_LOADADDR 0x40280000 +#define CONFIG_LOADADDR 0x80280000 #undef CONFIG_SYS_INIT_SP_ADDR -#define CONFIG_SYS_INIT_SP_ADDR 0x40200000 +#define CONFIG_SYS_INIT_SP_ADDR 0x80200000 #undef CONFIG_REQUIRE_SERIAL_CONSOLE #undef CONFIG_IMX_SMMU @@ -33,7 +33,7 @@ #define CONFIG_FASTBOOT_USB_DEV 0 /* Use OTG port, not typec port */ /* This needs to be stay same in iomem in domu.cfg */ -#define SC_IPC_CH 0x15d1d0000 +#define SC_IPC_CH 0x5d1d0000 #define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED |