You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ra...@apache.org on 2024/02/04 08:54:12 UTC
(nuttx) 01/04: arch: Remove the identity mapping of up_addrenv_va_to_pa and up_addrenv_pa_to_va
This is an automated email from the ASF dual-hosted git repository.
raiden00 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 43d51cd4fc3a8a419ea507bfa6fa78f8c73657db
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Dec 17 18:22:21 2023 +0800
arch: Remove the identity mapping of up_addrenv_va_to_pa and up_addrenv_pa_to_va
and reuse the reuse the implementation from:
drivers/misc/addrenv.c
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/nrf53/nrf53_rptun.c | 40 ----------------------
arch/arm/src/stm32h7/stm32_rptun.c | 40 ----------------------
arch/risc-v/src/mpfs/mpfs_ihc.c | 40 ----------------------
.../configs/rpmsghci_bt_cpuapp/defconfig | 1 +
.../configs/rpmsghci_nimble_cpuapp/defconfig | 1 +
.../configs/rpmsghci_sdc_cpunet/defconfig | 1 +
.../nrf5340-dk/configs/rptun_cpuapp/defconfig | 1 +
.../nrf5340-dk/configs/rptun_cpunet/defconfig | 1 +
.../nucleo-h745zi/configs/nsh_cm4_rptun/defconfig | 1 +
.../nucleo-h745zi/configs/nsh_cm7_rptun/defconfig | 1 +
.../risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig | 1 +
.../risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig | 1 +
12 files changed, 9 insertions(+), 120 deletions(-)
diff --git a/arch/arm/src/nrf53/nrf53_rptun.c b/arch/arm/src/nrf53/nrf53_rptun.c
index b97c66d791..e5d23f91bf 100644
--- a/arch/arm/src/nrf53/nrf53_rptun.c
+++ b/arch/arm/src/nrf53/nrf53_rptun.c
@@ -533,43 +533,3 @@ int nrf53_rptun_init(const char *shmemname, const char *cpuname)
errout:
return ret;
}
-
-/****************************************************************************
- * Name: up_addrenv_va_to_pa
- *
- * Description:
- * This is needed by openamp/libmetal/lib/system/nuttx/io.c:78. The
- * physical memory is mapped as virtual.
- *
- * Input Parameters:
- * va_
- *
- * Returned Value:
- * va
- *
- ****************************************************************************/
-
-uintptr_t up_addrenv_va_to_pa(void *va)
-{
- return (uintptr_t)va;
-}
-
-/****************************************************************************
- * Name: up_addrenv_pa_to_va
- *
- * Description:
- * This is needed by openamp/libmetal/lib/system/nuttx/io.c. The
- * physical memory is mapped as virtual.
- *
- * Input Parameters:
- * pa
- *
- * Returned Value:
- * pa
- *
- ****************************************************************************/
-
-void *up_addrenv_pa_to_va(uintptr_t pa)
-{
- return (void *)pa;
-}
diff --git a/arch/arm/src/stm32h7/stm32_rptun.c b/arch/arm/src/stm32h7/stm32_rptun.c
index 818451f12e..54af43b782 100644
--- a/arch/arm/src/stm32h7/stm32_rptun.c
+++ b/arch/arm/src/stm32h7/stm32_rptun.c
@@ -527,43 +527,3 @@ int stm32_rptun_init(const char *shmemname, const char *cpuname)
errout:
return ret;
}
-
-/****************************************************************************
- * Name: up_addrenv_va_to_pa
- *
- * Description:
- * This is needed by openamp/libmetal/lib/system/nuttx/io.c:78. The
- * physical memory is mapped as virtual.
- *
- * Input Parameters:
- * va_
- *
- * Returned Value:
- * va
- *
- ****************************************************************************/
-
-uintptr_t up_addrenv_va_to_pa(void *va)
-{
- return (uintptr_t)va;
-}
-
-/****************************************************************************
- * Name: up_addrenv_pa_to_va
- *
- * Description:
- * This is needed by openamp/libmetal/lib/system/nuttx/io.c. The
- * physical memory is mapped as virtual.
- *
- * Input Parameters:
- * pa
- *
- * Returned Value:
- * pa
- *
- ****************************************************************************/
-
-void *up_addrenv_pa_to_va(uintptr_t pa)
-{
- return (void *)pa;
-}
diff --git a/arch/risc-v/src/mpfs/mpfs_ihc.c b/arch/risc-v/src/mpfs/mpfs_ihc.c
index e1823b2ab5..0084da7076 100644
--- a/arch/risc-v/src/mpfs/mpfs_ihc.c
+++ b/arch/risc-v/src/mpfs/mpfs_ihc.c
@@ -1467,43 +1467,3 @@ init_error:
up_disable_irq(g_plic_irq);
return ret;
}
-
-/****************************************************************************
- * Name: up_addrenv_va_to_pa
- *
- * Description:
- * This is needed by openamp/libmetal/lib/system/nuttx/io.c:78. The
- * physical memory is mapped as virtual.
- *
- * Input Parameters:
- * va_
- *
- * Returned Value:
- * va
- *
- ****************************************************************************/
-
-uintptr_t up_addrenv_va_to_pa(void *va)
-{
- return (uintptr_t)va;
-}
-
-/****************************************************************************
- * Name: up_addrenv_pa_to_va
- *
- * Description:
- * This is needed by openamp/libmetal/lib/system/nuttx/io.c. The
- * physical memory is mapped as virtual.
- *
- * Input Parameters:
- * pa
- *
- * Returned Value:
- * pa
- *
- ****************************************************************************/
-
-void *up_addrenv_pa_to_va(uintptr_t pa)
-{
- return (void *)pa;
-}
diff --git a/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_bt_cpuapp/defconfig b/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_bt_cpuapp/defconfig
index 06c2aae061..a179024c3e 100644
--- a/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_bt_cpuapp/defconfig
+++ b/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_bt_cpuapp/defconfig
@@ -23,6 +23,7 @@ CONFIG_BLUETOOTH_RPMSG=y
CONFIG_BOARD_LOOPSPERMSEC=5500
CONFIG_BTSAK=y
CONFIG_BUILTIN=y
+CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_BLUETOOTH=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_EXPERIMENTAL=y
diff --git a/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_nimble_cpuapp/defconfig b/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_nimble_cpuapp/defconfig
index 5a0d8fa8cd..ce5ac50a90 100644
--- a/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_nimble_cpuapp/defconfig
+++ b/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_nimble_cpuapp/defconfig
@@ -23,6 +23,7 @@ CONFIG_BLUETOOTH_MAX_CONN=2
CONFIG_BLUETOOTH_RPMSG=y
CONFIG_BOARD_LOOPSPERMSEC=5500
CONFIG_BUILTIN=y
+CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_BLUETOOTH=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_EXPERIMENTAL=y
diff --git a/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_sdc_cpunet/defconfig b/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_sdc_cpunet/defconfig
index 5c07e33436..376f1de4da 100644
--- a/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_sdc_cpunet/defconfig
+++ b/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_sdc_cpunet/defconfig
@@ -22,6 +22,7 @@ CONFIG_BOARDCTL=y
CONFIG_BOARDCTL_MKRD=y
CONFIG_BOARD_LATE_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=5500
+CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DRIVERS_BLUETOOTH=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_EXAMPLES_HELLO=y
diff --git a/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpuapp/defconfig b/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpuapp/defconfig
index 4076ef0fd1..dd661911ba 100644
--- a/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpuapp/defconfig
+++ b/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpuapp/defconfig
@@ -18,6 +18,7 @@ CONFIG_ARCH_CHIP_NRF53=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_STDARG_H=y
CONFIG_BOARD_LOOPSPERMSEC=5500
+CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
diff --git a/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpunet/defconfig b/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpunet/defconfig
index cc10d99420..d7e7830f07 100644
--- a/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpunet/defconfig
+++ b/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpunet/defconfig
@@ -18,6 +18,7 @@ CONFIG_ARCH_CHIP_NRF53=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_STDARG_H=y
CONFIG_BOARD_LOOPSPERMSEC=5500
+CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
diff --git a/boards/arm/stm32h7/nucleo-h745zi/configs/nsh_cm4_rptun/defconfig b/boards/arm/stm32h7/nucleo-h745zi/configs/nsh_cm4_rptun/defconfig
index 1ab9c3a729..49562d943e 100644
--- a/boards/arm/stm32h7/nucleo-h745zi/configs/nsh_cm4_rptun/defconfig
+++ b/boards/arm/stm32h7/nucleo-h745zi/configs/nsh_cm4_rptun/defconfig
@@ -21,6 +21,7 @@ CONFIG_BOARD_LOOPSPERMSEC=43103
CONFIG_BUILTIN=y
CONFIG_DEBUG_FEATURES=y
CONFIG_DEBUG_SYMBOLS=y
+CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/stm32h7/nucleo-h745zi/configs/nsh_cm7_rptun/defconfig b/boards/arm/stm32h7/nucleo-h745zi/configs/nsh_cm7_rptun/defconfig
index 28e1e82ac5..3375e07a23 100644
--- a/boards/arm/stm32h7/nucleo-h745zi/configs/nsh_cm7_rptun/defconfig
+++ b/boards/arm/stm32h7/nucleo-h745zi/configs/nsh_cm7_rptun/defconfig
@@ -25,6 +25,7 @@ CONFIG_ARM_MPU_NREGIONS=8
CONFIG_BOARD_LOOPSPERMSEC=43103
CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
+CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig
index 7544eb643f..d9c0ffe27a 100644
--- a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig
+++ b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig
@@ -27,6 +27,7 @@ CONFIG_DEBUG_ASSERTIONS=y
CONFIG_DEBUG_FEATURES=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
+CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DEV_ZERO=y
CONFIG_EXPERIMENTAL=y
CONFIG_FAT_LCNAMES=y
diff --git a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig
index edb2d0f4de..4a2d73e522 100644
--- a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig
+++ b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig
@@ -27,6 +27,7 @@ CONFIG_DEBUG_ASSERTIONS=y
CONFIG_DEBUG_FEATURES=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
+CONFIG_DEV_SIMPLE_ADDRENV=y
CONFIG_DEV_ZERO=y
CONFIG_EXPERIMENTAL=y
CONFIG_FAT_LCNAMES=y