From: Amit Singh Tomar <amittomer25@gmail.com>
To: u-boot@lists.denx.de
Subject: [PATCH v11 02/13] arm: actions: rename sysmap-s900 to sysmap-owl
Date: Sun, 19 Apr 2020 19:28:26 +0530 [thread overview]
Message-ID: <1587304717-13322-3-git-send-email-amittomer25@gmail.com> (raw)
In-Reply-To: <1587304717-13322-1-git-send-email-amittomer25@gmail.com>
Now that memory maps(for both S700 and S900 SoCs) can be managed using
a common file, rename sysmap-s900 to sysmap-owl to reflect the same.
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Amit Singh Tomar <amittomer25@gmail.com>
---
Changes since v10:
* No change.
Changes since v9:
* No changes.
Changes since v8:
* No changes.
Changes since v7:
* No changes.
Changes since v6:
* No changes.
Changes since v5:
* No changes.
Changes since v4:
* No changes.
Changes since v3:
* Added reviewed-by tag.
Changes since v2:
* Fixed the commit message and header.
Changes since v1:
* compile sysmap-owl.c against CONFIG_ARM64 now.
---
arch/arm/mach-owl/Makefile | 2 +-
arch/arm/mach-owl/sysmap-owl.c | 32 ++++++++++++++++++++++++++++++++
arch/arm/mach-owl/sysmap-s900.c | 32 --------------------------------
3 files changed, 33 insertions(+), 33 deletions(-)
create mode 100644 arch/arm/mach-owl/sysmap-owl.c
delete mode 100644 arch/arm/mach-owl/sysmap-s900.c
diff --git a/arch/arm/mach-owl/Makefile b/arch/arm/mach-owl/Makefile
index 0b181c6..f3a69eb 100644
--- a/arch/arm/mach-owl/Makefile
+++ b/arch/arm/mach-owl/Makefile
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0+
obj-y += soc.o
-obj-y += sysmap-s900.o
+obj-$(CONFIG_ARM64) += sysmap-owl.o
diff --git a/arch/arm/mach-owl/sysmap-owl.c b/arch/arm/mach-owl/sysmap-owl.c
new file mode 100644
index 0000000..81f6ca2
--- /dev/null
+++ b/arch/arm/mach-owl/sysmap-owl.c
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Memory map for Actions Semi Owl series SoCs.
+ *
+ * Copyright (C) 2015 Actions Semi Co., Ltd.
+ * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+ */
+
+#include <common.h>
+#include <asm/armv8/mmu.h>
+
+static struct mm_region owl_mem_map[] = {
+ {
+ .virt = 0x0UL, /* DDR */
+ .phys = 0x0UL, /* DDR */
+ .size = 0x80000000UL,
+ .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
+ PTE_BLOCK_INNER_SHARE
+ }, {
+ .virt = 0xE0000000UL, /* Peripheral block */
+ .phys = 0xE0000000UL, /* Peripheral block */
+ .size = 0x08000000UL,
+ .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 = owl_mem_map;
diff --git a/arch/arm/mach-owl/sysmap-s900.c b/arch/arm/mach-owl/sysmap-s900.c
deleted file mode 100644
index f78b639..0000000
--- a/arch/arm/mach-owl/sysmap-s900.c
+++ /dev/null
@@ -1,32 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Actions Semi S900 Memory map
- *
- * Copyright (C) 2015 Actions Semi Co., Ltd.
- * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
- */
-
-#include <common.h>
-#include <asm/armv8/mmu.h>
-
-static struct mm_region s900_mem_map[] = {
- {
- .virt = 0x0UL, /* DDR */
- .phys = 0x0UL, /* DDR */
- .size = 0x80000000UL,
- .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
- PTE_BLOCK_INNER_SHARE
- }, {
- .virt = 0xE0000000UL, /* Peripheral block */
- .phys = 0xE0000000UL, /* Peripheral block */
- .size = 0x08000000UL,
- .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 = s900_mem_map;
--
2.7.4
next prev parent reply other threads:[~2020-04-19 13:58 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-19 13:58 [PATCH v11 00/13] Actions S700 SoC support Amit Singh Tomar
2020-04-19 13:58 ` [PATCH v11 01/13] arm: actions: Add common framework for Actions Owl Semi SoCs Amit Singh Tomar
2020-04-26 11:27 ` Tom Rini
2020-04-19 13:58 ` Amit Singh Tomar [this message]
2020-04-26 11:27 ` [PATCH v11 02/13] arm: actions: rename sysmap-s900 to sysmap-owl Tom Rini
2020-04-19 13:58 ` [PATCH v11 03/13] serial: actions: add compatible string Amit Singh Tomar
2020-04-26 11:27 ` Tom Rini
2020-04-19 13:58 ` [PATCH v11 04/13] arm: dts: sync dts for Action Semi S900 Amit Singh Tomar
2020-04-26 11:27 ` Tom Rini
2020-04-19 13:58 ` [PATCH v11 05/13] arm: dts: actions: s900: add u-boot specific dtsi file Amit Singh Tomar
2020-04-26 11:27 ` Tom Rini
2020-04-19 13:58 ` [PATCH v11 06/13] clk: actions: Add common clock driver Amit Singh Tomar
2020-04-26 11:28 ` Tom Rini
2020-04-19 13:58 ` [PATCH v11 07/13] arm: actions: add S700 SoC device tree Amit Singh Tomar
2020-04-26 11:28 ` Tom Rini
2020-04-19 13:58 ` [PATCH v11 08/13] arm: dts: actions: s700: add u-boot specific dtsi file Amit Singh Tomar
2020-04-26 11:28 ` Tom Rini
2020-04-19 13:58 ` [PATCH v11 09/13] arm: add support Actions Semi S700 Amit Singh Tomar
2020-04-26 11:28 ` Tom Rini
2020-04-19 13:58 ` [PATCH v11 10/13] actions: Move defconfig options to Kconfig Amit Singh Tomar
2020-04-26 11:28 ` Tom Rini
2020-04-19 13:58 ` [PATCH v11 11/13] arm: add Cubieboard7 board support Amit Singh Tomar
2020-04-26 11:28 ` Tom Rini
2020-04-19 13:58 ` [PATCH v11 12/13] doc: boards: add Cubieboard7 documentation Amit Singh Tomar
2020-04-26 11:28 ` Tom Rini
2020-04-19 13:58 ` [PATCH v11 13/13] MAINTAINERS: add entry for cubieboard7 config Amit Singh Tomar
2020-04-26 11:28 ` Tom Rini
2020-04-19 14:07 ` [PATCH v11 00/13] Actions S700 SoC support Amit Singh Tomar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1587304717-13322-3-git-send-email-amittomer25@gmail.com \
--to=amittomer25@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox