diff options
| author | Tom Rini <[email protected]> | 2026-03-12 07:45:29 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-03-12 07:45:29 -0600 |
| commit | 9f1059bc735ec2a8d78c1f3e4fcab1fa3f428317 (patch) | |
| tree | 19467af2033fbdb4fa7a262e427dc76b58d00e1e /arch | |
| parent | 8bc2a5196c1c0bb5dbdaca073323da0015a0de37 (diff) | |
| parent | 05677fedd6fc7716a9b2366b3f19d32c80bfbfd5 (diff) | |
Merge tag 'mediatek-for-next-2026-03-11' of https://source.denx.de/u-boot/custodians/u-boot-mediatek into next
A fix:
* Fixing compiling MT8195 due to some independent changes that were applied
around the same time as MT8195 support was merged. (CI would not have caught
this since we didn't have a defconfig until now).
And few small features:
* New defconfig for MT8395/Genio 1200 EVK.
* pinctrl support for MT8189-compatible SoCs.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mediatek/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mediatek/mt8195/init.c | 21 |
2 files changed, 1 insertions, 22 deletions
diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig index 8da4ba5ceab..671a6cb1cad 100644 --- a/arch/arm/mach-mediatek/Kconfig +++ b/arch/arm/mach-mediatek/Kconfig @@ -149,7 +149,7 @@ config MTK_MEM_MAP_DDR_BASE_PHY config MTK_MEM_MAP_DDR_SIZE hex "DDR .size in mem_map" - default 0x200000000 if TARGET_MT7987 || TARGET_MT7988 || TARGET_MT8188 + default 0x200000000 if TARGET_MT7987 || TARGET_MT7988 || TARGET_MT8188 || TARGET_MT8195 default 0xc0000000 if TARGET_MT8365 default 0x80000000 if TARGET_MT7981 || TARGET_MT7986 || TARGET_MT8183 default 0x40000000 if TARGET_MT7622 || TARGET_MT8512 diff --git a/arch/arm/mach-mediatek/mt8195/init.c b/arch/arm/mach-mediatek/mt8195/init.c index c399550b8fc..0f68c589e9a 100644 --- a/arch/arm/mach-mediatek/mt8195/init.c +++ b/arch/arm/mach-mediatek/mt8195/init.c @@ -68,24 +68,3 @@ int print_cpuinfo(void) printf("CPU: MediaTek MT8195\n"); return 0; } - -static struct mm_region mt8195_mem_map[] = { - { - /* DDR */ - .virt = 0x40000000UL, - .phys = 0x40000000UL, - .size = 0x200000000UL, - .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE, - }, { - .virt = 0x00000000UL, - .phys = 0x00000000UL, - .size = 0x20000000UL, - .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | - PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, { - 0, - } -}; - -struct mm_region *mem_map = mt8195_mem_map; |