This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit bbabcf3c78567a6ff81717001f4f638f4844a088
Author: raiden00pl <raide...@railab.me>
AuthorDate: Sat Jul 8 12:15:10 2023 +0200
arch/nrf91: modem shmem always at the RAM start
---
arch/arm/src/nrf91/nrf91_modem.h | 2 +-
boards/arm/nrf91/common/scripts/flash_app.ld | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/arch/arm/src/nrf91/nrf91_modem.h b/arch/arm/src/nrf91/nrf91_modem.h
index dcd8b40439..9dca967bbe 100644
--- a/arch/arm/src/nrf91/nrf91_modem.h
+++ b/arch/arm/src/nrf91/nrf91_modem.h
@@ -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)
diff --git a/boards/arm/nrf91/common/scripts/flash_app.ld
b/boards/arm/nrf91/common/scripts/flash_app.ld
index 746e7f172d..2a237e1f13 100644
--- a/boards/arm/nrf91/common/scripts/flash_app.ld
+++ b/boards/arm/nrf91/common/scripts/flash_app.ld
@@ -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)
