Merge pull request #9091 from ARMmbed/release-candidate

Release candidate for mbed-os-5.11.0-rc4

Author: Cruz Monrreal

targets/targets.json

@@ -13,6 +13,7 @@
         "public": false,
         "default_lib": "std",
         "bootloader_supported": false,
+        "static_memory_defines": true,
         "config": {
             "console-uart-flow-control": {
                 "help": "Console hardware flow control. Options: null, RTS, CTS, RTSCTS.",
@@ -1842,7 +1843,8 @@
             "XIP_BOOT_HEADER_DCD_ENABLE=1",
             "SKIP_SYSCLK_INIT",
             "FSL_FEATURE_PHYKSZ8081_USE_RMII50M_MODE",
-            "SDRAM_IS_SHAREABLE"
+            "SDRAM_IS_SHAREABLE",
+            "MBED_MPU_CUSTOM"
         ],
         "inherits": ["Target"],
         "detect_code": ["0227"],
@@ -1864,8 +1866,7 @@
             "SERIAL",
             "SPI",
             "SPISLAVE",
-            "STDIO_MESSAGES",
-            "MPU"
+            "STDIO_MESSAGES"
         ],
         "release_versions": ["2", "5"],
         "features": ["LWIP"],
@@ -6482,6 +6483,7 @@
     "MCU_NRF52832": {
         "inherits": ["Target"],
         "core": "Cortex-M4F",
+        "static_memory_defines": false,
         "macros": [
             "BOARD_PCA10040",
             "NRF52",
@@ -6596,6 +6598,7 @@
     "MCU_NRF52840": {
         "inherits": ["Target"],
         "core": "Cortex-M4F",
+        "static_memory_defines": false,
         "macros": [
             "BOARD_PCA10056",
             "NRF52840_XXAA",

tools/toolchains/__init__.py

@@ -755,6 +755,8 @@ def add_regions(self):
 
         try:
             # Add all available ROM regions to build profile
+            if not getattr(self.target, "static_memory_defines", False):
+                raise ConfigException()
             rom_available_regions = self.config.get_all_active_memories(ROM_ALL_MEMORIES)
             for key, value in rom_available_regions.items():
                 rom_start, rom_size = value
@@ -767,6 +769,8 @@ def add_regions(self):
             pass
         try:
             # Add all available RAM regions to build profile
+            if not getattr(self.target, "static_memory_defines", False):
+                raise ConfigException()
             ram_available_regions = self.config.get_all_active_memories(RAM_ALL_MEMORIES)
             for key, value in ram_available_regions.items():
                 ram_start, ram_size = value