Skip to content

Commit 7ac85d0

Browse files
hathachhathach
committed
move lpc18 and rp2040 to cmake workflow since rp2040 often failed randomly with make
1 parent 05cc342 commit 7ac85d0

File tree

12 files changed

+429
-34
lines changed

12 files changed

+429
-34
lines changed

‎.github/workflows/build_arm.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,11 @@ jobs:
3535
# Alphabetical order
3636
- 'broadcom_32bit'
3737
- 'kinetis_k32l kinetis_kl'
38-
- 'lpc11 lpc13 lpc15 lpc17 lpc18'
38+
- 'lpc11 lpc13 lpc15 lpc17'
3939
- 'lpc51 lpc54 lpc55'
4040
- 'mm32 msp432e4'
4141
- 'nrf'
4242
- 'ra'
43-
- 'rp2040'
4443
- 'samd11 samd21'
4544
- 'samd51 same5x'
4645
- 'saml2x'

‎.github/workflows/cmake_arm.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
family:
35-
# Alphabetical order
36-
- 'mcx'
37-
- 'imxrt'
35+
# Alphabetical order
36+
- 'lpc18'
37+
- 'mcx'
38+
- 'imxrt'
39+
- 'rp2040'
3840
steps:
3941
- name: Setup Python
4042
uses: actions/setup-python@v4
@@ -52,8 +54,19 @@ jobs:
5254
- name: Checkout TinyUSB
5355
uses: actions/checkout@v3
5456

57+
- name: Checkout pico-sdk for rp2040
58+
if: matrix.family == 'rp2040'
59+
uses: actions/checkout@v3
60+
with:
61+
repository: raspberrypi/pico-sdk
62+
ref: develop
63+
path: pico-sdk
64+
5565
- name: Get Dependencies
5666
run: python3 tools/get_deps.py ${{ matrix.family }}
5767

5868
- name: Build
5969
run: python tools/build_cmake.py ${{ matrix.family }}
70+
env:
71+
# for rp2040, there is no harm if defined for other families
72+
PICO_SDK_PATH: ${{ github.workspace }}/pico-sdk

‎hw/bsp/imxrt/FreeRTOSConfig/FreeRTOSConfig.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ extern uint32_t SystemCoreClock;
4949
#endif
5050

5151
/* Cortex M23/M33 port configuration. */
52-
#define configENABLE_MPU 0
53-
#define configENABLE_FPU 1
54-
#define configENABLE_TRUSTZONE 0
55-
#define configMINIMAL_SECURE_STACK_SIZE ( 1024 )
52+
#define configENABLE_MPU 0
53+
#define configENABLE_FPU 1
54+
#define configENABLE_TRUSTZONE 0
55+
#define configMINIMAL_SECURE_STACK_SIZE (1024)
5656

5757
#define configUSE_PREEMPTION 1
5858
#define configUSE_PORT_OPTIMISED_TASK_SELECTION 0

