From 12db2221e639bb36269f5ad11659cab358e59f95 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sun, 5 Feb 2023 16:56:13 -0800 Subject: [PATCH] make nucleo builds normal (#5035) * make nucleo builds normal * no skip for test * don't check for `no` * put back skips --- .github/workflows/build-firmware.yaml | 11 ++++------- firmware/config/boards/nucleo_f429/prepend.txt | 0 firmware/config/boards/nucleo_f767/board.mk | 2 +- .../config/boards/nucleo_f767/board_configuration.cpp | 7 ------- firmware/config/boards/nucleo_f767/prepend.txt | 0 firmware/config/boards/nucleo_h743/prepend.txt | 0 misc/jenkins/build_working_folder.sh | 5 ----- 7 files changed, 5 insertions(+), 20 deletions(-) create mode 100644 firmware/config/boards/nucleo_f429/prepend.txt delete mode 100644 firmware/config/boards/nucleo_f767/board_configuration.cpp create mode 100644 firmware/config/boards/nucleo_f767/prepend.txt create mode 100644 firmware/config/boards/nucleo_h743/prepend.txt diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml index 0f4abb50a9..344bd7e614 100644 --- a/.github/workflows/build-firmware.yaml +++ b/.github/workflows/build-firmware.yaml @@ -241,20 +241,17 @@ jobs: - build-target: stm32f429_nucleo folder: nucleo_f429 - ini-file: no - skip-config: yes + ini-file: rusefi_stm32f429_nucleo.ini - build-target: stm32f767_nucleo folder: nucleo_f767 - ini-file: no + ini-file: rusefi_stm32f767_nucleo.ini console-settings: firmware/config/boards/nucleo_f767/rusefi_console_properties.xml - skip-config: yes skip-rate: 95 - build-target: stm32h743_nucleo folder: nucleo_h743 - ini-file: no - skip-config: yes + ini-file: rusefi_stm32h743_nucleo.ini skip-rate: 95 - build-target: subaru_eg33_f7 @@ -340,7 +337,7 @@ jobs: run: ./gen_enum_to_string.sh - name: Generate Configs for build-target - if: ${{ matrix.skip-config != 'yes' && env.skip != 'true' }} + if: ${{ env.skip != 'true' }} working-directory: ./firmware/ # todo: we have code duplication with gen_config.sh here :( run: | diff --git a/firmware/config/boards/nucleo_f429/prepend.txt b/firmware/config/boards/nucleo_f429/prepend.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/firmware/config/boards/nucleo_f767/board.mk b/firmware/config/boards/nucleo_f767/board.mk index 9176fb1af1..0aa65dced0 100644 --- a/firmware/config/boards/nucleo_f767/board.mk +++ b/firmware/config/boards/nucleo_f767/board.mk @@ -1,7 +1,7 @@ # List of all the board related files. # F429 and F767 Nucleo are indeed the same board with a different chip fitted - so recycle the F429 config -BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp +BOARDCPPSRC = $(BOARDS_DIR)/nucleo_f429/board_configuration.cpp # reducing flash consumption for EFI_ETHERNET to fit DDEFS += -DEFI_FILE_LOGGING=FALSE -DEFI_ALTERNATOR_CONTROL=FALSE -DEFI_LOGIC_ANALYZER=FALSE -DEFI_ENABLE_ASSERTS=FALSE diff --git a/firmware/config/boards/nucleo_f767/board_configuration.cpp b/firmware/config/boards/nucleo_f767/board_configuration.cpp deleted file mode 100644 index 3505ae5e7e..0000000000 --- a/firmware/config/boards/nucleo_f767/board_configuration.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "pch.h" - -void setBoardConfigOverrides() { -} - -void preHalInit() { -} diff --git a/firmware/config/boards/nucleo_f767/prepend.txt b/firmware/config/boards/nucleo_f767/prepend.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/firmware/config/boards/nucleo_h743/prepend.txt b/firmware/config/boards/nucleo_h743/prepend.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/misc/jenkins/build_working_folder.sh b/misc/jenkins/build_working_folder.sh index 510371eea7..d511c7ebae 100755 --- a/misc/jenkins/build_working_folder.sh +++ b/misc/jenkins/build_working_folder.sh @@ -33,11 +33,6 @@ ls -l $FOLDER wget https://rusefi.com/build_server/st_files/silent_st_drivers2.exe -P $DRIVERS_FOLDER [ -e $DRIVERS_FOLDER/silent_st_drivers2.exe ] || { echo "$SCRIPT_NAME: ERROR DOWNLOADING silent_st_drivers2.exe"; exit 1; } -if [ "$INI_FILE_OVERRIDE" = "no" ]; then - INI_FILE_OVERRIDE="rusefi.ini" - echo "$SCRIPT_NAME: N/a ini_file_override specified" -fi - if [ -z $INI_FILE_OVERRIDE ]; then INI_FILE_OVERRIDE="rusefi.ini" echo "$SCRIPT_NAME: No ini_file_override specified"