Skip to content

Commit fd9d43d

Browse files
hathachhathach
committed
refactor spresense into cxd56. there is no orphan board in bsp.
1 parent 55227a6 commit fd9d43d

File tree

12 files changed

+388
-45
lines changed

12 files changed

+388
-45
lines changed

‎examples/device/uac2_headset/src/usb_descriptors.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ uint8_t const * tud_descriptor_device_cb(void)
8787
#elif CFG_TUSB_MCU == OPT_MCU_CXD56
8888
// CXD56 USB driver has fixed endpoint type (bulk/interrupt/iso) and direction (IN/OUT) by its number
8989
// 0 control (IN/OUT), 1 Bulk (IN), 2 Bulk (OUT), 3 In (IN), 4 Bulk (IN), 5 Bulk (OUT), 6 In (IN)
90-
// #define EPNUM_AUDIO_IN 0x01
91-
// #define EPNUM_AUDIO_OUT 0x02
92-
// #define EPNUM_AUDIO_INT 0x03
90+
#define EPNUM_AUDIO_IN 0x01
91+
#define EPNUM_AUDIO_OUT 0x02
92+
#define EPNUM_AUDIO_INT 0x03
9393

9494
#elif CFG_TUSB_MCU == OPT_MCU_NRF5X
9595
// ISO endpoints for NRF5x are fixed to 0x08 (0x88)

‎hw/bsp/cxd56/FreeRTOSConfig/FreeRTOSConfig.h‎

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
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 "nuttx/config.h"
48+
#endif
49+
50+
/* Cortex-M4F 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*8*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 1
77+
#define configSUPPORT_DYNAMIC_ALLOCATION 0
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+
#define configCHECK_HANDLER_INSTALLATION 0
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+
/* FreeRTOS hooks to NVIC vectors */
121+
#define xPortPendSVHandler PendSV_Handler
122+
#define xPortSysTickHandler SysTick_Handler
123+
#define vPortSVCHandler SVC_Handler
124+
125+
//--------------------------------------------------------------------+
126+
// Interrupt nesting behavior configuration.
127+
//--------------------------------------------------------------------+
128+
129+
// For Cortex-M specific: __NVIC_PRIO_BITS is defined in mcu header
130+
// CXD56 (Cortex-M4F) has 3 priority bits
131+
#define configPRIO_BITS 3
132+
133+
/* The lowest interrupt priority that can be used in a call to a "set priority" function. */
134+
#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY ((1<<configPRIO_BITS) - 1)
135+
136+
/* The highest interrupt priority that can be used by any interrupt service
137+
routine that makes calls to interrupt safe FreeRTOS API functions. DO NOT CALL
138+
INTERRUPT SAFE FREERTOS API FUNCTIONS FROM ANY INTERRUPT THAT HAS A HIGHER
139+
PRIORITY THAN THIS! (higher priorities are lower numeric values. */
140+
#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY 2
141+
142+
/* Interrupt priorities used by the kernel port layer itself. These are generic
143+
to all Cortex-M ports, and do not rely on any particular library functions. */
144+
#define configKERNEL_INTERRUPT_PRIORITY ( configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
145+
146+
/* !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!!
147+
See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */
148+
#define configMAX_SYSCALL_INTERRUPT_PRIORITY ( configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
149+
150+
#endif

‎hw/bsp/cxd56/boards/spresense/board.cmake‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
set(SERIAL /dev/ttyUSB0 CACHE STRING "Serial port for flashing")
2+
3+
function(update_board TARGET)
4+
target_compile_definitions(${TARGET} PUBLIC
5+
)
6+
endfunction()

‎hw/bsp/cxd56/boards/spresense/board.h‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* The MIT License (MIT)
3+
*
4+
* Copyright 2019 Sony Semiconductor Solutions Corporation
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
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,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*
24+
* This file is part of the TinyUSB stack.
25+
*/
26+
27+
#ifndef BOARD_H_
28+
#define BOARD_H_
29+
30+
#ifdef __cplusplus
31+
extern "C" {
32+
#endif
33+
34+
#include <arch/chip/pin.h>
35+
36+
#define LED_PIN PIN_I2S1_BCK
37+
#define BUTTON_PIN PIN_HIF_IRQ_OUT
38+
39+
#ifdef __cplusplus
40+
}
41+
#endif
42+
43+
#endif

