summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/dts/fsl-imx8qm-mek-xen.dts7
-rw-r--r--arch/arm/mach-imx/imx8/cpu.c8
2 files changed, 4 insertions, 11 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;