boards: sifli: add sf32lb52_devkit_lcd revisions

- declare n16r8 (default) and a128r8 revisions in board.yml
- add revision.cmake to validate BOARD_REVISION and keep n16r8 as fallback
- teach board.cmake to append --memory nor/nand for sftool based on the active revision
- extend the sftool west runner with an optional --memory argument so the flag is passed through

Signed-off-by: Haoran Jiang <[email protected]>

Author: HalfSweet

MAINTAINERS.yml

@@ -4685,6 +4685,7 @@ SiFli SF32LB Platforms:
   collaborators:
     - cameled
     - ck-telecom
+    - halfsweet
   files:
     - boards/sifli/
     - drivers/*/*sf32lb*

boards/sifli/sf32lb52_devkit_lcd/board.cmake

@@ -2,7 +2,17 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # keep first
-board_runner_args(sftool "--chip=SF32LB52")
+set(_sf32lb52_sftool_args "--chip=SF32LB52")
+
+if(DEFINED BOARD_REVISION)
+  if(BOARD_REVISION STREQUAL "n16r8")
+    list(APPEND _sf32lb52_sftool_args "--memory=nor")
+  elseif(BOARD_REVISION STREQUAL "a128r8")
+    list(APPEND _sf32lb52_sftool_args "--memory=nand")
+  endif()
+endif()
+
+board_runner_args(sftool ${_sf32lb52_sftool_args})
 
 # keep first
 include(${ZEPHYR_BASE}/boards/common/sftool.board.cmake)

boards/sifli/sf32lb52_devkit_lcd/board.yml

@@ -5,5 +5,11 @@ board:
   name: sf32lb52_devkit_lcd
   full_name: SF32LB52-DevKit-LCD
   vendor: sifli
+  revision:
+    format: custom
+    default: "n16r8"
+    revisions:
+      - name: "n16r8"
+      - name: "a128r8"
   socs:
     - name: sf32lb525uc6

boards/sifli/sf32lb52_devkit_lcd/revision.cmake

@@ -0,0 +1,9 @@
+set(BOARD_REVISIONS "n16r8" "a128r8")
+
+if(NOT DEFINED BOARD_REVISION)
+  set(BOARD_REVISION "n16r8")
+else()
+  if(NOT BOARD_REVISION IN_LIST BOARD_REVISIONS)
+    message(FATAL_ERROR "${BOARD_REVISION} is not a valid revision for sf32lb52_devkit_lcd. Accepted revisions: ${BOARD_REVISIONS}")
+  endif()
+endif()

scripts/west_commands/runners/sftool.py

@@ -18,13 +18,15 @@ def __init__(
         erase: bool,
         dt_flash: bool,
         tool_opt: list[str],
+        memory: str | None,
     ) -> None:
         super().__init__(cfg)
 
         self._chip = chip
         self._port = port
         self._erase = erase
         self._dt_flash = dt_flash
+        self._memory = memory
 
         self._tool_opt: list[str] = []
         for opts in [shlex.split(opt) for opt in tool_opt]:
@@ -54,6 +56,12 @@ def do_add_parser(cls, parser):
             help="Serial port device, e.g. /dev/ttyUSB0",
         )
 
+        parser.add_argument(
+            "--memory",
+            choices=("nor", "nand"),
+            help="Internal flash target (e.g. NOR or NAND)",
+        )
+
     @classmethod
     def do_create(cls, cfg: RunnerConfig, args: argparse.Namespace) -> "SftoolRunner":
         return SftoolRunner(
@@ -63,12 +71,15 @@ def do_create(cls, cfg: RunnerConfig, args: argparse.Namespace) -> "SftoolRunner
             erase=args.erase,
             dt_flash=args.dt_flash,
             tool_opt=args.tool_opt,
+            memory=args.memory,
         )
 
     def do_run(self, command: str, **kwargs):
         sftool = self.require("sftool")
 
         cmd = [sftool, "--chip", self._chip, "--port", self._port]
+        if self._memory:
+            cmd += ["--memory", self._memory]
         cmd += self._tool_opt
 
         if self._erase: