From c7aa6f3d43c87d9d6cd50b75d3a62463a5548b40 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 25 May 2022 10:44:34 -0400 Subject: [PATCH] console uses .hex Looks like I broke MRE and Proteus with OpenBLT #4199 steps towards proper script in HW CI --- .github/workflows/build-firmware.yaml | 1 + .github/workflows/hardware-ci.yaml | 2 +- firmware/Makefile | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml index e4489c62b9..81c96d8dd7 100644 --- a/.github/workflows/build-firmware.yaml +++ b/.github/workflows/build-firmware.yaml @@ -369,6 +369,7 @@ jobs: name: rusefi_bundle_${{matrix.build-target}}_autoupdate.zip path: ./artifacts/rusefi_bundle_${{matrix.build-target}}_autoupdate.zip + # here we build f407-discovery build-primary-bundle: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/hardware-ci.yaml b/.github/workflows/hardware-ci.yaml index efded33817..f7bd768282 100644 --- a/.github/workflows/hardware-ci.yaml +++ b/.github/workflows/hardware-ci.yaml @@ -62,7 +62,7 @@ jobs: - name: Build Firmware working-directory: ./firmware - run: make -j6 EXTRA_PARAMS="-DHARDWARE_CI" PROJECT_BOARD=${{matrix.board}} + run: make -j6 EXTRA_2_PARAMS="-DHARDWARE_CI" PROJECT_BOARD=${{matrix.board}} - name: Check for STLINK run: lsusb | grep 'ST-LINK\|STLINK' diff --git a/firmware/Makefile b/firmware/Makefile index 94c079a85b..48c4d717f6 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -46,8 +46,10 @@ endif # Compiler options here. +# yes we have two kinds of EXTRA_*PARAMS so that we can define those in two different places independently +# ifeq ($(USE_OPT),) - USE_OPT = $(EXTRA_PARAMS) $(DEBUG_LEVEL_OPT) $(RFLAGS) -fomit-frame-pointer -falign-functions=16 -fsingle-precision-constant + USE_OPT = $(EXTRA_PARAMS) $(EXTRA_2_PARAMS) $(DEBUG_LEVEL_OPT) $(RFLAGS) -fomit-frame-pointer -falign-functions=16 -fsingle-precision-constant endif # EFI_UNIT_TEST determines if we are running in a unit test (hide things from hw/sim)