Skip to content

Commit 19577df

Browse files
CYFS3Rbb666
authored andcommitted
[bsp][nuvoton]:fix nuvoton ci err
1 parent b943c0d commit 19577df

11 files changed

Lines changed: 229 additions & 59 deletions

File tree

bsp/nuvoton/libraries/n9h30/rtt_port/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ config SOC_SERIES_N9H30
44
select SOC_FAMILY_NUMICRO
55
select RT_USING_COMPONENTS_INIT
66
select RT_USING_USER_MAIN
7-
select PKG_USING_NUVOTON_ARM926_LIB
7+
select PKG_USING_NUVOTON_SERIES_DRIVER
88
default y
99

1010
config BSP_USE_STDDRIVER_SOURCE

bsp/nuvoton/libraries/nuc980/rtt_port/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ config SOC_SERIES_NUC980
44
select SOC_FAMILY_NUMICRO
55
select RT_USING_COMPONENTS_INIT
66
select RT_USING_USER_MAIN
7-
select PKG_USING_NUVOTON_ARM926_LIB
7+
select PKG_USING_NUVOTON_SERIES_DRIVER
88
default y
99

1010
config BSP_USE_STDDRIVER_SOURCE

bsp/nuvoton/nk-980iot/.config

Lines changed: 55 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@ CONFIG_RT_USING_DEVICE=y
180180
CONFIG_RT_USING_CONSOLE=y
181181
CONFIG_RT_CONSOLEBUF_SIZE=256
182182
CONFIG_RT_CONSOLE_DEVICE_NAME="uart0"
183-
CONFIG_RT_VER_NUM=0x50201
183+
CONFIG_RT_USING_CONSOLE_OUTPUT_CTL=y
184+
CONFIG_RT_VER_NUM=0x50300
184185
# CONFIG_RT_USING_STDC_ATOMIC is not set
185186
CONFIG_RT_BACKTRACE_LEVEL_MAX_NR=32
186187
# end of RT-Thread Kernel
@@ -257,6 +258,7 @@ CONFIG_RT_DFS_ELM_MUTEX_TIMEOUT=3000
257258
# end of elm-chan's FatFs, Generic FAT Filesystem Module
258259

259260
CONFIG_RT_USING_DFS_DEVFS=y
261+
# CONFIG_RT_USING_DFS_9PFS is not set
260262
# CONFIG_RT_USING_DFS_ISO9660 is not set
261263
# CONFIG_RT_USING_DFS_ROMFS is not set
262264
# CONFIG_RT_USING_DFS_CROMFS is not set
@@ -292,8 +294,7 @@ CONFIG_RT_CANSND_BOX_NUM=1
292294
CONFIG_RT_CANSND_MSG_TIMEOUT=100
293295
CONFIG_RT_CAN_NB_TX_FIFO_SIZE=256
294296
# CONFIG_RT_CAN_MALLOC_NB_TX_BUFFER is not set
295-
CONFIG_RT_USING_CPUTIME=y
296-
CONFIG_CPUTIME_TIMER_FREQ=0
297+
CONFIG_RT_USING_CLOCK_TIME=y
297298
CONFIG_RT_USING_I2C=y
298299
# CONFIG_RT_I2C_DEBUG is not set
299300
CONFIG_RT_USING_I2C_BITOPS=y
@@ -322,6 +323,8 @@ CONFIG_RT_ALARM_PRIORITY=10
322323
# CONFIG_RT_USING_SOFT_RTC is not set
323324
# CONFIG_RT_USING_SDIO is not set
324325
CONFIG_RT_USING_SPI=y
326+
CONFIG_RT_USING_SPI_ISR=y
327+
# CONFIG_RT_USING_SPI_BITOPS is not set
325328
# CONFIG_RT_USING_SOFT_SPI is not set
326329
CONFIG_RT_USING_QSPI=y
327330
# CONFIG_RT_USING_SPI_MSD is not set
@@ -362,10 +365,10 @@ CONFIG_RT_HWCRYPTO_USING_RNG=y
362365
# CONFIG_RT_HWCRYPTO_USING_BIGNUM is not set
363366
# CONFIG_RT_USING_WIFI is not set
364367
# CONFIG_RT_USING_BLK is not set
368+
# CONFIG_RT_USING_REGULATOR is not set
369+
# CONFIG_RT_USING_POWER_SUPPLY is not set
365370
# CONFIG_RT_USING_VIRTIO is not set
366371
CONFIG_RT_USING_PIN=y
367-
# CONFIG_RT_USING_KTIME is not set
368-
CONFIG_RT_USING_HWTIMER=y
369372
# CONFIG_RT_USING_CHERRYUSB is not set
370373
# end of Device Drivers
371374

