Merge pull request #58 from choco-technologies/copilot/add-support-for-configurations-and-boards

JohnAmadis · web-flow · commit 96665e67ab04 · 2026-02-25T16:31:31.000+01:00
Add multi-configuration and board support (BOARD param, layered .dmd files, per-MCU linker dirs)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,6 +7,7 @@ cmake_minimum_required(VERSION 3.10)
 #               Configuration
 # ======================================================================
 set(TARGET "STM32F746xG" CACHE STRING "Target microcontroller")
+set(BOARD "" CACHE STRING "Board name (optional). If set, TARGET is derived from configs/board/<BOARD>/board.cmake")
 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)")
@@ -18,6 +19,12 @@ option(DMBOOT_EMULATION "Enable Renode emulation mode" OFF)
 set(DMOD_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib/dmod")
 include(configs/dmod-cfg.cmake)
 include(configs/dmvfs-cfg.cmake)
+
+# If BOARD is specified, read TARGET from board.cmake
+if(BOARD)
+    include(configs/board/${BOARD}/board.cmake)
+endif()
+
 include(configs/mcu/${TARGET}.cmake)
 
 # Include toolchain configuration before project() to set compilers
@@ -139,7 +146,7 @@ target_link_options(${MODULE_NAME}.elf
     PRIVATE 
         -L${DMOD_DIR}/scripts
         -T${CMAKE_CURRENT_SOURCE_DIR}/configs/arch/${DMBOOT_ARCH}/arch.ld
-        -T${CMAKE_CURRENT_SOURCE_DIR}/configs/mcu/${DMBOOT_MCU_SERIES}/${DMBOOT_MCU_NAME}.ld
+        -T${CMAKE_CURRENT_SOURCE_DIR}/configs/mcu/${DMBOOT_MCU_SERIES}/${DMBOOT_MCU_NAME}/mcu.ld
         -T${CMAKE_CURRENT_SOURCE_DIR}/linker/common.ld
         -Wl,-Map=${MODULE_NAME}.map
 )
diff --git a/configs/board/stm32f746g-disco/board.cmake b/configs/board/stm32f746g-disco/board.cmake
@@ -0,0 +1,3 @@
+# Board configuration for STM32F746G Discovery
+# Sets TARGET for the build system
+set(TARGET "STM32F746xG" CACHE STRING "Target microcontroller" FORCE)
diff --git a/configs/board/stm32f746g-disco/flash.dmd b/configs/board/stm32f746g-disco/flash.dmd
@@ -0,0 +1,5 @@
+#
+# STM32F746G Discovery board flash modules - board-specific modules with configs
+#
+dmclk board/stm32f746g-disco.ini
+dmgpio board/stm32f746g-disco.ini
diff --git a/configs/board/stm32f746g-disco/sdcard.dmd b/configs/board/stm32f746g-disco/sdcard.dmd
@@ -0,0 +1,3 @@
+#
+# STM32F746G Discovery board sdcard modules - board-specific modules for sdcard
+#
diff --git a/configs/common/flash.dmd b/configs/common/flash.dmd
@@ -0,0 +1,9 @@
+#
+# Common flash modules - loaded for all targets
+#
+dmell
+dmffs
+dmramfs
+dmdevfs
+ls
+mkdir
diff --git a/configs/common/sdcard.dmd b/configs/common/sdcard.dmd
@@ -0,0 +1,3 @@
+#
+# Common sdcard modules - loaded for all targets
+#
diff --git a/configs/mcu/stm32f4/stm32f407g/flash.dmd b/configs/mcu/stm32f4/stm32f407g/flash.dmd
@@ -0,0 +1,5 @@
+#
+# STM32F407G flash modules - MCU-specific modules for flash
+#
+dmclk
+dmgpio
diff --git a/configs/mcu/stm32f4/stm32f407g/mcu.ld b/configs/mcu/stm32f4/stm32f407g/mcu.ld
diff --git a/configs/mcu/stm32f4/stm32f407g/sdcard.dmd b/configs/mcu/stm32f4/stm32f407g/sdcard.dmd
@@ -0,0 +1,3 @@
+#
+# STM32F407G sdcard modules - MCU-specific modules for sdcard
+#
diff --git a/configs/mcu/stm32f7/stm32f746xg/flash.dmd b/configs/mcu/stm32f7/stm32f746xg/flash.dmd
@@ -0,0 +1,5 @@
+#
+# STM32F746xG flash modules - MCU-specific modules for flash
+#
+dmclk
+dmgpio
diff --git a/configs/mcu/stm32f7/stm32f746xg/mcu.ld b/configs/mcu/stm32f7/stm32f746xg/mcu.ld
diff --git a/configs/mcu/stm32f7/stm32f746xg/sdcard.dmd b/configs/mcu/stm32f7/stm32f746xg/sdcard.dmd
@@ -0,0 +1,3 @@
+#
+# STM32F746xG sdcard modules - MCU-specific modules for sdcard
+#
diff --git a/configs/mcu/stm32f7/stm32f746zg/flash.dmd b/configs/mcu/stm32f7/stm32f746zg/flash.dmd
@@ -0,0 +1,5 @@
+#
+# STM32F746ZG flash modules - MCU-specific modules for flash
+#
+dmclk
+dmgpio
diff --git a/configs/mcu/stm32f7/stm32f746zg/mcu.ld b/configs/mcu/stm32f7/stm32f746zg/mcu.ld
diff --git a/configs/mcu/stm32f7/stm32f746zg/sdcard.dmd b/configs/mcu/stm32f7/stm32f746zg/sdcard.dmd
@@ -0,0 +1,3 @@
+#
+# STM32F746ZG sdcard modules - MCU-specific modules for sdcard
+#
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
@@ -1,3 +1,53 @@
+# ======================================================================
+#               Collecting flash.dmd files (common + MCU + board)
+# ======================================================================
+set(DMBOOT_FLASH_DMD_FILES "")
+
+# Common flash modules
+set(_COMMON_FLASH_DMD "${CMAKE_SOURCE_DIR}/configs/common/flash.dmd")
+if(EXISTS "${_COMMON_FLASH_DMD}")
+    list(APPEND DMBOOT_FLASH_DMD_FILES "${_COMMON_FLASH_DMD}")
+endif()
+
+# MCU-specific flash modules
+set(_MCU_FLASH_DMD "${CMAKE_SOURCE_DIR}/configs/mcu/${DMBOOT_MCU_SERIES}/${DMBOOT_MCU_NAME}/flash.dmd")
+if(EXISTS "${_MCU_FLASH_DMD}")
+    list(APPEND DMBOOT_FLASH_DMD_FILES "${_MCU_FLASH_DMD}")
+endif()
+
+# Board-specific flash modules (only if BOARD is set)
+if(BOARD)
+    set(_BOARD_FLASH_DMD "${CMAKE_SOURCE_DIR}/configs/board/${BOARD}/flash.dmd")
+    if(EXISTS "${_BOARD_FLASH_DMD}")
+        list(APPEND DMBOOT_FLASH_DMD_FILES "${_BOARD_FLASH_DMD}")
+    endif()
+endif()
+
+# ======================================================================
+#               Collecting sdcard.dmd files (common + MCU + board)
+# ======================================================================
+set(DMBOOT_SDCARD_DMD_FILES "")
+
+# Common sdcard modules
+set(_COMMON_SDCARD_DMD "${CMAKE_SOURCE_DIR}/configs/common/sdcard.dmd")
+if(EXISTS "${_COMMON_SDCARD_DMD}")
+    list(APPEND DMBOOT_SDCARD_DMD_FILES "${_COMMON_SDCARD_DMD}")
+endif()
+
+# MCU-specific sdcard modules
+set(_MCU_SDCARD_DMD "${CMAKE_SOURCE_DIR}/configs/mcu/${DMBOOT_MCU_SERIES}/${DMBOOT_MCU_NAME}/sdcard.dmd")
+if(EXISTS "${_MCU_SDCARD_DMD}")
+    list(APPEND DMBOOT_SDCARD_DMD_FILES "${_MCU_SDCARD_DMD}")
+endif()
+
+# Board-specific sdcard modules (only if BOARD is set)
+if(BOARD)
+    set(_BOARD_SDCARD_DMD "${CMAKE_SOURCE_DIR}/configs/board/${BOARD}/sdcard.dmd")
+    if(EXISTS "${_BOARD_SDCARD_DMD}")
+        list(APPEND DMBOOT_SDCARD_DMD_FILES "${_BOARD_SDCARD_DMD}")
+    endif()
+endif()
+
 # ======================================================================
 #               Downloading modules from DMD 
 # ======================================================================
@@ -6,36 +56,83 @@ if(NOT DMF_GET)
     message(FATAL_ERROR "dmf-get tool not found. Please build and install dmod tools first.")
 endif()
 
-set(DMBOOT_MODULES_DMD "${CMAKE_CURRENT_SOURCE_DIR}/modules.dmd")
 set(DMBOOT_MODULES_OUT_DIR "${CMAKE_BINARY_DIR}/dmf")
 set(DMBOOT_MODULES_MARKER_FILE "${DMBOOT_MODULES_OUT_DIR}/.download_complete")
-if(EXISTS "${DMBOOT_MODULES_DMD}")
-    add_custom_command(
-        OUTPUT "${DMBOOT_MODULES_MARKER_FILE}"
+
+if(DMBOOT_FLASH_DMD_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}"
-        COMMAND ${CMAKE_COMMAND} -E echo "Downloading modules to ${DMBOOT_MODULES_OUT_DIR}..."
-        COMMAND ${DMF_GET} -d "${DMBOOT_MODULES_DMD}" -o "${DMBOOT_MODULES_OUT_DIR}" -t "${DMOD_TOOLS_NAME}" --cpu-family "${DMBOOT_MCU_SERIES}" -y --type dmf --config-dir "${DMBOOT_CONFIG_DIR}"
+    )
+    foreach(_DMD_FILE IN LISTS DMBOOT_FLASH_DMD_FILES)
+        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}"
+        )
+    endforeach()
+    list(APPEND _FLASH_DOWNLOAD_COMMANDS
         COMMAND ${CMAKE_COMMAND} -E touch "${DMBOOT_MODULES_MARKER_FILE}"
-        DEPENDS "${DMBOOT_MODULES_DMD}"
-        COMMENT "Downloading modules specified in ${DMBOOT_MODULES_DMD} from DMD..."
+    )
+
+    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}"
         VERBATIM
     )
     add_custom_target(download_modules ALL
         DEPENDS "${DMBOOT_MODULES_MARKER_FILE}"
     )
+    message(STATUS "Flash DMD files: ${DMBOOT_FLASH_DMD_FILES}")
+else()
+    message(WARNING "No flash.dmd files found. Skipping flash module download.")
+    add_custom_target(download_modules ALL)
+endif()
+
+# ======================================================================
+#               Downloading sdcard modules
+# ======================================================================
+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)
+    set(_SDCARD_DOWNLOAD_COMMANDS
+        COMMAND ${CMAKE_COMMAND} -E make_directory "${DMBOOT_SDCARD_OUT_DIR}"
+    )
+    foreach(_DMD_FILE IN LISTS DMBOOT_SDCARD_DMD_FILES)
+        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}"
+        )
+    endforeach()
+    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}"
+        VERBATIM
+    )
+    add_custom_target(download_sdcard_modules ALL
+        DEPENDS "${DMBOOT_SDCARD_MARKER_FILE}"
+    )
+    message(STATUS "Sdcard DMD files: ${DMBOOT_SDCARD_DMD_FILES}")
 else()
-    message(WARNING "Modules DMD file not found at ${DMBOOT_MODULES_DMD}. Skipping module download.")
+    message(STATUS "No sdcard.dmd files found. Skipping sdcard module download.")
+    add_custom_target(download_sdcard_modules ALL)
 endif()
