scripts: west_commands: genboard: support current NCS only

Maintaining multiversion compatibility is a nightmare, so lets make the
tool support the current NCS version, ie, the one in the same tree.

Signed-off-by: Gerard Marull-Paretas <[email protected]>

Author: gmarull

scripts/west_commands/genboard/config.yml

@@ -37,7 +37,6 @@ products:
           - name: qdaa
             ram: 128
             flash: 512
-            since: 2.5.0
           - name: qiaa
             ram: 128
             flash: 512
@@ -46,7 +45,6 @@ products:
           - name: qfaa
             ram: 256
             flash: 1024
-            since: 2.5.0
           - name: qiaa
             ram: 256
             flash: 1024
@@ -68,7 +66,6 @@ products:
       - name: nrf54l15
         variants:
           - name: qfaa
-            since: 2.7.0
             cores:
               - name: cpuapp
                 arch: arm
@@ -82,14 +79,12 @@ products:
             ram: 256
             flash: 1024
             ns: true
-            since: 2.5.0
       - name: nrf9151
         variants:
           - name: laca
             ram: 256
             flash: 1024
             ns: true
-            since: 2.6.0
       - name: nrf9160
         variants:
           - name: sica
@@ -99,7 +94,6 @@ products:
       - name: nrf9161
         variants:
           - name: laca
-            since: 2.5.0
             ram: 256
             flash: 1024
             ns: true

scripts/west_commands/genboard/ncs_genboard.py

@@ -20,11 +20,6 @@
 TEMPLATE_DIR = SCRIPT_DIR / "templates"
 CONFIG = SCRIPT_DIR / "config.yml"
 
-NCS_VERSION_MIN = (2, 0, 0)
-HWMV2_SINCE = (2, 7, 0)
-TFM_SINCE = (2, 6, 0)
-
-NCS_VERSION_RE = re.compile(r"^(\d+)\.(\d+)\.(\d+)$")
 VENDOR_RE = re.compile(r"^[a-zA-Z0-9_-]+$")
 BOARD_RE = re.compile(r"^[a-zA-Z0-9_-]+$")
 
@@ -51,9 +46,6 @@ def do_add_parser(self, parser_adder):
         )
         parser.add_argument("-s", "--soc", required=True, help="SoC")
         parser.add_argument("-v", "--variant", required=True, help="Variant")
-        parser.add_argument(
-            "-n", "--ncs-version", required=True, help="NCS target version"
-        )
 
         return parser
 
@@ -62,17 +54,6 @@ def do_run(self, args, unknown_args):
             config = load(f, Loader=Loader)
 
         # validate input
-        m = NCS_VERSION_RE.match(args.ncs_version)
-        if not m:
-            log.err(f"Invalid NCS version: {args.ncs_version}")
-            return
-
-        ncs_version = tuple(int(n) for n in m.groups())
-
-        if ncs_version < NCS_VERSION_MIN:
-            log.err(f"Unsupported NCS version: {args.ncs_version}")
-            return
-
         if not VENDOR_RE.match(args.vendor):
             log.err(f"Invalid vendor name: {args.vendor}")
             return
@@ -100,26 +81,13 @@ def do_run(self, args, unknown_args):
         targets = []
         for variant in soc["variants"]:
             if args.variant == variant["name"]:
-                since = variant.get("since", ".".join(str(i) for i in NCS_VERSION_MIN))
-                m = NCS_VERSION_RE.match(since)
-                if not m:
-                    log.err(f"Malformed NCS version: {since}")
-                    return
-
-                since_version = tuple(int(n) for n in m.groups())
-                if ncs_version < since_version:
-                    log.err(
-                        f"SoC {args.soc}-{args.variant} not supported in NCS version {args.ncs_version}"
-                    )
-                    return
-
                 if "cores" in variant:
                     for core in variant["cores"]:
                         target = {
                             "core": core["name"],
                             "ram": core["ram"],
                             "flash": core["flash"],
-                            "ns": core.get("ns", False) if ncs_version >= TFM_SINCE else False,
+                            "ns": core.get("ns", False),
                             "xip": core.get("xip", False),
                             "arch": core.get("arch", "arm"),
                         }
@@ -137,7 +105,7 @@ def do_run(self, args, unknown_args):
                     target = {
                         "ram": variant["ram"],
                         "flash": variant["flash"],
-                        "ns": variant.get("ns", False) if ncs_version >= TFM_SINCE else False,
+                        "ns": variant.get("ns", False),
                         "xip": variant.get("xip", False),
                         "arch": variant.get("arch", "arm"),
                     }
@@ -161,8 +129,6 @@ def do_run(self, args, unknown_args):
             loader=FileSystemLoader(TEMPLATE_DIR / series),
         )
 
