michaelh/zephyr
1
0
Fork 0
Code Releases Activity

linker: stm32wb: move IPC RAM definition to DT

Browse source 
Move the definition of the two IPC RAM blocks from `#define`'s in family
linker scripts to proper devicetree nodes. Use the devicetree nodes to
generate the memory regions.

Signed-off-by: Jordan Yates <jordan.yates@data61.csiro.au>
This commit is contained in:
Jordan Yates 2021-04-10 15:11:50 +10:00 • committed by Carles Cufí
commit a4150c0483
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dts/arm/st/wb/stm32wb.dtsi
View file

@ -31,6 +31,16 @@
compatible = "mmio-sram";
};
sram1: memory@20030000 {
compatible = "mmio-sram";
reg = <0x20030000 0x2800>;
};
sram2: memory@20038000 {
compatible = "mmio-sram";
reg = <0x20038000 0x5000>;
};
soc {
flash: flash-controller@58004000 {
compatible = "st,stm32-flash-controller", "st,stm32wb-flash-controller";

7
include/arch/arm/aarch32/cortex_m/scripts/linker.ld
View file

@ -102,10 +102,9 @@ MEMORY
DT_REGION_FROM_NODE_STATUS_OKAY(DTCM, rw, DT_CHOSEN(zephyr_dtcm))
/* STM32 Core Coupled Memory */
DT_REGION_FROM_NODE_STATUS_OKAY(CCM, rw, DT_CHOSEN(zephyr_ccm))
#ifdef CONFIG_BT_STM32_IPM
SRAM1 (rw) : ORIGIN = RAM1_ADDR, LENGTH = RAM1_SIZE
SRAM2 (rw) : ORIGIN = RAM2_ADDR, LENGTH = RAM2_SIZE
#endif
/* STM32WB IPC RAM */
DT_REGION_FROM_NODE_STATUS_OKAY(SRAM1, rw, DT_NODELABEL(sram1))
DT_REGION_FROM_NODE_STATUS_OKAY(SRAM2, rw, DT_NODELABEL(sram2))
/* STM32 alternate RAM configurations */
DT_REGION_FROM_NODE_STATUS_OKAY(SDRAM1, rw, DT_NODELABEL(sdram1))
DT_REGION_FROM_NODE_STATUS_OKAY(SDRAM2, rw, DT_NODELABEL(sdram2))

5
soc/arm/st_stm32/stm32wb/linker.ld
View file

@ -6,9 +6,4 @@
* SPDX-License-Identifier: Apache-2.0
*/
#define RAM1_SIZE (10 * 1K)
#define RAM1_ADDR 0x20030000
#define RAM2_SIZE (20 * 1K)
#define RAM2_ADDR 0x20038000
#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>