-        
+
 # ======================================================================
-#               Preparing dmp file from modules
+#               Preparing dmp file from flash modules
 # ======================================================================
 find_program(TODMP todmp HINTS ${DMBOOT_TOOLS_DIR})
 if(NOT TODMP)
     message(FATAL_ERROR "todmp tool not found. Please build and install dmod tools first.")
 endif()
-set(DMBOOT_MODULES_PACKAGE_NAME "modules")
-set(DMBOOT_REQUIRED_MODULES_DMD "${DMBOOT_MODULES_DMD}")
 set(DMBOOT_MODULES_DMP "${CMAKE_BINARY_DIR}/modules.dmp")
 
 add_custom_command(
@@ -46,7 +143,7 @@ add_custom_command(
     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"
     DEPENDS download_modules
-    COMMENT "Creating modules dmp file from modules (if any exist)..."
+    COMMENT "Creating modules dmp file from flash modules (if any exist)..."
     VERBATIM
 )
 add_custom_target(prepare_modules_dmp ALL

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Board configuration for STM32F746G Discovery`
	`2`	`+# Sets TARGET for the build system`
	`3`	`+set(TARGET "STM32F746xG" CACHE STRING "Target microcontroller" FORCE)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#`
	`2`	`+# STM32F746G Discovery board sdcard modules - board-specific modules for sdcard`
	`3`	`+#`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
 +#
 +# Common flash modules - loaded for all targets
 +#
 +dmell
 +dmffs
 +dmramfs
 +dmdevfs
 +ls
 +mkdir
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#`
	`2`	`+# Common sdcard modules - loaded for all targets`
	`3`	`+#`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#`
	`2`	`+# STM32F407G sdcard modules - MCU-specific modules for sdcard`
	`3`	`+#`