@@ -541,11 +544,10 @@ CONFIG_RT_USING_ADT_REF=y
541544
# CONFIG_RT_USING_RT_LINK is not set
542545
# end of Utilities
543546

544-
# CONFIG_RT_USING_VBUS is not set
545-
546547
#
547548
# Memory management
548549
#
550+
# CONFIG_RT_PAGE_MPR_SIZE_DYNAMIC is not set
549551
CONFIG_RT_PAGE_AFFINITY_BLOCK_SIZE=0x1000
550552
CONFIG_RT_PAGE_MAX_ORDER=11
551553
# CONFIG_RT_USING_MEMBLOCK is not set
@@ -590,6 +592,7 @@ CONFIG_RT_USB_MSTORAGE_DISK_NAME="ramdisk1"
590592
# end of Using USB legacy version
591593

592594
# CONFIG_RT_USING_FDT is not set
595+
# CONFIG_RT_USING_RUST is not set
593596
# end of RT-Thread Components
594597

595598
#
@@ -791,6 +794,7 @@ CONFIG_RT_USB_MSTORAGE_DISK_NAME="ramdisk1"
791794
# CONFIG_PKG_USING_U8G2 is not set
792795
# end of u8g2: a monochrome graphic library
793796

797+
# CONFIG_PKG_USING_NES_SIMULATOR is not set
794798
# CONFIG_PKG_USING_OPENMV is not set
795799
# CONFIG_PKG_USING_MUPDF is not set
796800
# CONFIG_PKG_USING_STEMWIN is not set
@@ -816,6 +820,9 @@ CONFIG_RT_USB_MSTORAGE_DISK_NAME="ramdisk1"
816820
#
817821
# tools packages
818822
#
823+
# CONFIG_PKG_USING_VECTOR is not set
824+
# CONFIG_PKG_USING_SORCH is not set
825+
# CONFIG_PKG_USING_DICT is not set
819826
# CONFIG_PKG_USING_CMBACKTRACE is not set
820827
# CONFIG_PKG_USING_MCOREDUMP is not set
821828
# CONFIG_PKG_USING_EASYFLASH is not set
@@ -864,6 +871,9 @@ CONFIG_RT_USB_MSTORAGE_DISK_NAME="ramdisk1"
864871
# CONFIG_PKG_USING_RVBACKTRACE is not set
865872
# CONFIG_PKG_USING_HPATCHLITE is not set
866873
# CONFIG_PKG_USING_THREAD_METRIC is not set
874+
# CONFIG_PKG_USING_UORB is not set
875+
# CONFIG_PKG_USING_RT_TUNNEL is not set
876+
# CONFIG_PKG_USING_VIRTUAL_TERMINAL is not set
867877
# end of tools packages
868878

869879
#
@@ -958,6 +968,7 @@ CONFIG_RT_USB_MSTORAGE_DISK_NAME="ramdisk1"
958968
# CONFIG_PKG_USING_R_RHEALSTONE is not set
959969
# CONFIG_PKG_USING_HEARTBEAT is not set
960970
# CONFIG_PKG_USING_MICRO_ROS_RTTHREAD_PACKAGE is not set
971+
# CONFIG_PKG_USING_CHERRYECAT is not set
961972
# end of system packages
962973

