New version of memory bank information system

Author: multiplemonomials

targets/cmsis_mcu_descriptions.json5

@@ -8178,8 +8178,8 @@
                     "write": false
                 },
                 "default": true,
-                "size": 1048576,
-                "start": 135266304,
+                "size": 0x200000,
+                "start": 0x08000000,
                 "startup": true
             },
             "RAM_D3": {

targets/targets.json5

@@ -3690,10 +3690,13 @@
     "ARDUINO_PORTENTA_H7_M7": {
         "inherits": ["ARDUINO_PORTENTA_H7"],
         "core": "Cortex-M7FD",
-        "mbed_rom_start": "0x08000000",
-        "mbed_rom_size" : "0x100000",
-        "mbed_ram_start": "0x24000000",
-        "mbed_ram_size" : "0x80000",
+        "memory_bank_config": {
+            // Select flash bank 1
+            "IROM1": {
+                "start": 0x08000000,
+                "size": 0x100000
+            }
+        },
         "extra_labels_add": [
             "STM32H747xI_CM7"
         ],
@@ -3704,10 +3707,13 @@
     "ARDUINO_PORTENTA_H7_M4": {
         "inherits": ["ARDUINO_PORTENTA_H7"],
         "core": "Cortex-M4F",
-        "mbed_rom_start": "0x08100000",
-        "mbed_rom_size" : "0x100000",
-        "mbed_ram_start": "0x10000000",
-        "mbed_ram_size" : "0x48000",
+        "memory_bank_config": {
+            // Select flash bank 2
+            "IROM1": {
+                "start": 0x08100000,
+                "size": 0x100000
+            }
+        },
         "extra_labels_add": [
             "STM32H747xI_CM4"
         ],
@@ -5309,6 +5315,35 @@
         "overrides": {
             "network-default-interface-type": "ETHERNET"
         },
+        "memory_banks": {
+            "SDRAM": {
+                "access": {
+                    "execute": false,
+                    "peripheral": false,
+                    "read": true,
+                    "secure": false,
+                    "write": true
+                },
+                "default": false,
+                "size": 0x10000000, // 256MiB
+                "start": 0x80000000,
+                "startup": false
+            },
+            // MIMXRT1050 EVK uses hyperflash by default
+            "EXT_FLASH": {
+                "access": {
+                    "execute": true,
+                    "peripheral": false,
+                    "read": true,
+                    "secure": false,
+                    "write": false
+                },
+                "default": true,
+                "size": 0x4000000, // 64MiB
+                "start": 0x60000000,
+                "startup": true
+            }
+        },
         "bootloader_supported": true,
         "device_name": "MIMXRT1052DVL6A",
         "image_url": "https://www.nxp.com/assets/images/en/dev-board-image/IMX_RT1050-EVKB_TOP-LR.jpg"
@@ -5335,6 +5370,35 @@
         "overrides": {
             "network-default-interface-type": "ETHERNET"
         },
+        "memory_banks": {
+            "SDRAM": {
+                "access": {
+                    "execute": false,
+                    "peripheral": false,
+                    "read": true,
+                    "secure": false,
+                    "write": true
+                },
+                "default": false,
+                "size": 0x10000000, // 256MiB
+                "start": 0x80000000,
+                "startup": false
+            },
+            // MIMXRT1050 EVK uses QSPI flash by default
+            "EXT_FLASH": {
+                "access": {
+                    "execute": true,
+                    "peripheral": false,
+                    "read": true,
+                    "secure": false,
+                    "write": false
+                },
+                "default": true,
+                "size": 0x800000, // 8MiB
+                "start": 0x60000000,
+                "startup": true
+            }
+        },
         "device_name": "MIMXRT1062DVL6B",
         "image_url": "https://www.nxp.com/assets/images/en/dev-board-image/X-MIMXRT1060-EVK-BOARD-BOTTOM.jpg"
     },

tools/cmake/mbed_generate_configuration.cmake

@@ -97,7 +97,7 @@ if(MBED_NEED_TO_RECONFIGURE)
     file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/mbed_config.cmake)
 
     set(MBEDTOOLS_CONFIGURE_COMMAND ${Python3_EXECUTABLE}
-        -c "import mbed_tools.cli.main\; exit(mbed_tools.cli.main.cli())" # This is used instead of invoking mbed_tools as a script, because it might not be on the user's PATH.
+        -m mbed_tools.cli.main
         -v # without -v, warnings (e.g. "you have tried to override a nonexistent parameter") do not get printed
         configure
         -t GCC_ARM # GCC_ARM is currently the only supported toolchain
@@ -120,7 +120,7 @@ if(MBED_NEED_TO_RECONFIGURE)
 
     if((NOT MBEDTOOLS_CONFIGURE_RESULT EQUAL 0) OR (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/mbed_config.cmake))
         string(JOIN " " MBEDTOOLS_COMMAND_SPC_SEP ${MBEDTOOLS_CONFIGURE_COMMAND})
-        message(FATAL_ERROR "mbedtools configure failed!  Cannot build this project.  Command was ${MBEDTOOLS_COMMAND_SPC_SEP}")
+        message(FATAL_ERROR "mbedtools configure failed!  Cannot build this project.  Command was cd ${CMAKE_CURRENT_LIST_DIR}/../python && ${MBEDTOOLS_COMMAND_SPC_SEP}")
     endif()
 
 endif()

tools/python/mbed_tools/build/_internal/templates/mbed_config.tmpl

@@ -57,24 +57,14 @@ set(MBED_TARGET_DEFINITIONS{% for component in components %}
 {% for form_factor in supported_form_factors %}
     TARGET_FF_{{form_factor}}
 {%- endfor %}
-{% if mbed_rom_start is defined %}
-    MBED_ROM_START={{ mbed_rom_start | to_hex }}
-{%- endif %}
-{% if mbed_rom_size is defined %}
-    MBED_ROM_SIZE={{ mbed_rom_size | to_hex }}
-{%- endif %}
-{% if mbed_ram_start is defined %}
-    MBED_RAM_START={{ mbed_ram_start | to_hex }}
-{%- endif %}
-{% if mbed_ram_size is defined %}
-    MBED_RAM_SIZE={{ mbed_ram_size | to_hex }}
-{%- endif %}
     TARGET_LIKE_MBED
     __MBED__=1
 )
 
 # config
 set(MBED_CONFIG_DEFINITIONS
+
+    # Config settings
 {% for setting in config %}
     {%- if setting.macro_name -%}
         {%- set setting_name = setting.macro_name -%}
@@ -90,7 +80,14 @@ set(MBED_CONFIG_DEFINITIONS
     "{{setting_name}}={{value}}"
     {% endif -%}
 {%- endfor -%}
+
+    # Macros from JSON
 {% for macro in macros %}
     "{{macro|replace("\"", "\\\"")}}"
 {%- endfor %}
+
+    # Memory bank macros
+{% for macro in memory_bank_macros | sort %}
+    {{macro}}
+{%- endfor %}
 )

tools/python/mbed_tools/build/config.py

@@ -12,10 +12,12 @@
 from mbed_tools.targets import get_target_by_name
 from mbed_tools.build._internal.cmake_file import render_mbed_config_cmake_template
 from mbed_tools.build._internal.config.assemble_build_config import Config, assemble_config
+from mbed_tools.build._internal.memory_banks import incorporate_memory_bank_data_from_cmsis, process_memory_banks
 from mbed_tools.build._internal.write_files import write_file
 from mbed_tools.build.exceptions import MbedBuildError
 
 CMAKE_CONFIG_FILE = "mbed_config.cmake"
+MEMORY_BANKS_JSON_FILE = "memory_banks.json"
 MBEDIGNORE_FILE = ".mbedignore"
 
 
@@ -33,9 +35,11 @@ def generate_config(target_name: str, toolchain: str, program: MbedProgram) -> T
     """
     targets_data = _load_raw_targets_data(program)
     target_build_attributes = get_target_by_name(target_name, targets_data)
+    incorporate_memory_bank_data_from_cmsis(target_build_attributes, program)
     config = assemble_config(
         target_build_attributes, [program.root, program.mbed_os.root], program.files.app_config_file
     )
+    process_memory_banks(config, program.files.cmake_build_dir / MEMORY_BANKS_JSON_FILE)
     cmake_file_contents = render_mbed_config_cmake_template(
         target_name=target_name, config=config, toolchain_name=toolchain,
     )

tools/python/mbed_tools/project/_internal/project_data.py

@@ -27,6 +27,7 @@
 MBED_OS_REFERENCE_FILE_NAME = "mbed-os.lib"
 MBED_OS_DIR_NAME = "mbed-os"
 TARGETS_JSON_FILE_PATH = Path("targets", "targets.json5")
+CMSIS_MCU_DESCRIPTIONS_JSON_FILE_PATH = Path("targets", "cmsis_mcu_descriptions.json5")
 CUSTOM_TARGETS_JSON_FILE_NAME = "custom_targets.json"
 CUSTOM_TARGETS_JSON5_FILE_NAME = "custom_targets.json5"
 
@@ -149,21 +150,29 @@ class MbedOS:
 
     root: Path
     targets_json_file: Path
+    cmsis_mcu_descriptions_json_file: Path
 
     @classmethod
     def from_existing(cls, root_path: Path, check_root_path_exists: bool = True) -> "MbedOS":
         """Create MbedOS from a directory containing an existing MbedOS installation."""
         targets_json_file = root_path / TARGETS_JSON_FILE_PATH
+        cmsis_mcu_descriptions_json_file = root_path / CMSIS_MCU_DESCRIPTIONS_JSON_FILE_PATH
 
         if check_root_path_exists and not root_path.exists():
             raise ValueError("The mbed-os directory does not exist.")
 
         if root_path.exists() and not targets_json_file.exists():
-            raise ValueError("This MbedOS copy does not contain a targets.json file.")
+            raise ValueError(f"This MbedOS copy does not contain a {TARGETS_JSON_FILE_PATH} file.")
 
-        return cls(root=root_path, targets_json_file=targets_json_file)
+        if root_path.exists() and not cmsis_mcu_descriptions_json_file.exists():
+            raise ValueError(f"This MbedOS copy does not contain a "
+                             f"{CMSIS_MCU_DESCRIPTIONS_JSON_FILE_PATH.name} file.")
+
+        return cls(root=root_path, targets_json_file=targets_json_file,
+                   cmsis_mcu_descriptions_json_file=cmsis_mcu_descriptions_json_file)
 
     @classmethod
     def from_new(cls, root_path: Path) -> "MbedOS":
         """Create MbedOS from an empty or new directory."""
-        return cls(root=root_path, targets_json_file=root_path / TARGETS_JSON_FILE_PATH)
+        return cls(root=root_path, targets_json_file=root_path / TARGETS_JSON_FILE_PATH,
+                   cmsis_mcu_descriptions_json_file=root_path / CMSIS_MCU_DESCRIPTIONS_JSON_FILE_PATH)

tools/python/mbed_tools/targets/_internal/targets_json_parsers/overriding_attribute_parser.py

@@ -24,7 +24,7 @@
 
 from mbed_tools.targets._internal.targets_json_parsers.accumulating_attribute_parser import ALL_ACCUMULATING_ATTRIBUTES
 
-MERGING_ATTRIBUTES = ("config", "overrides")
+MERGING_ATTRIBUTES = ("config", "overrides", "memory_banks", "memory_overrides")
 NON_OVERRIDING_ATTRIBUTES = ALL_ACCUMULATING_ATTRIBUTES + ("public", "inherits")