‎hw/bsp/lpc18/FreeRTOSConfig/FreeRTOSConfig.h

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
/*
2+
* FreeRTOS Kernel V10.0.0
3+
* Copyright (C) 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
*
5+
* Permission is hereby granted, free of charge, to any person obtaining a copy of
6+
* this software and associated documentation files (the "Software"), to deal in
7+
* the Software without restriction, including without limitation the rights to
8+
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
9+
* the Software, and to permit persons to whom the Software is furnished to do so,
10+
* subject to the following conditions:
11+
*
12+
* The above copyright notice and this permission notice shall be included in all
13+
* copies or substantial portions of the Software. If you wish to use our Amazon
14+
* FreeRTOS name, please do so in a fair use way that does not cause confusion.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
18+
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
19+
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
20+
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21+
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22+
*
23+
* http://www.FreeRTOS.org
24+
* http://aws.amazon.com/freertos
25+
*
26+
* 1 tab == 4 spaces!
27+
*/
28+
29+
30+
#ifndef FREERTOS_CONFIG_H
31+
#define FREERTOS_CONFIG_H
32+
33+
/*-----------------------------------------------------------
34+
* Application specific definitions.
35+
*
36+
* These definitions should be adjusted for your particular hardware and
37+
* application requirements.
38+
*
39+
* THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
40+
* FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
41+
*
42+
* See http://www.freertos.org/a00110.html.
43+
*----------------------------------------------------------*/
44+
45+
// IAR assembler have limited preprocessor support and it only need following macros:
46+
#ifndef __IASMARM__
47+
// FIXME cause redundant-decls warnings
48+
extern uint32_t SystemCoreClock;
49+
#endif
50+
51+
/* Cortex M23/M33 port configuration. */
52+
#define configENABLE_MPU 0
53+
#define configENABLE_FPU 0
54+
#define configENABLE_TRUSTZONE 0
55+
#define configMINIMAL_SECURE_STACK_SIZE (1024)
56+
57+
#define configUSE_PREEMPTION 1
58+
#define configUSE_PORT_OPTIMISED_TASK_SELECTION 0
59+
#define configCPU_CLOCK_HZ SystemCoreClock
60+
#define configTICK_RATE_HZ ( 1000 )
61+
#define configMAX_PRIORITIES ( 5 )
62+
#define configMINIMAL_STACK_SIZE ( 128 )
63+
#define configTOTAL_HEAP_SIZE ( configSUPPORT_DYNAMIC_ALLOCATION*4*1024 )
64+
#define configMAX_TASK_NAME_LEN 16
65+
#define configUSE_16_BIT_TICKS 0
66+
#define configIDLE_SHOULD_YIELD 1
67+
#define configUSE_MUTEXES 1
68+
#define configUSE_RECURSIVE_MUTEXES 1
69+
#define configUSE_COUNTING_SEMAPHORES 1
70+
#define configQUEUE_REGISTRY_SIZE 2
71+
#define configUSE_QUEUE_SETS 0
72+
#define configUSE_TIME_SLICING 0
73+
#define configUSE_NEWLIB_REENTRANT 0
74+
#define configENABLE_BACKWARD_COMPATIBILITY 1
75+
#define configSTACK_ALLOCATION_FROM_SEPARATE_HEAP 0
76+
77+
#define configSUPPORT_STATIC_ALLOCATION 0
78+
#define configSUPPORT_DYNAMIC_ALLOCATION 1
79+
80+
/* Hook function related definitions. */
81+
#define configUSE_IDLE_HOOK 0
82+
#define configUSE_TICK_HOOK 0
83+
#define configUSE_MALLOC_FAILED_HOOK 0 // cause nested extern warning
84+
#define configCHECK_FOR_STACK_OVERFLOW 2
85+
86+
/* Run time and task stats gathering related definitions. */
87+
#define configGENERATE_RUN_TIME_STATS 0
88+
#define configRECORD_STACK_HIGH_ADDRESS 1
89+
#define configUSE_TRACE_FACILITY 1 // legacy trace
90+
#define configUSE_STATS_FORMATTING_FUNCTIONS 0
91+
92+
/* Co-routine definitions. */
93+
#define configUSE_CO_ROUTINES 0
94+
#define configMAX_CO_ROUTINE_PRIORITIES 2
95+
96+
/* Software timer related definitions. */
97+
#define configUSE_TIMERS 1
98+
#define configTIMER_TASK_PRIORITY (configMAX_PRIORITIES-2)
99+
#define configTIMER_QUEUE_LENGTH 32
100+
#define configTIMER_TASK_STACK_DEPTH configMINIMAL_STACK_SIZE
101+
102+
/* Optional functions - most linkers will remove unused functions anyway. */
103+
#define INCLUDE_vTaskPrioritySet 0
104+
#define INCLUDE_uxTaskPriorityGet 0
105+
#define INCLUDE_vTaskDelete 0
106+
#define INCLUDE_vTaskSuspend 1 // required for queue, semaphore, mutex to be blocked indefinitely with portMAX_DELAY
107+
#define INCLUDE_xResumeFromISR 0
108+
#define INCLUDE_vTaskDelayUntil 1
109+
#define INCLUDE_vTaskDelay 1
110+
#define INCLUDE_xTaskGetSchedulerState 0
111+
#define INCLUDE_xTaskGetCurrentTaskHandle 1
112+
#define INCLUDE_uxTaskGetStackHighWaterMark 0
113+
#define INCLUDE_xTaskGetIdleTaskHandle 0
114+
#define INCLUDE_xTimerGetTimerDaemonTaskHandle 0
115+
#define INCLUDE_pcTaskGetTaskName 0
116+
#define INCLUDE_eTaskGetState 0
117+
#define INCLUDE_xEventGroupSetBitFromISR 0
118+
#define INCLUDE_xTimerPendFunctionCall 0
119+
120+
/* Define to trap errors during development. */
121+
// Halt CPU (breakpoint) when hitting error, only apply for Cortex M3, M4, M7
122+
#if defined(__ARM_ARCH_7M__) || defined (__ARM_ARCH_7EM__)
123+
#define configASSERT(_exp) \
124+
do {\
125+
if ( !(_exp) ) { \
126+
volatile uint32_t* ARM_CM_DHCSR = ((volatile uint32_t*) 0xE000EDF0UL); /* Cortex M CoreDebug->DHCSR */ \
127+
if ( (*ARM_CM_DHCSR) & 1UL ) { /* Only halt mcu if debugger is attached */ \
128+
taskDISABLE_INTERRUPTS(); \
129+
__asm("BKPT #0\n"); \
130+
}\
131+
}\
132+
} while(0)
133+
#else
134+
#define configASSERT( x )
135+
#endif
136+
137+
/* FreeRTOS hooks to NVIC vectors */
138+
#define xPortPendSVHandler PendSV_Handler
139+
#define xPortSysTickHandler SysTick_Handler
140+
#define vPortSVCHandler SVC_Handler
141+
142+
//--------------------------------------------------------------------+
143+
// Interrupt nesting behavior configuration.
144+
//--------------------------------------------------------------------+
145+
146+
// For Cortex-M specific: __NVIC_PRIO_BITS is defined in mcu header
147+
#define configPRIO_BITS 3
148+
149+
/* The lowest interrupt priority that can be used in a call to a "set priority" function. */
150+
#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY ((1<<configPRIO_BITS) - 1)
151+
152+
/* The highest interrupt priority that can be used by any interrupt service
153+
routine that makes calls to interrupt safe FreeRTOS API functions. DO NOT CALL
154+
INTERRUPT SAFE FREERTOS API FUNCTIONS FROM ANY INTERRUPT THAT HAS A HIGHER
155+
PRIORITY THAN THIS! (higher priorities are lower numeric values. */
156+
#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY 2
157+
158+
/* Interrupt priorities used by the kernel port layer itself. These are generic
159+
to all Cortex-M ports, and do not rely on any particular library functions. */
160+
#define configKERNEL_INTERRUPT_PRIORITY ( configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
161+
162+
/* !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!!
163+
See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */
164+
#define configMAX_SYSCALL_INTERRUPT_PRIORITY ( configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
165+
166+
#endif

‎hw/bsp/lpc55/FreeRTOSConfig/FreeRTOSConfig.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ extern uint32_t SystemCoreClock;
4949
#endif
5050

5151
/* Cortex M23/M33 port configuration. */
52-
#define configENABLE_MPU 0
53-
#define configENABLE_FPU 1
54-
#define configENABLE_TRUSTZONE 0
55-
#define configMINIMAL_SECURE_STACK_SIZE ( 1024 )
52+
#define configENABLE_MPU 0
53+
#define configENABLE_FPU 1
54+
#define configENABLE_TRUSTZONE 0
55+
#define configMINIMAL_SECURE_STACK_SIZE (1024)
5656

5757
#define configUSE_PREEMPTION 1
5858
#define configUSE_PORT_OPTIMISED_TASK_SELECTION 0

‎hw/bsp/lpc55/boards/double_m33_express/board.cmake

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
set(MCU_VARIANT LPC55S69)
2+
set(MCU_CORE LPC55S69_cm33_core0)
3+
4+
set(JLINK_DEVICE LPC55S69)
5+
set(PYOCD_TARGET LPC55S69)
6+
set(NXPLINK_DEVICE LPC55S69:LPCXpresso55S69)
7+
8+
set(LD_FILE_gcc ${CMAKE_CURRENT_LIST_DIR}/LPC55S69_cm33_core0_uf2.ld)
9+
10+
function(update_board TARGET)
11+
target_compile_definitions(${TARGET} PUBLIC
12+
CPU_LPC55S69JBD100_cm33_core0
13+
# port 1 is highspeed
14+
BOARD_TUD_RHPORT=1
15+
)
16+
endfunction()

