Add manifest support for extra flash.dmd and sdcard.dmd files

Co-authored-by: JohnAmadis <17320783+JohnAmadis@users.noreply.github.com>

Author: Copilot

CMakeLists.txt

@@ -13,7 +13,9 @@ set(USER_DATA_FILE "" CACHE FILEPATH "Optional user_data file to embed in ROM")
 set(DMBOOT_CONFIG_DIR "${CMAKE_BINARY_DIR}/configs" CACHE PATH "Config directory to mount as /configs/ using dmffs (defaults to build/configs)")
 set(DMBOOT_MAIN_MODULE "dmell" CACHE STRING "Name of the main module to start after boot")
 set(DMBOOT_EXTRA_FLASH_DMD_FILES "" CACHE STRING "Additional flash.dmd files to include (semicolon-separated list of absolute paths)")
+set(DMBOOT_EXTRA_FLASH_DMD_MANIFESTS "" CACHE STRING "Manifests for extra flash.dmd files (semicolon-separated list of manifest paths/URLs, one per extra flash.dmd file)")
 set(DMBOOT_EXTRA_SDCARD_DMD_FILES "" CACHE STRING "Additional sdcard.dmd files to include (semicolon-separated list of absolute paths)")
+set(DMBOOT_EXTRA_SDCARD_DMD_MANIFESTS "" CACHE STRING "Manifests for extra sdcard.dmd files (semicolon-separated list of manifest paths/URLs, one per extra sdcard.dmd file)")
 option(DMBOOT_EMULATION "Enable Renode emulation mode" OFF)
 
 # ======================================================================

README.md

@@ -46,6 +46,10 @@ cmake --build build
 - `STARTUP_DMP_FILE` (optional) - Path to a startup package file (`.dmp`) that will be automatically loaded using `Dmod_AddPackageBuffer` at boot
 - `USER_DATA_FILE` (optional) - Path to a user data file that will be embedded in ROM, with its address and size available via environment variables `USER_DATA_ADDR` and `USER_DATA_SIZE`
 - `DMBOOT_CONFIG_DIR` (optional, defaults to `build/configs`) - Path to a directory that will be converted to a dmffs filesystem image and mounted at `/configs/` at boot time. By default, configuration files from `modules.dmd` are downloaded to this directory.
+- `DMBOOT_EXTRA_FLASH_DMD_FILES` (optional) - Semicolon-separated list of additional `flash.dmd` files. Each file adds more flash modules to download at build time.
+- `DMBOOT_EXTRA_FLASH_DMD_MANIFESTS` (optional) - Semicolon-separated list of manifest paths/URLs (one per extra flash.dmd file). Use this to specify a custom manifest for each extra flash.dmd file.
+- `DMBOOT_EXTRA_SDCARD_DMD_FILES` (optional) - Semicolon-separated list of additional `sdcard.dmd` files. Each file adds more sdcard modules to download at build time.
+- `DMBOOT_EXTRA_SDCARD_DMD_MANIFESTS` (optional) - Semicolon-separated list of manifest paths/URLs (one per extra sdcard.dmd file). Use this to specify a custom manifest for each extra sdcard.dmd file.
 - `DMBOOT_EMULATION` (optional) - Enable Renode simulation mode instead of hardware mode
 
 **Automatic Build-Time Embedding:**

modules/CMakeLists.txt

@@ -24,13 +24,27 @@ if(BOARD)
 endif()
 
 # Extra flash modules from cmake parameter
