add DVMV1 firmware compile options; update dvmfirmware submodule;

2 years ago · 19465cb6b3
parent d2968d63f4
commit 19465cb6b3
2 changed files with 9 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -344,7 +344,7 @@ add_custom_target(old_install-service
 #
 project(dvmfw)
 add_custom_target(dvmfw
-    DEPENDS dvmfw-stm32f4 dvmfw-stm32f4-pog dvmfw-stm32f4-eda dvmfw-stm32fx
+    DEPENDS dvmfw-stm32f4 dvmfw-stm32f4-pog dvmfw-stm32f4-eda dvmfw-stm32f4-dvmv1 dvmfw-stm32fx
    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/fw/modem
 )
 add_custom_target(dvmfw-clean
@ -373,6 +373,13 @@ add_custom_target(dvmfw-stm32f4-eda
    COMMAND cp dvm-firmware_eda.bin ${CMAKE_CURRENT_BINARY_DIR}
    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/fw/modem
 )
+add_custom_target(dvmfw-stm32f4-dvmv1
+    COMMAND make -f Makefile.STM32F4_DVMV1 clean
+    COMMAND make -f Makefile.STM32F4_DVMV1
+    COMMAND cp dvm-firmware_f4-dvmv1.elf ${CMAKE_CURRENT_BINARY_DIR}
+    COMMAND cp dvm-firmware_f4-dvmv1.bin ${CMAKE_CURRENT_BINARY_DIR}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/fw/modem
+)
 add_custom_target(dvmfw-sam3x8
    COMMAND make -f Makefile.SAM3X8_DUE clean
    COMMAND make -f Makefile.SAM3X8_DUE
--- a/src/fw/modem
+++ b/src/fw/modem
@ -1 +1 @@
-Subproject commit c9e9f412181d80492ac725afb7be6590a33cc06f
+Subproject commit 9f06958b185203e641434129c7d1f88897c9b081