From cc1707e3b39657309b03af4618232307349eb341 Mon Sep 17 00:00:00 2001 From: Supper Thomas <78900636@qq.com> Date: Tue, 19 Nov 2024 11:43:58 +0800 Subject: [PATCH] [bsp/nrf5x] Fix the nrf5340 bsp --- .../.ci/attachconfig/ci.attachconfig.yml | 39 + .../.ci/attachconfig/devices/adc.attach | 1 - .../attachconfig/devices/chip_flash.attach | 1 - .../.ci/attachconfig/devices/i2c.attach | 4 - .../.ci/attachconfig/devices/ipc.attach | 1 - .../.ci/attachconfig/devices/pwm.attach | 1 - .../attachconfig/devices/qspi_flash.attach | 2 - .../.ci/attachconfig/devices/rtc.attach | 1 - .../.ci/attachconfig/devices/spi.attach | 4 - .../.ci/attachconfig/devices/tim.attach | 2 - .../.ci/attachconfig/devices/wdt.attach | 1 - bsp/nrf5x/nrf5340/.config | 189 +- bsp/nrf5x/nrf5340/README.md | 51 +- bsp/nrf5x/nrf5340/board/Kconfig | 26 +- bsp/nrf5x/nrf5340/board/board.c | 10 +- bsp/nrf5x/nrf5340/project.uvoptx | 855 +++++++- bsp/nrf5x/nrf5340/project.uvprojx | 1774 +++++++++++++---- bsp/nrf5x/nrf5340/rtconfig.h | 94 +- bsp/nrf5x/nrf5340/rtconfig.py | 6 +- bsp/nrf5x/nrf5340/template.uvoptx | 23 +- bsp/nrf5x/nrf5340/template.uvprojx | 107 +- 21 files changed, 2557 insertions(+), 635 deletions(-) create mode 100644 bsp/nrf5x/nrf5340/.ci/attachconfig/ci.attachconfig.yml delete mode 100644 bsp/nrf5x/nrf5340/.ci/attachconfig/devices/adc.attach delete mode 100644 bsp/nrf5x/nrf5340/.ci/attachconfig/devices/chip_flash.attach delete mode 100644 bsp/nrf5x/nrf5340/.ci/attachconfig/devices/i2c.attach delete mode 100644 bsp/nrf5x/nrf5340/.ci/attachconfig/devices/ipc.attach delete mode 100644 bsp/nrf5x/nrf5340/.ci/attachconfig/devices/pwm.attach delete mode 100644 bsp/nrf5x/nrf5340/.ci/attachconfig/devices/qspi_flash.attach delete mode 100644 bsp/nrf5x/nrf5340/.ci/attachconfig/devices/rtc.attach delete mode 100644 bsp/nrf5x/nrf5340/.ci/attachconfig/devices/spi.attach delete mode 100644 bsp/nrf5x/nrf5340/.ci/attachconfig/devices/tim.attach delete mode 100644 bsp/nrf5x/nrf5340/.ci/attachconfig/devices/wdt.attach diff --git a/bsp/nrf5x/nrf5340/.ci/attachconfig/ci.attachconfig.yml b/bsp/nrf5x/nrf5340/.ci/attachconfig/ci.attachconfig.yml new file mode 100644 index 0000000000..823e21e862 --- /dev/null +++ b/bsp/nrf5x/nrf5340/.ci/attachconfig/ci.attachconfig.yml @@ -0,0 +1,39 @@ +devices.gpio: + kconfig: + - CONFIG_BSP_USING_GPIO=y +devices.adc: + kconfig: + - CONFIG_BSP_USING_SAADC=y +devices.i2c: + kconfig: + - CONFIG_BSP_USING_I2C=y + - CONFIG_BSP_USING_I2C0=n + - CONFIG_BSP_USING_I2C1=n + - CONFIG_BSP_USING_I2C2=y +devices.spi: + kconfig: + - CONFIG_BSP_USING_SPI=y + - CONFIG_BSP_USING_SPI0=n + - CONFIG_BSP_USING_SPI1=n + - CONFIG_BSP_USING_SPI2=y +devices.uart: + kconfig: + - CONFIG_BSP_USING_UART=y +devices.watchdog: + kconfig: + - CONFIG_BSP_USING_WDT=y +devices.pwm: + kconfig: + - CONFIG_BSP_USING_PWM=y +devices.rtc: + kconfig: + - CONFIG_BSP_USING_ONCHIP_RTC=y +devices.hwtimer: + kconfig: + - CONFIG_BSP_USING_TIM=y + - CONFIG_BSP_USING_TIM1=y +# ------ SEGGER CI ------ +segger: + kconfig: + - CONFIG_PKG_USING_SEGGER_RTT=y + - CONFIG_RT_USING_SERIAL_V1=y \ No newline at end of file diff --git a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/adc.attach b/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/adc.attach deleted file mode 100644 index f800def214..0000000000 --- a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/adc.attach +++ /dev/null @@ -1 +0,0 @@ -CONFIG_RT_USING_ADC=y \ No newline at end of file diff --git a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/chip_flash.attach b/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/chip_flash.attach deleted file mode 100644 index 5c49eb48fc..0000000000 --- a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/chip_flash.attach +++ /dev/null @@ -1 +0,0 @@ -CONFIG_BSP_USING_ON_CHIP_FLASH=y \ No newline at end of file diff --git a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/i2c.attach b/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/i2c.attach deleted file mode 100644 index 487a3d3137..0000000000 --- a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/i2c.attach +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_BSP_USING_I2C=y -CONFIG_BSP_USING_I2C0=n -CONFIG_BSP_USING_I2C1=n -CONFIG_BSP_USING_I2C2=y \ No newline at end of file diff --git a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/ipc.attach b/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/ipc.attach deleted file mode 100644 index 5a7131a48e..0000000000 --- a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/ipc.attach +++ /dev/null @@ -1 +0,0 @@ -CONFIG_RT_USING_IPC=y \ No newline at end of file diff --git a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/pwm.attach b/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/pwm.attach deleted file mode 100644 index 919d74a7ba..0000000000 --- a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/pwm.attach +++ /dev/null @@ -1 +0,0 @@ -CONFIG_RT_USING_PWM=y \ No newline at end of file diff --git a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/qspi_flash.attach b/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/qspi_flash.attach deleted file mode 100644 index f29eb44fb7..0000000000 --- a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/qspi_flash.attach +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_BSP_USING_QSPI_FLASH=y -CONFIG_RT_USING_SFUD=y \ No newline at end of file diff --git a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/rtc.attach b/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/rtc.attach deleted file mode 100644 index fb6acc20cd..0000000000 --- a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/rtc.attach +++ /dev/null @@ -1 +0,0 @@ -CONFIG_BSP_USING_ONCHIP_RTC=y \ No newline at end of file diff --git a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/spi.attach b/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/spi.attach deleted file mode 100644 index 93ffe518ce..0000000000 --- a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/spi.attach +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_BSP_USING_SPI=y -CONFIG_BSP_USING_SPI0=n -CONFIG_BSP_USING_SPI1=n -CONFIG_BSP_USING_SPI2=y \ No newline at end of file diff --git a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/tim.attach b/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/tim.attach deleted file mode 100644 index b0176a0ff6..0000000000 --- a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/tim.attach +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_BSP_USING_TIM=y -CONFIG_BSP_USING_TIM1=y diff --git a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/wdt.attach b/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/wdt.attach deleted file mode 100644 index 5c834f43db..0000000000 --- a/bsp/nrf5x/nrf5340/.ci/attachconfig/devices/wdt.attach +++ /dev/null @@ -1 +0,0 @@ -CONFIG_RT_USING_WDT=y \ No newline at end of file diff --git a/bsp/nrf5x/nrf5340/.config b/bsp/nrf5x/nrf5340/.config index b47d4a1507..d022f47e42 100644 --- a/bsp/nrf5x/nrf5340/.config +++ b/bsp/nrf5x/nrf5340/.config @@ -1,7 +1,3 @@ -# -# Automatically generated file; DO NOT EDIT. -# RT-Thread Configuration -# # # Hardware Drivers Config @@ -9,14 +5,15 @@ CONFIG_SOC_NRF5340=y CONFIG_SOC_NORDIC=y CONFIG_BSP_BOARD_PCA_10095=y -# CONFIG_BSP_BOARD_ARDUINO_NANO_33_BLE is not set +# CONFIG_BSP_BOARD_PCA_10143 is not set # # Onboard Peripheral Drivers # -# CONFIG_BSP_USING_JLINK_TO_USART is not set +# CONFIG_BSP_USING_JLINK_SEGGER_RTT_CONSOLE is not set CONFIG_RT_BSP_LED_PIN=28 # CONFIG_BSP_USING_QSPI_FLASH is not set +# end of Onboard Peripheral Drivers # # On-chip Peripheral Drivers @@ -53,9 +50,12 @@ CONFIG_MCU_FLASH_SIZE_KB=1024 CONFIG_MCU_SRAM_START_ADDRESS=0x20000000 CONFIG_MCU_SRAM_SIZE_KB=512 CONFIG_MCU_FLASH_PAGE_SIZE=0x1000 +# end of MCU flash config + # CONFIG_BSP_USING_TIM is not set +# end of On-chip Peripheral Drivers + CONFIG_BLE_STACK_USING_NULL=y -# CONFIG_BSP_USING_SOFTDEVICE is not set # CONFIG_BSP_USING_NIMBLE is not set CONFIG_NRFX_CLOCK_ENABLED=1 CONFIG_NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY=7 @@ -63,6 +63,7 @@ CONFIG_NRFX_CLOCK_CONFIG_LF_SRC=1 CONFIG_NRFX_UART_ENABLED=1 CONFIG_NRFX_UART0_ENABLED=1 CONFIG_NRFX_GPIOTE_ENABLED=1 +# end of Hardware Drivers Config # # RT-Thread Kernel @@ -79,7 +80,6 @@ CONFIG_RT_THREAD_PRIORITY_32=y # CONFIG_RT_THREAD_PRIORITY_256 is not set CONFIG_RT_THREAD_PRIORITY_MAX=32 CONFIG_RT_TICK_PER_SECOND=100 -# CONFIG_RT_USING_OVERFLOW_CHECK is not set CONFIG_RT_USING_HOOK=y CONFIG_RT_HOOK_USING_FUNC_PTR=y # CONFIG_RT_USING_HOOKLIST is not set @@ -89,18 +89,29 @@ CONFIG_IDLE_THREAD_STACK_SIZE=512 CONFIG_RT_USING_TIMER_SOFT=y CONFIG_RT_TIMER_THREAD_PRIO=4 CONFIG_RT_TIMER_THREAD_STACK_SIZE=512 +# CONFIG_RT_USING_TIMER_ALL_SOFT is not set +# CONFIG_RT_USING_CPU_USAGE_TRACER is not set # # kservice optimization # -# CONFIG_RT_KSERVICE_USING_STDLIB is not set -# CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set # CONFIG_RT_USING_TINY_FFS is not set -# CONFIG_RT_KPRINTF_USING_LONGLONG is not set +# end of kservice optimization + +# +# klibc optimization +# +# CONFIG_RT_KLIBC_USING_STDLIB is not set +# CONFIG_RT_KLIBC_USING_TINY_SIZE is not set +# CONFIG_RT_KLIBC_USING_PRINTF_LONGLONG is not set +# end of klibc optimization + CONFIG_RT_USING_DEBUG=y +CONFIG_RT_DEBUGING_ASSERT=y CONFIG_RT_DEBUGING_COLOR=y CONFIG_RT_DEBUGING_CONTEXT=y # CONFIG_RT_DEBUGING_AUTO_INIT is not set +# CONFIG_RT_USING_OVERFLOW_CHECK is not set # # Inter-Thread communication @@ -112,6 +123,7 @@ CONFIG_RT_USING_EVENT=y CONFIG_RT_USING_MESSAGEQUEUE=y # CONFIG_RT_USING_MESSAGEQUEUE_PRIORITY is not set # CONFIG_RT_USING_SIGNALS is not set +# end of Inter-Thread communication # # Memory Management @@ -128,22 +140,19 @@ CONFIG_RT_USING_SMALL_MEM_AS_HEAP=y # CONFIG_RT_USING_MEMTRACE is not set # CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y +# end of Memory Management + CONFIG_RT_USING_DEVICE=y # CONFIG_RT_USING_DEVICE_OPS is not set # CONFIG_RT_USING_INTERRUPT_INFO is not set # CONFIG_RT_USING_THREADSAFE_PRINTF is not set -# CONFIG_RT_USING_SCHED_THREAD_CTX is not set CONFIG_RT_USING_CONSOLE=y CONFIG_RT_CONSOLEBUF_SIZE=128 CONFIG_RT_CONSOLE_DEVICE_NAME="uart0" -CONFIG_RT_VER_NUM=0x50100 +CONFIG_RT_VER_NUM=0x50200 # CONFIG_RT_USING_STDC_ATOMIC is not set CONFIG_RT_BACKTRACE_LEVEL_MAX_NR=32 -# CONFIG_RT_USING_CACHE is not set -# CONFIG_RT_USING_HW_ATOMIC is not set -# CONFIG_ARCH_ARM_BOOTWITH_FLUSH_CACHE is not set -# CONFIG_ARCH_CPU_STACK_GROWS_UPWARD is not set -# CONFIG_RT_USING_CPU_FFS is not set +# end of RT-Thread Kernel # # RT-Thread Components @@ -174,12 +183,15 @@ CONFIG_FINSH_USING_OPTION_COMPLETION=y # DFS: device virtual file system # # CONFIG_RT_USING_DFS is not set +# end of DFS: device virtual file system + # CONFIG_RT_USING_FAL is not set # # Device Drivers # # CONFIG_RT_USING_DM is not set +# CONFIG_RT_USING_DEV_BUS is not set CONFIG_RT_USING_DEVICE_IPC=y CONFIG_RT_UNAMED_PIPE_NUMBER=64 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set @@ -190,53 +202,35 @@ CONFIG_RT_SERIAL_USING_DMA=y CONFIG_RT_SERIAL_RB_BUFSZ=64 # CONFIG_RT_USING_CAN is not set # CONFIG_RT_USING_CPUTIME is not set -CONFIG_RT_USING_I2C=y -# CONFIG_RT_I2C_DEBUG is not set -CONFIG_RT_USING_I2C_BITOPS=y -# CONFIG_RT_I2C_BITOPS_DEBUG is not set -# CONFIG_RT_USING_SOFT_I2C is not set +# CONFIG_RT_USING_I2C is not set # CONFIG_RT_USING_PHY is not set -CONFIG_RT_USING_ADC=y +# CONFIG_RT_USING_ADC is not set # CONFIG_RT_USING_DAC is not set # CONFIG_RT_USING_NULL is not set # CONFIG_RT_USING_ZERO is not set # CONFIG_RT_USING_RANDOM is not set -CONFIG_RT_USING_PWM=y +# CONFIG_RT_USING_PWM is not set +# CONFIG_RT_USING_PULSE_ENCODER is not set +# CONFIG_RT_USING_INPUT_CAPTURE is not set # CONFIG_RT_USING_MTD_NOR is not set # CONFIG_RT_USING_MTD_NAND is not set # CONFIG_RT_USING_PM is not set -CONFIG_RT_USING_RTC=y -# CONFIG_RT_USING_ALARM is not set -# CONFIG_RT_USING_SOFT_RTC is not set +# CONFIG_RT_USING_RTC is not set # CONFIG_RT_USING_SDIO is not set -CONFIG_RT_USING_SPI=y -# CONFIG_RT_USING_SPI_BITOPS is not set -# CONFIG_RT_USING_QSPI is not set -# CONFIG_RT_USING_SPI_MSD is not set -# CONFIG_RT_USING_SFUD is not set -# CONFIG_RT_USING_ENC28J60 is not set -# CONFIG_RT_USING_SPI_WIFI is not set -CONFIG_RT_USING_WDT=y +# CONFIG_RT_USING_SPI is not set +# CONFIG_RT_USING_WDT is not set # CONFIG_RT_USING_AUDIO is not set # CONFIG_RT_USING_SENSOR is not set # CONFIG_RT_USING_TOUCH is not set # CONFIG_RT_USING_LCD is not set # CONFIG_RT_USING_HWCRYPTO is not set -# CONFIG_RT_USING_PULSE_ENCODER is not set -# CONFIG_RT_USING_INPUT_CAPTURE is not set -# CONFIG_RT_USING_DEV_BUS is not set # CONFIG_RT_USING_WIFI is not set # CONFIG_RT_USING_VIRTIO is not set CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_KTIME is not set -CONFIG_RT_USING_HWTIMER=y - -# -# Using USB -# -# CONFIG_RT_USING_USB is not set -# CONFIG_RT_USING_USB_HOST is not set -# CONFIG_RT_USING_USB_DEVICE is not set +# CONFIG_RT_USING_HWTIMER is not set +# CONFIG_RT_USING_CHERRYUSB is not set +# end of Device Drivers # # C/C++ and POSIX layer @@ -254,6 +248,8 @@ CONFIG_RT_LIBC_USING_LIGHT_TZ_DST=y CONFIG_RT_LIBC_TZ_DEFAULT_HOUR=8 CONFIG_RT_LIBC_TZ_DEFAULT_MIN=0 CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 +# end of Timezone and Daylight Saving Time +# end of ISO-ANSI C layer # # POSIX (Portable Operating System Interface) layer @@ -275,7 +271,11 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # # Socket is in the 'Network' category # +# end of Interprocess Communication (IPC) +# end of POSIX (Portable Operating System Interface) layer + # CONFIG_RT_USING_CPLUSPLUS is not set +# end of C/C++ and POSIX layer # # Network @@ -284,12 +284,14 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_RT_USING_NETDEV is not set # CONFIG_RT_USING_LWIP is not set # CONFIG_RT_USING_AT is not set +# end of Network # # Memory protection # # CONFIG_RT_USING_MEM_PROTECTION is not set # CONFIG_RT_USING_HW_STACK_GUARD is not set +# end of Memory protection # # Utilities @@ -301,12 +303,25 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_RT_USING_RESOURCE_ID is not set # CONFIG_RT_USING_ADT is not set # CONFIG_RT_USING_RT_LINK is not set +# end of Utilities + # CONFIG_RT_USING_VBUS is not set +# +# Using USB legacy version +# +# CONFIG_RT_USING_USB_HOST is not set +# CONFIG_RT_USING_USB_DEVICE is not set +# end of Using USB legacy version + +# CONFIG_RT_USING_FDT is not set +# end of RT-Thread Components + # # RT-Thread Utestcases # # CONFIG_RT_USING_UTESTCASES is not set +# end of RT-Thread Utestcases # # RT-Thread online packages @@ -315,7 +330,6 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # # IoT - internet of things # -# CONFIG_PKG_USING_LWIP is not set # CONFIG_PKG_USING_LORAWAN_DRIVER is not set # CONFIG_PKG_USING_PAHOMQTT is not set # CONFIG_PKG_USING_UMQTT is not set @@ -328,6 +342,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_WEBTERMINAL is not set # CONFIG_PKG_USING_FREEMODBUS is not set # CONFIG_PKG_USING_NANOPB is not set +# CONFIG_PKG_USING_WIFI_HOST_DRIVER is not set # # Wi-Fi @@ -337,27 +352,35 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # Marvell WiFi # # CONFIG_PKG_USING_WLANMARVELL is not set +# end of Marvell WiFi # # Wiced WiFi # # CONFIG_PKG_USING_WLAN_WICED is not set +# end of Wiced WiFi + # CONFIG_PKG_USING_RW007 is not set # # CYW43012 WiFi # # CONFIG_PKG_USING_WLAN_CYW43012 is not set +# end of CYW43012 WiFi # # BL808 WiFi # # CONFIG_PKG_USING_WLAN_BL808 is not set +# end of BL808 WiFi # # CYW43439 WiFi # # CONFIG_PKG_USING_WLAN_CYW43439 is not set +# end of CYW43439 WiFi +# end of Wi-Fi + # CONFIG_PKG_USING_COAP is not set # CONFIG_PKG_USING_NOPOLL is not set # CONFIG_PKG_USING_NETUTILS is not set @@ -380,6 +403,8 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_UCLOUD_IOT_SDK is not set # CONFIG_PKG_USING_JOYLINK is not set # CONFIG_PKG_USING_IOTSHARP_SDK is not set +# end of IoT Cloud + # CONFIG_PKG_USING_NIMBLE is not set # CONFIG_PKG_USING_LLSYNC_SDK_ADAPTER is not set # CONFIG_PKG_USING_OTA_DOWNLOADER is not set @@ -422,6 +447,8 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_ZEPHYR_POLLING is not set # CONFIG_PKG_USING_MATTER_ADAPTATION_LAYER is not set # CONFIG_PKG_USING_LHC_MODBUS is not set +# CONFIG_PKG_USING_QMODBUS is not set +# end of IoT - internet of things # # security packages @@ -432,6 +459,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_TINYCRYPT is not set # CONFIG_PKG_USING_TFM is not set # CONFIG_PKG_USING_YD_CRYPTO is not set +# end of security packages # # language packages @@ -447,18 +475,22 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_JSMN is not set # CONFIG_PKG_USING_AGILE_JSMN is not set # CONFIG_PKG_USING_PARSON is not set +# end of JSON: JavaScript Object Notation, a lightweight data-interchange format # # XML: Extensible Markup Language # # CONFIG_PKG_USING_SIMPLE_XML is not set # CONFIG_PKG_USING_EZXML is not set +# end of XML: Extensible Markup Language + # CONFIG_PKG_USING_LUATOS_SOC is not set # CONFIG_PKG_USING_LUA is not set # CONFIG_PKG_USING_JERRYSCRIPT is not set # CONFIG_PKG_USING_MICROPYTHON is not set # CONFIG_PKG_USING_PIKASCRIPT is not set # CONFIG_PKG_USING_RTT_RUST is not set +# end of language packages # # multimedia packages @@ -470,12 +502,15 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_LVGL is not set # CONFIG_PKG_USING_LV_MUSIC_DEMO is not set # CONFIG_PKG_USING_GUI_GUIDER_DEMO is not set +# end of LVGL: powerful and easy-to-use embedded GUI library # # u8g2: a monochrome graphic library # # CONFIG_PKG_USING_U8G2_OFFICIAL is not set # CONFIG_PKG_USING_U8G2 is not set +# end of u8g2: a monochrome graphic library + # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set # CONFIG_PKG_USING_STEMWIN is not set @@ -495,6 +530,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_QRCODE is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_3GPP_AMRNB is not set +# end of multimedia packages # # tools packages @@ -543,6 +579,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_ARMV7M_DWT_TOOL is not set # CONFIG_PKG_USING_VOFA_PLUS is not set # CONFIG_PKG_USING_ZDEBUG is not set +# end of tools packages # # system packages @@ -554,6 +591,9 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_RT_MEMCPY_CM is not set # CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# end of enhanced kernel services + +# CONFIG_PKG_USING_AUNITY is not set # # acceleration: Assembly language or algorithmic acceleration packages @@ -561,6 +601,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_QFPLIB_M0_FULL is not set # CONFIG_PKG_USING_QFPLIB_M0_TINY is not set # CONFIG_PKG_USING_QFPLIB_M3 is not set +# end of acceleration: Assembly language or algorithmic acceleration packages # # CMSIS: ARM Cortex-M Microcontroller Software Interface Standard @@ -571,6 +612,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_CMSIS_NN is not set # CONFIG_PKG_USING_CMSIS_RTOS1 is not set # CONFIG_PKG_USING_CMSIS_RTOS2 is not set +# end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard # # Micrium: Micrium software products porting for RT-Thread @@ -581,6 +623,8 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_UC_CLK is not set # CONFIG_PKG_USING_UC_COMMON is not set # CONFIG_PKG_USING_UC_MODBUS is not set +# end of Micrium: Micrium software products porting for RT-Thread + # CONFIG_PKG_USING_FREERTOS_WRAPPER is not set # CONFIG_PKG_USING_LITEOS_SDK is not set # CONFIG_PKG_USING_TZ_DATABASE is not set @@ -628,6 +672,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_RTP is not set # CONFIG_PKG_USING_REB is not set # CONFIG_PKG_USING_R_RHEALSTONE is not set +# end of system packages # # peripheral libraries and drivers @@ -640,9 +685,27 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # # STM32 HAL & SDK Drivers # -# CONFIG_PKG_USING_STM32L4XX_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32L4_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32L4_CMSIS_DRIVER is not set # CONFIG_PKG_USING_STM32WB55_SDK is not set # CONFIG_PKG_USING_STM32_SDIO is not set +# end of STM32 HAL & SDK Drivers + +# +# Infineon HAL Packages +# +# CONFIG_PKG_USING_INFINEON_CAT1CM0P is not set +# CONFIG_PKG_USING_INFINEON_CMSIS is not set +# CONFIG_PKG_USING_INFINEON_CORE_LIB is not set +# CONFIG_PKG_USING_INFINEON_MTB_HAL_CAT1 is not set +# CONFIG_PKG_USING_INFINEON_MTB_PDL_CAT1 is not set +# CONFIG_PKG_USING_INFINEON_RETARGET_IO is not set +# CONFIG_PKG_USING_INFINEON_CAPSENSE is not set +# CONFIG_PKG_USING_INFINEON_CSDIDAC is not set +# CONFIG_PKG_USING_INFINEON_SERIAL_FLASH is not set +# CONFIG_PKG_USING_INFINEON_USBDEV is not set +# end of Infineon HAL Packages + # CONFIG_PKG_USING_BLUETRUM_SDK is not set # CONFIG_PKG_USING_EMBARC_BSP is not set # CONFIG_PKG_USING_ESP_IDF is not set @@ -652,6 +715,8 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # # CONFIG_PKG_USING_K210_SDK is not set # CONFIG_PKG_USING_KENDRYTE_SDK is not set +# end of Kendryte SDK + # CONFIG_PKG_USING_NRF5X_SDK is not set CONFIG_PKG_USING_NRFX=y CONFIG_PKG_NRFX_PATH="/packages/peripherals/hal-sdk/nrfx" @@ -659,6 +724,7 @@ CONFIG_PKG_NRFX_PATH="/packages/peripherals/hal-sdk/nrfx" CONFIG_PKG_USING_NRFX_LATEST_VERSION=y CONFIG_PKG_NRFX_VER="latest" # CONFIG_PKG_USING_RASPBERRYPI_PICO_SDK is not set +# end of HAL & SDK Drivers # # sensors drivers @@ -728,6 +794,7 @@ CONFIG_PKG_NRFX_VER="latest" # CONFIG_PKG_USING_ICM20608 is not set # CONFIG_PKG_USING_PAJ7620 is not set # CONFIG_PKG_USING_STHS34PF80 is not set +# end of sensors drivers # # touch drivers @@ -742,6 +809,8 @@ CONFIG_PKG_NRFX_VER="latest" # CONFIG_PKG_USING_XPT2046_TOUCH is not set # CONFIG_PKG_USING_CST816X is not set # CONFIG_PKG_USING_CST812T is not set +# end of touch drivers + # CONFIG_PKG_USING_REALTEK_AMEBA is not set # CONFIG_PKG_USING_BUTTON is not set # CONFIG_PKG_USING_PCF8574 is not set @@ -814,6 +883,7 @@ CONFIG_PKG_NRFX_VER="latest" # CONFIG_PKG_USING_BT_MX01 is not set # CONFIG_PKG_USING_RGPOWER is not set # CONFIG_PKG_USING_SPI_TOOLS is not set +# end of peripheral libraries and drivers # # AI packages @@ -828,15 +898,18 @@ CONFIG_PKG_NRFX_VER="latest" # CONFIG_PKG_USING_QUEST is not set # CONFIG_PKG_USING_NAXOS is not set # CONFIG_PKG_USING_R_TINYMAIX is not set +# end of AI packages # # Signal Processing and Control Algorithm Packages # +# CONFIG_PKG_USING_APID is not set # CONFIG_PKG_USING_FIRE_PID_CURVE is not set # CONFIG_PKG_USING_QPID is not set # CONFIG_PKG_USING_UKAL is not set # CONFIG_PKG_USING_DIGITALCTRL is not set # CONFIG_PKG_USING_KISSFFT is not set +# end of Signal Processing and Control Algorithm Packages # # miscellaneous packages @@ -845,6 +918,7 @@ CONFIG_PKG_NRFX_VER="latest" # # project laboratory # +# end of project laboratory # # samples: kernel and components samples @@ -853,6 +927,7 @@ CONFIG_PKG_NRFX_VER="latest" # CONFIG_PKG_USING_FILESYSTEM_SAMPLES is not set # CONFIG_PKG_USING_NETWORK_SAMPLES is not set # CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set +# end of samples: kernel and components samples # # entertainment: terminal games and other interesting software packages @@ -868,6 +943,8 @@ CONFIG_PKG_NRFX_VER="latest" # CONFIG_PKG_USING_DONUT is not set # CONFIG_PKG_USING_COWSAY is not set # CONFIG_PKG_USING_MORSE is not set +# end of entertainment: terminal games and other interesting software packages + # CONFIG_PKG_USING_LIBCSV is not set # CONFIG_PKG_USING_OPTPARSE is not set # CONFIG_PKG_USING_FASTLZ is not set @@ -901,6 +978,7 @@ CONFIG_PKG_NRFX_VER="latest" # CONFIG_PKG_USING_SOEM is not set # CONFIG_PKG_USING_QPARAM is not set # CONFIG_PKG_USING_CorevMCU_CLI is not set +# end of miscellaneous packages # # Arduino libraries @@ -916,6 +994,7 @@ CONFIG_PKG_NRFX_VER="latest" # CONFIG_PKG_USING_ARDUINO_NINEINONE_SENSOR_SHIELD is not set # CONFIG_PKG_USING_ARDUINO_SENSOR_KIT is not set # CONFIG_PKG_USING_ARDUINO_MATLAB_SUPPORT is not set +# end of Projects and Demos # # Sensors @@ -1055,6 +1134,8 @@ CONFIG_PKG_NRFX_VER="latest" # CONFIG_PKG_USING_ARDUINO_SEEED_LTC2941 is not set # CONFIG_PKG_USING_ARDUINO_SEEED_LDC1612 is not set # CONFIG_PKG_USING_ARDUINO_CAPACITIVESENSOR is not set +# CONFIG_PKG_USING_ARDUINO_JARZEBSKI_MPU6050 is not set +# end of Sensors # # Display @@ -1066,6 +1147,7 @@ CONFIG_PKG_NRFX_VER="latest" # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_SSD1306 is not set # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_ILI9341 is not set # CONFIG_PKG_USING_SEEED_TM1637 is not set +# end of Display # # Timing @@ -1074,6 +1156,7 @@ CONFIG_PKG_NRFX_VER="latest" # CONFIG_PKG_USING_ARDUINO_MSTIMER2 is not set # CONFIG_PKG_USING_ARDUINO_TICKER is not set # CONFIG_PKG_USING_ARDUINO_TASKSCHEDULER is not set +# end of Timing # # Data Processing @@ -1081,6 +1164,8 @@ CONFIG_PKG_NRFX_VER="latest" # CONFIG_PKG_USING_ARDUINO_KALMANFILTER is not set # CONFIG_PKG_USING_ARDUINO_ARDUINOJSON is not set # CONFIG_PKG_USING_ARDUINO_TENSORFLOW_LITE_MICRO is not set +# CONFIG_PKG_USING_ARDUINO_RUNNINGMEDIAN is not set +# end of Data Processing # # Data Storage @@ -1091,6 +1176,7 @@ CONFIG_PKG_NRFX_VER="latest" # # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_PN532 is not set # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_SI4713 is not set +# end of Communication # # Device Control @@ -1102,12 +1188,14 @@ CONFIG_PKG_NRFX_VER="latest" # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_DS1841 is not set # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_DS3502 is not set # CONFIG_PKG_USING_ARDUINO_SEEED_PCF85063TP is not set +# end of Device Control # # Other # # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_MFRC630 is not set # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_SI5351 is not set +# end of Other # # Signal IO @@ -1120,7 +1208,10 @@ CONFIG_PKG_NRFX_VER="latest" # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_MCP3008 is not set # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_MCP4725 is not set # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_BD3491FS is not set +# end of Signal IO # # Uncategorized # +# end of Arduino libraries +# end of RT-Thread online packages diff --git a/bsp/nrf5x/nrf5340/README.md b/bsp/nrf5x/nrf5340/README.md index bdb6f9e811..7635735bc9 100644 --- a/bsp/nrf5x/nrf5340/README.md +++ b/bsp/nrf5x/nrf5340/README.md @@ -6,11 +6,12 @@ 目前支持的开发板如下 -| 支持开发板型号 | 开发板上外设 | 备注 | -| ------------------------------------------------------------ | --------------------------- | ----------------------------------- | -| [PCA10095](https://www.nordicsemi.com/Products/Development-hardware/nRF5340-DK) | QSPI FLASH, 4 button，4 LED | UART0 | +| 支持开发板型号 | 开发板上外设 | 备注 | +| ------------------------------------------------------------ | --------------------------- | ----- | +| [NRF5340-DK-PCA10095](https://www.nordicsemi.com/Products/Development-hardware/nRF5340-DK) | QSPI FLASH, 4 button，4 LED | UART0 | +| [NRF7002-DK-PCA10143](https://www.nordicsemi.com/Products/Development-hardware/nRF7002-DK) | QSPI FLASH, 2LED, 2BUTTON | UART0 | + -| | | | 选择开发板请使用`menuconfig` -> `Hardware Driver Config` -> `Select Bsp board` @@ -20,7 +21,43 @@ 本文主要内容如下： - 开发板资源介绍 -- 进阶使用方法 + +PCA10095-nrf5340 开发板常用 **板载资源** 如下： + +- MCU：NRF5340，双核， Arm® Cortex®-M33，DSP, ARMV8,应用核128M Hz， 网络核64MHz +- MCU 外设: GPIO, UART, SPI, I2C(TWI), RTC,TIMER,NFC,QSPI,PWM,ADC,USB +- 板载外设 + - LED：4个，P0.28(LED1), P0.29(LED2), P0.30 (LED3), P0.31(LED4) 。 + - 按键：5个，P0.23(SW1), P0.24(SW2), P0.08(SW3), P0.09(SW4)。BOOT/RESET(SW5) + - FLASH: P0.13(QSPI0), P0.14(QSPI1), P0.15(QSPI2), P0.16(QSPI3), P0.17(QSPI_CLK), P0.18(QSPI_CS) =》QSPI flash + - USB: 1个 + - UART1: RXD(P1.00), TXD(P1.01), CTS(P0.10), RTS(P0.11) => 连接的JLINK中的VCOM0 + - UART2: RXD(P0.22), TXD(P0.20), CTS(P0.21), RTS(P0.19) => 连接的JLINK中的VCOM1 + - Segger RTT (RTT Console) + - NFC: NFC1(P0.02), NFC2(P0.03) +- 常用接口：USB device、Arduino Uno 接口 +- 调试接口：板载 J-LINK 调试器。 + +PCA10143-nrf7002 开发板常用 **板载资源** 如下： + +- 板载设 + - LED：2个，LED1(P1.06), LED2(P1.07). + + - BUTTON: 2个， SW1(P1.08), SW2(P1.09) + + - UART1: RXD(P1.00), TXD(P1.01), CTS(P0.10), RTS(P0.11) => 连接的JLINK中的VCOM0 + + - UART2: RXD(P0.22), TXD(P0.20), CTS(P0.21), RTS(P0.19) => 连接的JLINK中的VCOM1 + + - SPI_HS: SCK(P0.08), MOSI(P0.09), MISO(P0.10), CS(P0.11) => 连接MX25 QSPI FLASH + + - I2C: SDA(P1.02) SCL(P1.03) + + - NRF7002 CTRL: BUCKEN(P0.12), IRQ(P0.23), GRANT(P0.24), REQ(P0.28), STATUS1(P0.29), STATUS0(P0.30) + + - NRF7002(QSPI): CS(P0.18), CLK(P0.17), QSPI0(P0.13), QSPI1(P0.14), QSPI2(P0.15), QSPI3(P0.16) + + ## 开发板介绍 @@ -37,8 +74,8 @@ | QSPI | 支持 | 支持开发板上QSPI FLASH | | RTC | 支持 | | | ADC | 支持 | | -| | | | -| | | | +| | | | +| Segger_rtt | 支持 | 在Hardware Drivers Config → Onboard Peripheral Drirs中选中即可 | | | | | diff --git a/bsp/nrf5x/nrf5340/board/Kconfig b/bsp/nrf5x/nrf5340/board/Kconfig index 9ca008c633..eaf696c8ea 100644 --- a/bsp/nrf5x/nrf5340/board/Kconfig +++ b/bsp/nrf5x/nrf5340/board/Kconfig @@ -19,20 +19,23 @@ choice select BSP_USING_UART0 bool "NRF5340 pca10095 " - config BSP_BOARD_ARDUINO_NANO_33_BLE - bool "Arduino Nano 33 BLE (Sense)" + config BSP_BOARD_PCA_10143 + select BSP_USING_UART + select BSP_USING_UART0 + bool "NRF7002 NRF5340 pca10143" + endchoice menu "Onboard Peripheral Drivers" - config BSP_USING_JLINK_TO_USART - bool "Enable JLINK TO USART (uart0|RX_PIN:8|TX_PIN:6)" - default y - depends on BSP_BOARD_PCA_10095 + config BSP_USING_JLINK_SEGGER_RTT_CONSOLE + select PKG_USING_SEGGER_RTT + bool "Use the segger rtt instead of console uart" + default n config RT_BSP_LED_PIN - int + int default 28 if BSP_BOARD_PCA_10095 - default 16 if BSP_BOARD_ARDUINO_NANO_33_BLE + default 38 if BSP_BOARD_PCA_10143 depends on BSP_USING_GPIO @@ -40,8 +43,7 @@ menu "Onboard Peripheral Drivers" select RT_USING_FAL bool "Enable QSPI FLASH(MX25R64 8MB)" default n - depends on BSP_BOARD_PCA_10095 - + if BSP_USING_QSPI_FLASH config NRFX_QSPI_ENABLED int @@ -553,10 +555,6 @@ help config BLE_STACK_USING_NULL bool "not use the ble stack" -config BSP_USING_SOFTDEVICE - select PKG_USING_NRF5X_SDK - bool "Nordic softdevice(perpheral)" - config BSP_USING_NIMBLE select PKG_USING_NIMBLE select PKG_NIMBLE_BSP_NRF52840 diff --git a/bsp/nrf5x/nrf5340/board/board.c b/bsp/nrf5x/nrf5340/board/board.c index 5f78c76b18..0c023773b9 100644 --- a/bsp/nrf5x/nrf5340/board/board.c +++ b/bsp/nrf5x/nrf5340/board/board.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2022, RT-Thread Development Team + * Copyright (c) 2006-2024, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -65,7 +65,13 @@ void rt_hw_board_init(void) #endif #if defined(RT_USING_CONSOLE) && defined(RT_USING_DEVICE) - rt_console_set_device(RT_CONSOLE_DEVICE_NAME); + #ifdef SEGGER_RTT_ENABLE + extern int rt_hw_jlink_rtt_init(void); + rt_hw_jlink_rtt_init(); + rt_console_set_device("jlinkRtt"); + #else + rt_console_set_device(RT_CONSOLE_DEVICE_NAME); + #endif #endif #ifdef RT_USING_COMPONENTS_INIT diff --git a/bsp/nrf5x/nrf5340/project.uvoptx b/bsp/nrf5x/nrf5340/project.uvoptx index d161a179e0..0b183cda5e 100644 --- a/bsp/nrf5x/nrf5340/project.uvoptx +++ b/bsp/nrf5x/nrf5340/project.uvoptx @@ -28,7 +28,7 @@ 12000000 - 0 + 1 1 0 1 @@ -73,11 +73,11 @@ 0 - 0 + 1 0 1 - 0 + 5 0 1 @@ -103,7 +103,7 @@ 1 0 0 - 13 + 4 @@ -114,9 +114,14 @@ - BIN\UL2V8M.DLL + Segger\JL2CM3.dll + + 0 + JL2CM3 + -U1050713230 -O78 -S8 -ZTIFSpeedSel50000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8009 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC4000 -FN1 -FF0nrf53xx_application.flm -FS00 -FL0200000 -FP0($$Device:nRF5340_xxAA$Flash\nrf53xx_application.flm) + 0 UL2V8M @@ -177,11 +182,847 @@ - ::Device + Applications 0 0 0 - 1 + 0 + + 1 + 1 + 1 + 0 + 0 + 0 + applications\application.c + application.c + 0 + 0 + + + + + Compiler + 0 + 0 + 0 + 0 + + 2 + 2 + 1 + 0 + 0 + 0 + ..\..\..\components\libc\compilers\armlibc\syscall_mem.c + syscall_mem.c + 0 + 0 + + + 2 + 3 + 1 + 0 + 0 + 0 + ..\..\..\components\libc\compilers\armlibc\syscalls.c + syscalls.c + 0 + 0 + + + 2 + 4 + 1 + 0 + 0 + 0 + ..\..\..\components\libc\compilers\common\cctype.c + cctype.c + 0 + 0 + + + 2 + 5 + 1 + 0 + 0 + 0 + ..\..\..\components\libc\compilers\common\cstdlib.c + cstdlib.c + 0 + 0 + + + 2 + 6 + 1 + 0 + 0 + 0 + ..\..\..\components\libc\compilers\common\cstring.c + cstring.c + 0 + 0 + + + 2 + 7 + 1 + 0 + 0 + 0 + ..\..\..\components\libc\compilers\common\ctime.c + ctime.c + 0 + 0 + + + 2 + 8 + 1 + 0 + 0 + 0 + ..\..\..\components\libc\compilers\common\cunistd.c + cunistd.c + 0 + 0 + + + 2 + 9 + 1 + 0 + 0 + 0 + ..\..\..\components\libc\compilers\common\cwchar.c + cwchar.c + 0 + 0 + + + + + DeviceDrivers + 0 + 0 + 0 + 0 + + 3 + 10 + 1 + 0 + 0 + 0 + ..\..\..\components\drivers\core\device.c + device.c + 0 + 0 + + + 3 + 11 + 1 + 0 + 0 + 0 + ..\..\..\components\drivers\ipc\completion_comm.c + completion_comm.c + 0 + 0 + + + 3 + 12 + 1 + 0 + 0 + 0 + ..\..\..\components\drivers\ipc\completion_up.c + completion_up.c + 0 + 0 + + + 3 + 13 + 1 + 0 + 0 + 0 + ..\..\..\components\drivers\ipc\condvar.c + condvar.c + 0 + 0 + + + 3 + 14 + 1 + 0 + 0 + 0 + ..\..\..\components\drivers\ipc\dataqueue.c + dataqueue.c + 0 + 0 + + + 3 + 15 + 1 + 0 + 0 + 0 + ..\..\..\components\drivers\ipc\pipe.c + pipe.c + 0 + 0 + + + 3 + 16 + 1 + 0 + 0 + 0 + ..\..\..\components\drivers\ipc\ringblk_buf.c + ringblk_buf.c + 0 + 0 + + + 3 + 17 + 1 + 0 + 0 + 0 + ..\..\..\components\drivers\ipc\ringbuffer.c + ringbuffer.c + 0 + 0 + + + 3 + 18 + 1 + 0 + 0 + 0 + ..\..\..\components\drivers\ipc\waitqueue.c + waitqueue.c + 0 + 0 + + + 3 + 19 + 1 + 0 + 0 + 0 + ..\..\..\components\drivers\ipc\workqueue.c + workqueue.c + 0 + 0 + + + 3 + 20 + 1 + 0 + 0 + 0 + ..\..\..\components\drivers\pin\dev_pin.c + dev_pin.c + 0 + 0 + + + 3 + 21 + 1 + 0 + 0 + 0 + ..\..\..\components\drivers\serial\dev_serial.c + dev_serial.c + 0 + 0 + + + + + Drivers + 0 + 0 + 0 + 0 + + 4 + 22 + 1 + 0 + 0 + 0 + board\board.c + board.c + 0 + 0 + + + 4 + 23 + 1 + 0 + 0 + 0 + ..\libraries\drivers\drv_gpio.c + drv_gpio.c + 0 + 0 + + + 4 + 24 + 1 + 0 + 0 + 0 + ..\libraries\drivers\drv_uarte.c + drv_uarte.c + 0 + 0 + + + + + Finsh + 1 + 0 + 0 + 0 + + 5 + 25 + 1 + 0 + 0 + 0 + ..\..\..\components\finsh\cmd.c + cmd.c + 0 + 0 + + + 5 + 26 + 1 + 0 + 0 + 0 + ..\..\..\components\finsh\msh.c + msh.c + 0 + 0 + + + 5 + 27 + 1 + 0 + 0 + 0 + ..\..\..\components\finsh\msh_parse.c + msh_parse.c + 0 + 0 + + + 5 + 28 + 1 + 0 + 0 + 0 + ..\..\..\components\finsh\shell.c + shell.c + 0 + 0 + + + + + Kernel + 0 + 0 + 0 + 0 + + 6 + 29 + 1 + 0 + 0 + 0 + ..\..\..\src\clock.c + clock.c + 0 + 0 + + + 6 + 30 + 1 + 0 + 0 + 0 + ..\..\..\src\components.c + components.c + 0 + 0 + + + 6 + 31 + 1 + 0 + 0 + 0 + ..\..\..\src\cpu_up.c + cpu_up.c + 0 + 0 + + + 6 + 32 + 1 + 0 + 0 + 0 + ..\..\..\src\defunct.c + defunct.c + 0 + 0 + + + 6 + 33 + 1 + 0 + 0 + 0 + ..\..\..\src\idle.c + idle.c + 0 + 0 + + + 6 + 34 + 1 + 0 + 0 + 0 + ..\..\..\src\ipc.c + ipc.c + 0 + 0 + + + 6 + 35 + 1 + 0 + 0 + 0 + ..\..\..\src\irq.c + irq.c + 0 + 0 + + + 6 + 36 + 1 + 0 + 0 + 0 + ..\..\..\src\klibc\kerrno.c + kerrno.c + 0 + 0 + + + 6 + 37 + 1 + 0 + 0 + 0 + ..\..\..\src\klibc\kstdio.c + kstdio.c + 0 + 0 + + + 6 + 38 + 1 + 0 + 0 + 0 + ..\..\..\src\klibc\kstring.c + kstring.c + 0 + 0 + + + 6 + 39 + 1 + 0 + 0 + 0 + ..\..\..\src\kservice.c + kservice.c + 0 + 0 + + + 6 + 40 + 1 + 0 + 0 + 0 + ..\..\..\src\mem.c + mem.c + 0 + 0 + + + 6 + 41 + 1 + 0 + 0 + 0 + ..\..\..\src\mempool.c + mempool.c + 0 + 0 + + + 6 + 42 + 1 + 0 + 0 + 0 + ..\..\..\src\object.c + object.c + 0 + 0 + + + 6 + 43 + 1 + 0 + 0 + 0 + ..\..\..\src\scheduler_comm.c + scheduler_comm.c + 0 + 0 + + + 6 + 44 + 1 + 0 + 0 + 0 + ..\..\..\src\scheduler_up.c + scheduler_up.c + 0 + 0 + + + 6 + 45 + 1 + 0 + 0 + 0 + ..\..\..\src\thread.c + thread.c + 0 + 0 + + + 6 + 46 + 1 + 0 + 0 + 0 + ..\..\..\src\timer.c + timer.c + 0 + 0 + + + + + libcpu + 0 + 0 + 0 + 0 + + 7 + 47 + 1 + 0 + 0 + 0 + ..\..\..\libcpu\arm\common\div0.c + div0.c + 0 + 0 + + + 7 + 48 + 1 + 0 + 0 + 0 + ..\..\..\libcpu\arm\common\showmem.c + showmem.c + 0 + 0 + + + 7 + 49 + 2 + 0 + 0 + 0 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + context_rvds.S + 0 + 0 + + + 7 + 50 + 1 + 0 + 0 + 0 + ..\..\..\libcpu\arm\cortex-m4\cpuport.c + cpuport.c + 0 + 0 + + + + + nrf_Drivers + 0 + 0 + 0 + 0 + + 8 + 51 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_qspi.c + nrfx_qspi.c + 0 + 0 + + + 8 + 52 + 1 + 0 + 0 + 0 + packages\nrfx-latest\mdk\system_nrf5340_application.c + system_nrf5340_application.c + 0 + 0 + + + 8 + 53 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_uarte.c + nrfx_uarte.c + 0 + 0 + + + 8 + 54 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_rtc.c + nrfx_rtc.c + 0 + 0 + + + 8 + 55 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_wdt.c + nrfx_wdt.c + 0 + 0 + + + 8 + 56 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_twim.c + nrfx_twim.c + 0 + 0 + + + 8 + 57 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_pwm.c + nrfx_pwm.c + 0 + 0 + + + 8 + 58 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_gpiote.c + nrfx_gpiote.c + 0 + 0 + + + 8 + 59 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_saadc.c + nrfx_saadc.c + 0 + 0 + + + 8 + 60 + 2 + 0 + 0 + 0 + packages\nrfx-latest\mdk\arm_startup_nrf5340_application.s + arm_startup_nrf5340_application.s + 0 + 0 + + + 8 + 61 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_timer.c + nrfx_timer.c + 0 + 0 + + + 8 + 62 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_nvmc.c + nrfx_nvmc.c + 0 + 0 + + + 8 + 63 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_spim.c + nrfx_spim.c + 0 + 0 + + + 8 + 64 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_twi_twim.c + nrfx_twi_twim.c + 0 + 0 + + + 8 + 65 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_clock.c + nrfx_clock.c + 0 + 0 + diff --git a/bsp/nrf5x/nrf5340/project.uvprojx b/bsp/nrf5x/nrf5340/project.uvprojx index ed3e2a42df..b7db3994ce 100644 --- a/bsp/nrf5x/nrf5340/project.uvprojx +++ b/bsp/nrf5x/nrf5340/project.uvprojx @@ -1,7 +1,10 @@ + 2.1 +
### uVision Project, (C) Keil Software
+ rtthread @@ -13,31 +16,31 @@ nRF5340_xxAA:Application Nordic Semiconductor - NordicSemiconductor.nRF_DeviceFamilyPack.8.40.3 + NordicSemiconductor.nRF_DeviceFamilyPack.8.44.1 http://developer.nordicsemi.com/nRF5_SDK/pieces/nRF_DeviceFamilyPack/ IRAM(0x20000000,0x00040000) IRAM2(0x20040000,0x00040000) IROM(0x00000000,0x00100000) IROM2(0x10000000,0x08000000) CPUTYPE("Cortex-M33") FPU3(SFPU) DSP TZ CLOCK(12000000) ELITTLE - - + + UL2V8M(-S0 -C0 -P0 -FD20000000 -FC4000 -FN1 -FF0nrf53xx_application -FS00 -FL0200000 -FP0($$Device:nRF5340_xxAA$Flash\nrf53xx_application.flm)) 0 $$Device:nRF5340_xxAA$Device\Include\nrf.h - - - - - - - - - + + + + + + + + + $$Device:nRF5340_xxAA$SVD\nrf5340_application.svd 0 0 - - - - - + + + + + 0 0 @@ -59,8 +62,8 @@ 0 0 - - + + 0 0 0 @@ -69,8 +72,8 @@ 0 0 - - + + 0 0 0 @@ -80,14 +83,14 @@ 1 0 fromelf --bin !L --output rtthread.bin - + 0 0 0 0 0 - + 0 @@ -101,15 +104,15 @@ 0 0 3 - - + + 1 - - - - + + + + SARMV8M.DLL -MPU TCM.DLL @@ -131,15 +134,15 @@ 0 1 1 - 4101 + 4102 1 BIN\UL2V8M.DLL "" () - - - - + + + + 0 @@ -172,7 +175,7 @@ 0 0 "Cortex-M33" - + 0 0 0 @@ -306,11 +309,11 @@ 0x40000 - + 1 - 4 + 1 0 0 1 @@ -334,9 +337,9 @@ 0 -fshort-enums - __STDC_LIMIT_MACROS, RT_USING_ARMLIBC, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, NRF5340_XXAA_APPLICATION - - ..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\libc\compilers\common\extension\fcntl\octal;packages\nrfx-latest\drivers;packages\nrfx-latest\drivers\src;..\..\..\components\drivers\include;packages\nrfx-latest\mdk;..\..\..\components\libc\compilers\common\include;..\..\..\components\drivers\include;..\..\..\components\finsh;applications;..\..\..\components\libc\posix\io\epoll;packages\nrfx-latest\drivers\include;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\spi;packages\nrfx-latest;.;board;..\..\..\components\libc\compilers\common\extension;..\libraries\drivers;..\..\..\components\drivers\include;packages\nrfx-latest\hal;..\..\..\components\drivers\include;..\libraries\cmsis\include;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\include + __STDC_LIMIT_MACROS, RT_USING_LIBC, RT_USING_ARMLIBC, NRF5340_XXAA_APPLICATION, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND + + ..\..\..\components\libc\posix\io\epoll;.;..\..\..\libcpu\arm\common;..\libraries\drivers;..\..\..\components\libc\compilers\common\extension\fcntl\octal;board;..\..\..\components\libc\compilers\common\include;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;packages\nrfx-latest\mdk;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\include;packages\nrfx-latest\drivers;packages\SEGGER_RTT-latest;..\..\..\components\drivers\include;..\..\..\components\drivers\include;packages\nrfx-latest\hal;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\finsh;packages\SEGGER_RTT-latest\RTT;..\..\..\components\drivers\smp_call;..\..\..\components\libc\posix\io\poll;..\..\..\components\libc\compilers\common\extension;packages\nrfx-latest;packages\nrfx-latest\drivers\src;..\libraries\cmsis\include;packages\nrfx-latest\drivers\include;..\..\..\include;applications @@ -353,8 +356,8 @@ --cpreproc_opts=-DBOARD_PCA10095,-DBSP_DEFINES_ONLY,-DCONFIG_GPIO_AS_PINRESET,-DFLOAT_ABI_HARD,-DNRF5340_XXAA_APPLICATION,-D__HEAP_SIZE=8192,-D__STACK_SIZE=8192 BOARD_PCA10095 BSP_DEFINES_ONLY CONFIG_GPIO_AS_PINRESET FLOAT_ABI_HARD NRF5340_XXAA_APPLICATION __HEAP_SIZE=8192 __STACK_SIZE=8192 - - + + @@ -366,13 +369,13 @@ 0 0x00000000 0x20000000 - + .\board\linker_scripts\link.sct - - - - - + + + + + @@ -395,50 +398,36 @@ 1 ..\..\..\components\libc\compilers\armlibc\syscall_mem.c - - syscalls.c 1 ..\..\..\components\libc\compilers\armlibc\syscalls.c - - cctype.c 1 ..\..\..\components\libc\compilers\common\cctype.c - - cstdlib.c 1 ..\..\..\components\libc\compilers\common\cstdlib.c - - cstring.c 1 ..\..\..\components\libc\compilers\common\cstring.c - - ctime.c 1 ..\..\..\components\libc\compilers\common\ctime.c - - cunistd.c 1 ..\..\..\components\libc\compilers\common\cunistd.c - - cwchar.c 1 @@ -454,8 +443,47 @@ 1 ..\..\..\components\drivers\core\device.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_IPC_SOURCE__ @@ -466,15 +494,52 @@ - - - hwtimer.c + completion_comm.c 1 - ..\..\..\components\drivers\hwtimer\hwtimer.c + ..\..\..\components\drivers\ipc\completion_comm.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_IPC_SOURCE__ @@ -485,34 +550,108 @@ - - - i2c-bit-ops.c + completion_up.c 1 - ..\..\..\components\drivers\i2c\i2c-bit-ops.c + ..\..\..\components\drivers\ipc\completion_up.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_IPC_SOURCE__ - + - - - i2c_core.c + condvar.c 1 - ..\..\..\components\drivers\i2c\i2c_core.c + ..\..\..\components\drivers\ipc\condvar.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_IPC_SOURCE__ @@ -523,53 +662,52 @@ - - - - i2c_dev.c - 1 - ..\..\..\components\drivers\i2c\i2c_dev.c - - - - - - __RT_IPC_SOURCE__ - - - - - - - - - - - completion.c - 1 - ..\..\..\components\drivers\ipc\completion.c - - - - - - __RT_IPC_SOURCE__ - - - - - - - - - dataqueue.c 1 ..\..\..\components\drivers\ipc\dataqueue.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_IPC_SOURCE__ @@ -580,15 +718,52 @@ - - pipe.c 1 ..\..\..\components\drivers\ipc\pipe.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_IPC_SOURCE__ @@ -599,15 +774,52 @@ - - ringblk_buf.c 1 ..\..\..\components\drivers\ipc\ringblk_buf.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_IPC_SOURCE__ @@ -618,15 +830,52 @@ - - ringbuffer.c 1 ..\..\..\components\drivers\ipc\ringbuffer.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_IPC_SOURCE__ @@ -637,15 +886,52 @@ - - waitqueue.c 1 ..\..\..\components\drivers\ipc\waitqueue.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_IPC_SOURCE__ @@ -656,15 +942,52 @@ - - workqueue.c 1 ..\..\..\components\drivers\ipc\workqueue.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_IPC_SOURCE__ @@ -675,15 +998,52 @@ - - - adc.c + dev_pin.c 1 - ..\..\..\components\drivers\misc\adc.c + ..\..\..\components\drivers\pin\dev_pin.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_IPC_SOURCE__ @@ -694,129 +1054,52 @@ - - - rt_drv_pwm.c + dev_serial.c 1 - ..\..\..\components\drivers\misc\rt_drv_pwm.c - - - - - - __RT_IPC_SOURCE__ - - - - - - - - - - - pin.c - 1 - ..\..\..\components\drivers\pin\pin.c - - - - - - __RT_IPC_SOURCE__ - - - - - - - - - - - rtc.c - 1 - ..\..\..\components\drivers\rtc\rtc.c - - - - - - __RT_IPC_SOURCE__ - - - - - - - - - - - serial.c - 1 - ..\..\..\components\drivers\serial\serial.c - - - - - - __RT_IPC_SOURCE__ - - - - - - - - - - - spi_core.c - 1 - ..\..\..\components\drivers\spi\spi_core.c - - - - - - __RT_IPC_SOURCE__ - - - - - - - - - - - spi_dev.c - 1 - ..\..\..\components\drivers\spi\spi_dev.c - - - - - - __RT_IPC_SOURCE__ - - - - - - - - - - - watchdog.c - 1 - ..\..\..\components\drivers\watchdog\watchdog.c + ..\..\..\components\drivers\serial\dev_serial.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_IPC_SOURCE__ @@ -837,15 +1120,11 @@ 1 board\board.c - - drv_gpio.c 1 ..\libraries\drivers\drv_gpio.c - - drv_uarte.c 1 @@ -857,30 +1136,24 @@ Finsh - shell.c + cmd.c 1 - ..\..\..\components\finsh\shell.c + ..\..\..\components\finsh\cmd.c - - msh.c 1 ..\..\..\components\finsh\msh.c - - msh_parse.c 1 ..\..\..\components\finsh\msh_parse.c - - - cmd.c + shell.c 1 - ..\..\..\components\finsh\cmd.c + ..\..\..\components\finsh\shell.c @@ -892,8 +1165,47 @@ 1 ..\..\..\src\clock.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_KERNEL_SOURCE__ @@ -904,15 +1216,164 @@ - - components.c 1 ..\..\..\src\components.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + __RT_KERNEL_SOURCE__ + + + + + + + + + cpu_up.c + 1 + ..\..\..\src\cpu_up.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + __RT_KERNEL_SOURCE__ + + + + + + + + + defunct.c + 1 + ..\..\..\src\defunct.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_KERNEL_SOURCE__ @@ -923,15 +1384,52 @@ - - idle.c 1 ..\..\..\src\idle.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_KERNEL_SOURCE__ @@ -942,15 +1440,52 @@ - - ipc.c 1 ..\..\..\src\ipc.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_KERNEL_SOURCE__ @@ -961,15 +1496,108 @@ - - irq.c 1 ..\..\..\src\irq.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + __RT_KERNEL_SOURCE__ + + + + + + + + + kerrno.c + 1 + ..\..\..\src\klibc\kerrno.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_KERNEL_SOURCE__ @@ -980,15 +1608,52 @@ - - kstdio.c 1 ..\..\..\src\klibc\kstdio.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_KERNEL_SOURCE__ @@ -999,15 +1664,52 @@ - - kstring.c 1 ..\..\..\src\klibc\kstring.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_KERNEL_SOURCE__ @@ -1018,15 +1720,52 @@ - - kservice.c 1 ..\..\..\src\kservice.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_KERNEL_SOURCE__ @@ -1037,15 +1776,52 @@ - - mem.c 1 ..\..\..\src\mem.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_KERNEL_SOURCE__ @@ -1056,15 +1832,52 @@ - - mempool.c 1 ..\..\..\src\mempool.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_KERNEL_SOURCE__ @@ -1075,15 +1888,52 @@ - - object.c 1 ..\..\..\src\object.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_KERNEL_SOURCE__ @@ -1094,15 +1944,52 @@ - - scheduler_comm.c 1 ..\..\..\src\scheduler_comm.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_KERNEL_SOURCE__ @@ -1113,15 +2000,52 @@ - - scheduler_up.c 1 ..\..\..\src\scheduler_up.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_KERNEL_SOURCE__ @@ -1132,15 +2056,52 @@ - - thread.c 1 ..\..\..\src\thread.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_KERNEL_SOURCE__ @@ -1151,15 +2112,52 @@ - - timer.c 1 ..\..\..\src\timer.c + + 2 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 __RT_KERNEL_SOURCE__ @@ -1180,22 +2178,16 @@ 1 ..\..\..\libcpu\arm\common\div0.c - - showmem.c 1 ..\..\..\libcpu\arm\common\showmem.c - - context_rvds.S 2 ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - - cpuport.c 1 @@ -1207,166 +2199,130 @@ nrf_Drivers - arm_startup_nrf5340_application.s - 2 - packages\nrfx-latest\mdk\arm_startup_nrf5340_application.s - - - - - nrfx_gpiote.c + nrfx_qspi.c 1 - packages\nrfx-latest\drivers\src\nrfx_gpiote.c + packages\nrfx-latest\drivers\src\nrfx_qspi.c - - - - nrfx_pwm.c - 1 - packages\nrfx-latest\drivers\src\nrfx_pwm.c - - - - - nrfx_spim.c - 1 - packages\nrfx-latest\drivers\src\nrfx_spim.c - - - system_nrf5340_application.c 1 packages\nrfx-latest\mdk\system_nrf5340_application.c - - - - nrfx_saadc.c - 1 - packages\nrfx-latest\drivers\src\nrfx_saadc.c - - - - - nrfx_qspi.c - 1 - packages\nrfx-latest\drivers\src\nrfx_qspi.c - - - - - nrfx_rtc.c - 1 - packages\nrfx-latest\drivers\src\nrfx_rtc.c - - - - - nrfx_twi_twim.c - 1 - packages\nrfx-latest\drivers\src\nrfx_twi_twim.c - - - - - nrfx_wdt.c - 1 - packages\nrfx-latest\drivers\src\nrfx_wdt.c - - - - - nrfx_twim.c - 1 - packages\nrfx-latest\drivers\src\nrfx_twim.c - - - nrfx_uarte.c 1 packages\nrfx-latest\drivers\src\nrfx_uarte.c - - + + nrfx_rtc.c + 1 + packages\nrfx-latest\drivers\src\nrfx_rtc.c + + + nrfx_wdt.c + 1 + packages\nrfx-latest\drivers\src\nrfx_wdt.c + + + nrfx_twim.c + 1 + packages\nrfx-latest\drivers\src\nrfx_twim.c + + + nrfx_pwm.c + 1 + packages\nrfx-latest\drivers\src\nrfx_pwm.c + + + nrfx_gpiote.c + 1 + packages\nrfx-latest\drivers\src\nrfx_gpiote.c + + + nrfx_saadc.c + 1 + packages\nrfx-latest\drivers\src\nrfx_saadc.c + + + arm_startup_nrf5340_application.s + 2 + packages\nrfx-latest\mdk\arm_startup_nrf5340_application.s + + + nrfx_timer.c + 1 + packages\nrfx-latest\drivers\src\nrfx_timer.c + + + nrfx_nvmc.c + 1 + packages\nrfx-latest\drivers\src\nrfx_nvmc.c + + + nrfx_spim.c + 1 + packages\nrfx-latest\drivers\src\nrfx_spim.c + + + nrfx_twi_twim.c + 1 + packages\nrfx-latest\drivers\src\nrfx_twi_twim.c + nrfx_clock.c 1 packages\nrfx-latest\drivers\src\nrfx_clock.c - - - nrfx_timer.c - 1 - packages\nrfx-latest\drivers\src\nrfx_timer.c - - + - + - + - + - - - - - - - - - - - - - - - + + RTE\Device\nRF52840_xxAA\arm_startup_nrf52840.s - - - + + + RTE\Device\nRF52840_xxAA\system_nrf52.c - - - + + + - RTE\Device\nRF5340_xxAA_Application\arm_startup_nrf5340_application.s - - - - - + RTE\Device\nRF5340_xxAA_Application\arm_startup_nrf5340_application.s + + + - RTE\Device\nRF5340_xxAA_Application\system_nrf5340_application.c - - - - - + RTE\Device\nRF5340_xxAA_Application\system_nrf5340_application.c + + + + diff --git a/bsp/nrf5x/nrf5340/rtconfig.h b/bsp/nrf5x/nrf5340/rtconfig.h index c9bc967b5c..6d5443ffae 100644 --- a/bsp/nrf5x/nrf5340/rtconfig.h +++ b/bsp/nrf5x/nrf5340/rtconfig.h @@ -1,9 +1,6 @@ #ifndef RT_CONFIG_H__ #define RT_CONFIG_H__ -/* Automatically generated file; DO NOT EDIT. */ -/* RT-Thread Configuration */ - /* Hardware Drivers Config */ #define SOC_NRF5340 @@ -13,6 +10,7 @@ /* Onboard Peripheral Drivers */ #define RT_BSP_LED_PIN 28 +/* end of Onboard Peripheral Drivers */ /* On-chip Peripheral Drivers */ @@ -36,6 +34,8 @@ #define MCU_SRAM_START_ADDRESS 0x20000000 #define MCU_SRAM_SIZE_KB 512 #define MCU_FLASH_PAGE_SIZE 0x1000 +/* end of MCU flash config */ +/* end of On-chip Peripheral Drivers */ #define BLE_STACK_USING_NULL #define NRFX_CLOCK_ENABLED 1 #define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY 7 @@ -43,6 +43,7 @@ #define NRFX_UART_ENABLED 1 #define NRFX_UART0_ENABLED 1 #define NRFX_GPIOTE_ENABLED 1 +/* end of Hardware Drivers Config */ /* RT-Thread Kernel */ @@ -63,7 +64,13 @@ /* kservice optimization */ +/* end of kservice optimization */ + +/* klibc optimization */ + +/* end of klibc optimization */ #define RT_USING_DEBUG +#define RT_DEBUGING_ASSERT #define RT_DEBUGING_COLOR #define RT_DEBUGING_CONTEXT @@ -73,6 +80,7 @@ #define RT_USING_MUTEX #define RT_USING_EVENT #define RT_USING_MESSAGEQUEUE +/* end of Inter-Thread communication */ /* Memory Management */ @@ -80,12 +88,14 @@ #define RT_USING_SMALL_MEM #define RT_USING_SMALL_MEM_AS_HEAP #define RT_USING_HEAP +/* end of Memory Management */ #define RT_USING_DEVICE #define RT_USING_CONSOLE #define RT_CONSOLEBUF_SIZE 128 #define RT_CONSOLE_DEVICE_NAME "uart0" -#define RT_VER_NUM 0x50100 +#define RT_VER_NUM 0x50200 #define RT_BACKTRACE_LEVEL_MAX_NR 32 +/* end of RT-Thread Kernel */ /* RT-Thread Components */ @@ -110,6 +120,7 @@ /* DFS: device virtual file system */ +/* end of DFS: device virtual file system */ /* Device Drivers */ @@ -119,18 +130,8 @@ #define RT_USING_SERIAL_V1 #define RT_SERIAL_USING_DMA #define RT_SERIAL_RB_BUFSZ 64 -#define RT_USING_I2C -#define RT_USING_I2C_BITOPS -#define RT_USING_ADC -#define RT_USING_PWM -#define RT_USING_RTC -#define RT_USING_SPI -#define RT_USING_WDT #define RT_USING_PIN -#define RT_USING_HWTIMER - -/* Using USB */ - +/* end of Device Drivers */ /* C/C++ and POSIX layer */ @@ -142,6 +143,8 @@ #define RT_LIBC_TZ_DEFAULT_HOUR 8 #define RT_LIBC_TZ_DEFAULT_MIN 0 #define RT_LIBC_TZ_DEFAULT_SEC 0 +/* end of Timezone and Daylight Saving Time */ +/* end of ISO-ANSI C layer */ /* POSIX (Portable Operating System Interface) layer */ @@ -151,18 +154,30 @@ /* Socket is in the 'Network' category */ +/* end of Interprocess Communication (IPC) */ +/* end of POSIX (Portable Operating System Interface) layer */ +/* end of C/C++ and POSIX layer */ /* Network */ +/* end of Network */ /* Memory protection */ +/* end of Memory protection */ /* Utilities */ +/* end of Utilities */ + +/* Using USB legacy version */ + +/* end of Using USB legacy version */ +/* end of RT-Thread Components */ /* RT-Thread Utestcases */ +/* end of RT-Thread Utestcases */ /* RT-Thread online packages */ @@ -173,57 +188,78 @@ /* Marvell WiFi */ +/* end of Marvell WiFi */ /* Wiced WiFi */ +/* end of Wiced WiFi */ /* CYW43012 WiFi */ +/* end of CYW43012 WiFi */ /* BL808 WiFi */ +/* end of BL808 WiFi */ /* CYW43439 WiFi */ +/* end of CYW43439 WiFi */ +/* end of Wi-Fi */ /* IoT Cloud */ +/* end of IoT Cloud */ +/* end of IoT - internet of things */ /* security packages */ +/* end of security packages */ /* language packages */ /* JSON: JavaScript Object Notation, a lightweight data-interchange format */ +/* end of JSON: JavaScript Object Notation, a lightweight data-interchange format */ /* XML: Extensible Markup Language */ +/* end of XML: Extensible Markup Language */ +/* end of language packages */ /* multimedia packages */ /* LVGL: powerful and easy-to-use embedded GUI library */ +/* end of LVGL: powerful and easy-to-use embedded GUI library */ /* u8g2: a monochrome graphic library */ +/* end of u8g2: a monochrome graphic library */ +/* end of multimedia packages */ /* tools packages */ +/* end of tools packages */ /* system packages */ /* enhanced kernel services */ +/* end of enhanced kernel services */ /* acceleration: Assembly language or algorithmic acceleration packages */ +/* end of acceleration: Assembly language or algorithmic acceleration packages */ /* CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ +/* end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */ /* Micrium: Micrium software products porting for RT-Thread */ +/* end of Micrium: Micrium software products porting for RT-Thread */ +/* end of system packages */ /* peripheral libraries and drivers */ @@ -231,67 +267,95 @@ /* STM32 HAL & SDK Drivers */ +/* end of STM32 HAL & SDK Drivers */ + +/* Infineon HAL Packages */ + +/* end of Infineon HAL Packages */ /* Kendryte SDK */ +/* end of Kendryte SDK */ #define PKG_USING_NRFX #define PKG_USING_NRFX_LATEST_VERSION +/* end of HAL & SDK Drivers */ /* sensors drivers */ +/* end of sensors drivers */ /* touch drivers */ +/* end of touch drivers */ +/* end of peripheral libraries and drivers */ /* AI packages */ +/* end of AI packages */ /* Signal Processing and Control Algorithm Packages */ +/* end of Signal Processing and Control Algorithm Packages */ /* miscellaneous packages */ /* project laboratory */ +/* end of project laboratory */ + /* samples: kernel and components samples */ +/* end of samples: kernel and components samples */ /* entertainment: terminal games and other interesting software packages */ +/* end of entertainment: terminal games and other interesting software packages */ +/* end of miscellaneous packages */ /* Arduino libraries */ /* Projects and Demos */ +/* end of Projects and Demos */ /* Sensors */ +/* end of Sensors */ /* Display */ +/* end of Display */ /* Timing */ +/* end of Timing */ /* Data Processing */ +/* end of Data Processing */ /* Data Storage */ /* Communication */ +/* end of Communication */ /* Device Control */ +/* end of Device Control */ /* Other */ +/* end of Other */ /* Signal IO */ +/* end of Signal IO */ /* Uncategorized */ +/* end of Arduino libraries */ +/* end of RT-Thread online packages */ #endif diff --git a/bsp/nrf5x/nrf5340/rtconfig.py b/bsp/nrf5x/nrf5340/rtconfig.py index c809814516..e932950ac6 100644 --- a/bsp/nrf5x/nrf5340/rtconfig.py +++ b/bsp/nrf5x/nrf5340/rtconfig.py @@ -54,8 +54,10 @@ if PLATFORM == 'gcc': else: CFLAGS += ' -O2' - POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n' - + POST_ACTION = OBJCPY + ' -O binary $TARGET rt-thread.bin\n' + POST_ACTION += OBJCPY + ' -O ihex $TARGET rt-thread.hex\n' + POST_ACTION += SIZE + ' $TARGET \n' + elif PLATFORM == 'armcc': # toolchains CC = 'armcc' diff --git a/bsp/nrf5x/nrf5340/template.uvoptx b/bsp/nrf5x/nrf5340/template.uvoptx index d161a179e0..fd85a6794a 100644 --- a/bsp/nrf5x/nrf5340/template.uvoptx +++ b/bsp/nrf5x/nrf5340/template.uvoptx @@ -28,7 +28,7 @@ 12000000 - 0 + 1 1 0 1 @@ -73,11 +73,11 @@ 0 - 0 + 1 0 1 - 0 + 5 0 1 @@ -103,7 +103,7 @@ 1 0 0 - 13 + 4 @@ -114,9 +114,14 @@ - BIN\UL2V8M.DLL + Segger\JL2CM3.dll + + 0 + JL2CM3 + -U1050713230 -O78 -S8 -ZTIFSpeedSel50000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8009 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC4000 -FN1 -FF0nrf53xx_application.flm -FS00 -FL0200000 -FP0($$Device:nRF5340_xxAA$Flash\nrf53xx_application.flm) + 0 UL2V8M @@ -176,12 +181,4 @@ - - ::Device - 0 - 0 - 0 - 1 - - diff --git a/bsp/nrf5x/nrf5340/template.uvprojx b/bsp/nrf5x/nrf5340/template.uvprojx index 8f5fa105e0..800276238e 100644 --- a/bsp/nrf5x/nrf5340/template.uvprojx +++ b/bsp/nrf5x/nrf5340/template.uvprojx @@ -16,7 +16,7 @@ nRF5340_xxAA:Application Nordic Semiconductor - NordicSemiconductor.nRF_DeviceFamilyPack.8.40.3 + NordicSemiconductor.nRF_DeviceFamilyPack.8.44.1 http://developer.nordicsemi.com/nRF5_SDK/pieces/nRF_DeviceFamilyPack/ IRAM(0x20000000,0x00040000) IRAM2(0x20040000,0x00040000) IROM(0x00000000,0x00100000) IROM2(0x10000000,0x08000000) CPUTYPE("Cortex-M33") FPU3(SFPU) DSP TZ CLOCK(12000000) ELITTLE @@ -134,7 +134,7 @@ 0 1 1 - 4101 + 4102 1 BIN\UL2V8M.DLL @@ -313,7 +313,7 @@ 1 - 4 + 1 0 0 1 @@ -379,80 +379,6 @@ - - - ::Device - - - 0 - 0 - 0 - 0 - 0 - 0 - 2 - 2 - 2 - 2 - 11 - - - 1 - - - - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 0 - 2 - 2 - 2 - 2 - 2 - - - - - - - - - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 0 - - - - - - - - - - - @@ -473,20 +399,7 @@ - - - - - - - - - - - - - - + RTE\Device\nRF52840_xxAA\arm_startup_nrf52840.s @@ -501,20 +414,16 @@ - RTE\Device\nRF5340_xxAA_Application\arm_startup_nrf5340_application.s + RTE\Device\nRF5340_xxAA_Application\arm_startup_nrf5340_application.s - - - + - RTE\Device\nRF5340_xxAA_Application\system_nrf5340_application.c + RTE\Device\nRF5340_xxAA_Application\system_nrf5340_application.c - - - +