Build prometheus with makefiles instead of batch scripts (#1020)

* use makefiles instead of batch

* add to ci

* put batch files back, but minimum logic

* default to release

* debug level opt too

.github/workflows/build-firmware.yaml

@@ -12,7 +12,7 @@ jobs:
       matrix:
         # What boards should we build for? In the 'include' section below,
         # set up what each of these boards needs to build.
-        build-target: [frankenso, mre-f4, mre-f7]
+        build-target: [frankenso, mre-f4, mre-f7, prometheus-405, prometheus-469]
         build-type: [debug, release]
         
         include:
@@ -29,6 +29,14 @@ jobs:
             efi-cpu: ARCH_STM32F7
             efi-board: microrusefi
 
+          - build-target: prometheus-405
+            efi-cpu: ARCH_STM32F4
+            efi-board: prometheus/f405
+
+          - build-target: prometheus-469
+            efi-cpu: ARCH_STM32F4
+            efi-board: prometheus/f469
+
           # Debug vs. release configuration
           - build-type: debug
             extra-params: -DDUMMY

firmware/config/boards/prometheus/!compile-prometheus_405.bat

@@ -3,13 +3,7 @@ rem STM32F405 version of the firmware for https://rusefi.com/forum/viewtopic.php
 rem
 
 cd ../../..
-set PROJECT_BOARD=prometheus
-set PROMETHEUS_BOARD=405
-set EXTRA_PARAMS=-DDUMMY -DSTM32F405xx -DEFI_ENABLE_ASSERTS=FALSE ^
- -DFIRMWARE_ID=\"prometheus405\" ^
- -DCH_DBG_ENABLE_TRACE=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE
-set DEBUG_LEVEL_OPT="-O2"
-set USE_BOOTLOADER=yes
+set PROJECT_BOARD=prometheus/f405
 
 call config/boards/common_make.bat
 

firmware/config/boards/prometheus/!compile-prometheus_469.bat

@@ -3,12 +3,7 @@ rem STM32F469 version of the firmware for https://rusefi.com/forum/viewtopic.php
 rem
 
 cd ../../..
-set PROJECT_BOARD=prometheus
-set PROMETHEUS_BOARD=469
-set EXTRA_PARAMS=-DDUMMY -DSTM32F469xx -DEFI_ENABLE_ASSERTS=FALSE ^
- -DFIRMWARE_ID=\"prometeus469\" ^
- -DCH_DBG_ENABLE_TRACE=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE
-set DEBUG_LEVEL_OPT="-O2"
+set PROJECT_BOARD=prometheus/f469
 set USE_BOOTLOADER=yes
 
 call config/boards/common_make.bat

firmware/config/boards/prometheus/f405/board.mk

@@ -0,0 +1,3 @@
+PROMETHEUS_BOARD = 405
+
+include $(PROJECT_DIR)/config/boards/prometheus/prometheus-common.mk

firmware/config/boards/prometheus/f469/board.mk

@@ -0,0 +1,3 @@
+PROMETHEUS_BOARD = 469
+
+include $(PROJECT_DIR)/config/boards/prometheus/prometheus-common.mk

firmware/config/boards/prometheus/prometheus-common.mk

@@ -7,17 +7,25 @@ BOARDSRC_CPP = $(PROJECT_DIR)/config/boards/Prometheus/board_configuration.cpp
 # Required include directories
 BOARDINC = $(PROJECT_DIR)/config/boards/prometheus
 
-# Override LD script
-ifeq ($(USE_BOOTLOADER),yes)
-  # include Prometheus bootloader code
-  BOOTLOADERINC= $(PROJECT_DIR)/bootloader/prometheus/$(PROMETHEUS_BOARD)
+# This board uses bootloader
+USE_BOOTLOADER=yes
+
+# include Prometheus bootloader code
+BOOTLOADERINC= $(PROJECT_DIR)/bootloader/prometheus/$(PROMETHEUS_BOARD)
+
+# Default to a release build - clear EXTRA_PARAMS from cmdline to build debug
+ifeq ($(EXTRA_PARAMS),)
+	EXTRA_PARAMS=-DEFI_ENABLE_ASSERTS=FALSE-DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE
+endif
+ifeq ($(DEBUG_LEVEL_OPT),)
+	DEBUG_LEVEL_OPT = -O2
 endif
 
 ifeq ($(PROMETHEUS_BOARD),405)
 LDSCRIPT= $(PROJECT_DIR)/config/boards/prometheus/STM32F405xG.ld
-DDEFS += -DDEFAULT_ENGINE_TYPE=PROMETHEUS_DEFAULTS -DSTM32F405xx
+DDEFS += -DDEFAULT_ENGINE_TYPE=PROMETHEUS_DEFAULTS -DSTM32F405xx -DFIRMWARE_ID=\"prometeus405\"
 else
 # Override DEFAULT_ENGINE_TYPE
 LDSCRIPT= $(PROJECT_DIR)/config/boards/prometheus/STM32F469xI.ld
-DDEFS += -DDEFAULT_ENGINE_TYPE=PROMETHEUS_DEFAULTS -DSTM32F469xx
+DDEFS += -DDEFAULT_ENGINE_TYPE=PROMETHEUS_DEFAULTS -DSTM32F469xx -DFIRMWARE_ID=\"prometeus469\"
 endif