forked from pool/u-boot
Guillaume GARDET
c8ce9a56ae
- Remove ls1012afrdmqspi flavor since it has been removed upstream with commit b60274e6900ed1b08ad41f6d7fdebb2726ded108 - Update to 2024.01 OBS-URL: https://build.opensuse.org/request/show/1138155 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=203
80 lines
2.3 KiB
Diff
80 lines
2.3 KiB
Diff
From c9b27f8112c5d5fb545f49b5f6040ecdf4f60821 Mon Sep 17 00:00:00 2001
|
|
From: Dmitry Malkin <dmitry@bedrocksystems.com>
|
|
Date: Fri, 8 Dec 2023 17:31:10 +0200
|
|
Subject: [PATCH] rpi5: add initial memory map for bcm2712
|
|
|
|
includes:
|
|
* 1GB of RAM (from 4GB or 8GB total)
|
|
* VPU memory interface
|
|
* AXI ranges (main peripherals)
|
|
|
|
Signed-off-by: Dmitry Malkin <dmitry@bedrocksystems.com>
|
|
Signed-off-by: Ivan T. Ivanov <iivanov@suse.de>
|
|
---
|
|
arch/arm/mach-bcm283x/init.c | 38 +++++++++++++++++++++++++++++++++++-
|
|
1 file changed, 37 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
|
|
index 7265faf6ce..af23b9711a 100644
|
|
--- a/arch/arm/mach-bcm283x/init.c
|
|
+++ b/arch/arm/mach-bcm283x/init.c
|
|
@@ -19,7 +19,7 @@
|
|
#ifdef CONFIG_ARM64
|
|
#include <asm/armv8/mmu.h>
|
|
|
|
-#define MEM_MAP_MAX_ENTRIES (4)
|
|
+#define MEM_MAP_MAX_ENTRIES (5)
|
|
|
|
static struct mm_region bcm283x_mem_map[MEM_MAP_MAX_ENTRIES] = {
|
|
{
|
|
@@ -68,6 +68,41 @@ static struct mm_region bcm2711_mem_map[MEM_MAP_MAX_ENTRIES] = {
|
|
}
|
|
};
|
|
|
|
+static struct mm_region bcm2712_mem_map[MEM_MAP_MAX_ENTRIES] = {
|
|
+ {
|
|
+ .virt = 0x00000000UL,
|
|
+ .phys = 0x00000000UL,
|
|
+ .size = 0x3f800000UL,
|
|
+ .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
|
|
+ PTE_BLOCK_INNER_SHARE
|
|
+ }, {
|
|
+ .virt = 0x3f800000UL,
|
|
+ .phys = 0x3f800000UL,
|
|
+ .size = 0x00800000UL,
|
|
+ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
|
|
+ PTE_BLOCK_NON_SHARE |
|
|
+ PTE_BLOCK_PXN | PTE_BLOCK_UXN
|
|
+ }, {
|
|
+ /* Beginning of AXI bus where uSD controller lives */
|
|
+ .virt = 0x1000000000UL,
|
|
+ .phys = 0x1000000000UL,
|
|
+ .size = 0x0002000000UL,
|
|
+ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
|
|
+ PTE_BLOCK_NON_SHARE |
|
|
+ PTE_BLOCK_PXN | PTE_BLOCK_UXN
|
|
+ }, {
|
|
+ .virt = 0x107c000000UL,
|
|
+ .phys = 0x107c000000UL,
|
|
+ .size = 0x0004000000UL,
|
|
+ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
|
|
+ PTE_BLOCK_NON_SHARE |
|
|
+ PTE_BLOCK_PXN | PTE_BLOCK_UXN
|
|
+ }, {
|
|
+ /* List terminator */
|
|
+ 0,
|
|
+ }
|
|
+};
|
|
+
|
|
struct mm_region *mem_map = bcm283x_mem_map;
|
|
|
|
/*
|
|
@@ -78,6 +113,7 @@ static const struct udevice_id board_ids[] = {
|
|
{ .compatible = "brcm,bcm2837", .data = (ulong)&bcm283x_mem_map},
|
|
{ .compatible = "brcm,bcm2838", .data = (ulong)&bcm2711_mem_map},
|
|
{ .compatible = "brcm,bcm2711", .data = (ulong)&bcm2711_mem_map},
|
|
+ { .compatible = "brcm,bcm2712", .data = (ulong)&bcm2712_mem_map},
|
|
{ },
|
|
};
|
|
|