‎hw/bsp/cxd56/boards/spresense/board.mk‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Spresense board configuration
2+
SERIAL ?= /dev/ttyUSB0
3+
4+
# flash
5+
flash: $(BUILD)/$(PROJECT).spk
6+
@echo FLASH $<
7+
@$(PYTHON) $(TOP)/hw/mcu/sony/cxd56/tools/flash_writer.py -s -c $(SERIAL) -d -b 115200 -n $<

‎hw/bsp/spresense/board_spresense.c‎ renamed to ‎hw/bsp/cxd56/family.c‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,21 @@
2525
*/
2626

2727
#include <sys/boardctl.h>
28+
29+
#ifdef __GNUC__
30+
#pragma GCC diagnostic push
31+
#pragma GCC diagnostic ignored "-Wunused-parameter"
32+
#endif
33+
2834
#include <nuttx/arch.h>
2935
#include <arch/board/board.h>
30-
#include <arch/chip/pin.h>
31-
32-
#include "bsp/board_api.h"
3336

34-
/*------------------------------------------------------------------*/
35-
/* MACRO TYPEDEF CONSTANT ENUM
36-
*------------------------------------------------------------------*/
37-
#define LED_PIN PIN_I2S1_BCK
37+
#ifdef __GNUC__
38+
#pragma GCC diagnostic pop
39+
#endif
3840

39-
#define BUTTON_PIN PIN_HIF_IRQ_OUT
41+
#include "bsp/board_api.h"
42+
#include "board.h"
4043

4144
// Initialize on-board peripherals : led, button, uart and USB
4245
void board_init(void)
@@ -50,6 +53,10 @@ void board_init(void)
5053
board_gpio_config(PIN_HIF_IRQ_OUT, 0, true, true, PIN_FLOAT);
5154
};
5255

56+
void board_late_initialize(void) {
57+
58+
}
59+
5360
//--------------------------------------------------------------------+
5461
// Board porting API
5562
//--------------------------------------------------------------------+

