diff --git a/arch/arm/src/nrf53/nrf53_rptun.c b/arch/arm/src/nrf53/nrf53_rptun.c index 3f4fb1b4c20..ca20fa802f7 100644 --- a/arch/arm/src/nrf53/nrf53_rptun.c +++ b/arch/arm/src/nrf53/nrf53_rptun.c @@ -528,3 +528,43 @@ 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/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_bt_cpuapp/defconfig b/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_bt_cpuapp/defconfig index 3501b86747b..3cb64134b05 100644 --- a/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_bt_cpuapp/defconfig +++ b/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_bt_cpuapp/defconfig @@ -23,7 +23,6 @@ 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 5eaf8c87c0b..968bc25f1f2 100644 --- a/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_nimble_cpuapp/defconfig +++ b/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_nimble_cpuapp/defconfig @@ -23,7 +23,6 @@ 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 52c2e0dc5a4..79caf2728de 100644 --- a/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_sdc_cpunet/defconfig +++ b/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_sdc_cpunet/defconfig @@ -22,7 +22,6 @@ 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 027a2bb6995..54c67d60cb5 100644 --- a/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpuapp/defconfig +++ b/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpuapp/defconfig @@ -18,7 +18,6 @@ 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 df5404ae67e..df5a41632b4 100644 --- a/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpunet/defconfig +++ b/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpunet/defconfig @@ -18,7 +18,6 @@ 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