LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Peng Fan 2018-09-12 14:32:27 +08:00
parent d37cfb9d07
commit 884cada50b
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/dts/fsl-imx8qm-mek-xen.dts
View File

@ -14,14 +14,7 @@
#include "fsl-imx8qm-mek.dts" #include "fsl-imx8qm-mek.dts"
&usdhc1 {
/* Need to be same as iomem for sdhc1 in domu.cfg */
reg = <0x1 0x5b010000 0x0 0x10000>;
};
&usdhc2 { &usdhc2 {
/* Need to be same as iomem for sdhc2 in domu.cfg */
reg = <0x1 0x5b020000 0x0 0x10000>;
status = "disabled"; status = "disabled";
}; };

8
arch/arm/mach-imx/imx8/cpu.c
View File

@ -1547,12 +1547,12 @@ void enable_caches(void)
if (IS_ENABLED(CONFIG_XEN)) { if (IS_ENABLED(CONFIG_XEN)) {
imx8_mem_map[0].virt = 0x00000000UL; imx8_mem_map[0].virt = 0x00000000UL;
imx8_mem_map[0].phys = 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) | imx8_mem_map[0].attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN; PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN;
imx8_mem_map[1].virt = 0x40000000UL; imx8_mem_map[1].virt = 0x80000000UL;
imx8_mem_map[1].phys = 0x40000000UL; imx8_mem_map[1].phys = 0x80000000UL;
imx8_mem_map[1].size = 0xC0000000UL; imx8_mem_map[1].size = 0x80000000UL;
imx8_mem_map[1].attrs = (PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE); imx8_mem_map[1].attrs = (PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE);
imx8_mem_map[2].virt = 0x100000000UL; imx8_mem_map[2].virt = 0x100000000UL;

2
configs/imx8qm_mek_androidauto_xen_defconfig
View File

@ -3,7 +3,7 @@ CONFIG_ARCH_IMX8=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-xen" CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-xen"
CONFIG_SYS_EXTRA_OPTIONS="ANDROID_AUTO_SUPPORT" CONFIG_SYS_EXTRA_OPTIONS="ANDROID_AUTO_SUPPORT"
CONFIG_TARGET_IMX8QM_MEK=y CONFIG_TARGET_IMX8QM_MEK=y
CONFIG_SYS_TEXT_BASE=0x40080000 CONFIG_SYS_TEXT_BASE=0x80080000
CONFIG_EFI_PARTITION=y CONFIG_EFI_PARTITION=y
CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_DM=y CONFIG_DM=y

8
include/configs/imx8qm_mek_android_auto_xen.h
View File

@ -14,7 +14,7 @@
#undef PHYS_SDRAM_1_SIZE #undef PHYS_SDRAM_1_SIZE
#undef PHYS_SDRAM_2_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 CONFIG_NR_DRAM_BANKS 2
#define PHYS_SDRAM_1 0x80000000 #define PHYS_SDRAM_1 0x80000000
#define PHYS_SDRAM_2 0x200000000 #define PHYS_SDRAM_2 0x200000000
@ -22,9 +22,9 @@
#define PHYS_SDRAM_2_SIZE 0x60000000 /* 1536 MB */ #define PHYS_SDRAM_2_SIZE 0x60000000 /* 1536 MB */
#undef CONFIG_LOADADDR #undef CONFIG_LOADADDR
#define CONFIG_LOADADDR 0x40280000 #define CONFIG_LOADADDR 0x80280000
#undef CONFIG_SYS_INIT_SP_ADDR #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_REQUIRE_SERIAL_CONSOLE
#undef CONFIG_IMX_SMMU #undef CONFIG_IMX_SMMU
@ -33,7 +33,7 @@
#define CONFIG_FASTBOOT_USB_DEV 0 /* Use OTG port, not typec port */ #define CONFIG_FASTBOOT_USB_DEV 0 /* Use OTG port, not typec port */
/* This needs to be stay same in iomem in domu.cfg */ /* 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 #define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED