Skip to content

Commit 0a4fb69

Browse files
committed
fix build with lpc54
1 parent 3b0ffd0 commit 0a4fb69

File tree

7 files changed

+281
-70
lines changed

7 files changed

+281
-70
lines changed

.github/workflows/build_arm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- 'broadcom_32bit'
3737
- 'kinetis_k32l2'
3838
- 'lpc11 lpc13 lpc15 lpc17'
39-
- 'lpc51 lpc54'
39+
- 'lpc51'
4040
- 'mm32 msp432e4'
4141
- 'samd11 same5x saml2x'
4242
- 'stm32f2 stm32f3'

.github/workflows/cmake_arm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- 'imxrt'
3737
- 'kinetis_kl'
3838
- 'lpc18 lpc40 lpc43'
39-
- 'lpc55'
39+
- 'lpc54 lpc55'
4040
- 'mcx'
4141
- 'nrf'
4242
- 'ra'

hw/bsp/family_support.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ if (NOT FAMILY STREQUAL rp2040)
4040
# enable LTO if supported skip rp2040
4141
include(CheckIPOSupported)
4242
check_ipo_supported(RESULT IPO_SUPPORTED)
43+
cmake_print_variables(IPO_SUPPORTED)
4344
if (IPO_SUPPORTED)
4445
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
4546
endif()
Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
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+
// skip if included from IAR assembler
46+
#ifndef __IASMARM__
47+
#include "fsl_device_registers.h"
48+
#endif
49+
50+
/* Cortex M23/M33 port configuration. */
51+
#define configENABLE_MPU 0
52+
#define configENABLE_FPU 1
53+
#define configENABLE_TRUSTZONE 0
54+
#define configMINIMAL_SECURE_STACK_SIZE (1024)
55+
56+
#define configUSE_PREEMPTION 1
57+
#define configUSE_PORT_OPTIMISED_TASK_SELECTION 0
58+
#define configCPU_CLOCK_HZ SystemCoreClock
59+
#define configTICK_RATE_HZ ( 1000 )
60+
#define configMAX_PRIORITIES ( 5 )
61+
#define configMINIMAL_STACK_SIZE ( 128 )
62+
#define configTOTAL_HEAP_SIZE ( configSUPPORT_DYNAMIC_ALLOCATION*4*1024 )
63+
#define configMAX_TASK_NAME_LEN 16
64+
#define configUSE_16_BIT_TICKS 0
65+
#define configIDLE_SHOULD_YIELD 1
66+
#define configUSE_MUTEXES 1
67+
#define configUSE_RECURSIVE_MUTEXES 1
68+
#define configUSE_COUNTING_SEMAPHORES 1
69+
#define configQUEUE_REGISTRY_SIZE 4
70+
#define configUSE_QUEUE_SETS 0
71+
#define configUSE_TIME_SLICING 0
72+
#define configUSE_NEWLIB_REENTRANT 0
73+
#define configENABLE_BACKWARD_COMPATIBILITY 1
74+
#define configSTACK_ALLOCATION_FROM_SEPARATE_HEAP 0
75+
76+
#define configSUPPORT_STATIC_ALLOCATION 0
77+
#define configSUPPORT_DYNAMIC_ALLOCATION 1
78+
79+
/* Hook function related definitions. */
80+
#define configUSE_IDLE_HOOK 0
81+
#define configUSE_TICK_HOOK 0
82+
#define configUSE_MALLOC_FAILED_HOOK 0 // cause nested extern warning
83+
#define configCHECK_FOR_STACK_OVERFLOW 2
84+
85+
/* Run time and task stats gathering related definitions. */
86+
#define configGENERATE_RUN_TIME_STATS 0
87+
#define configRECORD_STACK_HIGH_ADDRESS 1
88+
#define configUSE_TRACE_FACILITY 1 // legacy trace
89+
#define configUSE_STATS_FORMATTING_FUNCTIONS 0
90+
91+
/* Co-routine definitions. */
92+
#define configUSE_CO_ROUTINES 0
93+
#define configMAX_CO_ROUTINE_PRIORITIES 2
94+
95+
/* Software timer related definitions. */
96+
#define configUSE_TIMERS 1
97+
#define configTIMER_TASK_PRIORITY (configMAX_PRIORITIES-2)
98+
#define configTIMER_QUEUE_LENGTH 32
99+
#define configTIMER_TASK_STACK_DEPTH configMINIMAL_STACK_SIZE
100+
101+
/* Optional functions - most linkers will remove unused functions anyway. */
102+
#define INCLUDE_vTaskPrioritySet 0
103+
#define INCLUDE_uxTaskPriorityGet 0
104+
#define INCLUDE_vTaskDelete 0
105+
#define INCLUDE_vTaskSuspend 1 // required for queue, semaphore, mutex to be blocked indefinitely with portMAX_DELAY
106+
#define INCLUDE_xResumeFromISR 0
107+
#define INCLUDE_vTaskDelayUntil 1
108+
#define INCLUDE_vTaskDelay 1
109+
#define INCLUDE_xTaskGetSchedulerState 0
110+
#define INCLUDE_xTaskGetCurrentTaskHandle 1
111+
#define INCLUDE_uxTaskGetStackHighWaterMark 0
112+
#define INCLUDE_xTaskGetIdleTaskHandle 0
113+
#define INCLUDE_xTimerGetTimerDaemonTaskHandle 0
114+
#define INCLUDE_pcTaskGetTaskName 0
115+
#define INCLUDE_eTaskGetState 0
116+
#define INCLUDE_xEventGroupSetBitFromISR 0
117+
#define INCLUDE_xTimerPendFunctionCall 0
118+
119+
/* Define to trap errors during development. */
120+
// Halt CPU (breakpoint) when hitting error, only apply for Cortex M3, M4, M7
121+
#if defined(__ARM_ARCH_7M__) || defined (__ARM_ARCH_7EM__)
122+
#define configASSERT(_exp) \
123+
do {\
124+
if ( !(_exp) ) { \
125+
volatile uint32_t* ARM_CM_DHCSR = ((volatile uint32_t*) 0xE000EDF0UL); /* Cortex M CoreDebug->DHCSR */ \
126+
if ( (*ARM_CM_DHCSR) & 1UL ) { /* Only halt mcu if debugger is attached */ \
127+
taskDISABLE_INTERRUPTS(); \
128+
__asm("BKPT #0\n"); \
129+
}\
130+
}\
131+
} while(0)
132+
#else
133+
#define configASSERT( x )
134+
#endif
135+
136+
/* FreeRTOS hooks to NVIC vectors */
137+
#define xPortPendSVHandler PendSV_Handler
138+
#define xPortSysTickHandler SysTick_Handler
139+
#define vPortSVCHandler SVC_Handler
140+
141+
//--------------------------------------------------------------------+
142+
// Interrupt nesting behavior configuration.
143+
//--------------------------------------------------------------------+
144+
145+
// For Cortex-M specific: __NVIC_PRIO_BITS is defined in mcu header
146+
#define configPRIO_BITS 3
147+
148+
/* The lowest interrupt priority that can be used in a call to a "set priority" function. */
149+
#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY ((1<<configPRIO_BITS) - 1)
150+
151+
/* The highest interrupt priority that can be used by any interrupt service
152+
routine that makes calls to interrupt safe FreeRTOS API functions. DO NOT CALL
153+
INTERRUPT SAFE FREERTOS API FUNCTIONS FROM ANY INTERRUPT THAT HAS A HIGHER
154+
PRIORITY THAN THIS! (higher priorities are lower numeric values. */
155+
#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY 2
156+
157+
/* Interrupt priorities used by the kernel port layer itself. These are generic
158+
to all Cortex-M ports, and do not rely on any particular library functions. */
159+
#define configKERNEL_INTERRUPT_PRIORITY ( configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
160+
161+
/* !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!!
162+
See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */
163+
#define configMAX_SYSCALL_INTERRUPT_PRIORITY ( configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
164+
165+
#endif
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
set(MCU_VARIANT LPC54114)
2+
set(MCU_CORE LPC54114_cm4)
3+
4+
set(JLINK_DEVICE LPC54114J256_M4)
5+
set(PYOCD_TARGET LPC54114)
6+
7+
set(LD_FILE_GNU ${SDK_DIR}/devices/${MCU_VARIANT}/gcc/LPC54114J256_cm4_flash.ld)
8+
9+
# Device port default to PORT1 Highspeed
10+
if (NOT DEFINED PORT)
11+
set(PORT 1)
12+
endif()
13+
14+
function(update_board TARGET)
15+
target_compile_definitions(${TARGET} PUBLIC
16+
CPU_LPC54114J256BD64_cm4
17+
)
18+
target_link_libraries(${TARGET} PUBLIC
19+
${SDK_DIR}/devices/${MCU_VARIANT}/gcc/libpower_cm4_hardabi.a
20+
)
21+
endfunction()
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
set(MCU_VARIANT LPC54608)
2+
set(MCU_CORE LPC54608)
3+
4+
set(JLINK_DEVICE LPC54608J512)
5+
set(PYOCD_TARGET LPC54608)
6+
set(NXPLINK_DEVICE LPC54608:LPCXpresso54608)
7+
8+
set(LD_FILE_GNU ${SDK_DIR}/devices/${MCU_VARIANT}/gcc/LPC54608J512_flash.ld)
9+
10+
# Device port default to PORT1 Highspeed
11+
if (NOT DEFINED PORT)
12+
set(PORT 1)
13+
endif()
14+
15+
function(update_board TARGET)
16+
target_compile_definitions(${TARGET} PUBLIC
17+
CPU_LPC54608J512ET180
18+
)
19+
target_link_libraries(${TARGET} PUBLIC
20+
${SDK_DIR}/devices/${MCU_VARIANT}/gcc/libpower_hardabi.a
21+
)
22+
endfunction()

hw/bsp/lpc54/family.cmake

Lines changed: 70 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -28,83 +28,85 @@ set(HOST_PORT $<NOT:${PORT}>)
2828
#------------------------------------
2929
# only need to be built ONCE for all examples
3030
function(add_board_target BOARD_TARGET)
31-
if (NOT TARGET ${BOARD_TARGET})
32-
add_library(${BOARD_TARGET} STATIC
33-
# driver
34-
${SDK_DIR}/drivers/lpc_gpio/fsl_gpio.c
35-
${SDK_DIR}/drivers/common/fsl_common_arm.c
36-
${SDK_DIR}/drivers/flexcomm/fsl_flexcomm.c
37-
${SDK_DIR}/drivers/flexcomm/fsl_usart.c
38-
# mcu
39-
${SDK_DIR}/devices/${MCU_VARIANT}/system_${MCU_CORE}.c
40-
${SDK_DIR}/devices/${MCU_VARIANT}/drivers/fsl_clock.c
41-
${SDK_DIR}/devices/${MCU_VARIANT}/drivers/fsl_power.c
42-
${SDK_DIR}/devices/${MCU_VARIANT}/drivers/fsl_reset.c
43-
)
31+
if (TARGET ${BOARD_TARGET})
32+
return()
33+
endif()
34+
35+
add_library(${BOARD_TARGET} STATIC
36+
# driver
37+
${SDK_DIR}/drivers/lpc_gpio/fsl_gpio.c
38+
${SDK_DIR}/drivers/common/fsl_common_arm.c
39+
${SDK_DIR}/drivers/flexcomm/fsl_flexcomm.c
40+
${SDK_DIR}/drivers/flexcomm/fsl_usart.c
41+
# mcu
42+
${SDK_DIR}/devices/${MCU_VARIANT}/system_${MCU_CORE}.c
43+
${SDK_DIR}/devices/${MCU_VARIANT}/drivers/fsl_clock.c
44+
${SDK_DIR}/devices/${MCU_VARIANT}/drivers/fsl_power.c
45+
${SDK_DIR}/devices/${MCU_VARIANT}/drivers/fsl_reset.c
46+
)
4447

48+
target_compile_definitions(${BOARD_TARGET} PUBLIC
49+
CFG_TUSB_MEM_ALIGN=TU_ATTR_ALIGNED\(64\)
50+
BOARD_TUD_RHPORT=${PORT}
51+
BOARD_TUH_RHPORT=${HOST_PORT}
52+
)
53+
# Port 0 is Fullspeed, Port 1 is Highspeed. Port1 controller can only access USB_SRAM
54+
if (PORT EQUAL 1)
4555
target_compile_definitions(${BOARD_TARGET} PUBLIC
46-
CFG_TUSB_MEM_ALIGN=TU_ATTR_ALIGNED\(64\)
47-
BOARD_TUD_RHPORT=${PORT}
48-
BOARD_TUH_RHPORT=${HOST_PORT}
56+
BOARD_TUD_MAX_SPEED=OPT_MODE_HIGH_SPEED
57+
BOARD_TUH_MAX_SPEED=OPT_MODE_FULL_SPEED
58+
CFG_TUD_MEM_SECTION=__attribute__\(\(section\(\"m_usb_global\"\)\)\)
4959
)
50-
# Port 0 is Fullspeed, Port 1 is Highspeed. Port1 controller can only access USB_SRAM
51-
if (PORT EQUAL 1)
52-
target_compile_definitions(${BOARD_TARGET} PUBLIC
53-
BOARD_TUD_MAX_SPEED=OPT_MODE_HIGH_SPEED
54-
BOARD_TUH_MAX_SPEED=OPT_MODE_FULL_SPEED
55-
CFG_TUD_MEM_SECTION=__attribute__\(\(section\(\"m_usb_global\"\)\)\)
56-
)
57-
else ()
58-
target_compile_definitions(${BOARD_TARGET} PUBLIC
59-
BOARD_TUD_MAX_SPEED=OPT_MODE_FULL_SPEED
60-
BOARD_TUH_MAX_SPEED=OPT_MODE_HIGH_SPEED
61-
CFG_TUH_MEM_SECTION=__attribute__\(\(section\(\"m_usb_global\"\)\)\)
62-
#CFG_TUD_MEM_SECTION=__attribute__\(\(section\(\"m_usb_global\"\)\)\)
63-
)
64-
endif ()
65-
66-
target_include_directories(${BOARD_TARGET} PUBLIC
67-
${TOP}/lib/sct_neopixel
68-
# driver
69-
${SDK_DIR}/drivers/common
70-
${SDK_DIR}/drivers/flexcomm
71-
${SDK_DIR}/drivers/lpc_iocon
72-
${SDK_DIR}/drivers/lpc_gpio
73-
${SDK_DIR}/drivers/lpuart
74-
${SDK_DIR}/drivers/sctimer
75-
# mcu
76-
${CMSIS_DIR}/CMSIS/Core/Include
77-
${SDK_DIR}/devices/${MCU_VARIANT}
78-
${SDK_DIR}/devices/${MCU_VARIANT}/drivers
60+
else ()
61+
target_compile_definitions(${BOARD_TARGET} PUBLIC
62+
BOARD_TUD_MAX_SPEED=OPT_MODE_FULL_SPEED
63+
BOARD_TUH_MAX_SPEED=OPT_MODE_HIGH_SPEED
64+
CFG_TUH_MEM_SECTION=__attribute__\(\(section\(\"m_usb_global\"\)\)\)
65+
#CFG_TUD_MEM_SECTION=__attribute__\(\(section\(\"m_usb_global\"\)\)\)
7966
)
67+
endif ()
68+
69+
target_include_directories(${BOARD_TARGET} PUBLIC
70+
${TOP}/lib/sct_neopixel
71+
# driver
72+
${SDK_DIR}/drivers/common
73+
${SDK_DIR}/drivers/flexcomm
74+
${SDK_DIR}/drivers/lpc_iocon
75+
${SDK_DIR}/drivers/lpc_gpio
76+
${SDK_DIR}/drivers/lpuart
77+
${SDK_DIR}/drivers/sctimer
78+
# mcu
79+
${CMSIS_DIR}/CMSIS/Core/Include
80+
${SDK_DIR}/devices/${MCU_VARIANT}
81+
${SDK_DIR}/devices/${MCU_VARIANT}/drivers
82+
)
8083

81-
update_board(${BOARD_TARGET})
84+
update_board(${BOARD_TARGET})
8285

83-
if (NOT DEFINED LD_FILE_${CMAKE_C_COMPILER_ID})
84-
set(LD_FILE_GNU ${SDK_DIR}/devices/${MCU_VARIANT}/gcc/${MCU_CORE}_flash.ld)
85-
endif ()
86+
if (NOT DEFINED LD_FILE_${CMAKE_C_COMPILER_ID})
87+
set(LD_FILE_GNU ${SDK_DIR}/devices/${MCU_VARIANT}/gcc/${MCU_CORE}_flash.ld)
88+
endif ()
8689

87-
if (NOT DEFINED STARTUP_FILE_${CMAKE_C_COMPILER_ID})
88-
set(STARTUP_FILE_GNU ${SDK_DIR}/devices/${MCU_VARIANT}/gcc/startup_${MCU_CORE}.S)
89-
endif ()
90+
if (NOT DEFINED STARTUP_FILE_${CMAKE_C_COMPILER_ID})
91+
set(STARTUP_FILE_GNU ${SDK_DIR}/devices/${MCU_VARIANT}/gcc/startup_${MCU_CORE}.S)
92+
endif ()
9093

91-
target_sources(${BOARD_TARGET} PUBLIC
92-
${STARTUP_FILE_${CMAKE_C_COMPILER_ID}}
93-
)
94+
target_sources(${BOARD_TARGET} PUBLIC
95+
${STARTUP_FILE_${CMAKE_C_COMPILER_ID}}
96+
)
9497

95-
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
96-
target_link_options(${BOARD_TARGET} PUBLIC
97-
# linker file
98-
"LINKER:--script=${LD_FILE_GNU}"
99-
# nanolib
100-
--specs=nosys.specs
101-
--specs=nano.specs
102-
)
103-
elseif (CMAKE_C_COMPILER_ID STREQUAL "IAR")
104-
target_link_options(${BOARD_TARGET} PUBLIC
105-
"LINKER:--config=${LD_FILE_IAR}"
106-
)
107-
endif ()
98+
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
99+
target_link_options(${BOARD_TARGET} PUBLIC
100+
# linker file
101+
"LINKER:--script=${LD_FILE_GNU}"
102+
# nanolib
103+
--specs=nosys.specs
104+
--specs=nano.specs
105+
)
106+
elseif (CMAKE_C_COMPILER_ID STREQUAL "IAR")
107+
target_link_options(${BOARD_TARGET} PUBLIC
108+
"LINKER:--config=${LD_FILE_IAR}"
109+
)
108110
endif ()
109111
endfunction()
110112

0 commit comments

Comments
 (0)