-        env.globals["ncs_version"] = ncs_version
-        env.globals["hwmv2_since"] = HWMV2_SINCE
         env.globals["vendor"] = args.vendor
         env.globals["board"] = args.board
         env.globals["board_desc"] = args.board_desc
@@ -172,11 +138,7 @@ def do_run(self, args, unknown_args):
         env.globals["targets"] = targets
 
         # render templates/copy files
-        if ncs_version < HWMV2_SINCE:
-            out_dir = args.output / "arm" / args.board
-        else:
-            out_dir = args.output / args.vendor / args.board
-
+        out_dir = args.output / args.vendor / args.board
         if not out_dir.exists():
             out_dir.mkdir(parents=True)
 
@@ -192,16 +154,12 @@ def do_run(self, args, unknown_args):
             f.write(tmpl.render())
 
         tmpl = env.get_template("Kconfig.board.jinja2")
-        fname = (
-            "Kconfig.board" if ncs_version < HWMV2_SINCE else f"Kconfig.{args.board}"
-        )
-        with open(out_dir / fname, "w") as f:
+        with open(out_dir / f"Kconfig.{args.board}", "w") as f:
             f.write(tmpl.render())
 
-        if ncs_version >= HWMV2_SINCE:
-            tmpl = env.get_template("board.yml.jinja2")
-            with open(out_dir / f"board.yml", "w") as f:
-                f.write(tmpl.render())
+        tmpl = env.get_template("board.yml.jinja2")
+        with open(out_dir / f"board.yml", "w") as f:
+            f.write(tmpl.render())
 
         tmpl = env.get_template("Kconfig.defconfig.jinja2")
         with open(out_dir / f"Kconfig.defconfig", "w") as f:
@@ -226,12 +184,10 @@ def do_run(self, args, unknown_args):
         for target in targets:
             name = args.board
             if target.get("core"):
-                if ncs_version >= HWMV2_SINCE:
-                    name += f"_{args.soc}"
-                name += f"_{target['core']}"
+                name += f"_{args.soc}_{target['core']}"
             if target["ns"]:
                 name += "_ns"
-            elif target["xip"]:
+            if target["xip"]:
                 name += "_xip"
 
             tmpl = env.get_template("board_defconfig.jinja2")

scripts/west_commands/genboard/templates/nrf52/Kconfig.board.jinja2

@@ -1,7 +1,2 @@
 config BOARD_{{ board | upper }}
-{% if ncs_version < hwmv2_since %}
-	bool "{{ board_desc }}"
-	depends on SOC_{{ soc | upper }}_{{ variant | upper}}
-{% else %}
 	select SOC_{{ soc | upper }}_{{ variant | upper}}
-{% endif %}

scripts/west_commands/genboard/templates/nrf52/Kconfig.defconfig.jinja2

@@ -1,10 +1,5 @@
 if BOARD_{{ board | upper }}
 
-{% if ncs_version < hwmv2_since %}
-config BOARD
-	default "{{ board }}"
-
-{% endif %}
 config BT_CTLR
 	default BT
 

scripts/west_commands/genboard/templates/nrf52/board.cmake.jinja2

@@ -2,9 +2,7 @@ board_runner_args(jlink "--device={{ soc | replace("nrf", "nRF") }}_xx{{ variant
 board_runner_args(pyocd "--target={{ soc }}" "--frequency=4000000")
 
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
-{% if ncs_version >= (2, 4, 0) %}
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
-{% endif %}
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)

scripts/west_commands/genboard/templates/nrf52/board.dts.jinja2

@@ -25,27 +25,6 @@
 		};
 
 {% if soc == "nrf52840" %}
-{% if ncs_version <= (2, 4, 0) %}
-		slot0_partition: partition@c000 {
-			label = "image-0";
-			reg = <0x0000c000 DT_SIZE_K(412)>;
-		};
-
-		slot1_partition: partition@73000 {
-			label = "image-1";
-			reg = <0x00073000 DT_SIZE_K(412)>;
-		};
-
-		scratch_partition: partition@da000 {
-			label = "image-scratch";
-			reg = <0xda000 DT_SIZE_K(120)>;
-		};
-
-		storage_partition: partition@f8000 {
-			label = "storage";
-			reg = <0x000f8000 DT_SIZE_K(32)>;
-		};
-{% else %}
 		slot0_partition: partition@c000 {
 			label = "image-0";
 			reg = <0x0000c000 DT_SIZE_K(472)>;
@@ -60,29 +39,7 @@
 			label = "storage";
 			reg = <0x000f8000 DT_SIZE_K(32)>;
 		};
-{% endif %}
 {% elif soc == "nrf52833" or soc == "nrf52832" %}
