sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/nrf91: modem shmem always at the RAM start

Browse Source
This commit is contained in:
raiden00pl 2023-07-08 12:15:10 +02:00 committed by Alan Carvalho de Assis
parent 88bc4cb1a0
commit bbabcf3c78
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/nrf91/nrf91_modem.h
View File

@ -34,7 +34,7 @@
/* Shared memory configuration */
#define NRF91_SHMEM_START_ADDR (0x20000000)
#define NRF91_SHMEM_START_ADDR (CONFIG_RAM_START)
#define NRF91_SHMEM_CTRL_BASE (NRF91_SHMEM_START_ADDR)
#define NRF91_SHMEM_TX_BASE (NRF91_SHMEM_CTRL_BASE+NRF91_SHMEM_CTRL_SIZE)
#define NRF91_SHMEM_TX_SIZE (CONFIG_NRF91_MODEM_SHMEM_TX_SIZE)

10
boards/arm/nrf91/common/scripts/flash_app.ld
View File

@ -20,6 +20,12 @@
#include <nuttx/config.h>
/* CONFIG_RAM_SIZE includes SHMEM and FIRC_RAM */
#if CONFIG_RAM_SIZE > CONFIG_NRF91_CPUAPP_MEM_RAM_SIZE
# error Invalid CONFIG_RAM_SIZE
#endif
/* Shared memory configuration */
#ifdef CONFIG_NRF91_MODEM_SHMEM_SIZE
@ -31,7 +37,7 @@
/* FLASH and RAM start */
#define FLASH_CPUAPP_START_ADDR (0x00000000)
#define RAM_CPUAPP_START_ADDR (0x20000000 + NRF91_SHMEM_SIZE)
#define RAM_CPUAPP_START_ADDR (CONFIG_RAM_START + NRF91_SHMEM_SIZE)
/* Image format configuration */
@ -54,7 +60,7 @@ MEMORY
progmem (rx) : ORIGIN = FLASH_CPUAPP_START_ADDR + FLASH_OFFSET,
LENGTH = FLASH_IMG_SIZE
datamem (rwx) : ORIGIN = RAM_CPUAPP_START_ADDR,
LENGTH = CONFIG_NRF91_CPUAPP_MEM_RAM_SIZE - NRF91_SHMEM_SIZE
LENGTH = CONFIG_RAM_SIZE - NRF91_SHMEM_SIZE
}
OUTPUT_ARCH(arm)