054f8deb29
- enable build for one U-Boot image for RPi3/4 (rpiarm64) implements (jsc#59185) Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2019.10 * Patches added: 0014-fdt-fix-bcm283x-dm-pre-reloc-defini.patch 0015-arm-dts-bcm283x-Rename-U-Boot-file.patch 0016-drivers-bcm283x-Set-pre-location-fl.patch 0017-pinctrl-bcm283x-Add-compatible-for-.patch 0018-rpi-push-fw_dtb_pointer-in-the-.dat.patch 0019-ARM-bcm283x-Move-BCM283x_BASE-to-a-.patch 0020-ARM-bcm283x-Set-rpi_bcm283x_base-at.patch 0021-ARM-bcm283x-Set-memory-map-at-run-t.patch 0022-ARM-defconfig-add-unified-config-fo.patch - RPi3 delete text base hack in spec file OBS-URL: https://build.opensuse.org/request/show/750139 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=62
182 lines
4.4 KiB
Diff
182 lines
4.4 KiB
Diff
From 2954695f440f60b19f379e83b950031fcbacfb2f Mon Sep 17 00:00:00 2001
|
|
From: Matthias Brugger <mbrugger@suse.com>
|
|
Date: Tue, 19 Nov 2019 16:01:05 +0100
|
|
Subject: [PATCH] ARM: bcm283x: Set memory map at run-time
|
|
|
|
For bcm283x based on arm64 we also have to change the mm_region.
|
|
Add assign this in mach_cpu_init() so we can create now one binary
|
|
for RPi3 and RPi4.
|
|
|
|
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
|
|
---
|
|
arch/arm/mach-bcm283x/init.c | 92 ++++++++++++++++++++++++++++++++++++
|
|
board/raspberrypi/rpi/rpi.c | 45 ------------------
|
|
2 files changed, 92 insertions(+), 45 deletions(-)
|
|
|
|
diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
|
|
index b3f3dfabea..6fb41a99b2 100644
|
|
--- a/arch/arm/mach-bcm283x/init.c
|
|
+++ b/arch/arm/mach-bcm283x/init.c
|
|
@@ -10,6 +10,96 @@
|
|
#include <dm/device.h>
|
|
#include <fdt_support.h>
|
|
|
|
+#ifdef CONFIG_ARM64
|
|
+#include <asm/armv8/mmu.h>
|
|
+
|
|
+static struct mm_region bcm283x_mem_map[] = {
|
|
+ {
|
|
+ .virt = 0x00000000UL,
|
|
+ .phys = 0x00000000UL,
|
|
+ .size = 0x3f000000UL,
|
|
+ .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
|
|
+ PTE_BLOCK_INNER_SHARE
|
|
+ }, {
|
|
+ .virt = 0x3f000000UL,
|
|
+ .phys = 0x3f000000UL,
|
|
+ .size = 0x01000000UL,
|
|
+ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
|
|
+ PTE_BLOCK_NON_SHARE |
|
|
+ PTE_BLOCK_PXN | PTE_BLOCK_UXN
|
|
+ }, {
|
|
+ /* List terminator */
|
|
+ 0,
|
|
+ }
|
|
+};
|
|
+
|
|
+static struct mm_region bcm2711_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,
|
|
+ }
|
|
+};
|
|
+
|
|
+struct mm_region *mem_map = bcm283x_mem_map;
|
|
+
|
|
+/*
|
|
+ * I/O address space varies on different chip versions.
|
|
+ * We set the base address by inspecting the DTB.
|
|
+ */
|
|
+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},
|
|
+ { },
|
|
+};
|
|
+
|
|
+static void _rpi_update_mem_map(struct mm_region *pd)
|
|
+{
|
|
+ int i;
|
|
+
|
|
+ for (i = 0; i < 2; i++) {
|
|
+ mem_map[i].virt = pd[i].virt;
|
|
+ mem_map[i].phys = pd[i].phys;
|
|
+ mem_map[i].size = pd[i].size;
|
|
+ mem_map[i].attrs = pd[i].attrs;
|
|
+ }
|
|
+}
|
|
+
|
|
+static void rpi_update_mem_map(void)
|
|
+{
|
|
+ int ret;
|
|
+ struct mm_region *mm;
|
|
+ const struct udevice_id *of_match = board_ids;
|
|
+
|
|
+ while (of_match->compatible) {
|
|
+ ret = fdt_node_check_compatible(gd->fdt_blob, 0,
|
|
+ of_match->compatible);
|
|
+ if (!ret) {
|
|
+ mm = (struct mm_region *)of_match->data;
|
|
+ _rpi_update_mem_map(mm);
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ of_match++;
|
|
+ }
|
|
+}
|
|
+#else
|
|
+static void rpi_update_mem_map(void) {}
|
|
+#endif
|
|
+
|
|
unsigned long rpi_bcm283x_base = 0x3f000000;
|
|
|
|
int arch_cpu_init(void)
|
|
@@ -24,6 +114,8 @@ int mach_cpu_init(void)
|
|
int ret, soc_offset;
|
|
u64 io_base, size;
|
|
|
|
+ rpi_update_mem_map();
|
|
+
|
|
/* Get IO base from device tree */
|
|
soc_offset = fdt_path_offset(gd->fdt_blob, "/soc");
|
|
if (soc_offset < 0)
|
|
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
|
|
index e84a1db14a..3d4afaf653 100644
|
|
--- a/board/raspberrypi/rpi/rpi.c
|
|
+++ b/board/raspberrypi/rpi/rpi.c
|
|
@@ -251,51 +251,6 @@ static uint32_t rev_scheme;
|
|
static uint32_t rev_type;
|
|
static const struct rpi_model *model;
|
|
|
|
-#ifdef CONFIG_ARM64
|
|
-#ifndef CONFIG_BCM2711
|
|
-static struct mm_region bcm283x_mem_map[] = {
|
|
- {
|
|
- .virt = 0x00000000UL,
|
|
- .phys = 0x00000000UL,
|
|
- .size = 0x3f000000UL,
|
|
- .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
|
|
- PTE_BLOCK_INNER_SHARE
|
|
- }, {
|
|
- .virt = 0x3f000000UL,
|
|
- .phys = 0x3f000000UL,
|
|
- .size = 0x01000000UL,
|
|
- .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
|
|
- PTE_BLOCK_NON_SHARE |
|
|
- PTE_BLOCK_PXN | PTE_BLOCK_UXN
|
|
- }, {
|
|
- /* List terminator */
|
|
- 0,
|
|
- }
|
|
-};
|
|
-#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)
|
|
{
|
|
ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_arm_mem, msg, 1);
|