diff options
| author | shaojinchun <[email protected]> | 2018-12-28 09:06:32 +0800 |
|---|---|---|
| committer | shaojinchun <[email protected]> | 2018-12-28 09:41:18 +0800 |
| commit | 86c76b0e8a4486dec13d61ee3ca68379b947dfb5 (patch) | |
| tree | 38b7f8cdc65781336ad929580c275d30dcd3f3f0 /bsp | |
| parent | 214652fd7ed7538d741ba16e2e80ebdc2806c379 (diff) | |
add k210 SMP support
Diffstat (limited to 'bsp')
| -rw-r--r-- | bsp/k210/.config | 36 | ||||
| -rw-r--r-- | bsp/k210/driver/board.c | 22 | ||||
| -rw-r--r-- | bsp/k210/rtconfig.h | 159 | ||||
| -rw-r--r-- | bsp/k210/rtconfig.py | 5 |
4 files changed, 175 insertions, 47 deletions
diff --git a/bsp/k210/.config b/bsp/k210/.config index a9737f1c80..65164c210d 100644 --- a/bsp/k210/.config +++ b/bsp/k210/.config @@ -7,7 +7,8 @@ # RT-Thread Kernel # CONFIG_RT_NAME_MAX=8 -# CONFIG_RT_USING_SMP is not set +CONFIG_RT_USING_SMP=y +CONFIG_RT_CPUS_NR=2 CONFIG_RT_ALIGN_SIZE=8 # CONFIG_RT_THREAD_PRIORITY_8 is not set CONFIG_RT_THREAD_PRIORITY_32=y @@ -326,39 +327,6 @@ CONFIG_PKG_KENDRYTE_SDK_VER="v0.5.2" # CONFIG_PKG_USING_DSTR is not set # CONFIG_PKG_USING_TINYFRAME is not set # CONFIG_PKG_USING_KENDRYTE_DEMO is not set -# CONFIG_PKG_USING_KENDRYTE_DEMO_V001 is not set -# CONFIG_PKG_USING_KENDRYTE_DEMO_LATEST_VERSION is not set -# CONFIG_KENDRYTE_DEMO_NONE is not set -# CONFIG_KENDRYTE_DEMO_AES_128_TEST is not set -# CONFIG_KENDRYTE_DEMO_AES_192_TEST is not set -# CONFIG_KENDRYTE_DEMO_AES_256_TEST is not set -# CONFIG_KENDRYTE_DEMO_AI_DEMO_SIM is not set -# CONFIG_KENDRYTE_DEMO_DVP_OV is not set -# CONFIG_KENDRYTE_DEMO_FACE_DETECT is not set -# CONFIG_KENDRYTE_DEMO_FFT_TEST is not set -# CONFIG_KENDRYTE_DEMO_FLASH_W25QXX is not set -# CONFIG_KENDRYTE_DEMO_FLASH_W25QXX_DMA_TEST is not set -# CONFIG_KENDRYTE_DEMO_FLASH_W25QXX_TEST is not set -# CONFIG_KENDRYTE_DEMO_GPIOHS_LED is not set -# CONFIG_KENDRYTE_DEMO_GPIO_LED is not set -# CONFIG_KENDRYTE_DEMO_HELLO_WORLD is not set -# CONFIG_KENDRYTE_DEMO_I2C_SLAVE is not set -# CONFIG_KENDRYTE_DEMO_KPU is not set -# CONFIG_KENDRYTE_DEMO_LCD is not set -# CONFIG_KENDRYTE_DEMO_MIC_PLAY is not set -# CONFIG_KENDRYTE_DEMO_PLAY_PCM is not set -# CONFIG_KENDRYTE_DEMO_PWM is not set -# CONFIG_KENDRYTE_DEMO_RTC is not set -# CONFIG_KENDRYTE_DEMO_RTC_SD3068 is not set -# CONFIG_KENDRYTE_DEMO_SD_CARD is not set -# CONFIG_KENDRYTE_DEMO_SERVO is not set -# CONFIG_KENDRYTE_DEMO_SHA256_TEST is not set -# CONFIG_KENDRYTE_DEMO_TIMER is not set -# CONFIG_KENDRYTE_DEMO_UART is not set -# CONFIG_KENDRYTE_DEMO_UART_DMA is not set -# CONFIG_KENDRYTE_DEMO_UART_DMA_IRQ is not set -# CONFIG_KENDRYTE_DEMO_UART_INTERRUPT is not set -# CONFIG_KENDRYTE_DEMO_WATCHDOG is not set # # samples: kernel and components samples diff --git a/bsp/k210/driver/board.c b/bsp/k210/driver/board.c index aac2adbc49..1b2b4c34e8 100644 --- a/bsp/k210/driver/board.c +++ b/bsp/k210/driver/board.c @@ -37,21 +37,14 @@ void init_bss(void) } } -void cpu_entry(int cpuid) +void primary_cpu_entry(void) { extern void entry(void); /* disable global interrupt */ + init_bss(); rt_hw_interrupt_disable(); - if (cpuid == 0) - { - init_bss(); - entry(); - } - else - { - while (1) ; - } + entry(); } #include <clint.h> @@ -85,6 +78,10 @@ int freq(void) } MSH_CMD_EXPORT(freq, show freq info); +#ifdef RT_USING_SMP +extern int rt_hw_clint_ipi_enable(void); +#endif + void rt_hw_board_init(void) { /* Init FPIOA */ @@ -96,8 +93,13 @@ void rt_hw_board_init(void) rt_hw_interrupt_init(); /* initialize hardware interrupt */ rt_hw_uart_init(); + rt_hw_tick_init(); +#ifdef RT_USING_SMP + rt_hw_clint_ipi_enable(); +#endif + #ifdef RT_USING_CONSOLE /* set console device */ rt_console_set_device(RT_CONSOLE_DEVICE_NAME); diff --git a/bsp/k210/rtconfig.h b/bsp/k210/rtconfig.h index b5fe0dfd48..94844cbf88 100644 --- a/bsp/k210/rtconfig.h +++ b/bsp/k210/rtconfig.h @@ -7,8 +7,12 @@ /* RT-Thread Kernel */ #define RT_NAME_MAX 8 +#define RT_USING_SMP +#define RT_CPUS_NR 2 #define RT_ALIGN_SIZE 8 +/* RT_THREAD_PRIORITY_8 is not set */ #define RT_THREAD_PRIORITY_32 +/* RT_THREAD_PRIORITY_256 is not set */ #define RT_THREAD_PRIORITY_MAX 32 #define RT_TICK_PER_SECOND 100 #define RT_USING_OVERFLOW_CHECK @@ -16,9 +20,19 @@ #define RT_USING_IDLE_HOOK #define RT_IDEL_HOOK_LIST_SIZE 4 #define IDLE_THREAD_STACK_SIZE 1024 +/* RT_USING_TIMER_SOFT is not set */ #define RT_DEBUG #define RT_DEBUG_INIT_CONFIG #define RT_DEBUG_INIT 1 +/* RT_DEBUG_THREAD_CONFIG is not set */ +/* RT_DEBUG_SCHEDULER_CONFIG is not set */ +/* RT_DEBUG_IPC_CONFIG is not set */ +/* RT_DEBUG_TIMER_CONFIG is not set */ +/* RT_DEBUG_IRQ_CONFIG is not set */ +/* RT_DEBUG_MEM_CONFIG is not set */ +/* RT_DEBUG_SLAB_CONFIG is not set */ +/* RT_DEBUG_MEMHEAP_CONFIG is not set */ +/* RT_DEBUG_MODULE_CONFIG is not set */ /* Inter-Thread communication */ @@ -27,16 +41,23 @@ #define RT_USING_EVENT #define RT_USING_MAILBOX #define RT_USING_MESSAGEQUEUE +/* RT_USING_SIGNALS is not set */ /* Memory Management */ #define RT_USING_MEMPOOL +/* RT_USING_MEMHEAP is not set */ +/* RT_USING_NOHEAP is not set */ #define RT_USING_SMALL_MEM +/* RT_USING_SLAB is not set */ +/* RT_USING_MEMTRACE is not set */ #define RT_USING_HEAP /* Kernel Device Object */ #define RT_USING_DEVICE +/* RT_USING_DEVICE_OPS is not set */ +/* RT_USING_INTERRUPT_INFO is not set */ #define RT_USING_CONSOLE #define RT_CONSOLEBUF_SIZE 128 #define RT_CONSOLE_DEVICE_NAME "uarths" @@ -44,6 +65,7 @@ #define ARCH_CPU_64BIT #define ARCH_RISCV #define ARCH_RISCV64 +/* ARCH_CPU_STACK_GROWS_UPWARD is not set */ /* RT-Thread Components */ @@ -54,6 +76,7 @@ /* C++ features */ +/* RT_USING_CPLUSPLUS is not set */ /* Command shell */ @@ -63,9 +86,11 @@ #define FINSH_HISTORY_LINES 5 #define FINSH_USING_SYMTAB #define FINSH_USING_DESCRIPTION +/* FINSH_ECHO_DISABLE_DEFAULT is not set */ #define FINSH_THREAD_PRIORITY 20 #define FINSH_THREAD_STACK_SIZE 16384 #define FINSH_CMD_SIZE 80 +/* FINSH_USING_AUTH is not set */ #define FINSH_USING_MSH #define FINSH_USING_MSH_DEFAULT #define FINSH_USING_MSH_ONLY @@ -78,7 +103,13 @@ #define DFS_FILESYSTEMS_MAX 4 #define DFS_FILESYSTEM_TYPES_MAX 4 #define DFS_FD_MAX 16 +/* RT_USING_DFS_MNTTABLE is not set */ +/* RT_USING_DFS_ELMFAT is not set */ #define RT_USING_DFS_DEVFS +/* RT_USING_DFS_ROMFS is not set */ +/* RT_USING_DFS_RAMFS is not set */ +/* RT_USING_DFS_UFFS is not set */ +/* RT_USING_DFS_JFFS2 is not set */ /* Device Drivers */ @@ -86,87 +117,215 @@ #define RT_PIPE_BUFSZ 512 #define RT_USING_SERIAL #define RT_SERIAL_USING_DMA +/* RT_USING_CAN is not set */ +/* RT_USING_HWTIMER is not set */ +/* RT_USING_CPUTIME is not set */ +/* RT_USING_I2C is not set */ +/* RT_USING_PIN is not set */ +/* RT_USING_ADC is not set */ +/* RT_USING_PWM is not set */ +/* RT_USING_MTD_NOR is not set */ +/* RT_USING_MTD_NAND is not set */ +/* RT_USING_MTD is not set */ +/* RT_USING_PM is not set */ +/* RT_USING_RTC is not set */ +/* RT_USING_SDIO is not set */ +/* RT_USING_SPI is not set */ +/* RT_USING_WDT is not set */ +/* RT_USING_AUDIO is not set */ /* Using WiFi */ +/* RT_USING_WIFI is not set */ /* Using USB */ +/* RT_USING_USB_HOST is not set */ +/* RT_USING_USB_DEVICE is not set */ /* POSIX layer and C standard library */ #define RT_USING_LIBC +/* RT_USING_PTHREADS is not set */ #define RT_USING_POSIX +/* RT_USING_POSIX_MMAP is not set */ +/* RT_USING_POSIX_TERMIOS is not set */ +/* RT_USING_POSIX_AIO is not set */ +/* RT_USING_MODULE is not set */ /* Network */ /* Socket abstraction layer */ +/* RT_USING_SAL is not set */ /* light weight TCP/IP stack */ +/* RT_USING_LWIP is not set */ /* Modbus master and slave stack */ +/* RT_USING_MODBUS is not set */ /* AT commands */ +/* RT_USING_AT is not set */ /* VBUS(Virtual Software BUS) */ +/* RT_USING_VBUS is not set */ /* Utilities */ +/* RT_USING_LOGTRACE is not set */ +/* RT_USING_RYM is not set */ +/* RT_USING_ULOG is not set */ +/* RT_USING_UTEST is not set */ /* RT-Thread online packages */ /* IoT - internet of things */ +/* PKG_USING_PAHOMQTT is not set */ +/* PKG_USING_WEBCLIENT is not set */ +/* PKG_USING_WEBNET is not set */ +/* PKG_USING_MONGOOSE is not set */ +/* PKG_USING_WEBTERMINAL is not set */ +/* PKG_USING_CJSON is not set */ +/* PKG_USING_JSMN is not set */ +/* PKG_USING_LJSON is not set */ +/* PKG_USING_EZXML is not set */ +/* PKG_USING_NANOPB is not set */ /* Wi-Fi */ /* Marvell WiFi */ +/* PKG_USING_WLANMARVELL is not set */ /* Wiced WiFi */ +/* PKG_USING_WLAN_WICED is not set */ +/* PKG_USING_COAP is not set */ +/* PKG_USING_NOPOLL is not set */ +/* PKG_USING_NETUTILS is not set */ +/* PKG_USING_AT_DEVICE is not set */ +/* PKG_USING_WIZNET is not set */ /* IoT Cloud */ +/* PKG_USING_ONENET is not set */ +/* PKG_USING_GAGENT_CLOUD is not set */ +/* PKG_USING_ALI_IOTKIT is not set */ +/* PKG_USING_AZURE is not set */ +/* PKG_USING_TENCENT_IOTKIT is not set */ /* security packages */ +/* PKG_USING_MBEDTLS is not set */ +/* PKG_USING_libsodium is not set */ +/* PKG_USING_TINYCRYPT is not set */ /* language packages */ +/* PKG_USING_LUA is not set */ +/* PKG_USING_JERRYSCRIPT is not set */ +/* PKG_USING_MICROPYTHON is not set */ /* multimedia packages */ +/* PKG_USING_OPENMV is not set */ +/* PKG_USING_MUPDF is not set */ /* tools packages */ +/* PKG_USING_CMBACKTRACE is not set */ +/* PKG_USING_EASYFLASH is not set */ +/* PKG_USING_EASYLOGGER is not set */ +/* PKG_USING_SYSTEMVIEW is not set */ +/* PKG_USING_RDB is not set */ +/* PKG_USING_QRCODE is not set */ +/* PKG_USING_ULOG_EASYFLASH is not set */ /* system packages */ +/* PKG_USING_GUIENGINE is not set */ +/* PKG_USING_CAIRO is not set */ +/* PKG_USING_PIXMAN is not set */ +/* PKG_USING_LWEXT4 is not set */ +/* PKG_USING_PARTITION is not set */ +/* PKG_USING_FAL is not set */ +/* PKG_USING_SQLITE is not set */ +/* PKG_USING_RTI is not set */ +/* PKG_USING_LITTLEVGL2RTT is not set */ +/* PKG_USING_CMSIS is not set */ +/* PKG_USING_DFS_YAFFS is not set */ +/* PKG_USING_LITTLEFS is not set */ /* peripheral libraries and drivers */ +/* PKG_USING_REALTEK_AMEBA is not set */ +/* PKG_USING_SHT2X is not set */ +/* PKG_USING_AHT10 is not set */ +/* PKG_USING_AP3216C is not set */ +/* PKG_USING_STM32_SDIO is not set */ +/* PKG_USING_ICM20608 is not set */ +/* PKG_USING_U8G2 is not set */ +/* PKG_USING_BUTTON is not set */ +/* PKG_USING_MPU6XXX is not set */ +/* PKG_USING_PCF8574 is not set */ #define PKG_USING_KENDRYTE_SDK #define PKG_USING_KENDRYTE_SDK_V052 +/* PKG_USING_KENDRYTE_SDK_LATEST_VERSION is not set */ /* miscellaneous packages */ +/* PKG_USING_LIBCSV is not set */ +/* PKG_USING_OPTPARSE is not set */ +/* PKG_USING_FASTLZ is not set */ +/* PKG_USING_MINILZO is not set */ +/* PKG_USING_QUICKLZ is not set */ +/* PKG_USING_MULTIBUTTON is not set */ +/* PKG_USING_CANFESTIVAL is not set */ +/* PKG_USING_ZLIB is not set */ +/* PKG_USING_DSTR is not set */ +/* PKG_USING_TINYFRAME is not set */ +/* PKG_USING_KENDRYTE_DEMO is not set */ /* samples: kernel and components samples */ +/* PKG_USING_KERNEL_SAMPLES is not set */ +/* PKG_USING_FILESYSTEM_SAMPLES is not set */ +/* PKG_USING_NETWORK_SAMPLES is not set */ +/* PKG_USING_PERIPHERAL_SAMPLES is not set */ +/* PKG_USING_HELLO is not set */ /* Privated Packages of RealThread */ +/* PKG_USING_CODEC is not set */ +/* PKG_USING_PLAYER is not set */ +/* PKG_USING_PERSIMMON_SRC is not set */ +/* PKG_USING_JS_PERSIMMON is not set */ +/* PKG_USING_JERRYSCRIPT_WIN32 is not set */ /* Network Utilities */ +/* PKG_USING_WICED is not set */ +/* PKG_USING_CLOUDSDK is not set */ +/* PKG_USING_COREMARK is not set */ +/* PKG_USING_POWER_MANAGER is not set */ +/* PKG_USING_RT_OTA is not set */ +/* PKG_USING_RDBD_SRC is not set */ +/* PKG_USING_RTINSIGHT is not set */ +/* PKG_USING_SMARTCONFIG is not set */ +/* PKG_USING_RTX is not set */ #define BOARD_K210_EVB #define BSP_USING_UART_HS +/* BSP_USING_UART1 is not set */ +/* BSP_USING_UART2 is not set */ +/* BSP_USING_UART3 is not set */ +/* BSP_USING_I2C1 is not set */ +/* BSP_USING_SPI1 is not set */ #define __STACKSIZE__ 4096 #endif diff --git a/bsp/k210/rtconfig.py b/bsp/k210/rtconfig.py index 418c1d7456..4610f85adc 100644 --- a/bsp/k210/rtconfig.py +++ b/bsp/k210/rtconfig.py @@ -15,7 +15,7 @@ if os.getenv('RTT_CC'): if CROSS_TOOL == 'gcc': PLATFORM = 'gcc' - EXEC_PATH = r'/opt/riscv64-unknown-elf-gcc-2018.07.0-x86_64-linux-ubuntu14/bin' + EXEC_PATH = r'/opt/riscv64-unknown-elf/bin' else: print('Please make sure your toolchains is GNU GCC!') exit(0) @@ -27,8 +27,7 @@ BUILD = 'release' if PLATFORM == 'gcc': # toolchains - PREFIX = 'riscv-none-embed-' - # PREFIX = 'riscv64-unknown-elf-' + PREFIX = 'riscv64-unknown-elf-' CC = PREFIX + 'gcc' CXX = PREFIX + 'g++' AS = PREFIX + 'gcc' |
