68 lines
2.4 KiB
Diff
68 lines
2.4 KiB
Diff
|
From c6219d9997a6cf474ca45f53bc49c6436f2861d5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Samuel Holland <samuel@sholland.org>
|
||
|
|
Date: Sun, 13 Dec 2020 21:26:36 -0600
|
||
|
|
Subject: [PATCH 2/8] allwinner: Rename static mmap region constant
|
||
|
|
|
||
|
|
This constant specifically refers to the number of static mmap regions.
|
||
|
|
Rename it to make that clear.
|
||
|
|
|
||
|
|
Signed-off-by: Samuel Holland <samuel@sholland.org>
|
||
|
|
Change-Id: I475c037777ce2a10db2631ec0e7446bb73590a36
|
||
|
|
---
|
||
|
|
plat/allwinner/common/include/platform_def.h | 6 +++---
|
||
|
|
plat/allwinner/common/sunxi_common.c | 4 ++--
|
||
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/plat/allwinner/common/include/platform_def.h b/plat/allwinner/common/include/platform_def.h
|
||
|
|
index 4893368c2..fa0c0abfa 100644
|
||
|
|
--- a/plat/allwinner/common/include/platform_def.h
|
||
|
|
+++ b/plat/allwinner/common/include/platform_def.h
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
/*
|
||
|
|
- * Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved.
|
||
|
|
+ * Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved.
|
||
|
|
*
|
||
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
||
|
|
*/
|
||
|
|
@@ -52,7 +52,8 @@
|
||
|
|
#define CACHE_WRITEBACK_SHIFT 6
|
||
|
|
#define CACHE_WRITEBACK_GRANULE (1 << CACHE_WRITEBACK_SHIFT)
|
||
|
|
|
||
|
|
-#define MAX_MMAP_REGIONS (3 + PLATFORM_MMAP_REGIONS)
|
||
|
|
+#define MAX_STATIC_MMAP_REGIONS 5
|
||
|
|
+#define MAX_MMAP_REGIONS (3 + MAX_STATIC_MMAP_REGIONS)
|
||
|
|
|
||
|
|
#define PLAT_CSS_SCP_COM_SHARED_MEM_BASE \
|
||
|
|
(SUNXI_SRAM_A2_BASE + SUNXI_SRAM_A2_SIZE - 0x200)
|
||
|
|
@@ -72,7 +73,6 @@
|
||
|
|
#define PLATFORM_CORE_COUNT (PLATFORM_CLUSTER_COUNT * \
|
||
|
|
PLATFORM_MAX_CPUS_PER_CLUSTER)
|
||
|
|
#define PLATFORM_MAX_CPUS_PER_CLUSTER U(4)
|
||
|
|
-#define PLATFORM_MMAP_REGIONS 5
|
||
|
|
#define PLATFORM_STACK_SIZE (0x1000 / PLATFORM_CORE_COUNT)
|
||
|
|
|
||
|
|
#ifndef SPD_none
|
||
|
|
diff --git a/plat/allwinner/common/sunxi_common.c b/plat/allwinner/common/sunxi_common.c
|
||
|
|
index d47d3605b..9d1b3c1ea 100644
|
||
|
|
--- a/plat/allwinner/common/sunxi_common.c
|
||
|
|
+++ b/plat/allwinner/common/sunxi_common.c
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
/*
|
||
|
|
- * Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved.
|
||
|
|
+ * Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved.
|
||
|
|
*
|
||
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
||
|
|
*/
|
||
|
|
@@ -14,7 +14,7 @@
|
||
|
|
#include <sunxi_mmap.h>
|
||
|
|
#include <sunxi_private.h>
|
||
|
|
|
||
|
|
-static const mmap_region_t sunxi_mmap[PLATFORM_MMAP_REGIONS + 1] = {
|
||
|
|
+static const mmap_region_t sunxi_mmap[MAX_STATIC_MMAP_REGIONS + 1] = {
|
||
|
|
MAP_REGION_FLAT(SUNXI_SRAM_BASE, SUNXI_SRAM_SIZE,
|
||
|
|
MT_RW_DATA | MT_SECURE),
|
||
|
|
#ifdef SUNXI_SCP_BASE
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|