mirror of
https://github.com/apache/nuttx.git
synced 2026-06-01 16:59:28 +08:00
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:
committed by
Mateusz Szafoni
parent
73ecd741e7
commit
43d51cd4fc
@@ -533,43 +533,3 @@ int nrf53_rptun_init(const char *shmemname, const char *cpuname)
|
|||||||
errout:
|
errout:
|
||||||
return ret;
|
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;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -527,43 +527,3 @@ int stm32_rptun_init(const char *shmemname, const char *cpuname)
|
|||||||
errout:
|
errout:
|
||||||
return ret;
|
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;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1467,43 +1467,3 @@ init_error:
|
|||||||
up_disable_irq(g_plic_irq);
|
up_disable_irq(g_plic_irq);
|
||||||
return ret;
|
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;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ CONFIG_BLUETOOTH_RPMSG=y
|
|||||||
CONFIG_BOARD_LOOPSPERMSEC=5500
|
CONFIG_BOARD_LOOPSPERMSEC=5500
|
||||||
CONFIG_BTSAK=y
|
CONFIG_BTSAK=y
|
||||||
CONFIG_BUILTIN=y
|
CONFIG_BUILTIN=y
|
||||||
|
CONFIG_DEV_SIMPLE_ADDRENV=y
|
||||||
CONFIG_DRIVERS_BLUETOOTH=y
|
CONFIG_DRIVERS_BLUETOOTH=y
|
||||||
CONFIG_DRIVERS_WIRELESS=y
|
CONFIG_DRIVERS_WIRELESS=y
|
||||||
CONFIG_EXPERIMENTAL=y
|
CONFIG_EXPERIMENTAL=y
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ CONFIG_BLUETOOTH_MAX_CONN=2
|
|||||||
CONFIG_BLUETOOTH_RPMSG=y
|
CONFIG_BLUETOOTH_RPMSG=y
|
||||||
CONFIG_BOARD_LOOPSPERMSEC=5500
|
CONFIG_BOARD_LOOPSPERMSEC=5500
|
||||||
CONFIG_BUILTIN=y
|
CONFIG_BUILTIN=y
|
||||||
|
CONFIG_DEV_SIMPLE_ADDRENV=y
|
||||||
CONFIG_DRIVERS_BLUETOOTH=y
|
CONFIG_DRIVERS_BLUETOOTH=y
|
||||||
CONFIG_DRIVERS_WIRELESS=y
|
CONFIG_DRIVERS_WIRELESS=y
|
||||||
CONFIG_EXPERIMENTAL=y
|
CONFIG_EXPERIMENTAL=y
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ CONFIG_BOARDCTL=y
|
|||||||
CONFIG_BOARDCTL_MKRD=y
|
CONFIG_BOARDCTL_MKRD=y
|
||||||
CONFIG_BOARD_LATE_INITIALIZE=y
|
CONFIG_BOARD_LATE_INITIALIZE=y
|
||||||
CONFIG_BOARD_LOOPSPERMSEC=5500
|
CONFIG_BOARD_LOOPSPERMSEC=5500
|
||||||
|
CONFIG_DEV_SIMPLE_ADDRENV=y
|
||||||
CONFIG_DRIVERS_BLUETOOTH=y
|
CONFIG_DRIVERS_BLUETOOTH=y
|
||||||
CONFIG_DRIVERS_WIRELESS=y
|
CONFIG_DRIVERS_WIRELESS=y
|
||||||
CONFIG_EXAMPLES_HELLO=y
|
CONFIG_EXAMPLES_HELLO=y
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ CONFIG_ARCH_CHIP_NRF53=y
|
|||||||
CONFIG_ARCH_STACKDUMP=y
|
CONFIG_ARCH_STACKDUMP=y
|
||||||
CONFIG_ARCH_STDARG_H=y
|
CONFIG_ARCH_STDARG_H=y
|
||||||
CONFIG_BOARD_LOOPSPERMSEC=5500
|
CONFIG_BOARD_LOOPSPERMSEC=5500
|
||||||
|
CONFIG_DEV_SIMPLE_ADDRENV=y
|
||||||
CONFIG_EXPERIMENTAL=y
|
CONFIG_EXPERIMENTAL=y
|
||||||
CONFIG_INIT_ENTRYPOINT="nsh_main"
|
CONFIG_INIT_ENTRYPOINT="nsh_main"
|
||||||
CONFIG_INTELHEX_BINARY=y
|
CONFIG_INTELHEX_BINARY=y
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ CONFIG_ARCH_CHIP_NRF53=y
|
|||||||
CONFIG_ARCH_STACKDUMP=y
|
CONFIG_ARCH_STACKDUMP=y
|
||||||
CONFIG_ARCH_STDARG_H=y
|
CONFIG_ARCH_STDARG_H=y
|
||||||
CONFIG_BOARD_LOOPSPERMSEC=5500
|
CONFIG_BOARD_LOOPSPERMSEC=5500
|
||||||
|
CONFIG_DEV_SIMPLE_ADDRENV=y
|
||||||
CONFIG_EXPERIMENTAL=y
|
CONFIG_EXPERIMENTAL=y
|
||||||
CONFIG_INIT_ENTRYPOINT="nsh_main"
|
CONFIG_INIT_ENTRYPOINT="nsh_main"
|
||||||
CONFIG_INTELHEX_BINARY=y
|
CONFIG_INTELHEX_BINARY=y
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ CONFIG_BOARD_LOOPSPERMSEC=43103
|
|||||||
CONFIG_BUILTIN=y
|
CONFIG_BUILTIN=y
|
||||||
CONFIG_DEBUG_FEATURES=y
|
CONFIG_DEBUG_FEATURES=y
|
||||||
CONFIG_DEBUG_SYMBOLS=y
|
CONFIG_DEBUG_SYMBOLS=y
|
||||||
|
CONFIG_DEV_SIMPLE_ADDRENV=y
|
||||||
CONFIG_HAVE_CXX=y
|
CONFIG_HAVE_CXX=y
|
||||||
CONFIG_HAVE_CXXINITIALIZE=y
|
CONFIG_HAVE_CXXINITIALIZE=y
|
||||||
CONFIG_INIT_ENTRYPOINT="nsh_main"
|
CONFIG_INIT_ENTRYPOINT="nsh_main"
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ CONFIG_ARM_MPU_NREGIONS=8
|
|||||||
CONFIG_BOARD_LOOPSPERMSEC=43103
|
CONFIG_BOARD_LOOPSPERMSEC=43103
|
||||||
CONFIG_BUILTIN=y
|
CONFIG_BUILTIN=y
|
||||||
CONFIG_DEBUG_SYMBOLS=y
|
CONFIG_DEBUG_SYMBOLS=y
|
||||||
|
CONFIG_DEV_SIMPLE_ADDRENV=y
|
||||||
CONFIG_HAVE_CXX=y
|
CONFIG_HAVE_CXX=y
|
||||||
CONFIG_HAVE_CXXINITIALIZE=y
|
CONFIG_HAVE_CXXINITIALIZE=y
|
||||||
CONFIG_INIT_ENTRYPOINT="nsh_main"
|
CONFIG_INIT_ENTRYPOINT="nsh_main"
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ CONFIG_DEBUG_ASSERTIONS=y
|
|||||||
CONFIG_DEBUG_FEATURES=y
|
CONFIG_DEBUG_FEATURES=y
|
||||||
CONFIG_DEBUG_FULLOPT=y
|
CONFIG_DEBUG_FULLOPT=y
|
||||||
CONFIG_DEBUG_SYMBOLS=y
|
CONFIG_DEBUG_SYMBOLS=y
|
||||||
|
CONFIG_DEV_SIMPLE_ADDRENV=y
|
||||||
CONFIG_DEV_ZERO=y
|
CONFIG_DEV_ZERO=y
|
||||||
CONFIG_EXPERIMENTAL=y
|
CONFIG_EXPERIMENTAL=y
|
||||||
CONFIG_FAT_LCNAMES=y
|
CONFIG_FAT_LCNAMES=y
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ CONFIG_DEBUG_ASSERTIONS=y
|
|||||||
CONFIG_DEBUG_FEATURES=y
|
CONFIG_DEBUG_FEATURES=y
|
||||||
CONFIG_DEBUG_FULLOPT=y
|
CONFIG_DEBUG_FULLOPT=y
|
||||||
CONFIG_DEBUG_SYMBOLS=y
|
CONFIG_DEBUG_SYMBOLS=y
|
||||||
|
CONFIG_DEV_SIMPLE_ADDRENV=y
|
||||||
CONFIG_DEV_ZERO=y
|
CONFIG_DEV_ZERO=y
|
||||||
CONFIG_EXPERIMENTAL=y
|
CONFIG_EXPERIMENTAL=y
|
||||||
CONFIG_FAT_LCNAMES=y
|
CONFIG_FAT_LCNAMES=y
|
||||||
|
|||||||
Reference in New Issue
Block a user