Skip to content

Commit ec093be

Browse files
hathachhathach
committed
Merge branch 'master' into renesas_ra_hs_rebased
2 parents 6b6dcc6 + db59494 commit ec093be

File tree

67 files changed

+1542
-848
lines changed

Some content is hidden

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

67 files changed

+1542
-848
lines changed

‎.github/workflows/cmake_arm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
# Alphabetical order
3636
- 'imxrt'
3737
- 'kinetis_kl'
38-
- 'lpc18'
38+
- 'lpc18 lpc40'
3939
- 'lpc55'
4040
- 'mcx'
4141
- 'ra'

‎.idea/runConfigurations/lpc4088.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/dual/host_hid_to_device_cdc/only.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
board:mimxrt1060_evk
22
board:mimxrt1064_evk
3+
board:mcb1800
34
mcu:RP2040
45
mcu:ra6m5

‎examples/rules.mk

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,16 @@ endif
9999
JLINK_IF ?= swd
100100

101101
# Jlink script
102-
define jlink_script
103-
halt
104-
loadfile $^
105-
r
106-
go
107-
exit
108-
endef
109-
export jlink_script
102+
$(BUILD)/$(BOARD).jlink: $(BUILD)/$(PROJECT).hex
103+
@echo halt > $@
104+
@echo loadfile $^ >> $@
105+
@echo r >> $@
106+
@echo go >> $@
107+
@echo exit >> $@
110108

111109
# Flash using jlink
112-
flash-jlink: $(BUILD)/$(PROJECT).hex
113-
@echo "$$jlink_script" > $(BUILD)/$(BOARD).jlink
114-
$(JLINKEXE) -device $(JLINK_DEVICE) -if $(JLINK_IF) -JTAGConf -1,-1 -speed auto -CommandFile $(BUILD)/$(BOARD).jlink
110+
flash-jlink: $(BUILD)/$(BOARD).jlink
111+
$(JLINKEXE) -device $(JLINK_DEVICE) -if $(JLINK_IF) -JTAGConf -1,-1 -speed auto -CommandFile $<
115112

116113
# Flash STM32 MCU using stlink with STM32 Cube Programmer CLI
117114
flash-stlink: $(BUILD)/$(PROJECT).elf

‎hw/bsp/imxrt/family.cmake

Lines changed: 61 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -22,69 +22,71 @@ set(FAMILY_MCUS MIMXRT1XXX CACHE INTERNAL "")
2222
#------------------------------------
2323
# only need to be built ONCE for all examples
2424
function(add_board_target BOARD_TARGET)
25-
if (NOT TARGET ${BOARD_TARGET})
26-
add_library(${BOARD_TARGET} STATIC
27-
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/boards/${BOARD}/board/clock_config.c
28-
#${SDK_DIR}/drivers/adc_12b1msps_sar/fsl_adc.c
29-
${SDK_DIR}/drivers/common/fsl_common.c
30-
${SDK_DIR}/drivers/igpio/fsl_gpio.c
31-
${SDK_DIR}/drivers/lpspi/fsl_lpspi.c
32-
${SDK_DIR}/drivers/lpuart/fsl_lpuart.c
33-
${SDK_DIR}/devices/${MCU_VARIANT}/system_${MCU_VARIANT}.c
34-
${SDK_DIR}/devices/${MCU_VARIANT}/xip/fsl_flexspi_nor_boot.c
35-
${SDK_DIR}/devices/${MCU_VARIANT}/drivers/fsl_clock.c
36-
)
37-
target_compile_definitions(${BOARD_TARGET} PUBLIC
38-
__ARMVFP__=0
39-
__ARMFPV5__=0
40-
XIP_EXTERNAL_FLASH=1
41-
XIP_BOOT_HEADER_ENABLE=1
42-
)
43-
target_include_directories(${BOARD_TARGET} PUBLIC
44-
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/boards/${BOARD}
45-
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/boards/${BOARD}/board
46-
${CMSIS_DIR}/CMSIS/Core/Include
47-
${SDK_DIR}/devices/${MCU_VARIANT}
48-
${SDK_DIR}/devices/${MCU_VARIANT}/drivers
49-
#${SDK_DIR}/drivers/adc_12b1msps_sar
50-
${SDK_DIR}/drivers/common
51-
${SDK_DIR}/drivers/igpio
52-
${SDK_DIR}/drivers/lpspi
53-
${SDK_DIR}/drivers/lpuart
54-
)
25+
if (TARGET ${BOARD_TARGET})
26+
return()
27+
endif ()
5528

56-
update_board(${BOARD_TARGET})
29+
add_library(${BOARD_TARGET} STATIC
30+
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/boards/${BOARD}/board/clock_config.c
31+
#${SDK_DIR}/drivers/adc_12b1msps_sar/fsl_adc.c
32+
${SDK_DIR}/drivers/common/fsl_common.c
33+
${SDK_DIR}/drivers/igpio/fsl_gpio.c
34+
${SDK_DIR}/drivers/lpspi/fsl_lpspi.c
35+
${SDK_DIR}/drivers/lpuart/fsl_lpuart.c
36+
${SDK_DIR}/devices/${MCU_VARIANT}/system_${MCU_VARIANT}.c
37+
${SDK_DIR}/devices/${MCU_VARIANT}/xip/fsl_flexspi_nor_boot.c
38+
${SDK_DIR}/devices/${MCU_VARIANT}/drivers/fsl_clock.c
39+
)
40+
target_compile_definitions(${BOARD_TARGET} PUBLIC
41+
__ARMVFP__=0
42+
__ARMFPV5__=0
43+
XIP_EXTERNAL_FLASH=1
44+
XIP_BOOT_HEADER_ENABLE=1
45+
)
46+
target_include_directories(${BOARD_TARGET} PUBLIC
47+
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/boards/${BOARD}
48+
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/boards/${BOARD}/board
49+
${CMSIS_DIR}/CMSIS/Core/Include
50+
${SDK_DIR}/devices/${MCU_VARIANT}
51+
${SDK_DIR}/devices/${MCU_VARIANT}/drivers
52+
#${SDK_DIR}/drivers/adc_12b1msps_sar
53+
${SDK_DIR}/drivers/common
54+
${SDK_DIR}/drivers/igpio
55+
${SDK_DIR}/drivers/lpspi
56+
${SDK_DIR}/drivers/lpuart
57+
)
5758

58-
# LD_FILE and STARTUP_FILE can be defined in board.cmake
59-
if (NOT DEFINED LD_FILE_${CMAKE_C_COMPILER_ID})
60-
set(LD_FILE_GNU ${SDK_DIR}/devices/${MCU_VARIANT}/gcc/${MCU_VARIANT}xxxxx_flexspi_nor.ld)
61-
#set(LD_FILE_IAR ${SDK_DIR}/devices/${MCU_VARIANT}/gcc/${MCU_VARIANT}xxxxx_flexspi_nor.ld)
62-
endif ()
59+
update_board(${BOARD_TARGET})
6360

64-
if (NOT DEFINED STARTUP_FILE_${CMAKE_C_COMPILER_ID})
65-
set(STARTUP_FILE_GNU ${SDK_DIR}/devices/${MCU_VARIANT}/gcc/startup_${MCU_VARIANT}.S)
66-
#set(STARTUP_FILE_IAR ${SDK_DIR}/devices/${MCU_VARIANT}/gcc/startup_${MCU_VARIANT}.S)
67-
endif ()
61+
# LD_FILE and STARTUP_FILE can be defined in board.cmake
62+
if (NOT DEFINED LD_FILE_${CMAKE_C_COMPILER_ID})
63+
set(LD_FILE_GNU ${SDK_DIR}/devices/${MCU_VARIANT}/gcc/${MCU_VARIANT}xxxxx_flexspi_nor.ld)
64+
#set(LD_FILE_IAR ${SDK_DIR}/devices/${MCU_VARIANT}/gcc/${MCU_VARIANT}xxxxx_flexspi_nor.ld)
65+
endif ()
6866

69-
target_sources(${BOARD_TARGET} PUBLIC
70-
${STARTUP_FILE_${CMAKE_C_COMPILER_ID}}
71-
)
67+
if (NOT DEFINED STARTUP_FILE_${CMAKE_C_COMPILER_ID})
68+
set(STARTUP_FILE_GNU ${SDK_DIR}/devices/${MCU_VARIANT}/gcc/startup_${MCU_VARIANT}.S)
69+
#set(STARTUP_FILE_IAR ${SDK_DIR}/devices/${MCU_VARIANT}/gcc/startup_${MCU_VARIANT}.S)
70+
endif ()
7271

73-
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
74-
target_link_options(${BOARD_TARGET} PUBLIC
75-
"LINKER:--script=${LD_FILE_GNU}"
76-
# nanolib
77-
--specs=nosys.specs
78-
--specs=nano.specs
79-
# force linker to look for these symbols
80-
-Wl,-uimage_vector_table
81-
-Wl,-ug_boot_data
82-
)
83-
elseif (CMAKE_C_COMPILER_ID STREQUAL "IAR")
84-
target_link_options(${BOARD_TARGET} PUBLIC
85-
"LINKER:--config=${LD_FILE_IAR}"
86-
)
87-
endif ()
72+
target_sources(${BOARD_TARGET} PUBLIC
73+
${STARTUP_FILE_${CMAKE_C_COMPILER_ID}}
74+
)
75+
76+
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
77+
target_link_options(${BOARD_TARGET} PUBLIC
78+
"LINKER:--script=${LD_FILE_GNU}"
79+
# nanolib
80+
--specs=nosys.specs
81+
--specs=nano.specs
82+
# force linker to look for these symbols
83+
-Wl,-uimage_vector_table
84+
-Wl,-ug_boot_data
85+
)
86+
elseif (CMAKE_C_COMPILER_ID STREQUAL "IAR")
87+
target_link_options(${BOARD_TARGET} PUBLIC
88+
"LINKER:--config=${LD_FILE_IAR}"
89+
)
8890
endif ()
8991
endfunction()
9092

@@ -114,7 +116,7 @@ function(family_configure_example TARGET RTOS)
114116

115117
# Add TinyUSB target and port source
116118
family_add_tinyusb(${TARGET} OPT_MCU_MIMXRT1XXX ${RTOS})
117-
target_sources(${TARGET}-tinyusb PUBLIC
119+
target_sources(${TARGET}-tinyusb PRIVATE
118120
${TOP}/src/portable/chipidea/ci_hs/dcd_ci_hs.c
119121
${TOP}/src/portable/chipidea/ci_hs/hcd_ci_hs.c
120122
${TOP}/src/portable/ehci/ehci.c

‎hw/bsp/lpc18/boards/mcb1800/board.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ static inline void board_lpc18_pinmux(void) {
7171

7272
// USB0
7373
{ 0x6, 3, SCU_MODE_PULLUP | SCU_MODE_INBUFF_EN | SCU_MODE_FUNC1 }, // P6_3 USB0_PWR_EN, USB0 VBus function
74-
7574
{ 0x9, 5, SCU_MODE_PULLUP | SCU_MODE_INBUFF_EN | SCU_MODE_FUNC2 }, // P9_5 USB1_VBUS_EN, USB1 VBus function
7675
{ 0x2, 5, SCU_MODE_INACT | SCU_MODE_INBUFF_EN | SCU_MODE_ZIF_DIS | SCU_MODE_FUNC2 }, // P2_5 USB1_VBUS, MUST CONFIGURE THIS SIGNAL FOR USB1 NORMAL OPERATION
7776
};

‎hw/bsp/lpc40/FreeRTOSConfig/FreeRTOSConfig.h

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 "chip.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 2
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 5
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

‎hw/bsp/lpc40/boards/ea4088_quickstart/board.cmake

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
set(JLINK_DEVICE LPC4088)
2+
set(PYOCD_TARGET LPC4088)
3+
set(NXPLINK_DEVICE LPC4088:LPC4088)
4+
5+
set(LD_FILE_GNU ${CMAKE_CURRENT_LIST_DIR}/lpc4088.ld)
6+
7+
function(update_board TARGET)
8+
# nothing to do
9+
endfunction()

0 commit comments

Comments
 (0)