-{% if ncs_version <= (2, 4, 0) %}
-		slot0_partition: partition@c000 {
-			label = "image-0";
-			reg = <0x0000c000 DT_SIZE_K(200)>;
-		};
-
-		slot1_partition: partition@3e000 {
-			label = "image-1";
-			reg = <0x0003e000 DT_SIZE_K(200)>;
-		};
-
-		scratch_partition: partition@70000 {
-			label = "image-scratch";
-			reg = <0x70000 DT_SIZE_K(40)>;
-		};
-
-		storage_partition: partition@7a000 {
-			label = "storage";
-			reg = <0x0007a000 DT_SIZE_K(24)>;
-		};
-{% else %}
 		slot0_partition: partition@c000 {
 			label = "image-0";
 			reg = <0x0000c000 DT_SIZE_K(220)>;
@@ -97,7 +54,6 @@
 			label = "storage";
 			reg = <0x0007a000 DT_SIZE_K(24)>;
 		};
-{% endif %}
 {% elif soc == "nrf52820" %}
 		slot0_partition: partition@c000 {
 			label = "image-0";
@@ -114,27 +70,6 @@
 			reg = <0x0003a000 DT_SIZE_K(24)>;
 		};
 {% elif soc == "nrf52811" or soc == "nrf52810" or soc == "nrf52805" %}
-{% if ncs_version <= (2, 4, 0) %}
-		slot0_partition: partition@c000 {
-			label = "image-0";
-			reg = <0x0000c000 DT_SIZE_K(52)>;
-		};
-
-		slot1_partition: partition@19000 {
-			label = "image-1";
-			reg = <0x0001a000 DT_SIZE_K(52)>;
-		};
-
-		scratch_partition: partition@26000 {
-			label = "image-scratch";
-			reg = <0x26000 DT_SIZE_K(12)>;
-		};
-
-		storage_partition: partition@29000 {
-			label = "storage";
-			reg = <0x00029000 DT_SIZE_K(28)>;
-		};
-{% else %}
 		slot0_partition: partition@c000 {
 			label = "image-0";
 			reg = <0x0000c000 DT_SIZE_K(56)>;
@@ -149,8 +84,6 @@
 			label = "storage";
 			reg = <0x00028000 DT_SIZE_K(32)>;
 		};
-{% endif %}
-
 {% endif %}
 	};
 };

scripts/west_commands/genboard/templates/nrf52/board_defconfig.jinja2

@@ -1,12 +1,2 @@
-{% if ncs_version < hwmv2_since %}
-CONFIG_SOC_SERIES_{{ series | upper }}X=y
-CONFIG_SOC_{{ soc | upper }}_{{ variant | upper }}=y
-CONFIG_BOARD_{{ board | upper }}=y
-
-{% endif %}
 CONFIG_ARM_MPU=y
 CONFIG_HW_STACK_PROTECTION=y
-
-{% if ncs_version <= (2, 6, 0) %}
-CONFIG_PINCTRL=y
-{% endif %}

scripts/west_commands/genboard/templates/nrf52/board_twister.yml.jinja2

@@ -1,8 +1,4 @@
-{% if ncs_version < hwmv2_since %}
-identifier: {{ board }}
-{% else %}
 identifier: {{ board }}/{{ soc }}
-{% endif %}
 name: {{ board_desc }}
 vendor: {{ vendor }}
 type: mcu
@@ -11,5 +7,4 @@ ram: {{ target["ram"] }}
 flash: {{ target["flash"] }}
 toolchain:
   - zephyr
-supported:
-  - gpio
+supported: []

scripts/west_commands/genboard/templates/nrf53/Kconfig.board.jinja2

@@ -1,20 +1,4 @@
-{% if ncs_version < hwmv2_since %}
-if SOC_NRF5340_CPUAPP_QKAA
-
-config BOARD_{{ board | upper }}_CPUAPP
-	bool "{{ board_desc }} (CPUAPP)"
-
-config BOARD_{{ board | upper }}_CPUAPP_NS
-	bool "{{ board_desc }} (CPUAPP Non-Secure)"
-
-endif # SOC_NRF5340_CPUAPP_QKAA
-
-config BOARD_{{ board | upper }}_CPUNET
-	bool "{{ board_desc }} (CPUNET)"
-	depends on SOC_NRF5340_CPUNET_QKAA
-{% else %}
 config BOARD_{{ board | upper }}
 	select SOC_NRF5340_CPUAPP_QKAA if BOARD_{{ board | upper }}_NRF5340_CPUAPP
 	select SOC_NRF5340_CPUAPP_QKAA if BOARD_{{ board | upper }}_NRF5340_CPUAPP_NS
 	select SOC_NRF5340_CPUNET_QKAA if BOARD_{{ board | upper }}_NRF5340_CPUNET
-{% endif %}