-foreach(_EXTRA_FLASH_DMD IN LISTS DMBOOT_EXTRA_FLASH_DMD_FILES)
-    if(EXISTS "${_EXTRA_FLASH_DMD}")
-        list(APPEND DMBOOT_FLASH_DMD_FILES "${_EXTRA_FLASH_DMD}")
-    else()
-        message(WARNING "Extra flash.dmd file not found: ${_EXTRA_FLASH_DMD}")
-    endif()
-endforeach()
+set(_EXTRA_FLASH_DMD_VALID_FILES "")
+set(_EXTRA_FLASH_DMD_VALID_MANIFESTS "")
+list(LENGTH DMBOOT_EXTRA_FLASH_DMD_FILES _EXTRA_FLASH_COUNT)
+if(_EXTRA_FLASH_COUNT GREATER 0)
+    math(EXPR _EXTRA_FLASH_LAST "${_EXTRA_FLASH_COUNT} - 1")
+    foreach(_IDX RANGE 0 ${_EXTRA_FLASH_LAST})
+        list(GET DMBOOT_EXTRA_FLASH_DMD_FILES ${_IDX} _EXTRA_FLASH_DMD)
+        if(EXISTS "${_EXTRA_FLASH_DMD}")
+            list(APPEND _EXTRA_FLASH_DMD_VALID_FILES "${_EXTRA_FLASH_DMD}")
+            list(LENGTH DMBOOT_EXTRA_FLASH_DMD_MANIFESTS _FLASH_MANIFEST_COUNT)
+            if(_IDX LESS _FLASH_MANIFEST_COUNT)
+                list(GET DMBOOT_EXTRA_FLASH_DMD_MANIFESTS ${_IDX} _EXTRA_FLASH_MANIFEST)
+            else()
+                set(_EXTRA_FLASH_MANIFEST "")
+            endif()
+            list(APPEND _EXTRA_FLASH_DMD_VALID_MANIFESTS "${_EXTRA_FLASH_MANIFEST}")
+        else()
+            message(WARNING "Extra flash.dmd file not found: ${_EXTRA_FLASH_DMD}")
+        endif()
+    endforeach()
+endif()
 
 # ======================================================================
 #               Collecting sdcard.dmd files (common + MCU + board)
@@ -58,13 +72,27 @@ if(BOARD)
 endif()
 
 # Extra sdcard modules from cmake parameter
-foreach(_EXTRA_SDCARD_DMD IN LISTS DMBOOT_EXTRA_SDCARD_DMD_FILES)
-    if(EXISTS "${_EXTRA_SDCARD_DMD}")
-        list(APPEND DMBOOT_SDCARD_DMD_FILES "${_EXTRA_SDCARD_DMD}")
-    else()
-        message(WARNING "Extra sdcard.dmd file not found: ${_EXTRA_SDCARD_DMD}")
-    endif()
-endforeach()
+set(_EXTRA_SDCARD_DMD_VALID_FILES "")
+set(_EXTRA_SDCARD_DMD_VALID_MANIFESTS "")
+list(LENGTH DMBOOT_EXTRA_SDCARD_DMD_FILES _EXTRA_SDCARD_COUNT)
+if(_EXTRA_SDCARD_COUNT GREATER 0)
+    math(EXPR _EXTRA_SDCARD_LAST "${_EXTRA_SDCARD_COUNT} - 1")
+    foreach(_IDX RANGE 0 ${_EXTRA_SDCARD_LAST})
+        list(GET DMBOOT_EXTRA_SDCARD_DMD_FILES ${_IDX} _EXTRA_SDCARD_DMD)
+        if(EXISTS "${_EXTRA_SDCARD_DMD}")
+            list(APPEND _EXTRA_SDCARD_DMD_VALID_FILES "${_EXTRA_SDCARD_DMD}")
+            list(LENGTH DMBOOT_EXTRA_SDCARD_DMD_MANIFESTS _SDCARD_MANIFEST_COUNT)
+            if(_IDX LESS _SDCARD_MANIFEST_COUNT)
+                list(GET DMBOOT_EXTRA_SDCARD_DMD_MANIFESTS ${_IDX} _EXTRA_SDCARD_MANIFEST)
+            else()
+                set(_EXTRA_SDCARD_MANIFEST "")
+            endif()
+            list(APPEND _EXTRA_SDCARD_DMD_VALID_MANIFESTS "${_EXTRA_SDCARD_MANIFEST}")
+        else()
+            message(WARNING "Extra sdcard.dmd file not found: ${_EXTRA_SDCARD_DMD}")
+        endif()
+    endforeach()
+endif()
 
 # ======================================================================
 #               Downloading modules from DMD 
@@ -77,7 +105,7 @@ endif()
 set(DMBOOT_MODULES_OUT_DIR "${CMAKE_BINARY_DIR}/dmf")
 set(DMBOOT_MODULES_MARKER_FILE "${DMBOOT_MODULES_OUT_DIR}/.download_complete")
 