‎hw/bsp/lpc55/family.cmake

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ endif()
3434
set(BOARD_TARGET board_${BOARD})
3535
if (NOT TARGET ${BOARD_TARGET})
3636
add_library(${BOARD_TARGET} STATIC
37-
# external driver
38-
#lib/sct_neopixel/sct_neopixel.c
3937
# driver
4038
${SDK_DIR}/drivers/lpc_gpio/fsl_gpio.c
4139
${SDK_DIR}/drivers/common/fsl_common_arm.c
@@ -48,29 +46,35 @@ if (NOT TARGET ${BOARD_TARGET})
4846
${SDK_DIR}/devices/${MCU_VARIANT}/drivers/fsl_reset.c
4947
)
5048
target_compile_definitions(${BOARD_TARGET} PUBLIC
51-
CFG_TUSB_MCU=OPT_MCU_LPC55XX
49+
CFG_TUSB_MEM_ALIGN=TU_ATTR_ALIGNED\(64\)
5250
)
5351
target_include_directories(${BOARD_TARGET} PUBLIC
52+
${TOP}/lib/sct_neopixel
5453
# driver
5554
${SDK_DIR}/drivers/common
5655
${SDK_DIR}/drivers/flexcomm
5756
${SDK_DIR}/drivers/lpc_iocon
5857
${SDK_DIR}/drivers/lpc_gpio
5958
${SDK_DIR}/drivers/lpuart
59+
${SDK_DIR}/drivers/sctimer
6060
# mcu
6161
${CMSIS_DIR}/CMSIS/Core/Include
6262
${SDK_DIR}/devices/${MCU_VARIANT}
6363
${SDK_DIR}/devices/${MCU_VARIANT}/drivers
6464
)
6565
update_board(${BOARD_TARGET})
6666

67+
if (NOT DEFINED LD_FILE_${TOOLCHAIN})
68+
set(LD_FILE_gcc ${SDK_DIR}/devices/${MCU_VARIANT}/gcc/${MCU_CORE}_flash.ld)
69+
endif ()
70+
6771
if (TOOLCHAIN STREQUAL "gcc")
6872
target_sources(${BOARD_TARGET} PUBLIC
6973
${SDK_DIR}/devices/${MCU_VARIANT}/gcc/startup_${MCU_CORE}.S
7074
)
7175
target_link_options(${BOARD_TARGET} PUBLIC
7276
# linker file
73-
"LINKER:--script=${SDK_DIR}/devices/${MCU_VARIANT}/gcc/${MCU_CORE}_flash.ld"
77+
"LINKER:--script=${LD_FILE_gcc}"
7478
# nanolib
7579
--specs=nosys.specs
7680
--specs=nano.specs
@@ -95,6 +99,8 @@ function(family_configure_example TARGET)
9599
# BSP
96100
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/family.c
97101
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../board.c
102+
# external driver
103+
${TOP}/lib/sct_neopixel/sct_neopixel.c
98104
)
99105
target_include_directories(${TARGET} PUBLIC
100106
# family, hw, board

‎hw/bsp/mcx/FreeRTOSConfig/FreeRTOSConfig.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ extern uint32_t SystemCoreClock;
4949
#endif
5050

5151
/* Cortex M23/M33 port configuration. */
52-
#define configENABLE_MPU 0
53-
#define configENABLE_FPU 1
54-
#define configENABLE_TRUSTZONE 0
55-
#define configMINIMAL_SECURE_STACK_SIZE ( 1024 )
52+
#define configENABLE_MPU 0
53+
#define configENABLE_FPU 1
54+
#define configENABLE_TRUSTZONE 0
55+
#define configMINIMAL_SECURE_STACK_SIZE (1024)
5656

5757
#define configUSE_PREEMPTION 1
5858
#define configUSE_PORT_OPTIMISED_TASK_SELECTION 0

0 commit comments

Comments
 (0)