963974
#
@@ -1103,20 +1114,40 @@ CONFIG_RT_USB_MSTORAGE_DISK_NAME="ramdisk1"
11031114
#
11041115
# NUVOTON Drivers
11051116
#
1106-
# CONFIG_PKG_USING_NUVOTON_CMSIS_DRIVER is not set
1107-
# CONFIG_PKG_USING_NUVOTON_SERIES_DRIVER is not set
1108-
CONFIG_PKG_USING_NUVOTON_ARM926_LIB=y
1109-
CONFIG_PKG_NUVOTON_ARM926_LIB_PATH="/packages/peripherals/hal-sdk/nuvoton/nuvoton-arm926-lib"
1110-
CONFIG_PKG_USING_NUVOTON_ARM926_LIB_LATEST_VERSION=y
1111-
CONFIG_PKG_NUVOTON_ARM926_LIB_VER="latest"
1117+
CONFIG_PKG_USING_NUVOTON_CMSIS_DRIVER=y
1118+
CONFIG_PKG_NUVOTON_CMSIS_DRIVER_PATH="/packages/peripherals/hal-sdk/nuvoton/nuvoton-cmsis"
1119+
CONFIG_PKG_USING_NUVOTON_CMSIS_DRIVER_LATEST_VERSION=y
1120+
CONFIG_PKG_NUVOTON_CMSIS_DRIVER_VER="latest"
1121+
CONFIG_PKG_USING_NUVOTON_SERIES_DRIVER=y
1122+
CONFIG_PKG_NUVOTON_SERIES_DRIVER_PATH="/packages/peripherals/hal-sdk/nuvoton/nuvoton-series"
1123+
CONFIG_PKG_USING_NUVOTON_SERIES_DRIVER_LATEST_VERSION=y
1124+
CONFIG_PKG_NUVOTON_SERIES_DRIVER_VER="latest"
1125+
# CONFIG_PKG_USING_NUVOTON_ARM926_LIB is not set
11121126
# end of NUVOTON Drivers
11131127

11141128
#
11151129
# GD32 Drivers
11161130
#
11171131
# CONFIG_PKG_USING_GD32_ARM_CMSIS_DRIVER is not set
11181132
# CONFIG_PKG_USING_GD32_ARM_SERIES_DRIVER is not set
1133+
# CONFIG_PKG_USING_GD32_RISCV_SERIES_DRIVER is not set
1134+
# CONFIG_PKG_USING_GD32VW55X_WIFI is not set
11191135
# end of GD32 Drivers
1136+
1137+
#
1138+
# HPMicro SDK
1139+
#
1140+
# CONFIG_PKG_USING_HPM_SDK is not set
1141+
# end of HPMicro SDK
1142+
1143+
#
1144+
# FT32 HAL & SDK Drivers
1145+
#
1146+
# CONFIG_PKG_USING_FT32F0_STD_DRIVER is not set
1147+
# CONFIG_PKG_USING_FT32F0_CMSIS_DRIVER is not set
1148+
# CONFIG_PKG_USING_FT32F4_STD_DRIVER is not set
1149+
# CONFIG_PKG_USING_FT32F4_CMSIS_DRIVER is not set
1150+
# end of FT32 HAL & SDK Drivers
11201151
# end of HAL & SDK Drivers
11211152

11221153
#
@@ -1162,9 +1193,11 @@ CONFIG_PKG_NUVOTON_ARM926_LIB_VER="latest"
11621193
# CONFIG_PKG_USING_RT3020 is not set
11631194
# CONFIG_PKG_USING_MLX90632 is not set
11641195
# CONFIG_PKG_USING_MLX90382 is not set
1196+
# CONFIG_PKG_USING_MLX90384 is not set
11651197
# CONFIG_PKG_USING_MLX90393 is not set
11661198
# CONFIG_PKG_USING_MLX90392 is not set
11671199
# CONFIG_PKG_USING_MLX90394 is not set
1200+
# CONFIG_PKG_USING_MLX90396 is not set
11681201
# CONFIG_PKG_USING_MLX90397 is not set
11691202
# CONFIG_PKG_USING_MS5611 is not set
11701203
# CONFIG_PKG_USING_MAX31865 is not set
@@ -1193,6 +1226,7 @@ CONFIG_PKG_NUVOTON_ARM926_LIB_VER="latest"
11931226
# CONFIG_PKG_USING_P3T1755 is not set
11941227
# CONFIG_PKG_USING_QMI8658 is not set
11951228
# CONFIG_PKG_USING_ICM20948 is not set
1229+
# CONFIG_PKG_USING_SCD4X is not set
11961230
# end of sensors drivers
11971231

11981232
#
@@ -1210,6 +1244,7 @@ CONFIG_PKG_NUVOTON_ARM926_LIB_VER="latest"
12101244
# CONFIG_PKG_USING_CST812T is not set
12111245
# end of touch drivers
12121246

