OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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 <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2023-12-17 18:22:21 +08:00 committed by Mateusz Szafoni
parent 73ecd741e7
commit 43d51cd4fc
12 changed files with 9 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
arch/arm/src/nrf53/nrf53_rptun.c
View File

@ -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;
}

40
arch/arm/src/stm32h7/stm32_rptun.c
View File

@ -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;
}

40
arch/risc-v/src/mpfs/mpfs_ihc.c
View File

@ -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;
}

1
boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_bt_cpuapp/defconfig
View File

@ -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

1
boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_nimble_cpuapp/defconfig
View File

@ -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

1
boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_sdc_cpunet/defconfig
View File

@ -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

1
boards/arm/nrf53/nrf5340-dk/configs/rptun_cpuapp/defconfig
View File

@ -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

1
boards/arm/nrf53/nrf5340-dk/configs/rptun_cpunet/defconfig
View File

@ -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

1
boards/arm/stm32h7/nucleo-h745zi/configs/nsh_cm4_rptun/defconfig
View File

@ -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"

1
boards/arm/stm32h7/nucleo-h745zi/configs/nsh_cm7_rptun/defconfig
View File

@ -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"

1
boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig
View File

@ -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

1
boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig
View File

@ -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