mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-19 12:59:03 +02:00
c33649a678
The upstream branch might suffer rebases due to effort of pushing the patches upstream. To avoid issues, let's have here the patches we need for RPi 4 support. Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
60 lines
1.5 KiB
Diff
60 lines
1.5 KiB
Diff
From ab0137601cea84296f607da22d27f0bbf1265e1a Mon Sep 17 00:00:00 2001
|
|
From: Andrei Gherzan <andrei@balena.io>
|
|
Date: Fri, 12 Jul 2019 14:27:31 +0100
|
|
Subject: [PATCH 11/12] rpi: Add memory map for bcm2838
|
|
|
|
Signed-off-by: Andrei Gherzan <andrei@balena.io>
|
|
Upstream-status: Pending
|
|
---
|
|
board/raspberrypi/rpi/rpi.c | 27 ++++++++++++++++++++++++---
|
|
1 file changed, 24 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
|
|
index 6d6f1ef39a..1c4fae9166 100644
|
|
--- a/board/raspberrypi/rpi/rpi.c
|
|
+++ b/board/raspberrypi/rpi/rpi.c
|
|
@@ -249,7 +249,8 @@ static uint32_t rev_type;
|
|
static const struct rpi_model *model;
|
|
|
|
#ifdef CONFIG_ARM64
|
|
-static struct mm_region bcm2837_mem_map[] = {
|
|
+#ifndef CONFIG_BCM2838
|
|
+static struct mm_region bcm283x_mem_map[] = {
|
|
{
|
|
.virt = 0x00000000UL,
|
|
.phys = 0x00000000UL,
|
|
@@ -268,8 +269,28 @@ static struct mm_region bcm2837_mem_map[] = {
|
|
0,
|
|
}
|
|
};
|
|
-
|
|
-struct mm_region *mem_map = bcm2837_mem_map;
|
|
+#else
|
|
+static struct mm_region bcm283x_mem_map[] = {
|
|
+ {
|
|
+ .virt = 0x00000000UL,
|
|
+ .phys = 0x00000000UL,
|
|
+ .size = 0xfe000000UL,
|
|
+ .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
|
|
+ PTE_BLOCK_INNER_SHARE
|
|
+ }, {
|
|
+ .virt = 0xfe000000UL,
|
|
+ .phys = 0xfe000000UL,
|
|
+ .size = 0x01800000UL,
|
|
+ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
|
|
+ PTE_BLOCK_NON_SHARE |
|
|
+ PTE_BLOCK_PXN | PTE_BLOCK_UXN
|
|
+ }, {
|
|
+ /* List terminator */
|
|
+ 0,
|
|
+ }
|
|
+};
|
|
+#endif
|
|
+struct mm_region *mem_map = bcm283x_mem_map;
|
|
#endif
|
|
|
|
int dram_init(void)
|
|
--
|
|
2.22.0
|
|
|