1247+
# CONFIG_PKG_USING_LCD_SPI_DRIVER is not set
12131248
# CONFIG_PKG_USING_REALTEK_AMEBA is not set
12141249
# CONFIG_PKG_USING_BUTTON is not set
12151250
# CONFIG_PKG_USING_PCF8574 is not set
@@ -1289,6 +1324,13 @@ CONFIG_PKG_NUVOTON_ARM926_LIB_VER="latest"
12891324
# CONFIG_PKG_USING_IC74HC165 is not set
12901325
# CONFIG_PKG_USING_IST8310 is not set
12911326
# CONFIG_PKG_USING_ST7789_SPI is not set
1327+
# CONFIG_PKG_USING_CAN_UDS is not set
1328+
# CONFIG_PKG_USING_ISOTP_C is not set
1329+
# CONFIG_PKG_USING_IKUNLED is not set
1330+
# CONFIG_PKG_USING_INS5T8025 is not set
1331+
# CONFIG_PKG_USING_IRUART is not set
1332+
# CONFIG_PKG_USING_ST7305 is not set
1333+
# CONFIG_PKG_USING_TM1668 is not set
12921334
# CONFIG_PKG_USING_SPI_TOOLS is not set
12931335
# end of peripheral libraries and drivers
12941336

bsp/nuvoton/nk-980iot/SConstruct

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ def bsp_pkg_check():
1919
import subprocess
2020

2121
check_paths = [
22-
os.path.join("packages", "nuvoton-arm926-lib-latest"),
22+
os.path.join("packages", "nuvoton-series-latest"),
23+
os.path.join("packages", "nuvoton-cmsis-latest"),
2324
]
2425

2526
need_update = not all(os.path.exists(p) for p in check_paths)

bsp/nuvoton/nk-980iot/rtconfig.h

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@
106106
#define RT_USING_CONSOLE
107107
#define RT_CONSOLEBUF_SIZE 256
108108
#define RT_CONSOLE_DEVICE_NAME "uart0"
109-
#define RT_VER_NUM 0x50201
109+
#define RT_USING_CONSOLE_OUTPUT_CTL
110+
#define RT_VER_NUM 0x50300
110111
#define RT_BACKTRACE_LEVEL_MAX_NR 32
111112
/* end of RT-Thread Kernel */
112113
#define RT_USING_CACHE
@@ -182,8 +183,7 @@
182183
#define RT_CANSND_BOX_NUM 1
183184
#define RT_CANSND_MSG_TIMEOUT 100
184185
#define RT_CAN_NB_TX_FIFO_SIZE 256
185-
#define RT_USING_CPUTIME
186-
#define CPUTIME_TIMER_FREQ 0
186+
#define RT_USING_CLOCK_TIME
187187
#define RT_USING_I2C
188188
#define RT_USING_I2C_BITOPS
189189
#define RT_USING_ADC
@@ -196,6 +196,7 @@
196196
#define RT_ALARM_TIMESLICE 5
197197
#define RT_ALARM_PRIORITY 10
198198
#define RT_USING_SPI
199+
#define RT_USING_SPI_ISR
199200
#define RT_USING_QSPI
200201
#define RT_USING_WDT
201202
#define RT_USING_AUDIO
@@ -220,7 +221,6 @@
220221
#define RT_HWCRYPTO_USING_SHA2_512
221222
#define RT_HWCRYPTO_USING_RNG
222223
#define RT_USING_PIN
223-
#define RT_USING_HWTIMER
224224
/* end of Device Drivers */
225225

226226
/* C/C++ and POSIX layer */
@@ -489,13 +489,23 @@
489489

490490
/* NUVOTON Drivers */
491491

492-
#define PKG_USING_NUVOTON_ARM926_LIB
493-
#define PKG_USING_NUVOTON_ARM926_LIB_LATEST_VERSION
492+
#define PKG_USING_NUVOTON_CMSIS_DRIVER
493+
#define PKG_USING_NUVOTON_CMSIS_DRIVER_LATEST_VERSION
494+
#define PKG_USING_NUVOTON_SERIES_DRIVER
495+
#define PKG_USING_NUVOTON_SERIES_DRIVER_LATEST_VERSION
494496
/* end of NUVOTON Drivers */
495497

496498
/* GD32 Drivers */
497499

498500
/* end of GD32 Drivers */
501+
502+
/* HPMicro SDK */
503+
504+
/* end of HPMicro SDK */
505+
506+
/* FT32 HAL & SDK Drivers */
507+
508+
/* end of FT32 HAL & SDK Drivers */
499509
/* end of HAL & SDK Drivers */
500510

501511
/* sensors drivers */

0 commit comments

Comments
 (0)