Skip to content

Commit 4101369

Browse files
hathachhathach
authored
Merge pull request #2622 from hathach/ci-update
Ci update
2 parents a435bef + dfda0b1 commit 4101369

File tree

217 files changed

+6539
-3220
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

217 files changed

+6539
-3220
lines changed

‎.clang-format

+66-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,66 @@
1-
---
2-
BreakBeforeBraces: Linux
3-
ColumnLimit: '200'
4-
ReflowComments: 'true'
5-
6-
...
1+
# Generated from CLion C/C++ Code Style settings
2+
BasedOnStyle: LLVM
3+
AccessModifierOffset: -2
4+
AlignAfterOpenBracket: Align
5+
AlignConsecutiveAssignments: None
6+
AlignOperands: Align
7+
AllowAllArgumentsOnNextLine: false
8+
AllowAllConstructorInitializersOnNextLine: false
9+
AllowAllParametersOfDeclarationOnNextLine: false
10+
AllowShortBlocksOnASingleLine: Always
11+
AllowShortCaseLabelsOnASingleLine: false
12+
AllowShortFunctionsOnASingleLine: All
13+
AllowShortIfStatementsOnASingleLine: Always
14+
AllowShortLambdasOnASingleLine: All
15+
AllowShortLoopsOnASingleLine: true
16+
AlwaysBreakAfterReturnType: None
17+
AlwaysBreakTemplateDeclarations: Yes
18+
BreakBeforeBraces: Custom
19+
BraceWrapping:
20+
AfterCaseLabel: false
21+
AfterClass: false
22+
AfterControlStatement: Never
23+
AfterEnum: false
24+
AfterFunction: false
25+
AfterNamespace: false
26+
AfterUnion: false
27+
BeforeCatch: false
28+
BeforeElse: false
29+
IndentBraces: false
30+
SplitEmptyFunction: false
31+
SplitEmptyRecord: true
32+
BreakBeforeBinaryOperators: None
33+
BreakBeforeTernaryOperators: true
34+
BreakConstructorInitializers: BeforeColon
35+
BreakInheritanceList: BeforeColon
36+
ColumnLimit: 0
37+
CompactNamespaces: false
38+
ContinuationIndentWidth: 4
39+
IndentCaseLabels: true
40+
IndentPPDirectives: BeforeHash
41+
IndentWidth: 2
42+
KeepEmptyLinesAtTheStartOfBlocks: true
43+
MaxEmptyLinesToKeep: 2
44+
NamespaceIndentation: All
45+
ObjCSpaceAfterProperty: false
46+
ObjCSpaceBeforeProtocolList: true
47+
PointerAlignment: Right
48+
ReflowComments: false
49+
SpaceAfterCStyleCast: true
50+
SpaceAfterLogicalNot: false
51+
SpaceAfterTemplateKeyword: false
52+
SpaceBeforeAssignmentOperators: true
53+
SpaceBeforeCpp11BracedList: false
54+
SpaceBeforeCtorInitializerColon: true
55+
SpaceBeforeInheritanceColon: true
56+
SpaceBeforeParens: ControlStatements
57+
SpaceBeforeRangeBasedForLoopColon: false
58+
SpaceInEmptyParentheses: false
59+
SpacesBeforeTrailingComments: 0
60+
SpacesInAngles: false
61+
SpacesInCStyleCastParentheses: false
62+
SpacesInContainerLiterals: true
63+
SpacesInParentheses: false
64+
SpacesInSquareBrackets: false
65+
TabWidth: 2
66+
UseTab: Never

‎.github/workflows/build_arm.yml

+1-8
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,7 @@ jobs:
3535
matrix:
3636
family:
3737
# Alphabetical order
38-
- 'broadcom_32bit'
39-
- 'kinetis_k32l2'
40-
- 'lpc11 lpc13 lpc15'
41-
- 'lpc51'
42-
- 'mm32 msp432e4'
43-
- 'samd11 same5x saml2x'
44-
- 'stm32l0 stm32wb'
45-
- 'tm4c123 xmc4000'
38+
- 'mm32'
4639
steps:
4740
- name: Setup Python
4841
uses: actions/setup-python@v5

‎.github/workflows/build_cmake.yml

+17-11
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,19 @@ jobs:
3737
matrix:
3838
family:
3939
# Alphabetical order
40+
- 'broadcom_32bit'
4041
- 'imxrt'
41-
- 'kinetis_k kinetis_kl'
42+
- 'kinetis_k kinetis_kl kinetis_k32l2'
43+
- 'lpc11 lpc13 lpc15'
4244
- 'lpc17 lpc18 lpc40 lpc43'
43-
- 'lpc54 lpc55'
45+
- 'lpc51 lpc54 lpc55'
4446
- 'mcx'
47+
- 'msp432e4'
48+
- 'mm32'
4549
- 'nrf'
4650
- 'ra'
4751
- 'rp2040'
48-
- 'samd21'
49-
- 'samd51'
52+
- 'samd11 samd21 saml2x samd5x_e5x samg'
5053
- 'stm32f0'
5154
- 'stm32f1'
5255
- 'stm32f2'
@@ -59,6 +62,9 @@ jobs:
5962
- 'stm32h7'
6063
- 'stm32l4'
6164
- 'stm32u5'
65+
- 'stm32wb'
66+
- 'tm4c'
67+
- 'xmc4000'
6268
steps:
6369
- name: Setup Python
6470
uses: actions/setup-python@v5
@@ -87,28 +93,28 @@ jobs:
8793
python3 tools/get_deps.py ${{ matrix.family }}
8894
8995
- name: Build
90-
run: python tools/build_cmake.py ${{ matrix.family }} -DCMAKE_BUILD_TYPE=MinSizeRel
96+
run: python tools/build_cmake.py ${{ matrix.family }}
9197
env:
9298
PICO_SDK_PATH: ${{ github.workspace }}/pico-sdk
9399

94100
- name: Upload Artifacts for Hardware Testing (rp2040)
95-
if: matrix.family == 'rp2040' && github.repository_owner == 'hathach'
101+
if: contains(matrix.family, 'rp2040') && github.repository_owner == 'hathach'
96102
uses: actions/upload-artifact@v4
97103
with:
98104
name: raspberry_pi_pico
99105
path: |
100106
cmake-build/cmake-build-raspberry_pi_pico/*/*/*.elf
101107
102108
- name: Upload Artifacts for Hardware Testing (nRF)
103-
if: matrix.family == 'nrf' && github.repository_owner == 'hathach'
109+
if: contains(matrix.family, 'nrf') && github.repository_owner == 'hathach'
104110
uses: actions/upload-artifact@v4
105111
with:
106112
name: feather_nrf52840_express
107113
path: |
108114
cmake-build/cmake-build-feather_nrf52840_express/*/*/*.elf
109115
110116
- name: Upload Artifacts for Hardware Testing (samd51)
111-
if: matrix.family == 'samd51' && github.repository_owner == 'hathach'
117+
if: contains(matrix.family, 'samd5x_e5x') && github.repository_owner == 'hathach'
112118
uses: actions/upload-artifact@v4
113119
with:
114120
name: itsybitsy_m4
@@ -134,7 +140,7 @@ jobs:
134140
#- 'ra' port later
135141
#- 'rp2040' port later
136142
- 'samd21'
137-
- 'samd51'
143+
- 'samd5x_e5x'
138144
- 'stm32f0'
139145
- 'stm32f1'
140146
- 'stm32f2'
@@ -188,7 +194,7 @@ jobs:
188194
python3 tools/get_deps.py ${{ matrix.family }}
189195
190196
- name: Build
191-
run: python tools/build_cmake.py ${{ matrix.family }} -DTOOLCHAIN=clang -DCMAKE_BUILD_TYPE=MinSizeRel
197+
run: python tools/build_cmake.py ${{ matrix.family }} -DTOOLCHAIN=clang
192198
env:
193199
PICO_SDK_PATH: ${{ github.workspace }}/pico-sdk
194200

@@ -236,7 +242,7 @@ jobs:
236242
python3 tools/get_deps.py ${{ matrix.family }}
237243
238244
- name: Build
239-
run: python tools/build_cmake.py ${{ matrix.family }} -DCMAKE_BUILD_TYPE=MinSizeRel
245+
run: python tools/build_cmake.py ${{ matrix.family }}
240246

241247
# ---------------------------------------
242248
# Hardware in the loop (HIL)

‎.github/workflows/build_iar.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
run: python3 tools/get_deps.py ${{ matrix.family }}
5353

5454
- name: Build
55-
run: python3 tools/build_cmake.py ${{ matrix.family }} -DTOOLCHAIN=iar -DCMAKE_BUILD_TYPE=MinSizeRel
55+
run: python3 tools/build_cmake.py ${{ matrix.family }} -DTOOLCHAIN=iar
5656

5757
- name: Test on actual hardware (hardware in the loop)
5858
run: |

‎.idea/cmake.xml

+39-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/runConfigurations/rp2040.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/build_system/cmake/cpu/arm1176jzf-s.cmake

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
if (TOOLCHAIN STREQUAL "gcc")
2+
set(TOOLCHAIN_COMMON_FLAGS
3+
-mcpu=arm1176jzf-s
4+
-ffreestanding
5+
)
6+
# set(FREERTOS_PORT GCC_ARM_CM0 CACHE INTERNAL "")
7+
8+
elseif (TOOLCHAIN STREQUAL "clang")
9+
set(TOOLCHAIN_COMMON_FLAGS
10+
--target=arm-none-eabi
11+
-mcpu=arm1176jzf-s
12+
-mfpu=none
13+
-mfloat-abi=soft
14+
-ffreestanding
15+
)
16+
#set(FREERTOS_PORT GCC_ARM_CM0 CACHE INTERNAL "")
17+
18+
elseif (TOOLCHAIN STREQUAL "iar")
19+
message(FATAL_ERROR "IAR not supported")
20+
21+
endif ()

‎examples/build_system/cmake/cpu/arm926ej-s.cmake

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
if (TOOLCHAIN STREQUAL "gcc")
2+
set(TOOLCHAIN_COMMON_FLAGS
3+
-mcpu=arm926ej-s
4+
-ffreestanding
5+
)
6+
# set(FREERTOS_PORT GCC_ARM_CM0 CACHE INTERNAL "")
7+
8+
elseif (TOOLCHAIN STREQUAL "clang")
9+
set(TOOLCHAIN_COMMON_FLAGS
10+
--target=arm-none-eabi
11+
-mcpu=arm926ej-s
12+
-mfpu=none
13+
-mfloat-abi=soft
14+
-ffreestanding
15+
)
16+
#set(FREERTOS_PORT GCC_ARM_CM0 CACHE INTERNAL "")
17+
18+
elseif (TOOLCHAIN STREQUAL "iar")
19+
message(FATAL_ERROR "IAR not supported")
20+
21+
endif ()

‎examples/build_system/cmake/cpu/cortex-a53.cmake

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
if (TOOLCHAIN STREQUAL "gcc")
2+
set(TOOLCHAIN_COMMON_FLAGS
3+
-mcpu=cortex-a53
4+
)
5+
# set(FREERTOS_PORT GCC_ARM_CM0 CACHE INTERNAL "")
6+
7+
elseif (TOOLCHAIN STREQUAL "clang")
8+
set(TOOLCHAIN_COMMON_FLAGS
9+
--target=arm-none-eabi
10+
-mcpu=cortex-a53
11+
)
12+
#set(FREERTOS_PORT GCC_ARM_CM0 CACHE INTERNAL "")
13+
14+
elseif (TOOLCHAIN STREQUAL "iar")
15+
message(FATAL_ERROR "IAR not supported")
16+
17+
endif ()

‎examples/build_system/cmake/cpu/cortex-a72.cmake

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
if (TOOLCHAIN STREQUAL "gcc")
2+
set(TOOLCHAIN_COMMON_FLAGS
3+
-mcpu=cortex-a72
4+
)
5+
# set(FREERTOS_PORT GCC_ARM_CM0 CACHE INTERNAL "")
6+
7+
elseif (TOOLCHAIN STREQUAL "clang")
8+
set(TOOLCHAIN_COMMON_FLAGS
9+
--target=arm-none-eabi
10+
-mcpu=cortex-a72
11+
)
12+
#set(FREERTOS_PORT GCC_ARM_CM0 CACHE INTERNAL "")
13+
14+
elseif (TOOLCHAIN STREQUAL "iar")
15+
message(FATAL_ERROR "IAR not supported")
16+
17+
endif ()

‎examples/build_system/cmake/toolchain/aarch64_gcc.cmake

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
if (NOT DEFINED CMAKE_C_COMPILER)
2+
set(CMAKE_C_COMPILER "aarch64-none-elf-gcc")
3+
endif ()
4+
5+
if (NOT DEFINED CMAKE_CXX_COMPILER)
6+
set(CMAKE_CXX_COMPILER "aarch64-none-elf-g++")
7+
endif ()
8+
9+
set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
10+
set(CMAKE_SIZE "aarch64-none-elf-size" CACHE FILEPATH "")
11+
set(CMAKE_OBJCOPY "aarch64-none-elf-objcopy" CACHE FILEPATH "")
12+
set(CMAKE_OBJDUMP "aarch64-none-elf-objdump" CACHE FILEPATH "")
13+
14+
include(${CMAKE_CURRENT_LIST_DIR}/common.cmake)
15+
16+
get_property(IS_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE)
17+
if (IS_IN_TRY_COMPILE)
18+
set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -nostdlib")
19+
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -nostdlib")
20+
cmake_print_variables(CMAKE_C_LINK_FLAGS)
21+
endif ()

‎examples/build_system/make/cpu/arm1176.mk renamed to ‎examples/build_system/make/cpu/arm1176jzf-s.mk

File renamed without changes.

‎examples/build_system/make/cpu/arm926ej-s.mk

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
ifeq ($(TOOLCHAIN),gcc)
2+
CFLAGS += \
3+
-mcpu=arm926ej-s \
4+
5+
else ifeq ($(TOOLCHAIN),iar)
6+
#CFLAGS += --cpu cortex-a53
7+
#ASFLAGS += --cpu cortex-a53
8+
9+
endif

‎examples/device/audio_4_channel_mic_freertos/skip.txt

+2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ mcu:SAMX7X
1010
mcu:VALENTYUSB_EPTRI
1111
mcu:RAXXX
1212
mcu:STM32L0
13+
board:lpcxpresso11u37
14+
board:lpcxpresso1347
1315
family:broadcom_32bit
1416
family:broadcom_64bit

‎hw/bsp/broadcom_32bit/boards/raspberrypi_zero/board.cmake

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
set(CMAKE_SYSTEM_PROCESSOR arm1176jzf-s CACHE INTERNAL "System Processor")
2+
#set(SUFFIX "")
3+
4+
function(update_board TARGET)
5+
target_compile_definitions(${TARGET} PUBLIC
6+
BCM_VERSION=2835
7+
)
8+
endfunction()

‎hw/bsp/broadcom_32bit/boards/raspberrypi_zero_w/board.h renamed to ‎hw/bsp/broadcom_32bit/boards/raspberrypi_zero/board.h

File renamed without changes.

‎hw/bsp/broadcom_32bit/boards/raspberrypi_zero_w/board.mk renamed to ‎hw/bsp/broadcom_32bit/boards/raspberrypi_zero/board.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CPU_CORE = arm1176
1+
CPU_CORE = arm1176jzf-s
22
CFLAGS += -DBCM_VERSION=2835 \
33
-DCFG_TUSB_MCU=OPT_MCU_BCM2835
44

0 commit comments

Comments
 (0)