Skip to content

Commit 22ac459

Browse files
committed
Update submodule commits and enhance module download process; add CPU family option and ensure 'mkdir' is included in module list
1 parent f52b5e7 commit 22ac459

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

lib/dmod

Submodule dmod updated 41 files

lib/dmvfs

Submodule dmvfs updated 1 file

modules/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if(EXISTS "${DMBOOT_MODULES_DMD}")
1414
OUTPUT "${DMBOOT_MODULES_MARKER_FILE}"
1515
COMMAND ${CMAKE_COMMAND} -E make_directory "${DMBOOT_MODULES_OUT_DIR}"
1616
COMMAND ${CMAKE_COMMAND} -E echo "Downloading modules to ${DMBOOT_MODULES_OUT_DIR}..."
17-
COMMAND ${DMF_GET} -d "${DMBOOT_MODULES_DMD}" -o "${DMBOOT_MODULES_OUT_DIR}" -t "${DMOD_TOOLS_NAME}" --type dmf
17+
COMMAND ${DMF_GET} -d "${DMBOOT_MODULES_DMD}" -o "${DMBOOT_MODULES_OUT_DIR}" -t "${DMOD_TOOLS_NAME}" --cpu-family "${DMBOOT_MCU_SERIES}" -y --type dmf
1818
COMMAND ${CMAKE_COMMAND} -E touch "${DMBOOT_MODULES_MARKER_FILE}"
1919
DEPENDS "${DMBOOT_MODULES_DMD}"
2020
COMMENT "Downloading modules specified in ${DMBOOT_MODULES_DMD} from DMD..."
@@ -44,7 +44,7 @@ add_custom_command(
4444
COMMAND ${CMAKE_COMMAND} -E echo "Checking if modules directory contains files..."
4545
COMMAND ${CMAKE_COMMAND} -E echo "Contents of ${DMBOOT_MODULES_OUT_DIR}:"
4646
COMMAND ls -la ${DMBOOT_MODULES_OUT_DIR} || ${CMAKE_COMMAND} -E echo "Directory is empty or does not exist"
47-
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}; ls ${DMBOOT_MODULES_OUT_DIR}/*.dmf; else echo 'No .dmf files found'; fi"
47+
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"
4848
DEPENDS download_modules
4949
COMMENT "Creating modules dmp file from modules (if any exist)..."
5050
VERBATIM

modules/modules.dmd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ dmell
55
dmffs
66
dmramfs
77
ls
8-
mkdir
8+
mkdir
9+
dmclk

0 commit comments

Comments
 (0)