From dc7c504774e36b2725319a945fe09a33d934aaf4 Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Tue, 3 Aug 2021 05:07:07 -0700 Subject: [PATCH 1/2] config: Add RAM1 memory region parameters to mbed_config.cmake Add ARM1 memory region defines to mbed_config.tmpl as most of the targets in targets.json has both RAM and RAM1 configurations --- news/20210803174602.bugfix | 1 + src/mbed_tools/build/_internal/templates/mbed_config.tmpl | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 news/20210803174602.bugfix diff --git a/news/20210803174602.bugfix b/news/20210803174602.bugfix new file mode 100644 index 00000000..04f36f8c --- /dev/null +++ b/news/20210803174602.bugfix @@ -0,0 +1 @@ +Add RAM1 memory region overrides. diff --git a/src/mbed_tools/build/_internal/templates/mbed_config.tmpl b/src/mbed_tools/build/_internal/templates/mbed_config.tmpl index 2e4fefbf..b784951d 100644 --- a/src/mbed_tools/build/_internal/templates/mbed_config.tmpl +++ b/src/mbed_tools/build/_internal/templates/mbed_config.tmpl @@ -66,6 +66,12 @@ set(MBED_TARGET_DEFINITIONS{% for component in components %} {%- endif %} {% if mbed_ram_size is defined %} MBED_RAM_SIZE={{ mbed_ram_size | to_hex }} +{%- endif %} +{% if mbed_ram1_start is defined %} + MBED_RAM1_START={{ mbed_ram1_start | to_hex }} +{%- endif %} +{% if mbed_ram1_size is defined %} + MBED_RAM1_SIZE={{ mbed_ram1_size | to_hex }} {%- endif %} TARGET_LIKE_MBED __MBED__=1 From ab4a1bc373888d51deb8c5f4014d30fc9118058d Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Tue, 3 Aug 2021 05:20:46 -0700 Subject: [PATCH 2/2] Update the test generate config to validate newly added ram1 configuration --- tests/build/test_generate_config.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/build/test_generate_config.py b/tests/build/test_generate_config.py index e7d7eb70..00015cc1 100644 --- a/tests/build/test_generate_config.py +++ b/tests/build/test_generate_config.py @@ -49,6 +49,8 @@ "trustzone": False, "mbed_ram_start": "0", "mbed_ram_size": "0", + "mbed_ram1_start": "0", + "mbed_ram1_size": "0", "mbed_rom_start": "0", "mbed_rom_size": "0", } @@ -297,6 +299,8 @@ def test_overrides_target_config_param_from_app(matching_target_and_filter, prog ("target.mbed_rom_size", "1010", "MBED_ROM_SIZE=0x3f2"), ("target.mbed_ram_start", "99", "MBED_RAM_START=0x63"), ("target.mbed_ram_size", "1010", "MBED_RAM_SIZE=0x3f2"), + ("target.mbed_ram1_start", "99", "MBED_RAM1_START=0x63"), + ("target.mbed_ram1_size", "1010", "MBED_RAM1_SIZE=0x3f2"), ], ) def test_overrides_target_non_config_params_from_app(