Merge pull request #61 from choco-technologies/copilot/extend-module-customization-options-again

Add configurable main module name and extra DMD file inputs via CMake parameters

Author: JohnAmadis

CMakeLists.txt

@@ -11,6 +11,9 @@ set(BOARD "" CACHE STRING "Board name (optional). If set, TARGET is derived from
 set(STARTUP_DMP_FILE "" CACHE FILEPATH "Optional startup.dmp file to embed in ROM")
 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_SDCARD_DMD_FILES "" CACHE STRING "Additional sdcard.dmd files to include (semicolon-separated list of absolute paths)")
 option(DMBOOT_EMULATION "Enable Renode emulation mode" OFF)
 
 # ======================================================================

modules/CMakeLists.txt

@@ -23,6 +23,15 @@ if(BOARD)
     endif()
 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()
+
 # ======================================================================
 #               Collecting sdcard.dmd files (common + MCU + board)
 # ======================================================================
@@ -48,6 +57,15 @@ if(BOARD)
     endif()
 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()
+
 # ======================================================================
 #               Downloading modules from DMD 
 # ======================================================================
@@ -141,7 +159,7 @@ add_custom_command(
     COMMAND ${CMAKE_COMMAND} -E echo "Checking if modules directory contains files..."
     COMMAND ${CMAKE_COMMAND} -E echo "Contents of ${DMBOOT_MODULES_OUT_DIR}:"
     COMMAND ls -la ${DMBOOT_MODULES_OUT_DIR} || ${CMAKE_COMMAND} -E echo "Directory is empty or does not exist"
-    COMMAND bash -c "if ls ${DMBOOT_MODULES_OUT_DIR}/*.dmf 1> /dev/null 2>&1; then ${TODMP} modules ${DMBOOT_MODULES_OUT_DIR} ${DMBOOT_MODULES_DMP} dmell; ls ${DMBOOT_MODULES_OUT_DIR}/*.dmf; else echo 'No .dmf files found'; fi"
+    COMMAND bash -c "if ls ${DMBOOT_MODULES_OUT_DIR}/*.dmf 1> /dev/null 2>&1; then ${TODMP} modules ${DMBOOT_MODULES_OUT_DIR} ${DMBOOT_MODULES_DMP} ${DMBOOT_MAIN_MODULE}; ls ${DMBOOT_MODULES_OUT_DIR}/*.dmf; else echo 'No .dmf files found'; fi"
     DEPENDS download_modules
     COMMENT "Creating modules dmp file from flash modules (if any exist)..."
     VERBATIM