github CI fix (Kinetis/release) (#1045)
* fix? * more fix * Proteus fix * fix Kinetis gen_config * update Kinetis config * quotes fix? * quotes fix?? * Okay, no quotes, just move -DFIRMWARE_ID inside .mk * Exclude Kinetis/debug build
This commit is contained in:
parent
ede7f4d872
commit
deaef6c5bc
|
@ -44,7 +44,8 @@ jobs:
|
|||
- build-target: kinetis
|
||||
efi-cpu: kinetis
|
||||
efi-board: kinetis
|
||||
extra-params: -DDUMMY -DCPU_MKE16F512VLH16 -DCPU_MKE16F512VLH16_cm4 -D__USE_CMSI
|
||||
extra-extra-params: -DCPU_MKE16F512VLH16 -DCPU_MKE16F512VLH16_cm4 -D__USE_CMSI -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
|
||||
extra-options: USE_FATFS=no USE_BOOTLOADER=no
|
||||
|
||||
# Debug vs. release configuration
|
||||
- build-type: debug
|
||||
|
@ -54,7 +55,11 @@ jobs:
|
|||
- build-type: release
|
||||
extra-params: -DEFI_ENABLE_ASSERTS=FALSE -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
|
||||
build-debug-level-opt: -O2 -ggdb -g3
|
||||
|
||||
|
||||
exclude:
|
||||
- build-target: kinetis
|
||||
build-type: debug
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
with:
|
||||
|
@ -75,7 +80,7 @@ jobs:
|
|||
# Build the firmware!
|
||||
- name: Build Firmware
|
||||
working-directory: ./firmware/
|
||||
run: make -j4 PROJECT_BOARD=${{matrix.efi-board}} PROJECT_CPU=${{matrix.efi-cpu}} EXTRA_PARAMS="${{matrix.extra-params}}" DEBUG_LEVEL_OPT='${{matrix.build-debug-level-opt}}'
|
||||
run: make -j4 PROJECT_BOARD=${{matrix.efi-board}} PROJECT_CPU=${{matrix.efi-cpu}} EXTRA_PARAMS="${{matrix.extra-params}} ${{matrix.extra-extra-params}}" DEBUG_LEVEL_OPT='${{matrix.build-debug-level-opt}}' ${{matrix.extra-options}}
|
||||
|
||||
# The next two steps upload the bin and elf as build artifacts
|
||||
- name: Upload elf
|
||||
|
|
|
@ -3,7 +3,6 @@ rem TODO: somehow this -DDUMMY is helping us to not mess up the parameters, why?
|
|||
rem https://github.com/rusefi/rusefi/issues/684
|
||||
set EXTRA_PARAMS=-DDUMMY -DCPU_MKE16F512VLH16 -DCPU_MKE16F512VLH16_cm4 -D__USE_CMSIS^
|
||||
-DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE^
|
||||
-DFIRMWARE_ID=\"kinetis\" ^
|
||||
-DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
|
||||
set BUILDDIR=build_kinetis
|
||||
set PROJECT_BOARD=kinetis
|
||||
|
|
|
@ -12,4 +12,4 @@ CPU_HWLAYER = ports/kinetis
|
|||
|
||||
GENERATED_ENUMS_DIR = $(BOARD_DIR)/config/controllers/algo
|
||||
|
||||
EXTRA_PARAMS += -nodefaultlibs -L$(PROJECT_DIR)/config/boards/$(PROJECT_BOARD)/libc -lgcc -ltinyc
|
||||
EXTRA_PARAMS += -DFIRMWARE_ID=\"kinetis\" -nodefaultlibs -L$(PROJECT_DIR)/config/boards/$(PROJECT_BOARD)/libc -lgcc -ltinyc
|
||||
|
|
|
@ -21,9 +21,12 @@ mkdir build_kinetis
|
|||
|
||||
java ^
|
||||
-DSystemOut.name=gen_config ^
|
||||
-Drusefi.generator.lazyfile.enabled=true ^
|
||||
-jar ../java_tools/ConfigDefinition.jar ^
|
||||
-definition integration/rusefi_config.txt ^
|
||||
-ts_destination tunerstudio ^
|
||||
-with_c_defines false ^
|
||||
-initialize_to_zero false ^
|
||||
-ts_output_name rusefi_kinetis.ini ^
|
||||
-c_defines config/boards/kinetis/config/controllers/algo/rusefi_generated.h ^
|
||||
-c_destination config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h ^
|
||||
|
|
|
@ -627,6 +627,8 @@ case NISSAN_PRIMERA:
|
|||
return "NISSAN_PRIMERA";
|
||||
case PROMETHEUS_DEFAULTS:
|
||||
return "PROMETHEUS_DEFAULTS";
|
||||
case PROTEUS:
|
||||
return "PROTEUS";
|
||||
case ROVER_V8:
|
||||
return "ROVER_V8";
|
||||
case SACHS:
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue