Merge branch 'master' into fork/JannisKonradBecker/master

This commit is contained in:
hathach
2025-02-06 17:56:10 +07:00
3 changed files with 7 additions and 5 deletions

View File

@@ -111,6 +111,7 @@ jobs:
# --------------------------------------- # ---------------------------------------
# Build IAR on HFP self-hosted # Build IAR on HFP self-hosted
# Since IAR Token secret is not passed to forked PR, only build on PR from the same repo
# --------------------------------------- # ---------------------------------------
arm-iar: arm-iar:
if: github.repository_owner == 'hathach' && github.event_name == 'push' if: github.repository_owner == 'hathach' && github.event_name == 'push'

View File

@@ -90,9 +90,10 @@ jobs:
# --------------------------------------- # ---------------------------------------
# Hardware in the loop (HIL) # Hardware in the loop (HIL)
# self-hosted by HFP, build with IAR toolchain, for attached hardware checkout test/hil/hfp.json # self-hosted by HFP, build with IAR toolchain, for attached hardware checkout test/hil/hfp.json
# Since IAR Token secret is not passed to forked PR, only build on PR from the same repo
# --------------------------------------- # ---------------------------------------
hil-hfp: hil-hfp:
if: github.repository_owner == 'hathach' if: github.repository_owner == 'hathach' && github.event.pull_request.head.repo.fork == false
runs-on: [self-hosted, Linux, X64, hifiphile] runs-on: [self-hosted, Linux, X64, hifiphile]
env: env:
IAR_LMS_BEARER_TOKEN: ${{ secrets.IAR_LMS_BEARER_TOKEN }} IAR_LMS_BEARER_TOKEN: ${{ secrets.IAR_LMS_BEARER_TOKEN }}

View File

@@ -1,12 +1,12 @@
CFLAGS += -DSTM32F407xx CFLAGS += -DSTM32F407xx
# GCC # GCC
GCC_SRC_S += $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f407xx.s SRC_S_GCC += $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f407xx.s
GCC_LD_FILE = $(BOARD_PATH)/STM32F407VETX_FLASH.ld LD_FILE_GCC = $(BOARD_PATH)/STM32F407VETx_FLASH.ld
# IAR # IAR
IAR_SRC_S += $(ST_CMSIS)/Source/Templates/iar/startup_stm32f407xx.s SRC_S_IAR += $(ST_CMSIS)/Source/Templates/iar/startup_stm32f407xx.s
IAR_LD_FILE = $(ST_CMSIS)/Source/Templates/iar/linker/stm32f407xx_flash.icf LD_FILE_IAR = $(ST_CMSIS)/Source/Templates/iar/linker/stm32f407xx_flash.icf
# For flash-jlink target # For flash-jlink target