-if(DMBOOT_FLASH_DMD_FILES)
+if(DMBOOT_FLASH_DMD_FILES OR _EXTRA_FLASH_DMD_VALID_FILES)
     # Build a sequence of download commands, one per flash.dmd file
     set(_FLASH_DOWNLOAD_COMMANDS
         COMMAND ${CMAKE_COMMAND} -E make_directory "${DMBOOT_MODULES_OUT_DIR}"
@@ -88,21 +116,40 @@ if(DMBOOT_FLASH_DMD_FILES)
             COMMAND ${DMF_GET} -d "${_DMD_FILE}" -o "${DMBOOT_MODULES_OUT_DIR}" -t "${DMOD_TOOLS_NAME}" --cpu-family "${DMBOOT_MCU_SERIES}" -y --type dmf --config-dir "${DMBOOT_CONFIG_DIR}"
         )
     endforeach()
+    list(LENGTH _EXTRA_FLASH_DMD_VALID_FILES _EXTRA_FLASH_VALID_COUNT)
+    if(_EXTRA_FLASH_VALID_COUNT GREATER 0)
+        math(EXPR _EXTRA_FLASH_VALID_LAST "${_EXTRA_FLASH_VALID_COUNT} - 1")
+        foreach(_IDX RANGE 0 ${_EXTRA_FLASH_VALID_LAST})
+            list(GET _EXTRA_FLASH_DMD_VALID_FILES ${_IDX} _DMD_FILE)
+            list(GET _EXTRA_FLASH_DMD_VALID_MANIFESTS ${_IDX} _MANIFEST)
+            if(_MANIFEST)
+                list(APPEND _FLASH_DOWNLOAD_COMMANDS
+                    COMMAND ${CMAKE_COMMAND} -E echo "Downloading flash modules from ${_DMD_FILE} (manifest: ${_MANIFEST})..."
+                    COMMAND ${DMF_GET} -d "${_DMD_FILE}" -m "${_MANIFEST}" -o "${DMBOOT_MODULES_OUT_DIR}" -t "${DMOD_TOOLS_NAME}" --cpu-family "${DMBOOT_MCU_SERIES}" -y --type dmf --config-dir "${DMBOOT_CONFIG_DIR}"
+                )
+            else()
+                list(APPEND _FLASH_DOWNLOAD_COMMANDS
+                    COMMAND ${CMAKE_COMMAND} -E echo "Downloading flash modules from ${_DMD_FILE}..."
+                    COMMAND ${DMF_GET} -d "${_DMD_FILE}" -o "${DMBOOT_MODULES_OUT_DIR}" -t "${DMOD_TOOLS_NAME}" --cpu-family "${DMBOOT_MCU_SERIES}" -y --type dmf --config-dir "${DMBOOT_CONFIG_DIR}"
+                )
+            endif()
+        endforeach()
+    endif()
     list(APPEND _FLASH_DOWNLOAD_COMMANDS
         COMMAND ${CMAKE_COMMAND} -E touch "${DMBOOT_MODULES_MARKER_FILE}"
     )
 
     add_custom_command(
         OUTPUT "${DMBOOT_MODULES_MARKER_FILE}"
         ${_FLASH_DOWNLOAD_COMMANDS}
-        DEPENDS ${DMBOOT_FLASH_DMD_FILES}
-        COMMENT "Downloading flash modules from: ${DMBOOT_FLASH_DMD_FILES}"
+        DEPENDS ${DMBOOT_FLASH_DMD_FILES} ${_EXTRA_FLASH_DMD_VALID_FILES}
+        COMMENT "Downloading flash modules from: ${DMBOOT_FLASH_DMD_FILES} ${_EXTRA_FLASH_DMD_VALID_FILES}"
         VERBATIM
     )
     add_custom_target(download_modules ALL
         DEPENDS "${DMBOOT_MODULES_MARKER_FILE}"
     )
-    message(STATUS "Flash DMD files: ${DMBOOT_FLASH_DMD_FILES}")
+    message(STATUS "Flash DMD files: ${DMBOOT_FLASH_DMD_FILES} ${_EXTRA_FLASH_DMD_VALID_FILES}")
 else()
     message(WARNING "No flash.dmd files found. Skipping flash module download.")
     add_custom_target(download_modules ALL)
@@ -114,7 +161,7 @@ endif()
 set(DMBOOT_SDCARD_OUT_DIR "${CMAKE_BINARY_DIR}/sdcard")
 set(DMBOOT_SDCARD_MARKER_FILE "${DMBOOT_SDCARD_OUT_DIR}/.download_complete")
 
