Eric Lee / smarc-uboot

12
Download as
Browse Code ยป

Commit 884cada50b9a9fcda09d259cf145d87a29122cac

Authored by Peng Fan
1 parent d37cfb9d07
Exists in smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga and in 5 other branches smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga

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>

Showing 4 changed files with 9 additions and 16 deletions Side-by-side Diff

arch/arm/dts/fsl-imx8qm-mek-xen.dts
Diff comments   View file @ 884cada
... ... @@ -14,14 +14,7 @@
14 14  
15 15 #include "fsl-imx8qm-mek.dts"
16 16  
17   -&usdhc1 {
18   - /* Need to be same as iomem for sdhc1 in domu.cfg */
19   - reg = <0x1 0x5b010000 0x0 0x10000>;
20   -};
21   -
22 17 &usdhc2 {
23   - /* Need to be same as iomem for sdhc2 in domu.cfg */
24   - reg = <0x1 0x5b020000 0x0 0x10000>;
25 18 status = "disabled";
26 19 };
27 20  
arch/arm/mach-imx/imx8/cpu.c
Diff comments   View file @ 884cada
... ... @@ -1547,12 +1547,12 @@
1547 1547 if (IS_ENABLED(CONFIG_XEN)) {
1548 1548 imx8_mem_map[0].virt = 0x00000000UL;
1549 1549 imx8_mem_map[0].phys = 0x00000000UL;
1550   - imx8_mem_map[0].size = 0x40000000UL;
  1550 + imx8_mem_map[0].size = 0x80000000UL;
1551 1551 imx8_mem_map[0].attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
1552 1552 PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN;
1553   - imx8_mem_map[1].virt = 0x40000000UL;
1554   - imx8_mem_map[1].phys = 0x40000000UL;
1555   - imx8_mem_map[1].size = 0xC0000000UL;
  1553 + imx8_mem_map[1].virt = 0x80000000UL;
  1554 + imx8_mem_map[1].phys = 0x80000000UL;
  1555 + imx8_mem_map[1].size = 0x80000000UL;
1556 1556 imx8_mem_map[1].attrs = (PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE);
1557 1557  
1558 1558 imx8_mem_map[2].virt = 0x100000000UL;
configs/imx8qm_mek_androidauto_xen_defconfig
Diff comments   View file @ 884cada
... ... @@ -3,7 +3,7 @@
3 3 CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek-xen"
4 4 CONFIG_SYS_EXTRA_OPTIONS="ANDROID_AUTO_SUPPORT"
5 5 CONFIG_TARGET_IMX8QM_MEK=y
6   -CONFIG_SYS_TEXT_BASE=0x40080000
  6 +CONFIG_SYS_TEXT_BASE=0x80080000
7 7 CONFIG_EFI_PARTITION=y
8 8 CONFIG_SYS_MALLOC_F_LEN=0x2000
9 9 CONFIG_DM=y
include/configs/imx8qm_mek_android_auto_xen.h
Diff comments   View file @ 884cada
... ... @@ -14,7 +14,7 @@
14 14 #undef PHYS_SDRAM_1_SIZE
15 15 #undef PHYS_SDRAM_2_SIZE
16 16  
17   -#define CONFIG_SYS_SDRAM_BASE 0x40000000
  17 +#define CONFIG_SYS_SDRAM_BASE 0x80000000
18 18 #define CONFIG_NR_DRAM_BANKS 2
19 19 #define PHYS_SDRAM_1 0x80000000
20 20 #define PHYS_SDRAM_2 0x200000000
21 21  
... ... @@ -22,9 +22,9 @@
22 22 #define PHYS_SDRAM_2_SIZE 0x60000000 /* 1536 MB */
23 23  
24 24 #undef CONFIG_LOADADDR
25   -#define CONFIG_LOADADDR 0x40280000
  25 +#define CONFIG_LOADADDR 0x80280000
26 26 #undef CONFIG_SYS_INIT_SP_ADDR
27   -#define CONFIG_SYS_INIT_SP_ADDR 0x40200000
  27 +#define CONFIG_SYS_INIT_SP_ADDR 0x80200000
28 28  
29 29 #undef CONFIG_REQUIRE_SERIAL_CONSOLE
30 30 #undef CONFIG_IMX_SMMU
... ... @@ -33,7 +33,7 @@
33 33 #define CONFIG_FASTBOOT_USB_DEV 0 /* Use OTG port, not typec port */
34 34  
35 35 /* This needs to be stay same in iomem in domu.cfg */
36   -#define SC_IPC_CH 0x15d1d0000
  36 +#define SC_IPC_CH 0x5d1d0000
37 37  
38 38 #define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED
39 39