‎hw/bsp/cxd56/family.cmake‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
include_guard()
2+
3+
# include board specific
4+
include(${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/board.cmake)
5+
6+
set(SDK_DIR ${TOP}/hw/mcu/sony/cxd56/spresense-exported-sdk)
7+
8+
# toolchain set up
9+
set(CMAKE_SYSTEM_CPU cortex-m4 CACHE INTERNAL "System Processor")
10+
set(CMAKE_TOOLCHAIN_FILE ${TOP}/examples/build_system/cmake/toolchain/arm_${TOOLCHAIN}.cmake)
11+
12+
set(FAMILY_MCUS CXD56 CACHE INTERNAL "")
13+
14+
# Detect platform for mkspk tool
15+
set(PLATFORM ${CMAKE_SYSTEM_NAME})
16+
if(PLATFORM STREQUAL "Darwin")
17+
set(MKSPK ${TOP}/hw/mcu/sony/cxd56/mkspk/mkspk)
18+
elseif(PLATFORM STREQUAL "Linux")
19+
set(MKSPK ${TOP}/hw/mcu/sony/cxd56/mkspk/mkspk)
20+
else()
21+
set(MKSPK ${TOP}/hw/mcu/sony/cxd56/mkspk/mkspk.exe)
22+
endif()
23+
24+
#------------------------------------
25+
# BOARD_TARGET
26+
#------------------------------------
27+
function(add_board_target BOARD_TARGET)
28+
if (TARGET ${BOARD_TARGET})
29+
return()
30+
endif ()
31+
32+
set(LD_FILE_GNU ${SDK_DIR}/nuttx/scripts/ramconfig.ld)
33+
set(LD_FILE_Clang ${LD_FILE_GNU})
34+
35+
if (NOT DEFINED LD_FILE_${CMAKE_C_COMPILER_ID})
36+
message(FATAL_ERROR "LD_FILE_${CMAKE_C_COMPILER_ID} not defined")
37+
endif ()
38+
39+
# Spresense uses NuttX libraries
40+
add_library(${BOARD_TARGET} INTERFACE)
41+
42+
target_include_directories(${BOARD_TARGET} INTERFACE
43+
${SDK_DIR}/nuttx/include
44+
${SDK_DIR}/nuttx/arch
45+
${SDK_DIR}/nuttx/arch/chip
46+
${SDK_DIR}/nuttx/arch/os
47+
${SDK_DIR}/sdk/include
48+
)
49+
50+
target_compile_definitions(${BOARD_TARGET} INTERFACE
51+
CONFIG_HAVE_DOUBLE
52+
main=spresense_main
53+
)
54+
55+
target_compile_options(${BOARD_TARGET} INTERFACE
56+
-pipe
57+
-fno-builtin
58+
-fno-strength-reduce
59+
-fomit-frame-pointer
60+
-Wno-error=undef
61+
-Wno-error=cast-align
62+
-Wno-error=unused-parameter
63+
-Wno-error=shadow
64+
-Wno-error=redundant-decls
65+
)
66+
67+
update_board(${BOARD_TARGET})
68+
69+
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
70+
target_link_options(${BOARD_TARGET} INTERFACE
71+
"LINKER:--script=${LD_FILE_GNU}"
72+
-Xlinker --entry=__start
73+
-nostartfiles
74+
-nodefaultlibs
75+
-Wl,--gc-sections
76+
-u spresense_main
77+
--specs=nosys.specs --specs=nano.specs
78+
)
79+
elseif (CMAKE_C_COMPILER_ID STREQUAL "Clang")
80+
target_link_options(${BOARD_TARGET} INTERFACE
81+
"LINKER:--script=${LD_FILE_Clang}"
82+
-Xlinker --entry=__start
83+
-nostartfiles
84+
-nodefaultlibs
85+
-u spresense_main
86+
)
87+
endif ()
88+
endfunction()
89+
90+
91+
#------------------------------------
92+
# Functions
93+
#------------------------------------
94+
function(family_configure_example TARGET RTOS)
95+
family_configure_common(${TARGET} ${RTOS})
96+
97+
# Board target
98+
add_board_target(board_${BOARD})
99+
100+
#---------- Port Specific ----------
101+
target_sources(${TARGET} PUBLIC
102+
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/family.c
103+
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../board.c
104+
)
105+
target_include_directories(${TARGET} PUBLIC
106+
${CMAKE_CURRENT_FUNCTION_LIST_DIR}
107+
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../../
108+
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/boards/${BOARD}
109+
)
110+
111+
# Add TinyUSB target and port source
112+
family_add_tinyusb(${TARGET} OPT_MCU_CXD56)
113+
target_sources(${TARGET} PUBLIC
114+
${TOP}/src/portable/sony/cxd56/dcd_cxd56.c
115+
)
116+
target_link_libraries(${TARGET} PUBLIC
117+
board_${BOARD}
118+
${SDK_DIR}/nuttx/libs/libapps.a
119+
${SDK_DIR}/nuttx/libs/libnuttx.a
120+
gcc # Compiler runtime support for FP operations like __aeabi_dmul
121+
)
122+
123+
# Build mkspk tool
124+
add_custom_command(OUTPUT ${MKSPK}
125+
COMMAND $(MAKE) -C ${TOP}/hw/mcu/sony/cxd56/mkspk
126+
COMMENT "Building mkspk tool"
127+
)
128+
129+
# Create .spk file
130+
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.spk
131+
COMMAND ${MKSPK} -c 2 $<TARGET_FILE:${TARGET}> nuttx ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.spk
132+
DEPENDS ${TARGET} ${MKSPK}
133+
COMMENT "Creating ${TARGET}.spk"
134+
)
135+
endfunction()

0 commit comments

Comments
 (0)