-if(DMBOOT_SDCARD_DMD_FILES)
+if(DMBOOT_SDCARD_DMD_FILES OR _EXTRA_SDCARD_DMD_VALID_FILES)
     set(_SDCARD_DOWNLOAD_COMMANDS
         COMMAND ${CMAKE_COMMAND} -E make_directory "${DMBOOT_SDCARD_OUT_DIR}"
     )
@@ -124,21 +171,40 @@ if(DMBOOT_SDCARD_DMD_FILES)
             COMMAND ${DMF_GET} -d "${_DMD_FILE}" -o "${DMBOOT_SDCARD_OUT_DIR}" -t "${DMOD_TOOLS_NAME}" --cpu-family "${DMBOOT_MCU_SERIES}" -y --type dmf --config-dir "${DMBOOT_CONFIG_DIR}"
         )
     endforeach()
+    list(LENGTH _EXTRA_SDCARD_DMD_VALID_FILES _EXTRA_SDCARD_VALID_COUNT)
+    if(_EXTRA_SDCARD_VALID_COUNT GREATER 0)
+        math(EXPR _EXTRA_SDCARD_VALID_LAST "${_EXTRA_SDCARD_VALID_COUNT} - 1")
+        foreach(_IDX RANGE 0 ${_EXTRA_SDCARD_VALID_LAST})
+            list(GET _EXTRA_SDCARD_DMD_VALID_FILES ${_IDX} _DMD_FILE)
+            list(GET _EXTRA_SDCARD_DMD_VALID_MANIFESTS ${_IDX} _MANIFEST)
+            if(_MANIFEST)
+                list(APPEND _SDCARD_DOWNLOAD_COMMANDS
+                    COMMAND ${CMAKE_COMMAND} -E echo "Downloading sdcard modules from ${_DMD_FILE} (manifest: ${_MANIFEST})..."
+                    COMMAND ${DMF_GET} -d "${_DMD_FILE}" -m "${_MANIFEST}" -o "${DMBOOT_SDCARD_OUT_DIR}" -t "${DMOD_TOOLS_NAME}" --cpu-family "${DMBOOT_MCU_SERIES}" -y --type dmf --config-dir "${DMBOOT_CONFIG_DIR}"
+                )
+            else()
+                list(APPEND _SDCARD_DOWNLOAD_COMMANDS
+                    COMMAND ${CMAKE_COMMAND} -E echo "Downloading sdcard modules from ${_DMD_FILE}..."
+                    COMMAND ${DMF_GET} -d "${_DMD_FILE}" -o "${DMBOOT_SDCARD_OUT_DIR}" -t "${DMOD_TOOLS_NAME}" --cpu-family "${DMBOOT_MCU_SERIES}" -y --type dmf --config-dir "${DMBOOT_CONFIG_DIR}"
+                )
+            endif()
+        endforeach()
+    endif()
     list(APPEND _SDCARD_DOWNLOAD_COMMANDS
         COMMAND ${CMAKE_COMMAND} -E touch "${DMBOOT_SDCARD_MARKER_FILE}"
     )
 
     add_custom_command(
         OUTPUT "${DMBOOT_SDCARD_MARKER_FILE}"
         ${_SDCARD_DOWNLOAD_COMMANDS}
-        DEPENDS ${DMBOOT_SDCARD_DMD_FILES}
-        COMMENT "Downloading sdcard modules from: ${DMBOOT_SDCARD_DMD_FILES}"
+        DEPENDS ${DMBOOT_SDCARD_DMD_FILES} ${_EXTRA_SDCARD_DMD_VALID_FILES}
+        COMMENT "Downloading sdcard modules from: ${DMBOOT_SDCARD_DMD_FILES} ${_EXTRA_SDCARD_DMD_VALID_FILES}"
         VERBATIM
     )
     add_custom_target(download_sdcard_modules ALL
         DEPENDS "${DMBOOT_SDCARD_MARKER_FILE}"
     )
-    message(STATUS "Sdcard DMD files: ${DMBOOT_SDCARD_DMD_FILES}")
+    message(STATUS "Sdcard DMD files: ${DMBOOT_SDCARD_DMD_FILES} ${_EXTRA_SDCARD_DMD_VALID_FILES}")
 else()
     message(STATUS "No sdcard.dmd files found. Skipping sdcard module download.")
     add_custom_target(download_sdcard_modules ALL)