From 5f49d2ba87c78e7aa2c974cb91738355d5ec7f1c Mon Sep 17 00:00:00 2001 From: Wang_Weigen Date: Tue, 14 Jun 2022 10:54:08 +0800 Subject: [PATCH 1/6] add config for queue manage --- Ubiquitous/XiZi/kernel/thread/queue_manager.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Ubiquitous/XiZi/kernel/thread/queue_manager.c b/Ubiquitous/XiZi/kernel/thread/queue_manager.c index 5a46db1d5..d3cfa5968 100644 --- a/Ubiquitous/XiZi/kernel/thread/queue_manager.c +++ b/Ubiquitous/XiZi/kernel/thread/queue_manager.c @@ -30,6 +30,7 @@ void* g_queue_done[QUEUE_MAX]; void QueuemanagerDoneRegister() { +#ifdef KERNEL_DATAQUEUE DataQueueDoneType* pdata_queue_done = (DataQueueDoneType*)x_malloc(sizeof(DataQueueDoneType)); pdata_queue_done->InitDataqueue = InitDataqueue; pdata_queue_done->PushDataqueue = PushDataqueue; @@ -37,20 +38,27 @@ void QueuemanagerDoneRegister() pdata_queue_done->DataqueuePeak = DataqueuePeak; pdata_queue_done->DeInitDataqueue = DeInitDataqueue; + g_queue_done[DATA_QUEUE] = pdata_queue_done; +#endif + +#ifdef KERNEL_WORKQUEUE WorkQueueDoneType* pwork_queue_done = (WorkQueueDoneType*)x_malloc(sizeof(WorkQueueDoneType)); pwork_queue_done->CreateWorkQueue = CreateWorkQueue; pwork_queue_done->WorkInit = WorkInit; pwork_queue_done->WorkSubmit = WorkSubmit; pwork_queue_done->WorkSubmit_immediate = WorkSubmit_immediate; + + g_queue_done[WORK_QUEUE] = pwork_queue_done; +#endif +#ifdef KERNEL_WAITQUEUE WaitQueueDoneType* pwait_queue_done = (WaitQueueDoneType*)x_malloc(sizeof(WaitQueueDoneType)); pwait_queue_done->InitWqueue = InitWqueue; pwait_queue_done->WqueueAdd = WqueueAdd; pwait_queue_done->WqueueRemove = WqueueRemove; pwait_queue_done->WqueueWait = WqueueWait; pwait_queue_done->WakeupWqueue = WakeupWqueue; - - g_queue_done[DATA_QUEUE] = pdata_queue_done; - g_queue_done[WORK_QUEUE] = pwork_queue_done; + g_queue_done[WAIT_QUEUE] = pwait_queue_done; +#endif } \ No newline at end of file From 517825a52f23d090f46b9e4dc8c00d42440bfe1d Mon Sep 17 00:00:00 2001 From: Wang_Weigen Date: Wed, 22 Jun 2022 14:57:25 +0800 Subject: [PATCH 2/6] repair the task shcedule failed problem of arm,update the assign task before pendsv fault --- Ubiquitous/XiZi/arch/arm/cortex-m23/pendsv.S | 1 - Ubiquitous/XiZi/arch/arm/shared/pendsv.S | 3 --- Ubiquitous/XiZi/kernel/thread/CriticalArea.c | 2 +- Ubiquitous/XiZi/kernel/thread/assign.c | 3 +++ Ubiquitous/XiZi/tool/shell/letter-shell/shell.c | 12 ++++++++++-- Ubiquitous/XiZi/tool/shell/letter-shell/shell_port.c | 11 +++++++---- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/Ubiquitous/XiZi/arch/arm/cortex-m23/pendsv.S b/Ubiquitous/XiZi/arch/arm/cortex-m23/pendsv.S index 4fcd6ee24..1c1fe65dc 100644 --- a/Ubiquitous/XiZi/arch/arm/cortex-m23/pendsv.S +++ b/Ubiquitous/XiZi/arch/arm/cortex-m23/pendsv.S @@ -76,7 +76,6 @@ PendSV_Handler: MOV R7, R11 STMIA R1!, {R4 - R7} /* push thread {R8 - R11} high register to thread stack */ switch_to_task: - BL UpdateRunningTask LDR R1, =InterruptToKtask LDR R1, [R1] diff --git a/Ubiquitous/XiZi/arch/arm/shared/pendsv.S b/Ubiquitous/XiZi/arch/arm/shared/pendsv.S index 561778f77..3461f4808 100644 --- a/Ubiquitous/XiZi/arch/arm/shared/pendsv.S +++ b/Ubiquitous/XiZi/arch/arm/shared/pendsv.S @@ -70,9 +70,6 @@ PendSV_Handler: switch_to_task: - PUSH {lr} - BL UpdateRunningTask - POP {lr} #ifdef TASK_ISOLATION PUSH {lr} diff --git a/Ubiquitous/XiZi/kernel/thread/CriticalArea.c b/Ubiquitous/XiZi/kernel/thread/CriticalArea.c index f313e30e8..2cc850ec5 100644 --- a/Ubiquitous/XiZi/kernel/thread/CriticalArea.c +++ b/Ubiquitous/XiZi/kernel/thread/CriticalArea.c @@ -95,7 +95,7 @@ uint16 GetOsAssignLockLevel(void) #include -static int16 KTaskOsAssignLockNest; +static uint16 KTaskOsAssignLockNest; /** * This function will get critical lock level. diff --git a/Ubiquitous/XiZi/kernel/thread/assign.c b/Ubiquitous/XiZi/kernel/thread/assign.c index 2bef0fe53..776b61f6a 100644 --- a/Ubiquitous/XiZi/kernel/thread/assign.c +++ b/Ubiquitous/XiZi/kernel/thread/assign.c @@ -87,6 +87,7 @@ SWITCH: Assign.ready_vector_done->remove(new_task); KTaskStatSetAsRunning(new_task); + Assign.os_running_task = new_task; SYS_KDEBUG_LOG(KDBG_SCHED, ("[%d]switch to priority#%d " @@ -162,6 +163,7 @@ SWITCH: Assign.ready_vector_done->remove(new_task); KTaskStatSetAsRunning(new_task); + Assign.os_running_task = new_task; SYS_KDEBUG_LOG(KDBG_SCHED, ("[%d]switch to priority#%d " @@ -327,6 +329,7 @@ x_err_t YieldOsAssign(void) Assign.ready_vector_done->remove(new_task); KTaskStatSetAsRunning(new_task); + Assign.os_running_task = new_task; SYS_KDEBUG_LOG(KDBG_SCHED, ("[%d]switch to priority#%d " diff --git a/Ubiquitous/XiZi/tool/shell/letter-shell/shell.c b/Ubiquitous/XiZi/tool/shell/letter-shell/shell.c index 6a923ece8..201178a12 100644 --- a/Ubiquitous/XiZi/tool/shell/letter-shell/shell.c +++ b/Ubiquitous/XiZi/tool/shell/letter-shell/shell.c @@ -1647,9 +1647,17 @@ void shellTask(void *param) while(RET_TRUE) { if (shell->read) { + memset(data, 0, KEY_LENGTH); + data_len = 0; + x_base lock; + data_len = shell->read(data); - for (i = 0; i < data_len; i++) { - shellHandler(shell, data[i]); + if(data_len > 0) { + int lock = CriticalAreaLock(); + for (i = 0; i < data_len; i++) { + shellHandler(shell, data[i]); + } + CriticalAreaUnLock(lock); } } } diff --git a/Ubiquitous/XiZi/tool/shell/letter-shell/shell_port.c b/Ubiquitous/XiZi/tool/shell/letter-shell/shell_port.c index 661cfb604..8f315ebdd 100644 --- a/Ubiquitous/XiZi/tool/shell/letter-shell/shell_port.c +++ b/Ubiquitous/XiZi/tool/shell/letter-shell/shell_port.c @@ -48,10 +48,13 @@ signed char userShellRead(char *data) { char read_length = 0; struct BusBlockReadParam read_param; - read_param.read_length = 0; - read_param.size = 1; - read_param.buffer = data; + memset(&read_param,0, sizeof(read_param)); + + read_param.read_length = 0; + read_param.size = KEY_LENGTH; + read_param.buffer = data; + BusDevReadData(console, &read_param); read_length = (char)read_param.read_length; @@ -120,7 +123,7 @@ int userShellInit(void) tid = KTaskCreate("letter-shell", shellTask, &shell, SHELL_TASK_STACK_SIZE, SHELL_TASK_PRIORITY); - + StartupKTask(tid); return 0; } From 42cf1290d164472b7b1189409ab8a58b1f0644bf Mon Sep 17 00:00:00 2001 From: Wang_Weigen Date: Wed, 22 Jun 2022 15:52:23 +0800 Subject: [PATCH 3/6] rename board name 'xidatong' as 'xidatong-arm32' --- Ubiquitous/XiZi/Makefile | 2 +- Ubiquitous/XiZi/README.md | 2 +- .../XiZi/board/{xidatong => xidatong-arm32}/Kconfig | 2 +- .../board/{xidatong => xidatong-arm32}/Makefile | 0 .../board/{xidatong => xidatong-arm32}/README.md | 8 ++++---- .../XiZi/board/{xidatong => xidatong-arm32}/board.c | 2 +- .../board/{xidatong => xidatong-arm32}/config.mk | 0 .../img/NXPBootUtility_1.png | Bin .../img/NXPBootUtility_2.png | Bin .../img/flashconfig.png | Bin .../{xidatong => xidatong-arm32}/img/menuconfig.png | Bin .../img/menuconfig1.png | Bin .../{xidatong => xidatong-arm32}/img/terminal.png | Bin .../{xidatong => xidatong-arm32}/img/vscode.jpg | Bin .../{xidatong => xidatong-arm32}/include/board.h | 0 .../include/clock_config.h | 0 .../{xidatong => xidatong-arm32}/include/pin_mux.h | 0 .../board/{xidatong => xidatong-arm32}/link-usb.lds | 4 ++-- .../board/{xidatong => xidatong-arm32}/link.lds | 4 ++-- .../CMSIS/Include/cmsis_compiler.h | 0 .../third_party_driver/CMSIS/Include/cmsis_gcc.h | 0 .../CMSIS/Include/cmsis_version.h | 0 .../third_party_driver/CMSIS/Include/core_cm7.h | 0 .../third_party_driver/CMSIS/Include/mpu_armv7.h | 0 .../third_party_driver/CMSIS/LICENSE.txt | 0 .../third_party_driver/Kconfig | 0 .../third_party_driver/Makefile | 0 .../third_party_driver/ch438/Kconfig | 0 .../third_party_driver/ch438/Makefile | 0 .../third_party_driver/ch438/connect_ch438.c | 0 .../third_party_driver/common/Makefile | 0 .../third_party_driver/common/clock_config.c | 0 .../third_party_driver/common/fsl_cache.c | 0 .../third_party_driver/common/fsl_clock.c | 0 .../third_party_driver/common/fsl_common.c | 0 .../third_party_driver/common/fsl_usdhc.c | 0 .../third_party_driver/common/pin_mux.c | 0 .../third_party_driver/common/system_MIMXRT1052.c | 0 .../third_party_driver/ethernet/Kconfig | 0 .../third_party_driver/ethernet/Makefile | 0 .../third_party_driver/ethernet/enet_ethernetif.c | 0 .../ethernet/enet_ethernetif_kinetis.c | 0 .../ethernet/enet_ethernetif_lpc.c | 0 .../third_party_driver/ethernet/fsl_enet.c | 0 .../third_party_driver/ethernet/lan8720/Makefile | 0 .../third_party_driver/ethernet/lan8720/fsl_phy.c | 0 .../third_party_driver/ethernet/lan8720/fsl_phy.h | 0 .../third_party_driver/gpio/Kconfig | 0 .../third_party_driver/gpio/Makefile | 0 .../third_party_driver/gpio/connect_gpio.c | 0 .../third_party_driver/gpio/fsl_gpio.c | 0 .../third_party_driver/i2c/Kconfig | 0 .../third_party_driver/i2c/Makefile | 0 .../third_party_driver/i2c/connect_i2c.c | 0 .../third_party_driver/i2c/connect_i2c_eeprom.c | 0 .../third_party_driver/i2c/fsl_lpi2c.c | 0 .../third_party_driver/i2c/hardware_i2c.c | 0 .../third_party_driver/include/MIMXRT1052.h | 0 .../include/MIMXRT1052_features.h | 0 .../third_party_driver/include/connect_ch438.h | 0 .../third_party_driver/include/connect_ethernet.h | 0 .../third_party_driver/include/connect_gpio.h | 0 .../third_party_driver/include/connect_i2c.h | 0 .../third_party_driver/include/connect_lcd.h | 2 +- .../third_party_driver/include/connect_sdio.h | 0 .../third_party_driver/include/connect_touch.h | 2 +- .../third_party_driver/include/connect_uart.h | 0 .../third_party_driver/include/connect_usb.h | 0 .../third_party_driver/include/connect_wdt.h | 0 .../third_party_driver/include/enet_ethernetif.h | 0 .../include/enet_ethernetif_priv.h | 0 .../third_party_driver/include/fsl_cache.h | 0 .../third_party_driver/include/fsl_clock.h | 0 .../third_party_driver/include/fsl_common.h | 0 .../include/fsl_device_registers.h | 0 .../third_party_driver/include/fsl_elcdif.h | 0 .../third_party_driver/include/fsl_enet.h | 0 .../third_party_driver/include/fsl_gpio.h | 0 .../third_party_driver/include/fsl_iomuxc.h | 0 .../third_party_driver/include/fsl_lpi2c.h | 0 .../third_party_driver/include/fsl_lpuart.h | 0 .../third_party_driver/include/fsl_semc.h | 0 .../third_party_driver/include/fsl_usdhc.h | 0 .../third_party_driver/include/fsl_wdog.h | 0 .../third_party_driver/include/system_MIMXRT1052.h | 0 .../third_party_driver/lcd/Kconfig | 0 .../third_party_driver/lcd/Makefile | 0 .../third_party_driver/lcd/connect_lcd.c | 2 +- .../third_party_driver/lcd/fsl_elcdif.c | 0 .../third_party_driver/sdio/Kconfig | 0 .../third_party_driver/sdio/Makefile | 0 .../third_party_driver/sdio/connect_sdio.c | 2 +- .../third_party_driver/sdio/sdmmc/Makefile | 0 .../third_party_driver/sdio/sdmmc/inc/fsl_mmc.h | 0 .../third_party_driver/sdio/sdmmc/inc/fsl_sd.h | 0 .../third_party_driver/sdio/sdmmc/inc/fsl_sdio.h | 0 .../sdio/sdmmc/inc/fsl_sdmmc_common.h | 0 .../sdio/sdmmc/inc/fsl_sdmmc_host.h | 0 .../sdio/sdmmc/inc/fsl_sdmmc_spec.h | 0 .../third_party_driver/sdio/sdmmc/port/Makefile | 0 .../sdio/sdmmc/port/fsl_sdmmc_event.h | 0 .../sdio/sdmmc/port/usdhc/Makefile | 0 .../sdio/sdmmc/port/usdhc/interrupt/Makefile | 0 .../sdmmc/port/usdhc/interrupt/fsl_sdmmc_event.c | 0 .../sdmmc/port/usdhc/interrupt/fsl_sdmmc_host.c | 0 .../sdio/sdmmc/port/usdhc/polling/Makefile | 0 .../sdio/sdmmc/port/usdhc/polling/fsl_sdmmc_event.c | 0 .../sdio/sdmmc/port/usdhc/polling/fsl_sdmmc_host.c | 0 .../third_party_driver/sdio/sdmmc/src/Makefile | 0 .../third_party_driver/sdio/sdmmc/src/fsl_mmc.c | 0 .../third_party_driver/sdio/sdmmc/src/fsl_sd.c | 0 .../third_party_driver/sdio/sdmmc/src/fsl_sdio.c | 0 .../sdio/sdmmc/src/fsl_sdmmc_common.c | 0 .../third_party_driver/semc/Kconfig | 0 .../third_party_driver/semc/Makefile | 0 .../third_party_driver/semc/connect_semc.c | 0 .../third_party_driver/semc/fsl_semc.c | 0 .../third_party_driver/semc/semc_externsdram_test.c | 0 .../third_party_driver/touch/Kconfig | 0 .../third_party_driver/touch/Makefile | 0 .../third_party_driver/touch/connect_touch.c | 2 +- .../third_party_driver/touch/i2c_touch.c | 0 .../third_party_driver/touch/i2c_touch.h | 0 .../third_party_driver/uart/Kconfig | 0 .../third_party_driver/uart/Makefile | 0 .../third_party_driver/uart/connect_uart.c | 0 .../third_party_driver/uart/fsl_lpuart.c | 0 .../third_party_driver/usb/Kconfig | 0 .../third_party_driver/usb/Makefile | 0 .../third_party_driver/usb/connect_usb.c | 2 +- .../third_party_driver/usb/nxp_usb_driver/Makefile | 0 .../usb/nxp_usb_driver/host/Makefile | 0 .../usb/nxp_usb_driver/host/class/Makefile | 0 .../usb/nxp_usb_driver/host/class/usb_host_hub.c | 0 .../usb/nxp_usb_driver/host/class/usb_host_hub.h | 0 .../nxp_usb_driver/host/class/usb_host_hub_app.c | 0 .../nxp_usb_driver/host/class/usb_host_hub_app.h | 0 .../usb/nxp_usb_driver/host/class/usb_host_msd.c | 0 .../usb/nxp_usb_driver/host/class/usb_host_msd.h | 0 .../nxp_usb_driver/host/class/usb_host_msd_ufi.c | 0 .../usb/nxp_usb_driver/host/usb_host.h | 0 .../usb/nxp_usb_driver/host/usb_host_devices.c | 0 .../usb/nxp_usb_driver/host/usb_host_devices.h | 0 .../usb/nxp_usb_driver/host/usb_host_ehci.c | 0 .../usb/nxp_usb_driver/host/usb_host_ehci.h | 0 .../usb/nxp_usb_driver/host/usb_host_framework.c | 0 .../usb/nxp_usb_driver/host/usb_host_framework.h | 0 .../usb/nxp_usb_driver/host/usb_host_hci.c | 0 .../usb/nxp_usb_driver/host/usb_host_hci.h | 0 .../usb/nxp_usb_driver/host_msd_command.c | 0 .../usb/nxp_usb_driver/include/host_msd_command.h | 0 .../usb/nxp_usb_driver/include/usb.h | 0 .../usb/nxp_usb_driver/include/usb_host_config.h | 0 .../usb/nxp_usb_driver/include/usb_misc.h | 0 .../usb/nxp_usb_driver/include/usb_spec.h | 0 .../usb/nxp_usb_driver/osa/Makefile | 0 .../usb/nxp_usb_driver/osa/usb_osa.h | 0 .../usb/nxp_usb_driver/osa/usb_osa_bm.c | 0 .../usb/nxp_usb_driver/osa/usb_osa_bm.h | 0 .../usb/nxp_usb_driver/phy/Makefile | 0 .../usb/nxp_usb_driver/phy/usb_phy.c | 0 .../usb/nxp_usb_driver/phy/usb_phy.h | 0 .../third_party_driver/wdt/Kconfig | 0 .../third_party_driver/wdt/Makefile | 0 .../third_party_driver/wdt/connect_wdt.c | 0 .../third_party_driver/wdt/fsl_wdog.c | 0 .../board/{xidatong => xidatong-arm32}/xip/Makefile | 0 .../xip/fsl_flexspi_nor_boot.c | 0 .../xip/fsl_flexspi_nor_boot.h | 0 .../xip/fsl_flexspi_nor_flash.c | 0 .../xip/fsl_flexspi_nor_flash.h | 0 Ubiquitous/XiZi/path_kernel.mk | 2 +- 172 files changed, 19 insertions(+), 19 deletions(-) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/Kconfig (97%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/README.md (98%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/board.c (99%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/config.mk (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/img/NXPBootUtility_1.png (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/img/NXPBootUtility_2.png (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/img/flashconfig.png (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/img/menuconfig.png (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/img/menuconfig1.png (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/img/terminal.png (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/img/vscode.jpg (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/include/board.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/include/clock_config.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/include/pin_mux.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/link-usb.lds (98%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/link.lds (98%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/CMSIS/Include/cmsis_compiler.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/CMSIS/Include/cmsis_gcc.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/CMSIS/Include/cmsis_version.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/CMSIS/Include/core_cm7.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/CMSIS/Include/mpu_armv7.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/CMSIS/LICENSE.txt (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/Kconfig (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/ch438/Kconfig (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/ch438/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/ch438/connect_ch438.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/common/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/common/clock_config.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/common/fsl_cache.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/common/fsl_clock.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/common/fsl_common.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/common/fsl_usdhc.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/common/pin_mux.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/common/system_MIMXRT1052.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/ethernet/Kconfig (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/ethernet/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/ethernet/enet_ethernetif.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/ethernet/enet_ethernetif_kinetis.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/ethernet/enet_ethernetif_lpc.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/ethernet/fsl_enet.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/ethernet/lan8720/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/ethernet/lan8720/fsl_phy.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/ethernet/lan8720/fsl_phy.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/gpio/Kconfig (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/gpio/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/gpio/connect_gpio.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/gpio/fsl_gpio.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/i2c/Kconfig (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/i2c/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/i2c/connect_i2c.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/i2c/connect_i2c_eeprom.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/i2c/fsl_lpi2c.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/i2c/hardware_i2c.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/MIMXRT1052.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/MIMXRT1052_features.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/connect_ch438.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/connect_ethernet.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/connect_gpio.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/connect_i2c.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/connect_lcd.h (85%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/connect_sdio.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/connect_touch.h (94%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/connect_uart.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/connect_usb.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/connect_wdt.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/enet_ethernetif.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/enet_ethernetif_priv.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/fsl_cache.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/fsl_clock.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/fsl_common.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/fsl_device_registers.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/fsl_elcdif.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/fsl_enet.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/fsl_gpio.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/fsl_iomuxc.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/fsl_lpi2c.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/fsl_lpuart.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/fsl_semc.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/fsl_usdhc.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/fsl_wdog.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/include/system_MIMXRT1052.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/lcd/Kconfig (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/lcd/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/lcd/connect_lcd.c (98%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/lcd/fsl_elcdif.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/Kconfig (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/connect_sdio.c (99%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/inc/fsl_mmc.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/inc/fsl_sd.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/inc/fsl_sdio.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/inc/fsl_sdmmc_common.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/inc/fsl_sdmmc_host.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/inc/fsl_sdmmc_spec.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/port/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/port/fsl_sdmmc_event.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/port/usdhc/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/port/usdhc/interrupt/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/port/usdhc/interrupt/fsl_sdmmc_event.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/port/usdhc/interrupt/fsl_sdmmc_host.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/port/usdhc/polling/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/port/usdhc/polling/fsl_sdmmc_event.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/port/usdhc/polling/fsl_sdmmc_host.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/src/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/src/fsl_mmc.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/src/fsl_sd.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/src/fsl_sdio.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/sdio/sdmmc/src/fsl_sdmmc_common.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/semc/Kconfig (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/semc/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/semc/connect_semc.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/semc/fsl_semc.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/semc/semc_externsdram_test.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/touch/Kconfig (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/touch/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/touch/connect_touch.c (99%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/touch/i2c_touch.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/touch/i2c_touch.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/uart/Kconfig (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/uart/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/uart/connect_uart.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/uart/fsl_lpuart.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/Kconfig (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/connect_usb.c (99%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/class/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub_app.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub_app.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_msd.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_msd.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_msd_ufi.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/usb_host.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/usb_host_devices.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/usb_host_devices.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/usb_host_ehci.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/usb_host_ehci.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/usb_host_framework.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/usb_host_framework.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/usb_host_hci.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host/usb_host_hci.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/host_msd_command.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/include/host_msd_command.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/include/usb.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/include/usb_host_config.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/include/usb_misc.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/include/usb_spec.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/osa/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/osa/usb_osa.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/osa/usb_osa_bm.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/osa/usb_osa_bm.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/phy/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/phy/usb_phy.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/usb/nxp_usb_driver/phy/usb_phy.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/wdt/Kconfig (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/wdt/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/wdt/connect_wdt.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/third_party_driver/wdt/fsl_wdog.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/xip/Makefile (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/xip/fsl_flexspi_nor_boot.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/xip/fsl_flexspi_nor_boot.h (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/xip/fsl_flexspi_nor_flash.c (100%) rename Ubiquitous/XiZi/board/{xidatong => xidatong-arm32}/xip/fsl_flexspi_nor_flash.h (100%) diff --git a/Ubiquitous/XiZi/Makefile b/Ubiquitous/XiZi/Makefile index 7ef1113fe..6645f2fad 100755 --- a/Ubiquitous/XiZi/Makefile +++ b/Ubiquitous/XiZi/Makefile @@ -6,7 +6,7 @@ MAKEFLAGS += --no-print-directory support :=kd233 stm32f407-st-discovery maix-go stm32f407zgt6 aiit-riscv64-board aiit-arm32-board hifive1-rev-B hifive1-emulator k210-emulator cortex-m3-emulator cortex-m4-emulator ok1052-c gapuino stm32f103-nano gd32vf103_rvstar cortex-m0-emulator rv32m1_vega nuvoton-m2354 -support += xidatong +support += xidatong-arm32 SRC_DIR := export BOARD ?=kd233 diff --git a/Ubiquitous/XiZi/README.md b/Ubiquitous/XiZi/README.md index 238db6ab0..5121cc070 100644 --- a/Ubiquitous/XiZi/README.md +++ b/Ubiquitous/XiZi/README.md @@ -23,7 +23,7 @@ ARM架构系列的开发板有 - aiit-arm32-board nuvoton-m2354 ok1052-c stm32f103-nano stm32f407-st-discovery stm32f407zgt6 xidatong + aiit-arm32-board nuvoton-m2354 ok1052-c stm32f103-nano stm32f407-st-discovery stm32f407zgt6 xidatong-arm32 ### RISC-V diff --git a/Ubiquitous/XiZi/board/xidatong/Kconfig b/Ubiquitous/XiZi/board/xidatong-arm32/Kconfig similarity index 97% rename from Ubiquitous/XiZi/board/xidatong/Kconfig rename to Ubiquitous/XiZi/board/xidatong-arm32/Kconfig index 9653b4851..0efb5251d 100644 --- a/Ubiquitous/XiZi/board/xidatong/Kconfig +++ b/Ubiquitous/XiZi/board/xidatong-arm32/Kconfig @@ -18,7 +18,7 @@ config BOARD_CORTEX_M7_EVB source "$KERNEL_DIR/arch/Kconfig" -menu "xidatong feature" +menu "xidatong-arm32 feature" source "$BSP_DIR/third_party_driver/Kconfig" menu "config default board resources" diff --git a/Ubiquitous/XiZi/board/xidatong/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/README.md b/Ubiquitous/XiZi/board/xidatong-arm32/README.md similarity index 98% rename from Ubiquitous/XiZi/board/xidatong/README.md rename to Ubiquitous/XiZi/board/xidatong-arm32/README.md index 5eddfd9a1..c5aaa5171 100644 --- a/Ubiquitous/XiZi/board/xidatong/README.md +++ b/Ubiquitous/XiZi/board/xidatong-arm32/README.md @@ -1,6 +1,6 @@ # 从零开始构建矽璓工业物联操作系统：使用ARM架构的矽达通 -# xidatong +# xidatong-arm32 [XiUOS](http://xuos.io/) (X Industrial Ubiquitous Operating System) 矽璓XiUOS是一款面向智慧车间的工业物联网操作系统，主要由一个极简的微型实时操作系统内核和其上的工业物联框架构成，通过高效管理工业物联网设备、支撑工业物联应用，在生产车间内实现智能化的“感知环境、联网传输、知悉识别、控制调整”，促进以工业设备和工业控制系统为核心的人、机、物深度互联，帮助提升生产线的数字化和智能化水平。 @@ -133,8 +133,8 @@ $ sudo apt install gcc-arm-none-eabi ```c cd ./Ubiquitous/XiZi -make BOARD=xidatong distclean -make BOARD=xidatong menuconfig +make BOARD=xidatong-arm32 distclean +make BOARD=xidatong-arm32 menuconfig ``` 2.在menuconfig界面配置需要关闭和开启的功能，按回车键进入下级菜单，按Y键选中需要开启的功能，按N键选中需要关闭的功能，配置结束后保存并退出（本例旨在演示简单的输出例程，所以没有需要配置的选项，双击快捷键ESC退出配置） @@ -148,7 +148,7 @@ make BOARD=xidatong menuconfig 3.继续执行以下命令，进行编译 ``` -make BOARD=xidatong +make BOARD=xidatong-arm32 ``` 4.如果编译正确无误，会产生XiZi_xidatong.elf、XiZi_xidatong.bin文件。 diff --git a/Ubiquitous/XiZi/board/xidatong/board.c b/Ubiquitous/XiZi/board/xidatong-arm32/board.c similarity index 99% rename from Ubiquitous/XiZi/board/xidatong/board.c rename to Ubiquitous/XiZi/board/xidatong-arm32/board.c index 014925cd8..7c4e83381 100644 --- a/Ubiquitous/XiZi/board/xidatong/board.c +++ b/Ubiquitous/XiZi/board/xidatong-arm32/board.c @@ -7,7 +7,7 @@ /** * @file board.c - * @brief relative configure for xidatong + * @brief relative configure for xidatong-arm32 * @version 2.0 * @author AIIT XUOS Lab * @date 2022.03.15 diff --git a/Ubiquitous/XiZi/board/xidatong/config.mk b/Ubiquitous/XiZi/board/xidatong-arm32/config.mk similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/config.mk rename to Ubiquitous/XiZi/board/xidatong-arm32/config.mk diff --git a/Ubiquitous/XiZi/board/xidatong/img/NXPBootUtility_1.png b/Ubiquitous/XiZi/board/xidatong-arm32/img/NXPBootUtility_1.png similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/img/NXPBootUtility_1.png rename to Ubiquitous/XiZi/board/xidatong-arm32/img/NXPBootUtility_1.png diff --git a/Ubiquitous/XiZi/board/xidatong/img/NXPBootUtility_2.png b/Ubiquitous/XiZi/board/xidatong-arm32/img/NXPBootUtility_2.png similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/img/NXPBootUtility_2.png rename to Ubiquitous/XiZi/board/xidatong-arm32/img/NXPBootUtility_2.png diff --git a/Ubiquitous/XiZi/board/xidatong/img/flashconfig.png b/Ubiquitous/XiZi/board/xidatong-arm32/img/flashconfig.png similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/img/flashconfig.png rename to Ubiquitous/XiZi/board/xidatong-arm32/img/flashconfig.png diff --git a/Ubiquitous/XiZi/board/xidatong/img/menuconfig.png b/Ubiquitous/XiZi/board/xidatong-arm32/img/menuconfig.png similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/img/menuconfig.png rename to Ubiquitous/XiZi/board/xidatong-arm32/img/menuconfig.png diff --git a/Ubiquitous/XiZi/board/xidatong/img/menuconfig1.png b/Ubiquitous/XiZi/board/xidatong-arm32/img/menuconfig1.png similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/img/menuconfig1.png rename to Ubiquitous/XiZi/board/xidatong-arm32/img/menuconfig1.png diff --git a/Ubiquitous/XiZi/board/xidatong/img/terminal.png b/Ubiquitous/XiZi/board/xidatong-arm32/img/terminal.png similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/img/terminal.png rename to Ubiquitous/XiZi/board/xidatong-arm32/img/terminal.png diff --git a/Ubiquitous/XiZi/board/xidatong/img/vscode.jpg b/Ubiquitous/XiZi/board/xidatong-arm32/img/vscode.jpg similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/img/vscode.jpg rename to Ubiquitous/XiZi/board/xidatong-arm32/img/vscode.jpg diff --git a/Ubiquitous/XiZi/board/xidatong/include/board.h b/Ubiquitous/XiZi/board/xidatong-arm32/include/board.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/include/board.h rename to Ubiquitous/XiZi/board/xidatong-arm32/include/board.h diff --git a/Ubiquitous/XiZi/board/xidatong/include/clock_config.h b/Ubiquitous/XiZi/board/xidatong-arm32/include/clock_config.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/include/clock_config.h rename to Ubiquitous/XiZi/board/xidatong-arm32/include/clock_config.h diff --git a/Ubiquitous/XiZi/board/xidatong/include/pin_mux.h b/Ubiquitous/XiZi/board/xidatong-arm32/include/pin_mux.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/include/pin_mux.h rename to Ubiquitous/XiZi/board/xidatong-arm32/include/pin_mux.h diff --git a/Ubiquitous/XiZi/board/xidatong/link-usb.lds b/Ubiquitous/XiZi/board/xidatong-arm32/link-usb.lds similarity index 98% rename from Ubiquitous/XiZi/board/xidatong/link-usb.lds rename to Ubiquitous/XiZi/board/xidatong-arm32/link-usb.lds index fc005fd55..79ad714ff 100755 --- a/Ubiquitous/XiZi/board/xidatong/link-usb.lds +++ b/Ubiquitous/XiZi/board/xidatong-arm32/link-usb.lds @@ -28,7 +28,7 @@ /** * @file link.lds -* @brief xidatong Linker script +* @brief xidatong-arm32 Linker script * @version 1.0 * @author AIIT XUOS Lab * @date 2021-05-28 @@ -36,7 +36,7 @@ /************************************************* File name: link.lds -Description: xidatong Linker script +Description: xidatong-arm32 Linker script Others: take MIMXRT1052xxxxx_flexspi_nor.ld for references History: 1. Date: 2021-05-28 diff --git a/Ubiquitous/XiZi/board/xidatong/link.lds b/Ubiquitous/XiZi/board/xidatong-arm32/link.lds similarity index 98% rename from Ubiquitous/XiZi/board/xidatong/link.lds rename to Ubiquitous/XiZi/board/xidatong-arm32/link.lds index d9db1e140..9c0fec187 100644 --- a/Ubiquitous/XiZi/board/xidatong/link.lds +++ b/Ubiquitous/XiZi/board/xidatong-arm32/link.lds @@ -28,7 +28,7 @@ /** * @file link.lds -* @brief xidatong Linker script +* @brief xidatong-arm32 Linker script * @version 1.0 * @author AIIT XUOS Lab * @date 2021-05-28 @@ -36,7 +36,7 @@ /************************************************* File name: link.lds -Description: xidatong Linker script +Description: xidatong-arm32 Linker script Others: take MIMXRT1052xxxxx_flexspi_nor.ld for references History: 1. Date: 2021-05-28 diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/CMSIS/Include/cmsis_compiler.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/CMSIS/Include/cmsis_compiler.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/CMSIS/Include/cmsis_compiler.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/CMSIS/Include/cmsis_compiler.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/CMSIS/Include/cmsis_gcc.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/CMSIS/Include/cmsis_gcc.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/CMSIS/Include/cmsis_gcc.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/CMSIS/Include/cmsis_gcc.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/CMSIS/Include/cmsis_version.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/CMSIS/Include/cmsis_version.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/CMSIS/Include/cmsis_version.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/CMSIS/Include/cmsis_version.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/CMSIS/Include/core_cm7.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/CMSIS/Include/core_cm7.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/CMSIS/Include/core_cm7.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/CMSIS/Include/core_cm7.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/CMSIS/Include/mpu_armv7.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/CMSIS/Include/mpu_armv7.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/CMSIS/Include/mpu_armv7.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/CMSIS/Include/mpu_armv7.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/CMSIS/LICENSE.txt b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/CMSIS/LICENSE.txt similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/CMSIS/LICENSE.txt rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/CMSIS/LICENSE.txt diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/Kconfig b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/Kconfig rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/Kconfig diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/ch438/Kconfig b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ch438/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/ch438/Kconfig rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ch438/Kconfig diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/ch438/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ch438/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/ch438/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ch438/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/ch438/connect_ch438.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ch438/connect_ch438.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/ch438/connect_ch438.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ch438/connect_ch438.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/common/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/common/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/common/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/common/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/common/clock_config.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/common/clock_config.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/common/clock_config.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/common/clock_config.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/common/fsl_cache.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/common/fsl_cache.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/common/fsl_cache.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/common/fsl_cache.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/common/fsl_clock.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/common/fsl_clock.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/common/fsl_clock.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/common/fsl_clock.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/common/fsl_common.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/common/fsl_common.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/common/fsl_common.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/common/fsl_common.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/common/fsl_usdhc.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/common/fsl_usdhc.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/common/fsl_usdhc.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/common/fsl_usdhc.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/common/pin_mux.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/common/pin_mux.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/common/pin_mux.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/common/pin_mux.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/common/system_MIMXRT1052.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/common/system_MIMXRT1052.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/common/system_MIMXRT1052.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/common/system_MIMXRT1052.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/Kconfig b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/Kconfig rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/Kconfig diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/enet_ethernetif.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/enet_ethernetif.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/enet_ethernetif.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/enet_ethernetif.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/enet_ethernetif_kinetis.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/enet_ethernetif_kinetis.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/enet_ethernetif_kinetis.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/enet_ethernetif_kinetis.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/enet_ethernetif_lpc.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/enet_ethernetif_lpc.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/enet_ethernetif_lpc.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/enet_ethernetif_lpc.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/fsl_enet.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/fsl_enet.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/fsl_enet.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/fsl_enet.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/lan8720/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/lan8720/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/lan8720/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/lan8720/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/lan8720/fsl_phy.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/lan8720/fsl_phy.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/lan8720/fsl_phy.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/lan8720/fsl_phy.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/lan8720/fsl_phy.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/lan8720/fsl_phy.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/ethernet/lan8720/fsl_phy.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/ethernet/lan8720/fsl_phy.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/gpio/Kconfig b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/gpio/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/gpio/Kconfig rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/gpio/Kconfig diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/gpio/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/gpio/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/gpio/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/gpio/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/gpio/connect_gpio.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/gpio/connect_gpio.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/gpio/connect_gpio.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/gpio/connect_gpio.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/gpio/fsl_gpio.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/gpio/fsl_gpio.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/gpio/fsl_gpio.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/gpio/fsl_gpio.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/i2c/Kconfig b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/i2c/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/i2c/Kconfig rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/i2c/Kconfig diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/i2c/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/i2c/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/i2c/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/i2c/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/i2c/connect_i2c.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/i2c/connect_i2c.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/i2c/connect_i2c.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/i2c/connect_i2c.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/i2c/connect_i2c_eeprom.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/i2c/connect_i2c_eeprom.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/i2c/connect_i2c_eeprom.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/i2c/connect_i2c_eeprom.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/i2c/fsl_lpi2c.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/i2c/fsl_lpi2c.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/i2c/fsl_lpi2c.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/i2c/fsl_lpi2c.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/i2c/hardware_i2c.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/i2c/hardware_i2c.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/i2c/hardware_i2c.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/i2c/hardware_i2c.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/MIMXRT1052.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/MIMXRT1052.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/MIMXRT1052.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/MIMXRT1052.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/MIMXRT1052_features.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/MIMXRT1052_features.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/MIMXRT1052_features.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/MIMXRT1052_features.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_ch438.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_ch438.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_ch438.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_ch438.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_ethernet.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_ethernet.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_ethernet.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_ethernet.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_gpio.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_gpio.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_gpio.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_gpio.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_i2c.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_i2c.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_i2c.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_i2c.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_lcd.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_lcd.h similarity index 85% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_lcd.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_lcd.h index 20c88eaf8..9ac16f839 100644 --- a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_lcd.h +++ b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_lcd.h @@ -1,6 +1,6 @@ /** * @file connect_lcd.h -* @brief define xidatong lcd function +* @brief define xidatong-arm32 lcd function * @version 1.0 * @author AIIT XiUOS Lab * @date 2022-04-25 diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_sdio.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_sdio.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_sdio.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_sdio.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_touch.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_touch.h similarity index 94% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_touch.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_touch.h index 1be319f06..caca723f3 100644 --- a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_touch.h +++ b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_touch.h @@ -1,7 +1,7 @@ /** * @file connect_touch.c -* @brief support xidatong touch function and register to bus framework +* @brief support xidatong-arm32 touch function and register to bus framework * @version 1.0 * @author AIIT XUOS Lab * @date 2022-04-25 diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_uart.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_uart.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_uart.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_uart.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_usb.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_usb.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_usb.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_usb.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_wdt.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_wdt.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/connect_wdt.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/connect_wdt.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/enet_ethernetif.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/enet_ethernetif.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/enet_ethernetif.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/enet_ethernetif.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/enet_ethernetif_priv.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/enet_ethernetif_priv.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/enet_ethernetif_priv.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/enet_ethernetif_priv.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_cache.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_cache.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_cache.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_cache.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_clock.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_clock.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_clock.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_clock.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_common.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_common.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_common.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_common.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_device_registers.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_device_registers.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_device_registers.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_device_registers.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_elcdif.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_elcdif.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_elcdif.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_elcdif.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_enet.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_enet.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_enet.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_enet.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_gpio.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_gpio.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_gpio.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_gpio.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_iomuxc.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_iomuxc.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_iomuxc.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_iomuxc.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_lpi2c.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_lpi2c.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_lpi2c.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_lpi2c.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_lpuart.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_lpuart.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_lpuart.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_lpuart.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_semc.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_semc.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_semc.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_semc.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_usdhc.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_usdhc.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_usdhc.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_usdhc.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_wdog.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_wdog.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/fsl_wdog.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/fsl_wdog.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/include/system_MIMXRT1052.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/system_MIMXRT1052.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/include/system_MIMXRT1052.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/include/system_MIMXRT1052.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/lcd/Kconfig b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/lcd/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/lcd/Kconfig rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/lcd/Kconfig diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/lcd/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/lcd/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/lcd/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/lcd/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/lcd/connect_lcd.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/lcd/connect_lcd.c similarity index 98% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/lcd/connect_lcd.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/lcd/connect_lcd.c index ac1459aca..2e6d174e3 100644 --- a/Ubiquitous/XiZi/board/xidatong/third_party_driver/lcd/connect_lcd.c +++ b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/lcd/connect_lcd.c @@ -1,6 +1,6 @@ /** * @file connect_lcd.c -* @brief support xidatong lcd function and register to bus framework +* @brief support xidatong-arm32 lcd function and register to bus framework * @version 2.0 * @author AIIT XiUOS Lab * @date 2022-04-25 diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/lcd/fsl_elcdif.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/lcd/fsl_elcdif.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/lcd/fsl_elcdif.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/lcd/fsl_elcdif.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/Kconfig b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/Kconfig rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/Kconfig diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/connect_sdio.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/connect_sdio.c similarity index 99% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/connect_sdio.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/connect_sdio.c index 841ed2fc2..2f3260728 100644 --- a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/connect_sdio.c +++ b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/connect_sdio.c @@ -8,7 +8,7 @@ /** * @file connect_sdio.c -* @brief support sdio function using bus driver framework on xidatong board +* @brief support sdio function using bus driver framework on xidatong-arm32 board * @version 2.0 * @author AIIT XUOS Lab * @date 2022-01-24 diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/inc/fsl_mmc.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/inc/fsl_mmc.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/inc/fsl_mmc.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/inc/fsl_mmc.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/inc/fsl_sd.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/inc/fsl_sd.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/inc/fsl_sd.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/inc/fsl_sd.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/inc/fsl_sdio.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/inc/fsl_sdio.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/inc/fsl_sdio.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/inc/fsl_sdio.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/inc/fsl_sdmmc_common.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/inc/fsl_sdmmc_common.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/inc/fsl_sdmmc_common.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/inc/fsl_sdmmc_common.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/inc/fsl_sdmmc_host.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/inc/fsl_sdmmc_host.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/inc/fsl_sdmmc_host.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/inc/fsl_sdmmc_host.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/inc/fsl_sdmmc_spec.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/inc/fsl_sdmmc_spec.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/inc/fsl_sdmmc_spec.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/inc/fsl_sdmmc_spec.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/fsl_sdmmc_event.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/fsl_sdmmc_event.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/fsl_sdmmc_event.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/fsl_sdmmc_event.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/usdhc/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/usdhc/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/usdhc/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/usdhc/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/usdhc/interrupt/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/usdhc/interrupt/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/usdhc/interrupt/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/usdhc/interrupt/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/usdhc/interrupt/fsl_sdmmc_event.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/usdhc/interrupt/fsl_sdmmc_event.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/usdhc/interrupt/fsl_sdmmc_event.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/usdhc/interrupt/fsl_sdmmc_event.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/usdhc/interrupt/fsl_sdmmc_host.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/usdhc/interrupt/fsl_sdmmc_host.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/usdhc/interrupt/fsl_sdmmc_host.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/usdhc/interrupt/fsl_sdmmc_host.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/usdhc/polling/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/usdhc/polling/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/usdhc/polling/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/usdhc/polling/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/usdhc/polling/fsl_sdmmc_event.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/usdhc/polling/fsl_sdmmc_event.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/usdhc/polling/fsl_sdmmc_event.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/usdhc/polling/fsl_sdmmc_event.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/usdhc/polling/fsl_sdmmc_host.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/usdhc/polling/fsl_sdmmc_host.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/port/usdhc/polling/fsl_sdmmc_host.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/port/usdhc/polling/fsl_sdmmc_host.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/src/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/src/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/src/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/src/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/src/fsl_mmc.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/src/fsl_mmc.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/src/fsl_mmc.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/src/fsl_mmc.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/src/fsl_sd.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/src/fsl_sd.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/src/fsl_sd.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/src/fsl_sd.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/src/fsl_sdio.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/src/fsl_sdio.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/src/fsl_sdio.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/src/fsl_sdio.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/src/fsl_sdmmc_common.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/src/fsl_sdmmc_common.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/sdio/sdmmc/src/fsl_sdmmc_common.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/sdio/sdmmc/src/fsl_sdmmc_common.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/semc/Kconfig b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/semc/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/semc/Kconfig rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/semc/Kconfig diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/semc/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/semc/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/semc/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/semc/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/semc/connect_semc.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/semc/connect_semc.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/semc/connect_semc.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/semc/connect_semc.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/semc/fsl_semc.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/semc/fsl_semc.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/semc/fsl_semc.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/semc/fsl_semc.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/semc/semc_externsdram_test.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/semc/semc_externsdram_test.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/semc/semc_externsdram_test.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/semc/semc_externsdram_test.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/touch/Kconfig b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/touch/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/touch/Kconfig rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/touch/Kconfig diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/touch/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/touch/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/touch/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/touch/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/touch/connect_touch.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/touch/connect_touch.c similarity index 99% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/touch/connect_touch.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/touch/connect_touch.c index 3f26a3055..e37b73386 100644 --- a/Ubiquitous/XiZi/board/xidatong/third_party_driver/touch/connect_touch.c +++ b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/touch/connect_touch.c @@ -12,7 +12,7 @@ /** * @file connect_touch.c -* @brief support xidatong touch function and register to bus framework +* @brief support xidatong-arm32 touch function and register to bus framework * @version 1.0 * @author AIIT XUOS Lab * @date 2022-05-15 diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/touch/i2c_touch.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/touch/i2c_touch.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/touch/i2c_touch.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/touch/i2c_touch.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/touch/i2c_touch.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/touch/i2c_touch.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/touch/i2c_touch.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/touch/i2c_touch.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/uart/Kconfig b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/uart/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/uart/Kconfig rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/uart/Kconfig diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/uart/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/uart/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/uart/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/uart/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/uart/connect_uart.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/uart/connect_uart.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/uart/connect_uart.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/uart/connect_uart.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/uart/fsl_lpuart.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/uart/fsl_lpuart.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/uart/fsl_lpuart.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/uart/fsl_lpuart.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/Kconfig b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/Kconfig rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/Kconfig diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/connect_usb.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/connect_usb.c similarity index 99% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/connect_usb.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/connect_usb.c index 536e52db3..717659f9a 100644 --- a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/connect_usb.c +++ b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/connect_usb.c @@ -8,7 +8,7 @@ /** * @file connect_usb.c -* @brief support usb host function using bus driver framework on xidatong board +* @brief support usb host function using bus driver framework on xidatong-arm32 board * @version 2.0 * @author AIIT XUOS Lab * @date 2022-02-09 diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/class/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/class/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/class/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/class/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub_app.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub_app.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub_app.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub_app.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub_app.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub_app.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub_app.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_hub_app.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_msd.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_msd.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_msd.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_msd.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_msd.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_msd.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_msd.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_msd.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_msd_ufi.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_msd_ufi.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_msd_ufi.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/class/usb_host_msd_ufi.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host_devices.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host_devices.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host_devices.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host_devices.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host_devices.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host_devices.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host_devices.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host_devices.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host_ehci.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host_ehci.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host_ehci.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host_ehci.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host_ehci.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host_ehci.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host_ehci.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host_ehci.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host_framework.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host_framework.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host_framework.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host_framework.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host_framework.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host_framework.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host_framework.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host_framework.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host_hci.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host_hci.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host_hci.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host_hci.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host_hci.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host_hci.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host/usb_host_hci.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host/usb_host_hci.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host_msd_command.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host_msd_command.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/host_msd_command.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/host_msd_command.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/include/host_msd_command.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/include/host_msd_command.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/include/host_msd_command.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/include/host_msd_command.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/include/usb.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/include/usb.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/include/usb.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/include/usb.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/include/usb_host_config.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/include/usb_host_config.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/include/usb_host_config.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/include/usb_host_config.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/include/usb_misc.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/include/usb_misc.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/include/usb_misc.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/include/usb_misc.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/include/usb_spec.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/include/usb_spec.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/include/usb_spec.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/include/usb_spec.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/osa/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/osa/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/osa/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/osa/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/osa/usb_osa.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/osa/usb_osa.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/osa/usb_osa.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/osa/usb_osa.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/osa/usb_osa_bm.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/osa/usb_osa_bm.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/osa/usb_osa_bm.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/osa/usb_osa_bm.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/osa/usb_osa_bm.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/osa/usb_osa_bm.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/osa/usb_osa_bm.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/osa/usb_osa_bm.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/phy/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/phy/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/phy/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/phy/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/phy/usb_phy.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/phy/usb_phy.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/phy/usb_phy.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/phy/usb_phy.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/phy/usb_phy.h b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/phy/usb_phy.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/usb/nxp_usb_driver/phy/usb_phy.h rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/usb/nxp_usb_driver/phy/usb_phy.h diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/wdt/Kconfig b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/wdt/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/wdt/Kconfig rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/wdt/Kconfig diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/wdt/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/wdt/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/wdt/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/wdt/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/wdt/connect_wdt.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/wdt/connect_wdt.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/wdt/connect_wdt.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/wdt/connect_wdt.c diff --git a/Ubiquitous/XiZi/board/xidatong/third_party_driver/wdt/fsl_wdog.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/wdt/fsl_wdog.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/third_party_driver/wdt/fsl_wdog.c rename to Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/wdt/fsl_wdog.c diff --git a/Ubiquitous/XiZi/board/xidatong/xip/Makefile b/Ubiquitous/XiZi/board/xidatong-arm32/xip/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/xip/Makefile rename to Ubiquitous/XiZi/board/xidatong-arm32/xip/Makefile diff --git a/Ubiquitous/XiZi/board/xidatong/xip/fsl_flexspi_nor_boot.c b/Ubiquitous/XiZi/board/xidatong-arm32/xip/fsl_flexspi_nor_boot.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/xip/fsl_flexspi_nor_boot.c rename to Ubiquitous/XiZi/board/xidatong-arm32/xip/fsl_flexspi_nor_boot.c diff --git a/Ubiquitous/XiZi/board/xidatong/xip/fsl_flexspi_nor_boot.h b/Ubiquitous/XiZi/board/xidatong-arm32/xip/fsl_flexspi_nor_boot.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/xip/fsl_flexspi_nor_boot.h rename to Ubiquitous/XiZi/board/xidatong-arm32/xip/fsl_flexspi_nor_boot.h diff --git a/Ubiquitous/XiZi/board/xidatong/xip/fsl_flexspi_nor_flash.c b/Ubiquitous/XiZi/board/xidatong-arm32/xip/fsl_flexspi_nor_flash.c similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/xip/fsl_flexspi_nor_flash.c rename to Ubiquitous/XiZi/board/xidatong-arm32/xip/fsl_flexspi_nor_flash.c diff --git a/Ubiquitous/XiZi/board/xidatong/xip/fsl_flexspi_nor_flash.h b/Ubiquitous/XiZi/board/xidatong-arm32/xip/fsl_flexspi_nor_flash.h similarity index 100% rename from Ubiquitous/XiZi/board/xidatong/xip/fsl_flexspi_nor_flash.h rename to Ubiquitous/XiZi/board/xidatong-arm32/xip/fsl_flexspi_nor_flash.h diff --git a/Ubiquitous/XiZi/path_kernel.mk b/Ubiquitous/XiZi/path_kernel.mk index 91a7f3e45..378f0252f 100755 --- a/Ubiquitous/XiZi/path_kernel.mk +++ b/Ubiquitous/XiZi/path_kernel.mk @@ -1,7 +1,7 @@ export KERNELPATHS:= -ifeq ($(BSP_ROOT),$(KERNEL_ROOT)/board/xidatong) +ifeq ($(BSP_ROOT),$(KERNEL_ROOT)/board/xidatong-arm32) KERNELPATHS :=-I$(BSP_ROOT) \ -I$(KERNEL_ROOT)/arch/arm/cortex-m7 \ -I$(BSP_ROOT)/third_party_driver \ From 29a205e467f44a211a633254846c5c7acff8b102 Mon Sep 17 00:00:00 2001 From: Wang_Weigen Date: Wed, 22 Jun 2022 16:42:52 +0800 Subject: [PATCH 4/6] rename board name 'rv32m1_vega' as 'rv32m1-vega' --- Ubiquitous/XiZi/Makefile | 4 ++-- Ubiquitous/XiZi/README.md | 2 +- Ubiquitous/XiZi/arch/risc-v/Makefile | 2 +- .../{rv32m1_vega => rv32m1-vega}/Makefile | 0 .../RV32M1_ri5cy.h | 0 .../RV32M1_ri5cy_features.h | 0 .../RV32M1_zero_riscy.h | 0 .../RV32M1_zero_riscy_features.h | 0 .../arch_interrupt.h | 2 +- .../core_riscv32.h | 0 .../fsl_device_registers.h | 0 .../{rv32m1_vega => rv32m1-vega}/interrupt.c | 0 .../interrupt_gcc.S | 0 .../startup_RV32M1_ri5cy.S | 0 .../startup_RV32M1_zero_riscy.S | 0 .../system_RV32M1_ri5cy.c | 0 .../system_RV32M1_ri5cy.h | 0 .../system_RV32M1_zero_riscy.c | 0 .../system_RV32M1_zero_riscy.h | 0 .../XiZi/board/aiit-arm32-board/README.md | 6 ++--- .../XiZi/board/aiit-arm32-board/config.mk | 2 +- .../XiZi/board/aiit-riscv64-board/README.md | 4 ++-- .../XiZi/board/aiit-riscv64-board/config.mk | 2 +- .../XiZi/board/cortex-m0-emulator/README.md | 8 +++---- .../XiZi/board/cortex-m0-emulator/config.mk | 4 ++-- .../XiZi/board/cortex-m3-emulator/README.md | 8 +++---- .../XiZi/board/cortex-m3-emulator/config.mk | 4 ++-- .../XiZi/board/cortex-m4-emulator/README.md | 8 +++---- .../XiZi/board/cortex-m4-emulator/config.mk | 4 ++-- .../cortex-m4-emulator/documents/技术文档.md | 8 +++---- Ubiquitous/XiZi/board/gapuino/README.md | 4 ++-- Ubiquitous/XiZi/board/gapuino/config.mk | 4 ++-- .../XiZi/board/gd32vf103_rvstar/README.md | 4 ++-- .../XiZi/board/gd32vf103_rvstar/config.mk | 4 ++-- .../XiZi/board/hifive1-emulator/README.md | 8 +++---- .../XiZi/board/hifive1-emulator/config.mk | 2 +- Ubiquitous/XiZi/board/hifive1-rev-B/README.md | 2 +- Ubiquitous/XiZi/board/hifive1-rev-B/config.mk | 2 +- Ubiquitous/XiZi/board/k210-emulator/README.md | 8 +++---- Ubiquitous/XiZi/board/k210-emulator/config.mk | 4 ++-- Ubiquitous/XiZi/board/kd233/README.md | 4 ++-- Ubiquitous/XiZi/board/kd233/config.mk | 4 ++-- Ubiquitous/XiZi/board/maix-go/README.md | 4 ++-- Ubiquitous/XiZi/board/maix-go/config.mk | 2 +- Ubiquitous/XiZi/board/nuvoton-m2354/README.md | 2 +- Ubiquitous/XiZi/board/nuvoton-m2354/config.mk | 2 +- Ubiquitous/XiZi/board/ok1052-c/README.md | 4 ++-- Ubiquitous/XiZi/board/ok1052-c/config.mk | 6 ++--- .../{rv32m1_vega => rv32m1-vega}/Kconfig | 2 +- .../{rv32m1_vega => rv32m1-vega}/Makefile | 0 .../{rv32m1_vega => rv32m1-vega}/README.md | 22 +++++++++--------- .../{rv32m1_vega => rv32m1-vega}/board.c | 0 .../{rv32m1_vega => rv32m1-vega}/board.h | 0 .../{rv32m1_vega => rv32m1-vega}/config.mk | 2 +- .../doc/RV32M1DS_Rev.1.1.pdf | 0 .../doc/RV32M1RM_Rev.1.1.pdf | Bin .../doc/RV32M1_VEGA_Board_User_Guide.pdf | Bin .../doc/RV32M1_VEGA_Quick_Start_Guide.pdf | Bin .../RV32M1_Vega_Develop_Environment_Setup.pdf | Bin .../{rv32m1_vega => rv32m1-vega}/fsl_host.c | 0 .../img/gdb_load.png | Bin .../img/menuconfig.png | Bin .../img/multicore.jpg | Bin .../img/openocd.png | Bin .../img/riscv_gnu.png | Bin .../img/terminal.png | Bin .../img/vscode.jpg | Bin .../{rv32m1_vega => rv32m1-vega}/link.lds | 0 .../third_party_driver/Kconfig | 0 .../third_party_driver/Makefile | 0 .../third_party_driver/fsl_clock.c | 0 .../third_party_driver/fsl_common.c | 0 .../third_party_driver/fsl_intmux.c | 0 .../third_party_driver/gpio/Kconfig | 0 .../third_party_driver/gpio/Makefile | 0 .../third_party_driver/gpio/pin_mux.c | 0 .../third_party_driver/include/clock_config.h | 0 .../third_party_driver/include/connect_uart.h | 0 .../third_party_driver/include/fsl_clock.h | 0 .../third_party_driver/include/fsl_common.h | 0 .../third_party_driver/include/fsl_intmux.h | 0 .../third_party_driver/include/fsl_lpuart.h | 0 .../third_party_driver/include/fsl_msmc.h | 0 .../third_party_driver/include/fsl_port.h | 0 .../third_party_driver/include/pin_mux.h | 0 .../third_party_driver/sys_clock/Kconfig | 0 .../third_party_driver/sys_clock/Makefile | 0 .../sys_clock/clock_config.c | 0 .../third_party_driver/uart/Kconfig | 0 .../third_party_driver/uart/Makefile | 0 .../third_party_driver/uart/connect_uart.c | 0 .../third_party_driver/uart/fsl_lpuart.c | 0 .../XiZi/board/stm32f103-nano/README.md | 4 ++-- .../XiZi/board/stm32f103-nano/config.mk | 4 ++-- .../board/stm32f407-st-discovery/README.md | 4 ++-- .../board/stm32f407-st-discovery/config.mk | 4 ++-- Ubiquitous/XiZi/board/stm32f407zgt6/README.md | 6 ++--- Ubiquitous/XiZi/board/stm32f407zgt6/config.mk | 2 +- .../XiZi/board/xidatong-arm32/README.md | 8 +++---- .../XiZi/board/xidatong-arm32/config.mk | 6 ++--- Ubiquitous/XiZi/link.mk | 2 +- Ubiquitous/XiZi/mergebin.py | 6 ++--- Ubiquitous/XiZi/path_app.mk | 2 +- Ubiquitous/XiZi/path_kernel.mk | 6 ++--- 104 files changed, 109 insertions(+), 109 deletions(-) rename Ubiquitous/XiZi/arch/risc-v/{rv32m1_vega => rv32m1-vega}/Makefile (100%) rename Ubiquitous/XiZi/arch/risc-v/{rv32m1_vega => rv32m1-vega}/RV32M1_ri5cy.h (100%) rename Ubiquitous/XiZi/arch/risc-v/{rv32m1_vega => rv32m1-vega}/RV32M1_ri5cy_features.h (100%) rename Ubiquitous/XiZi/arch/risc-v/{rv32m1_vega => rv32m1-vega}/RV32M1_zero_riscy.h (100%) rename Ubiquitous/XiZi/arch/risc-v/{rv32m1_vega => rv32m1-vega}/RV32M1_zero_riscy_features.h (100%) rename Ubiquitous/XiZi/arch/risc-v/{rv32m1_vega => rv32m1-vega}/arch_interrupt.h (89%) rename Ubiquitous/XiZi/arch/risc-v/{rv32m1_vega => rv32m1-vega}/core_riscv32.h (100%) rename Ubiquitous/XiZi/arch/risc-v/{rv32m1_vega => rv32m1-vega}/fsl_device_registers.h (100%) rename Ubiquitous/XiZi/arch/risc-v/{rv32m1_vega => rv32m1-vega}/interrupt.c (100%) rename Ubiquitous/XiZi/arch/risc-v/{rv32m1_vega => rv32m1-vega}/interrupt_gcc.S (100%) rename Ubiquitous/XiZi/arch/risc-v/{rv32m1_vega => rv32m1-vega}/startup_RV32M1_ri5cy.S (100%) rename Ubiquitous/XiZi/arch/risc-v/{rv32m1_vega => rv32m1-vega}/startup_RV32M1_zero_riscy.S (100%) rename Ubiquitous/XiZi/arch/risc-v/{rv32m1_vega => rv32m1-vega}/system_RV32M1_ri5cy.c (100%) rename Ubiquitous/XiZi/arch/risc-v/{rv32m1_vega => rv32m1-vega}/system_RV32M1_ri5cy.h (100%) rename Ubiquitous/XiZi/arch/risc-v/{rv32m1_vega => rv32m1-vega}/system_RV32M1_zero_riscy.c (100%) rename Ubiquitous/XiZi/arch/risc-v/{rv32m1_vega => rv32m1-vega}/system_RV32M1_zero_riscy.h (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/Kconfig (94%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/Makefile (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/README.md (91%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/board.c (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/board.h (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/config.mk (90%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/doc/RV32M1DS_Rev.1.1.pdf (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/doc/RV32M1RM_Rev.1.1.pdf (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/doc/RV32M1_VEGA_Board_User_Guide.pdf (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/doc/RV32M1_VEGA_Quick_Start_Guide.pdf (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/doc/RV32M1_Vega_Develop_Environment_Setup.pdf (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/fsl_host.c (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/img/gdb_load.png (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/img/menuconfig.png (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/img/multicore.jpg (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/img/openocd.png (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/img/riscv_gnu.png (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/img/terminal.png (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/img/vscode.jpg (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/link.lds (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/Kconfig (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/Makefile (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/fsl_clock.c (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/fsl_common.c (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/fsl_intmux.c (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/gpio/Kconfig (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/gpio/Makefile (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/gpio/pin_mux.c (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/include/clock_config.h (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/include/connect_uart.h (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/include/fsl_clock.h (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/include/fsl_common.h (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/include/fsl_intmux.h (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/include/fsl_lpuart.h (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/include/fsl_msmc.h (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/include/fsl_port.h (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/include/pin_mux.h (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/sys_clock/Kconfig (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/sys_clock/Makefile (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/sys_clock/clock_config.c (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/uart/Kconfig (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/uart/Makefile (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/uart/connect_uart.c (100%) rename Ubiquitous/XiZi/board/{rv32m1_vega => rv32m1-vega}/third_party_driver/uart/fsl_lpuart.c (100%) diff --git a/Ubiquitous/XiZi/Makefile b/Ubiquitous/XiZi/Makefile index 6645f2fad..ada5ef36a 100755 --- a/Ubiquitous/XiZi/Makefile +++ b/Ubiquitous/XiZi/Makefile @@ -5,7 +5,7 @@ MAKEFLAGS += --no-print-directory .PHONY:COMPILE_APP COMPILE_KERNEL -support :=kd233 stm32f407-st-discovery maix-go stm32f407zgt6 aiit-riscv64-board aiit-arm32-board hifive1-rev-B hifive1-emulator k210-emulator cortex-m3-emulator cortex-m4-emulator ok1052-c gapuino stm32f103-nano gd32vf103_rvstar cortex-m0-emulator rv32m1_vega nuvoton-m2354 +support :=kd233 stm32f407-st-discovery maix-go stm32f407zgt6 aiit-riscv64-board aiit-arm32-board hifive1-rev-B hifive1-emulator k210-emulator cortex-m3-emulator cortex-m4-emulator ok1052-c gapuino stm32f103-nano gd32vf103_rvstar cortex-m0-emulator rv32m1-vega nuvoton-m2354 support += xidatong-arm32 SRC_DIR := @@ -75,7 +75,7 @@ COMPILE_ALL: $(MAKE) -C $$dir; \ done @cp link.mk build/Makefile - @$(MAKE) -C build TARGET=XiZi_$(BOARD).elf LINK_FLAGS=LFLAGS + @$(MAKE) -C build TARGET=XiZi-$(BOARD).elf LINK_FLAGS=LFLAGS @rm build/Makefile build/make.obj diff --git a/Ubiquitous/XiZi/README.md b/Ubiquitous/XiZi/README.md index 5121cc070..745303e72 100644 --- a/Ubiquitous/XiZi/README.md +++ b/Ubiquitous/XiZi/README.md @@ -29,7 +29,7 @@ ARM架构系列的开发板有 RISC-V架构系列的开发板有 - aiit-riscv64-board gapuino gd32vf103_rvstar hifive1-rev-B kd233 maix-go rv32m1_vega + aiit-riscv64-board gapuino gd32vf103_rvstar hifive1-rev-B kd233 maix-go rv32m1-vega ## 开发环境 diff --git a/Ubiquitous/XiZi/arch/risc-v/Makefile b/Ubiquitous/XiZi/arch/risc-v/Makefile index 0d445c7ca..1b818a6b3 100755 --- a/Ubiquitous/XiZi/arch/risc-v/Makefile +++ b/Ubiquitous/XiZi/arch/risc-v/Makefile @@ -25,7 +25,7 @@ SRC_DIR +=gd32vf103_rvstar endif ifeq ($(CONFIG_BOARD_RV32M1_VEGA),y) -SRC_DIR +=rv32m1_vega +SRC_DIR +=rv32m1-vega endif include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/Makefile b/Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/Makefile similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/Makefile rename to Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/Makefile diff --git a/Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/RV32M1_ri5cy.h b/Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/RV32M1_ri5cy.h similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/RV32M1_ri5cy.h rename to Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/RV32M1_ri5cy.h diff --git a/Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/RV32M1_ri5cy_features.h b/Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/RV32M1_ri5cy_features.h similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/RV32M1_ri5cy_features.h rename to Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/RV32M1_ri5cy_features.h diff --git a/Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/RV32M1_zero_riscy.h b/Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/RV32M1_zero_riscy.h similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/RV32M1_zero_riscy.h rename to Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/RV32M1_zero_riscy.h diff --git a/Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/RV32M1_zero_riscy_features.h b/Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/RV32M1_zero_riscy_features.h similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/RV32M1_zero_riscy_features.h rename to Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/RV32M1_zero_riscy_features.h diff --git a/Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/arch_interrupt.h b/Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/arch_interrupt.h similarity index 89% rename from Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/arch_interrupt.h rename to Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/arch_interrupt.h index 4ef8b6353..225ac19d5 100755 --- a/Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/arch_interrupt.h +++ b/Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/arch_interrupt.h @@ -1,6 +1,6 @@ /** * @file arch_interrupt.h -* @brief support rv32m1_vega interrupt +* @brief support rv32m1-vega interrupt * @version 1.0 * @author AIIT XUOS Lab * @date 2022-02-16 diff --git a/Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/core_riscv32.h b/Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/core_riscv32.h similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/core_riscv32.h rename to Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/core_riscv32.h diff --git a/Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/fsl_device_registers.h b/Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/fsl_device_registers.h similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/fsl_device_registers.h rename to Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/fsl_device_registers.h diff --git a/Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/interrupt.c b/Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/interrupt.c similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/interrupt.c rename to Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/interrupt.c diff --git a/Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/interrupt_gcc.S b/Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/interrupt_gcc.S similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/interrupt_gcc.S rename to Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/interrupt_gcc.S diff --git a/Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/startup_RV32M1_ri5cy.S b/Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/startup_RV32M1_ri5cy.S similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/startup_RV32M1_ri5cy.S rename to Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/startup_RV32M1_ri5cy.S diff --git a/Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/startup_RV32M1_zero_riscy.S b/Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/startup_RV32M1_zero_riscy.S similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/startup_RV32M1_zero_riscy.S rename to Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/startup_RV32M1_zero_riscy.S diff --git a/Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/system_RV32M1_ri5cy.c b/Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/system_RV32M1_ri5cy.c similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/system_RV32M1_ri5cy.c rename to Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/system_RV32M1_ri5cy.c diff --git a/Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/system_RV32M1_ri5cy.h b/Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/system_RV32M1_ri5cy.h similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/system_RV32M1_ri5cy.h rename to Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/system_RV32M1_ri5cy.h diff --git a/Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/system_RV32M1_zero_riscy.c b/Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/system_RV32M1_zero_riscy.c similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/system_RV32M1_zero_riscy.c rename to Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/system_RV32M1_zero_riscy.c diff --git a/Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/system_RV32M1_zero_riscy.h b/Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/system_RV32M1_zero_riscy.h similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/rv32m1_vega/system_RV32M1_zero_riscy.h rename to Ubiquitous/XiZi/arch/risc-v/rv32m1-vega/system_RV32M1_zero_riscy.h diff --git a/Ubiquitous/XiZi/board/aiit-arm32-board/README.md b/Ubiquitous/XiZi/board/aiit-arm32-board/README.md index 005ee44e7..d7e8f0dca 100644 --- a/Ubiquitous/XiZi/board/aiit-arm32-board/README.md +++ b/Ubiquitous/XiZi/board/aiit-arm32-board/README.md @@ -42,9 +42,9 @@ make BOARD=aiit-arm32-board menuconfig ``` make BOARD=aiit-arm32-board ``` ->5.如果编译正确无误，会产生XiZi_aiit-arm32-board.elf、XiZi_aiit-arm32-board.bin文件。其中XiZi_aiit-arm32-board.bin需要烧写到设备中进行运行。 +>5.如果编译正确无误，会产生XiZi-aiit-arm32-board.elf、XiZi-aiit-arm32-board.bin文件。其中XiZi-aiit-arm32-board.bin需要烧写到设备中进行运行。 ``` -sudo write build/XiZi_aiit-arm32-board.bin 0x8000000 +sudo write build/XiZi-aiit-arm32-board.bin 0x8000000 ``` >6.最后可以执行以下命令，清除配置文件和编译生成的文件 ``` @@ -73,7 +73,7 @@ aiit-arm32-board下载连接示意图如下： 代码根目录下执行st-flash工具烧录 ``` -sudo st-flash write build/XiZi_aiit-arm32-board.bin 0x8000000 +sudo st-flash write build/XiZi-aiit-arm32-board.bin 0x8000000 ``` ### 3.1 运行结果 diff --git a/Ubiquitous/XiZi/board/aiit-arm32-board/config.mk b/Ubiquitous/XiZi/board/aiit-arm32-board/config.mk index d69e4ea9c..1ca74598e 100644 --- a/Ubiquitous/XiZi/board/aiit-arm32-board/config.mk +++ b/Ubiquitous/XiZi/board/aiit-arm32-board/config.mk @@ -5,7 +5,7 @@ export AFLAGS := -c -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard - export LFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds export CXXFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -export APPLFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export DEFINES := -DHAVE_CCONFIG_H -DSTM32F407xx -DUSE_HAL_DRIVER -DHAVE_SIGINFO diff --git a/Ubiquitous/XiZi/board/aiit-riscv64-board/README.md b/Ubiquitous/XiZi/board/aiit-riscv64-board/README.md index dc5aef2bd..ae5f1108e 100644 --- a/Ubiquitous/XiZi/board/aiit-riscv64-board/README.md +++ b/Ubiquitous/XiZi/board/aiit-riscv64-board/README.md @@ -36,7 +36,7 @@ make BOARD=aiit-riscv64-board menuconfig ``` make BOARD=aiit-riscv64-board ``` ->5.如果编译正确无误，会产生XiZi_aiit-riscv64-board.elf、XiZi_aiit-riscv64-board.bin文件。其中XiZi_aiit-riscv64-board.bin需要烧写到设备中进行运行。 +>5.如果编译正确无误，会产生XiZi-aiit-riscv64-board.elf、XiZi-aiit-riscv64-board.bin文件。其中XiZi-aiit-riscv64-board.bin需要烧写到设备中进行运行。 >注：最后可以执行以下命令，清除配置文件和编译生成的文件 ``` make BOARD=aiit-riscv64-board distclean @@ -64,7 +64,7 @@ sudo pip2 install kflash ``` 代码根目录下执行K-Flash工具烧录，-p为USB端口号，视实际情况而定 ``` -kflash -t build/XiZi_aiit-riscv64-board.bin -p /dev/ttyUSB0 +kflash -t build/XiZi-aiit-riscv64-board.bin -p /dev/ttyUSB0 ``` ### 3.1 运行结果 diff --git a/Ubiquitous/XiZi/board/aiit-riscv64-board/config.mk b/Ubiquitous/XiZi/board/aiit-riscv64-board/config.mk index f20436fec..97b73716a 100644 --- a/Ubiquitous/XiZi/board/aiit-riscv64-board/config.mk +++ b/Ubiquitous/XiZi/board/aiit-riscv64-board/config.mk @@ -2,7 +2,7 @@ export CFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -fno-common -ffun export AFLAGS := -c -mcmodel=medany -march=rv64imafdc -mabi=lp64d -x assembler-with-cpp -ggdb export LFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -nostartfiles -Wl,--gc-sections,-Map=XiZi.map,-cref,-u,_start -T $(BSP_ROOT)/link.lds -export APPLFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -nostartfiles -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -nostartfiles -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export CXXFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -fno-common -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -O0 -ggdb -Werror diff --git a/Ubiquitous/XiZi/board/cortex-m0-emulator/README.md b/Ubiquitous/XiZi/board/cortex-m0-emulator/README.md index 8ad0d342e..b26f37b37 100644 --- a/Ubiquitous/XiZi/board/cortex-m0-emulator/README.md +++ b/Ubiquitous/XiZi/board/cortex-m0-emulator/README.md @@ -153,7 +153,7 @@ make BOARD=cortex-m0-emulator menuconfig make BOARD=cortex-m0-emulator ``` -4.如果编译正确无误，会产生XiZi_cortex-m0-emulator.elf、XiZi_cortex-m0-emulator.bin文件。 +4.如果编译正确无误，会产生XiZi-cortex-m0-emulator.elf、XiZi-cortex-m0-emulator.bin文件。 ## 3. 运行 @@ -168,7 +168,7 @@ sudo apt install qemu-system-arm 通过以下命令启动Q‎EMU并加载XiUOS ELF文件 ``` -qemu-system-arm -machine microbit -nographic -kernel build/XiZi_cortex-m0-emulator.elf +qemu-system-arm -machine microbit -nographic -kernel build/XiZi-cortex-m0-emulator.elf ``` QEMU运行起来后将会在终端上看到信息打印输出 @@ -185,11 +185,11 @@ sudo apt install gdb-multiarch 并通过以下命令启动Q‎EMU ``` -qemu-system-arm -machine microbit -nographic -kernel build/XiZi_cortex-m0-emulator.elf -s -S +qemu-system-arm -machine microbit -nographic -kernel build/XiZi-cortex-m0-emulator.elf -s -S ``` 然后要重新开启另一个linux系统终端一个终端，执行命令 ``` -gdb-multiarch build/XiZi_cortex-m0-emulator.elf -ex "target remote localhost:1234" +gdb-multiarch build/XiZi-cortex-m0-emulator.elf -ex "target remote localhost:1234" ``` diff --git a/Ubiquitous/XiZi/board/cortex-m0-emulator/config.mk b/Ubiquitous/XiZi/board/cortex-m0-emulator/config.mk index 5d0f27e6e..c87f4635d 100644 --- a/Ubiquitous/XiZi/board/cortex-m0-emulator/config.mk +++ b/Ubiquitous/XiZi/board/cortex-m0-emulator/config.mk @@ -2,10 +2,10 @@ export CROSS_COMPILE ?=/usr/bin/arm-none-eabi- export CFLAGS := -mcpu=cortex-m0 -mthumb -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -fgnu89-inline -Wa,-mimplicit-it=thumb export AFLAGS := -c -mcpu=cortex-m0 -mthumb -ffunction-sections -fdata-sections -x assembler-with-cpp -Wa,-mimplicit-it=thumb -gdwarf-2 -export LFLAGS := -mcpu=cortex-m0 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_cortex-m0-emulator.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds +export LFLAGS := -mcpu=cortex-m0 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-cortex-m0-emulator.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds export CXXFLAGS := -mcpu=cortex-m0 -mthumb -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -export APPLFLAGS := -mcpu=cortex-m0 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcpu=cortex-m0 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export DEFINES := -DHAVE_CCONFIG_H -g diff --git a/Ubiquitous/XiZi/board/cortex-m3-emulator/README.md b/Ubiquitous/XiZi/board/cortex-m3-emulator/README.md index ff5e8a072..3045cf738 100644 --- a/Ubiquitous/XiZi/board/cortex-m3-emulator/README.md +++ b/Ubiquitous/XiZi/board/cortex-m3-emulator/README.md @@ -153,7 +153,7 @@ make BOARD=cortex-m3-emulator menuconfig make BOARD=cortex-m3-emulator ``` -4.如果编译正确无误，会产生XiZi_cortex-m3-emulator.elf、XiZi_cortex-m3-emulator.bin文件。 +4.如果编译正确无误，会产生XiZi-cortex-m3-emulator.elf、XiZi-cortex-m3-emulator.bin文件。 ## 3. 运行 @@ -168,7 +168,7 @@ sudo apt install qemu-system-arm 通过以下命令启动Q‎EMU并加载XiUOS ELF文件 ``` -qemu-system-arm -machine lm3s6965evb -nographic -kernel build/XiZi_cortex-m3-emulator.elf +qemu-system-arm -machine lm3s6965evb -nographic -kernel build/XiZi-cortex-m3-emulator.elf ``` QEMU运行起来后将会在终端上看到信息打印输出 @@ -185,11 +185,11 @@ sudo apt install gdb-multiarch 并通过以下命令启动Q‎EMU ``` -qemu-system-arm -machine lm3s6965evb -nographic -kernel build/XiZi_cortex-m3-emulator.elf -s -S +qemu-system-arm -machine lm3s6965evb -nographic -kernel build/XiZi-cortex-m3-emulator.elf -s -S ``` 然后要重新开启另一个linux系统终端一个终端，执行`riscv-none-embed-gdb`命令 ``` -gdb-multiarch build/XiZi_cortex-m3-emulator.elf -ex "target remote localhost:1234" +gdb-multiarch build/XiZi-cortex-m3-emulator.elf -ex "target remote localhost:1234" ``` diff --git a/Ubiquitous/XiZi/board/cortex-m3-emulator/config.mk b/Ubiquitous/XiZi/board/cortex-m3-emulator/config.mk index e23a78e9b..3ddd3af87 100644 --- a/Ubiquitous/XiZi/board/cortex-m3-emulator/config.mk +++ b/Ubiquitous/XiZi/board/cortex-m3-emulator/config.mk @@ -2,10 +2,10 @@ export CROSS_COMPILE ?=/usr/bin/arm-none-eabi- export CFLAGS := -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -fgnu89-inline -Wa,-mimplicit-it=thumb export AFLAGS := -c -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -x assembler-with-cpp -Wa,-mimplicit-it=thumb -gdwarf-2 -export LFLAGS := -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_cortex-m3-emulator.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds +export LFLAGS := -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-cortex-m3-emulator.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds export CXXFLAGS := -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -export APPLFLAGS := -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export DEFINES := -DHAVE_CCONFIG_H diff --git a/Ubiquitous/XiZi/board/cortex-m4-emulator/README.md b/Ubiquitous/XiZi/board/cortex-m4-emulator/README.md index 31fc82a70..f8d004f9a 100644 --- a/Ubiquitous/XiZi/board/cortex-m4-emulator/README.md +++ b/Ubiquitous/XiZi/board/cortex-m4-emulator/README.md @@ -161,7 +161,7 @@ make BOARD=cortex-m4-emulator menuconfig make BOARD=cortex-m4-emulator ``` -4.如果编译正确无误，会产生XiZi_cortex-m4-emulator.elf、XiZi_cortex-m4-emulator.bin文件。 +4.如果编译正确无误，会产生XiZi-cortex-m4-emulator.elf、XiZi-cortex-m4-emulator.bin文件。 @@ -178,7 +178,7 @@ sudo apt install qemu-system-arm 通过以下命令启动Q‎EMU并加载XiUOS ELF文件 ``` -qemu-system-arm -machine netduinoplus2 -nographic -kernel build/XiZi_cortex-m4-emulator.elf +qemu-system-arm -machine netduinoplus2 -nographic -kernel build/XiZi-cortex-m4-emulator.elf ``` QEMU运行起来后将会在终端上看到信息打印输出 @@ -198,11 +198,11 @@ sudo apt install gdb-multiarch 并通过以下命令启动Q‎EMU ``` -qemu-system-arm -machine netduinoplus2 -nographic -kernel build/XiZi_cortex-m4-emulator.elf -s -S +qemu-system-arm -machine netduinoplus2 -nographic -kernel build/XiZi-cortex-m4-emulator.elf -s -S ``` 然后要重新开启另一个linux系统终端一个终端，执行`riscv-none-embed-gdb`命令 ``` -gdb-multiarch build/XiZi_cortex-m4-emulator.elf -ex "target remote localhost:1234" +gdb-multiarch build/XiZi-cortex-m4-emulator.elf -ex "target remote localhost:1234" ``` \ No newline at end of file diff --git a/Ubiquitous/XiZi/board/cortex-m4-emulator/config.mk b/Ubiquitous/XiZi/board/cortex-m4-emulator/config.mk index 967283811..99f554bbb 100644 --- a/Ubiquitous/XiZi/board/cortex-m4-emulator/config.mk +++ b/Ubiquitous/XiZi/board/cortex-m4-emulator/config.mk @@ -2,10 +2,10 @@ export CROSS_COMPILE ?=/usr/bin/arm-none-eabi- export CFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -fgnu89-inline -Wa,-mimplicit-it=thumb -Werror export AFLAGS := -c -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -x assembler-with-cpp -Wa,-mimplicit-it=thumb -gdwarf-2 -export LFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_cortex-m4-emulator.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds +export LFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-cortex-m4-emulator.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds export CXXFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -Werror -export APPLFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export DEFINES := -DHAVE_CCONFIG_H -DSTM32F407xx -DUSE_HAL_DRIVER -DHAVE_SIGINFO diff --git a/Ubiquitous/XiZi/board/cortex-m4-emulator/documents/技术文档.md b/Ubiquitous/XiZi/board/cortex-m4-emulator/documents/技术文档.md index 815a5727e..eafc388f5 100644 --- a/Ubiquitous/XiZi/board/cortex-m4-emulator/documents/技术文档.md +++ b/Ubiquitous/XiZi/board/cortex-m4-emulator/documents/技术文档.md @@ -170,7 +170,7 @@ make BOARD=cortex-m4-emulator menuconfig make BOARD=cortex-m4-emulator ``` -4.如果编译正确无误，会产生XiZi_cortex-m4-emulator.elf、XiZi_cortex-m4-emulator.bin文件。 +4.如果编译正确无误，会产生XiZi-cortex-m4-emulator.elf、XiZi-cortex-m4-emulator.bin文件。 @@ -203,7 +203,7 @@ sudo apt install qemu-system-arm 通过以下命令启动Q‎EMU并加载XiUOS ELF文件 ``` -qemu-system-arm -machine netduinoplus2 -nographic -kernel build/XiZi_cortex-m4-emulator.elf +qemu-system-arm -machine netduinoplus2 -nographic -kernel build/XiZi-cortex-m4-emulator.elf ``` QEMU运行起来后将会在终端上看到信息打印输出 @@ -224,13 +224,13 @@ sudo apt install gdb-multiarch 并通过以下命令启动Q‎EMU ``` -qemu-system-arm -machine netduinoplus2 -nographic -kernel build/XiZi_cortex-m4-emulator.elf -s -S +qemu-system-arm -machine netduinoplus2 -nographic -kernel build/XiZi-cortex-m4-emulator.elf -s -S ``` 然后要重新开启另一个linux系统终端一个终端，执行`riscv-none-embed-gdb`命令 ``` -gdb-multiarch build/XiZi_cortex-m4-emulator.elf -ex "target remote localhost:1234" +gdb-multiarch build/XiZi-cortex-m4-emulator.elf -ex "target remote localhost:1234" ``` diff --git a/Ubiquitous/XiZi/board/gapuino/README.md b/Ubiquitous/XiZi/board/gapuino/README.md index 8e9d92a04..9daf41671 100755 --- a/Ubiquitous/XiZi/board/gapuino/README.md +++ b/Ubiquitous/XiZi/board/gapuino/README.md @@ -129,7 +129,7 @@ make BOARD=gapuino menuconfig make BOARD=gapuino ``` -4.如果编译正确无误，build文件夹下会产生XiZi_gapuino.elf、XiZi_gapuino.bin文件。 +4.如果编译正确无误，build文件夹下会产生XiZi-gapuino.elf、XiZi-gapuino.bin文件。 >注：最后可以执行以下命令，清除配置文件和编译生成的文件 @@ -172,7 +172,7 @@ screen /dev/ttyUSB0 115200 5、打开一个新的终端，进入编译生成的elf路径,输入例如： ``` -riscv32-unknown-elf-gdb build/XiZi_gapuino.elf -ex "target remote localhost:3333" +riscv32-unknown-elf-gdb build/XiZi-gapuino.elf -ex "target remote localhost:3333" ``` 结果如下图所示： ![gdb](./img/gdb_load.png) diff --git a/Ubiquitous/XiZi/board/gapuino/config.mk b/Ubiquitous/XiZi/board/gapuino/config.mk index 289769599..7f047fee1 100755 --- a/Ubiquitous/XiZi/board/gapuino/config.mk +++ b/Ubiquitous/XiZi/board/gapuino/config.mk @@ -22,9 +22,9 @@ export CFLAGS := -mcmodel=medany -march=rv32imac -mabi=ilp32 -fno-common -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -O0 -ggdb -fgnu89-inline -Werror export AFLAGS := -c -mcmodel=medany -march=rv32imac -mabi=ilp32 -x assembler-with-cpp -ggdb -export LFLAGS := -mcmodel=medany -march=rv32imac -mabi=ilp32 -nostartfiles -Wl,--gc-sections,-Map=XiZi_gap8.map,-cref,-u,_start -T $(BSP_ROOT)/link.lds +export LFLAGS := -mcmodel=medany -march=rv32imac -mabi=ilp32 -nostartfiles -Wl,--gc-sections,-Map=XiZi-gap8.map,-cref,-u,_start -T $(BSP_ROOT)/link.lds -export APPLFLAGS := -mcmodel=medany -march=rv32imac -mabi=ilp32 -nostartfiles -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcmodel=medany -march=rv32imac -mabi=ilp32 -nostartfiles -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export CXXFLAGS := -mcmodel=medany -march=rv32imac -mabi=ilp32 -fno-common -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -O0 -ggdb -Werror diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/README.md b/Ubiquitous/XiZi/board/gd32vf103_rvstar/README.md index 355c154f7..be1f87f3c 100755 --- a/Ubiquitous/XiZi/board/gd32vf103_rvstar/README.md +++ b/Ubiquitous/XiZi/board/gd32vf103_rvstar/README.md @@ -130,7 +130,7 @@ make BOARD=gd32vf103_rvstar menuconfig make BOARD=gd32vf103_rvstar ``` -4.如果编译正确无误，build文件夹下会产生XiZi_gd32vf103_rvstar.elf、XiZi_gd32vf103_rvstar.bin文件。 +4.如果编译正确无误，build文件夹下会产生XiZi-gd32vf103_rvstar.elf、XiZi-gd32vf103_rvstar.bin文件。 >注：最后可以执行以下命令，清除配置文件和编译生成的文件 @@ -177,7 +177,7 @@ screen /dev/ttyUSB0 115200 5、打开一个新的终端，进入编译生成的elf路径,输入例如： ``` -riscv-nuclei-elf-gdb build/XiZi_gd32vf103_rvstar.elf -ex "target remote localhost:3333" +riscv-nuclei-elf-gdb build/XiZi-gd32vf103_rvstar.elf -ex "target remote localhost:3333" ``` 结果如下图所示： ![gdb](./img/gdb_load.png) diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/config.mk b/Ubiquitous/XiZi/board/gd32vf103_rvstar/config.mk index 1c9b175eb..9b8b85c7f 100755 --- a/Ubiquitous/XiZi/board/gd32vf103_rvstar/config.mk +++ b/Ubiquitous/XiZi/board/gd32vf103_rvstar/config.mk @@ -1,9 +1,9 @@ export CFLAGS := -march=rv32imac -mabi=ilp32 -fno-common -ffunction-sections -fdata-sections -O0 -ggdb -fgnu89-inline -Werror export AFLAGS := -march=rv32imac -mabi=ilp32 -x assembler-with-cpp -ggdb -export LFLAGS := -march=rv32imac -mabi=ilp32 -nostartfiles -Wl,--gc-sections,-Map=XiZi_gd32vf103.map,-cref,-u,_start -T $(BSP_ROOT)/link.lds +export LFLAGS := -march=rv32imac -mabi=ilp32 -nostartfiles -Wl,--gc-sections,-Map=XiZi-gd32vf103.map,-cref,-u,_start -T $(BSP_ROOT)/link.lds -export APPLFLAGS := -nostartfiles -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -nostartfiles -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export CXXFLAGS := -fno-common -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -O0 -ggdb -Werror diff --git a/Ubiquitous/XiZi/board/hifive1-emulator/README.md b/Ubiquitous/XiZi/board/hifive1-emulator/README.md index c7bf1e31d..4e8db0d1b 100644 --- a/Ubiquitous/XiZi/board/hifive1-emulator/README.md +++ b/Ubiquitous/XiZi/board/hifive1-emulator/README.md @@ -130,7 +130,7 @@ make BOARD=hifive1-emulator menuconfig make BOARD=hifive1-emulator ``` -4.如果编译正确无误，会在build目录下产生XiZi_hifive1-emulator.elf、XiZi_hifive1-emulator.bin文件。 +4.如果编译正确无误，会在build目录下产生XiZi-hifive1-emulator.elf、XiZi-hifive1-emulator.bin文件。 ## 3. 运行 @@ -153,7 +153,7 @@ sudo make install 通过以下命令启动Q‎EMU并加载XiUOS ELF文件 ``` -qemu-system-riscv32 -nographic -machine sifive_e -kernel build/XiZi_hifive1-emulator.elf +qemu-system-riscv32 -nographic -machine sifive_e -kernel build/XiZi-hifive1-emulator.elf ``` QEMU运行起来后将会在终端上看到信息打印输出 @@ -165,11 +165,11 @@ QEMU运行起来后将会在终端上看到信息打印输出 利用Q‎EMU可以方便的对XiUOS进行调试，首先通过以下命令启动Q‎EMU ``` -qemu-system-riscv32 -nographic -machine sifive_e -kernel build/XiZi_hifive1-emulator.elf -s -S +qemu-system-riscv32 -nographic -machine sifive_e -kernel build/XiZi-hifive1-emulator.elf -s -S ``` 然后要重新开启另一个linux系统终端一个终端，执行`riscv-none-embed-gdb`命令 ``` -riscv-none-embed-gdb build/XiZi_hifive1-emulator.elf -ex "target remote localhost:1234" +riscv-none-embed-gdb build/XiZi-hifive1-emulator.elf -ex "target remote localhost:1234" ``` diff --git a/Ubiquitous/XiZi/board/hifive1-emulator/config.mk b/Ubiquitous/XiZi/board/hifive1-emulator/config.mk index 6213fc181..51ffac352 100644 --- a/Ubiquitous/XiZi/board/hifive1-emulator/config.mk +++ b/Ubiquitous/XiZi/board/hifive1-emulator/config.mk @@ -2,7 +2,7 @@ export CFLAGS := -mcmodel=medany -march=rv32imac -mabi=ilp32 -fno-common -ffunct export AFLAGS := -c -mcmodel=medany -march=rv32imac -mabi=ilp32 -x assembler-with-cpp -ggdb export LFLAGS := -mcmodel=medany -march=rv32imac -mabi=ilp32 -nostartfiles -Wl,--gc-sections,-Map=XiZi.map,-cref,-u,_start -T $(BSP_ROOT)/link.lds -export APPLFLAGS := -mcmodel=medany -march=rv32imac -mabi=ilp32 -nostartfiles -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcmodel=medany -march=rv32imac -mabi=ilp32 -nostartfiles -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export CXXFLAGS := -mcmodel=medany -march=rv32imac -mabi=ilp32 -fno-common -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -O0 -ggdb -Werror diff --git a/Ubiquitous/XiZi/board/hifive1-rev-B/README.md b/Ubiquitous/XiZi/board/hifive1-rev-B/README.md index e766f75f9..6a25be059 100644 --- a/Ubiquitous/XiZi/board/hifive1-rev-B/README.md +++ b/Ubiquitous/XiZi/board/hifive1-rev-B/README.md @@ -133,7 +133,7 @@ make BOARD=hifive1-rev-B menuconfig make BOARD=hifive1-rev-B ``` -4.如果编译正确无误，build文件夹下会产生XiZi_hifive1-rev-B.elf、XiZi_hifive1-rev-B.bin文件。其中XiZi_hifive1-rev-B.bin需要烧写到设备中进行运行。 +4.如果编译正确无误，build文件夹下会产生XiZi-hifive1-rev-B.elf、XiZi-hifive1-rev-B.bin文件。其中XiZi-hifive1-rev-B.bin需要烧写到设备中进行运行。 >注：最后可以执行以下命令，清除配置文件和编译生成的文件 diff --git a/Ubiquitous/XiZi/board/hifive1-rev-B/config.mk b/Ubiquitous/XiZi/board/hifive1-rev-B/config.mk index 1f88e3152..50b6e62c8 100644 --- a/Ubiquitous/XiZi/board/hifive1-rev-B/config.mk +++ b/Ubiquitous/XiZi/board/hifive1-rev-B/config.mk @@ -2,7 +2,7 @@ export CFLAGS := -mcmodel=medany -march=rv32imac -mabi=ilp32 -fno-common -ffunct export AFLAGS := -c -mcmodel=medany -march=rv32imac -mabi=ilp32 -x assembler-with-cpp -ggdb export LFLAGS := -mcmodel=medany -march=rv32imac -mabi=ilp32 -nostartfiles -Wl,--gc-sections,-Map=XiZi.map,-cref,-u,_start -T $(BSP_ROOT)/link.lds -export APPLFLAGS := -mcmodel=medany -march=rv32imac -mabi=ilp32 -nostartfiles -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcmodel=medany -march=rv32imac -mabi=ilp32 -nostartfiles -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export CXXFLAGS := -mcmodel=medany -march=rv32imac -mabi=ilp32 -fno-common -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -O0 -ggdb -Werror diff --git a/Ubiquitous/XiZi/board/k210-emulator/README.md b/Ubiquitous/XiZi/board/k210-emulator/README.md index a86c39f6c..cbf4d7d49 100644 --- a/Ubiquitous/XiZi/board/k210-emulator/README.md +++ b/Ubiquitous/XiZi/board/k210-emulator/README.md @@ -128,7 +128,7 @@ make BOARD=k210-emulator menuconfig make BOARD=k210-emulator ``` -4.如果编译正确无误，会在build目录下产生XiZi_k210-emulator.elf、XiZi_k210-emulator.bin文件。 +4.如果编译正确无误，会在build目录下产生XiZi-k210-emulator.elf、XiZi-k210-emulator.bin文件。 ## 3. 运行 @@ -150,7 +150,7 @@ sudo make install 通过以下命令启动Q‎EMU并加载XiUOS ELF文件 ``` -qemu-system-riscv64 -nographic -machine sifive_u -bios build/XiZi_k210-emulator.elf +qemu-system-riscv64 -nographic -machine sifive_u -bios build/XiZi-k210-emulator.elf ``` QEMU运行起来后将会在终端上看到信息打印输出 @@ -162,11 +162,11 @@ QEMU运行起来后将会在终端上看到信息打印输出 利用Q‎EMU可以方便的对XiUOS进行调试，首先通过以下命令启动Q‎EMU ``` -qemu-system-riscv64 -nographic -machine sifive_u -bios build/XiZi_k210-emulator.elf -s -S +qemu-system-riscv64 -nographic -machine sifive_u -bios build/XiZi-k210-emulator.elf -s -S ``` 然后要重新开启另一个linux系统终端一个终端，执行`riscv-none-embed-gdb`命令 ``` -riscv-none-embed-gdb build/XiZi_k210-emulator.elf -ex "target remote localhost:1234" +riscv-none-embed-gdb build/XiZi-k210-emulator.elf -ex "target remote localhost:1234" ``` diff --git a/Ubiquitous/XiZi/board/k210-emulator/config.mk b/Ubiquitous/XiZi/board/k210-emulator/config.mk index a48333688..d33cf2db8 100644 --- a/Ubiquitous/XiZi/board/k210-emulator/config.mk +++ b/Ubiquitous/XiZi/board/k210-emulator/config.mk @@ -1,8 +1,8 @@ export CFLAGS := -mcmodel=medany -march=rv64imac -mabi=lp64 -fno-common -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -O0 -Wa,-g -ggdb -fgnu89-inline -Werror export AFLAGS := -c -mcmodel=medany -march=rv64imac -mabi=lp64 -Wa,-g -ggdb -export LFLAGS := -mcmodel=medany -march=rv64imac -mabi=lp64 -nostartfiles -Wl,--gc-sections,-Map=XiZi_kd233.map,-cref,-u,_start -T $(BSP_ROOT)/link.lds +export LFLAGS := -mcmodel=medany -march=rv64imac -mabi=lp64 -nostartfiles -Wl,--gc-sections,-Map=XiZi-kd233.map,-cref,-u,_start -T $(BSP_ROOT)/link.lds -export APPLFLAGS := -mcmodel=medany -march=rv64imac -mabi=lp64 -nostartfiles -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcmodel=medany -march=rv64imac -mabi=lp64 -nostartfiles -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export CXXFLAGS := -mcmodel=medany -march=rv64imac -mabi=lp64 -fno-common -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -O0 -Wa,-g -ggdb -Werror diff --git a/Ubiquitous/XiZi/board/kd233/README.md b/Ubiquitous/XiZi/board/kd233/README.md index c075aa85b..4b86c7e56 100644 --- a/Ubiquitous/XiZi/board/kd233/README.md +++ b/Ubiquitous/XiZi/board/kd233/README.md @@ -143,7 +143,7 @@ make BOARD=kd233 menuconfig make BOARD=kd233 ``` -4.如果编译正确无误，会在build文件夹下生成XiZi_kd233.elf、XiZi_kd233.bin文件。其中XiZi_kd233.bin需要烧写到设备中进行运行。 +4.如果编译正确无误，会在build文件夹下生成XiZi-kd233.elf、XiZi-kd233.bin文件。其中XiZi-kd233.bin需要烧写到设备中进行运行。 >注：最后可以执行以下命令，清除配置文件和编译生成的文件 @@ -178,7 +178,7 @@ sudo pip2 install kflash 代码根目录下执行K-Flash工具烧录，-p为USB端口号，视实际情况而定 ``` -sudo kflash -t build/XiZi_kd233.bin -p /dev/ttyUSB0 +sudo kflash -t build/XiZi-kd233.bin -p /dev/ttyUSB0 ``` ### 3.1 运行结果 diff --git a/Ubiquitous/XiZi/board/kd233/config.mk b/Ubiquitous/XiZi/board/kd233/config.mk index 29b554c30..02b55a7d3 100644 --- a/Ubiquitous/XiZi/board/kd233/config.mk +++ b/Ubiquitous/XiZi/board/kd233/config.mk @@ -1,8 +1,8 @@ export CFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -fno-common -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -O0 -ggdb -fgnu89-inline -Werror export AFLAGS := -c -mcmodel=medany -march=rv64imafdc -mabi=lp64d -x assembler-with-cpp -ggdb -export LFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -nostartfiles -Wl,--gc-sections,-Map=XiZi_kd233.map,-cref,-u,_start -T $(BSP_ROOT)/link.lds +export LFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -nostartfiles -Wl,--gc-sections,-Map=XiZi-kd233.map,-cref,-u,_start -T $(BSP_ROOT)/link.lds -export APPLFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -nostartfiles -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -nostartfiles -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export CXXFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -fno-common -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -O0 -ggdb -Werror diff --git a/Ubiquitous/XiZi/board/maix-go/README.md b/Ubiquitous/XiZi/board/maix-go/README.md index 7279b4820..e4cce1f21 100644 --- a/Ubiquitous/XiZi/board/maix-go/README.md +++ b/Ubiquitous/XiZi/board/maix-go/README.md @@ -36,7 +36,7 @@ make BOARD=maix-go menuconfig ``` make BOARD=maix-go ``` ->5.如果编译正确无误，会产生XiZi_maix-go.elf、XiZi_maix-go.bin文件。其中XiZi_maix-go.bin需要烧写到设备中进行运行。 +>5.如果编译正确无误，会产生XiZi-maix-go.elf、XiZi-maix-go.bin文件。其中XiZi-maix-go.bin需要烧写到设备中进行运行。 >注：最后可以执行以下命令，清除配置文件和编译生成的文件 ``` make BOARD=maix-go distclean @@ -64,7 +64,7 @@ sudo pip2 install kflash ``` 代码根目录下执行K-Flash工具烧录，此时ls /dev/ttyUSB*会发现新增2个USB端口，烧录时选择后一个，例如此时新增的是/dev/ttyUSB0和/dev/ttyUSB1，选择/dev/ttyUSB1 ``` -kflash -t build/XiZi_kd233.bin -p /dev/ttyUSB1 +kflash -t build/XiZi-kd233.bin -p /dev/ttyUSB1 ``` ### 3.1 运行结果 diff --git a/Ubiquitous/XiZi/board/maix-go/config.mk b/Ubiquitous/XiZi/board/maix-go/config.mk index 04cea6973..36f17b37b 100644 --- a/Ubiquitous/XiZi/board/maix-go/config.mk +++ b/Ubiquitous/XiZi/board/maix-go/config.mk @@ -2,7 +2,7 @@ export CFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -fno-common -ffun export AFLAGS := -c -mcmodel=medany -march=rv64imafdc -mabi=lp64d -x assembler-with-cpp -ggdb export LFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -nostartfiles -Wl,--gc-sections,-Map=XiZi.map,-cref,-u,_start -T $(BSP_ROOT)/link.lds -export APPLFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -nostartfiles -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -nostartfiles -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export CXXFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -fno-common -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -O0 -ggdb -Werror diff --git a/Ubiquitous/XiZi/board/nuvoton-m2354/README.md b/Ubiquitous/XiZi/board/nuvoton-m2354/README.md index f3bf38f19..5e319c053 100644 --- a/Ubiquitous/XiZi/board/nuvoton-m2354/README.md +++ b/Ubiquitous/XiZi/board/nuvoton-m2354/README.md @@ -152,7 +152,7 @@ make BOARD=nuvoton-m2354 menuconfig make BOARD=nuvoton-m2354 ``` -4.如果编译正确无误，会产生XiZi_nuvoton-m2354.elf、XiZi_nuvoton-m2354.bin文件。 +4.如果编译正确无误，会产生XiZi-nuvoton-m2354.elf、XiZi-nuvoton-m2354.bin文件。 ## 3. 烧写及运行 diff --git a/Ubiquitous/XiZi/board/nuvoton-m2354/config.mk b/Ubiquitous/XiZi/board/nuvoton-m2354/config.mk index c64fd214d..d1f24133c 100644 --- a/Ubiquitous/XiZi/board/nuvoton-m2354/config.mk +++ b/Ubiquitous/XiZi/board/nuvoton-m2354/config.mk @@ -2,7 +2,7 @@ export CROSS_COMPILE ?= /opt/gcc-arm-none-eabi-6-2017-q1-update/bin/arm-none-eab export CFLAGS := -mcpu=cortex-m23 -mthumb -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -fgnu89-inline -Wa,-mimplicit-it=thumb export AFLAGS := -c -mcpu=cortex-m23 -mthumb -ffunction-sections -fdata-sections -x assembler-with-cpp -Wa,-mimplicit-it=thumb -gdwarf-2 -export LFLAGS := -mcpu=cortex-m23 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_nuvoton_m2354.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds +export LFLAGS := -mcpu=cortex-m23 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-nuvoton_m2354.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds export CXXFLAGS := -mcpu=cortex-m23 -mthumb -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g export DEFINES := -DHAVE_CCONFIG_H diff --git a/Ubiquitous/XiZi/board/ok1052-c/README.md b/Ubiquitous/XiZi/board/ok1052-c/README.md index 4e489f05c..44963d1fd 100644 --- a/Ubiquitous/XiZi/board/ok1052-c/README.md +++ b/Ubiquitous/XiZi/board/ok1052-c/README.md @@ -151,7 +151,7 @@ make BOARD=ok1052-c menuconfig make BOARD=ok1052-c ``` -4.如果编译正确无误，会产生XiZi_ok1052-c.elf、XiZi_ok1052-c.bin文件。 +4.如果编译正确无误，会产生XiZi-ok1052-c.elf、XiZi-ok1052-c.bin文件。 ## 3. 烧写及运行 @@ -164,7 +164,7 @@ make BOARD=ok1052-c 3、同时需要匹配ok1052-c开发板所使用的Flash型号，点击Boot Device Configuration，在Use Typical Device中选择Winbond_W25QxxxJV，然后点击ok。如下图所示： ![flashconfig](./img/flashconfig.png) -4、选择编译生成的XiZi_ok1052-c.elf或bin文件路径，按照图示步骤，将文件烧写至Flash中（link.lds中已构造Flash Bootable image，如有修改Flash相关配置需求，可修改/xip目录内相关文件，无需NXPBootUtility再次构造），若烧写无误，则下列绿色进度条会执行到底。如下图所示： +4、选择编译生成的XiZi-ok1052-c.elf或bin文件路径，按照图示步骤，将文件烧写至Flash中（link.lds中已构造Flash Bootable image，如有修改Flash相关配置需求，可修改/xip目录内相关文件，无需NXPBootUtility再次构造），若烧写无误，则下列绿色进度条会执行到底。如下图所示： ![NXPBootUtility_2](./img/NXPBootUtility_2.png) ### 3.2 运行结果 diff --git a/Ubiquitous/XiZi/board/ok1052-c/config.mk b/Ubiquitous/XiZi/board/ok1052-c/config.mk index f57b78739..920aa07f6 100644 --- a/Ubiquitous/XiZi/board/ok1052-c/config.mk +++ b/Ubiquitous/XiZi/board/ok1052-c/config.mk @@ -6,14 +6,14 @@ export AFLAGS := -c -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections ### if use USB function, use special lds file because USB uses ITCM ifeq ($(CONFIG_BSP_USING_USB),y) -export LFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_ok1052-c.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link-usb.lds +export LFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-ok1052-c.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link-usb.lds else -export LFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_ok1052-c.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds +export LFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-ok1052-c.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds endif export CXXFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -export APPLFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export DEFINES := -DHAVE_CCONFIG_H -DCPU_MIMXRT1052CVL5B -DSKIP_SYSCLK_INIT -DEVK_MCIMXRM -DFSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1 -DXIP_EXTERNAL_FLASH=1 -D__STARTUP_INITIALIZE_NONCACHEDATA -D__STARTUP_CLEAR_BSS diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/Kconfig b/Ubiquitous/XiZi/board/rv32m1-vega/Kconfig similarity index 94% rename from Ubiquitous/XiZi/board/rv32m1_vega/Kconfig rename to Ubiquitous/XiZi/board/rv32m1-vega/Kconfig index 8ed3d63be..cab83719b 100755 --- a/Ubiquitous/XiZi/board/rv32m1_vega/Kconfig +++ b/Ubiquitous/XiZi/board/rv32m1-vega/Kconfig @@ -17,7 +17,7 @@ config BOARD_RV32M1_VEGA source "$KERNEL_DIR/arch/Kconfig" -menu "rv32m1_vega feature" +menu "rv32m1-vega feature" source "$BSP_DIR/third_party_driver/Kconfig" endmenu diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/Makefile b/Ubiquitous/XiZi/board/rv32m1-vega/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/Makefile rename to Ubiquitous/XiZi/board/rv32m1-vega/Makefile diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/README.md b/Ubiquitous/XiZi/board/rv32m1-vega/README.md similarity index 91% rename from Ubiquitous/XiZi/board/rv32m1_vega/README.md rename to Ubiquitous/XiZi/board/rv32m1-vega/README.md index 7fdc0aa6b..889b3ef43 100755 --- a/Ubiquitous/XiZi/board/rv32m1_vega/README.md +++ b/Ubiquitous/XiZi/board/rv32m1-vega/README.md @@ -1,4 +1,4 @@ -# 从零开始构建矽璓工业物联操作系统：使用risc-v架构的rv32m1_vega 开发板 +# 从零开始构建矽璓工业物联操作系统：使用risc-v架构的rv32m1-vega 开发板 [XiUOS](http://xuos.io/) (X Industrial Ubiquitous Operating System) 矽璓工业物联操作系统是一款面向工业物联场景的泛在操作系统，来自泛在操作系统研究计划。所谓泛在操作系统(UOS: Ubiquitous Operating Systems)，是支持互联网时代人机物融合泛在计算应用模式的新型操作系统，是传统操作系统概念的泛化与延伸。在泛在操作系统技术体系中，不同的泛在计算设备和泛在应用场景需要符合各自特性的不同UOS，XiUOS即是面向工业物联场景的一种UOS，主要由一个极简的微型实时操作系统(RTOS)内核和其上的智能工业物联框架构成，支持工业物联网(IIoT: Industrial Internet of Things)应用。 @@ -73,7 +73,7 @@ RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载并解压。[ -将上述解压的编译工具链的路径添加到board/rv32m1_vega/config.mk文件当中，例如： +将上述解压的编译工具链的路径添加到board/rv32m1-vega/config.mk文件当中，例如： ``` export CROSS_COMPILE ?=/opt/gnu-mcu-eclipse/riscv-none-gcc/8.2.0-2.1-20190425-1021/bin/riscv-none-embed- @@ -81,9 +81,9 @@ export CROSS_COMPILE ?=/opt/gnu-mcu-eclipse/riscv-none-gcc/8.2.0-2.1-20190425-10 若已存在`export CROSS_COMPILE ?=xxxx` 应该将原有的语句注释，再写入上面的语句。 -# 在rv32m1_vega board 上创建第一个应用 +# rv32m1-vega board 上创建第一个应用 -## 1.rv32m1_vega board 简介 +## 1.rv32m1-vega board 简介 | 硬件 | 描述 | | -- | -- | @@ -125,19 +125,19 @@ make BOARD=rm32v1_vega menuconfig 3.继续执行以下命令，进行编译 ``` -make BOARD=rv32m1_vega +make BOARD=rv32m1-vega ``` -4.如果编译正确无误，build文件夹下会产生XiZi_rv32m1_vega.elf、XiZi_rv32m1_vega.bin文件。 +4.如果编译正确无误，build文件夹下会产生XiZi-rv32m1-vega.elf、XiZi-rv32m1-vega.bin文件。 >注：最后可以执行以下命令，清除配置文件和编译生成的文件 ``` -make BOARD=rv32m1_vega distclean +make BOARD=rv32m1-vega distclean ``` ## 3. 烧写及调试执行 -rv32m1_vega开发板启动模式说明:参考文档[RV32M1_VEGA_Quick_Start_Guide.pdf](./doc/RV32M1_VEGA_Board_User_Guide.pdf) +rv32m1-vega开发板启动模式说明:参考文档[RV32M1_VEGA_Quick_Start_Guide.pdf](./doc/RV32M1_VEGA_Board_User_Guide.pdf) ![openocd](./img/multicore.jpg) @@ -145,7 +145,7 @@ rv32m1_vega开发板启动模式说明:参考文档[RV32M1_VEGA_Quick_Start_Guid 请使用JLink接入到RV32M1_VEGA开发板的RISC-V核的JTAG接口上，同时把JLink在PC上的驱动更改为WinUSB模式。JTAG接口位于RV32M1芯片和天线座子旁边，小的20pin JTAG接口。 参考文档：[RV32M1_VEGA_Quick_Start_Guide.pdf](./doc/RV32M1_VEGA_Quick_Start_Guide.pdf) -rv32m1_vega支持openocd，可以通过openocd和gdb进行调试。 +rv32m1-vega支持openocd，可以通过openocd和gdb进行调试。 调试需要下载openocd和sdk,下载配置方法参见以下文档： https://github.com/open-isa-org/open-isa.org/blob/master/RV32M1_Vega_Develop_Environment_Setup.pdf @@ -163,7 +163,7 @@ cd ~/xiuos/Ubiquitous/XiZi ``` cd /vega_rv32/sdk -Openocd -f \boards\rv32m1_vega\vega_ri5cy.cfg +Openocd -f \boards\rv32m1-vega\vega_ri5cy.cfg ``` 在当前终端连接openocd，连接如下图所示： ![openocd](./img/openocd.png) @@ -176,7 +176,7 @@ screen /dev/ttyUSB0 115200 5、打开一个新的终端，进入编译生成的elf路径,输入例如： ``` -riscv-none-embed-gdb build/XiZi_rv32m1_vega.elf -ex "target remote localhost:3333" +riscv-none-embed-gdb build/XiZi-rv32m1-vega.elf -ex "target remote localhost:3333" ``` 结果如下图所示： ![gdb](./img/gdb_load.png) diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/board.c b/Ubiquitous/XiZi/board/rv32m1-vega/board.c similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/board.c rename to Ubiquitous/XiZi/board/rv32m1-vega/board.c diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/board.h b/Ubiquitous/XiZi/board/rv32m1-vega/board.h similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/board.h rename to Ubiquitous/XiZi/board/rv32m1-vega/board.h diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/config.mk b/Ubiquitous/XiZi/board/rv32m1-vega/config.mk similarity index 90% rename from Ubiquitous/XiZi/board/rv32m1_vega/config.mk rename to Ubiquitous/XiZi/board/rv32m1-vega/config.mk index 98582e468..e2242cc22 100755 --- a/Ubiquitous/XiZi/board/rv32m1_vega/config.mk +++ b/Ubiquitous/XiZi/board/rv32m1-vega/config.mk @@ -1,7 +1,7 @@ export CFLAGS := -march=rv32imac -mabi=ilp32 -fno-builtin -fno-exceptions -ffunction-sections -O0 -ggdb -Werror export AFLAGS := -c -march=rv32imac -mabi=ilp32 -x assembler-with-cpp -ggdb -export LFLAGS := -march=rv32imac -mabi=ilp32 -nostartfiles -Wl,--gc-sections,-Map=XiZi_rv32m1_vega.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds +export LFLAGS := -march=rv32imac -mabi=ilp32 -nostartfiles -Wl,--gc-sections,-Map=XiZi-rv32m1-vega.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds export CXXFLAGS := -march=rv32imac -mabi=ilp32 -fno-builtin -fno-exceptions -ffunction-sections -O0 -ggdb -Werror diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/doc/RV32M1DS_Rev.1.1.pdf b/Ubiquitous/XiZi/board/rv32m1-vega/doc/RV32M1DS_Rev.1.1.pdf similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/doc/RV32M1DS_Rev.1.1.pdf rename to Ubiquitous/XiZi/board/rv32m1-vega/doc/RV32M1DS_Rev.1.1.pdf diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/doc/RV32M1RM_Rev.1.1.pdf b/Ubiquitous/XiZi/board/rv32m1-vega/doc/RV32M1RM_Rev.1.1.pdf similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/doc/RV32M1RM_Rev.1.1.pdf rename to Ubiquitous/XiZi/board/rv32m1-vega/doc/RV32M1RM_Rev.1.1.pdf diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/doc/RV32M1_VEGA_Board_User_Guide.pdf b/Ubiquitous/XiZi/board/rv32m1-vega/doc/RV32M1_VEGA_Board_User_Guide.pdf similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/doc/RV32M1_VEGA_Board_User_Guide.pdf rename to Ubiquitous/XiZi/board/rv32m1-vega/doc/RV32M1_VEGA_Board_User_Guide.pdf diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/doc/RV32M1_VEGA_Quick_Start_Guide.pdf b/Ubiquitous/XiZi/board/rv32m1-vega/doc/RV32M1_VEGA_Quick_Start_Guide.pdf similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/doc/RV32M1_VEGA_Quick_Start_Guide.pdf rename to Ubiquitous/XiZi/board/rv32m1-vega/doc/RV32M1_VEGA_Quick_Start_Guide.pdf diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/doc/RV32M1_Vega_Develop_Environment_Setup.pdf b/Ubiquitous/XiZi/board/rv32m1-vega/doc/RV32M1_Vega_Develop_Environment_Setup.pdf similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/doc/RV32M1_Vega_Develop_Environment_Setup.pdf rename to Ubiquitous/XiZi/board/rv32m1-vega/doc/RV32M1_Vega_Develop_Environment_Setup.pdf diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/fsl_host.c b/Ubiquitous/XiZi/board/rv32m1-vega/fsl_host.c similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/fsl_host.c rename to Ubiquitous/XiZi/board/rv32m1-vega/fsl_host.c diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/img/gdb_load.png b/Ubiquitous/XiZi/board/rv32m1-vega/img/gdb_load.png similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/img/gdb_load.png rename to Ubiquitous/XiZi/board/rv32m1-vega/img/gdb_load.png diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/img/menuconfig.png b/Ubiquitous/XiZi/board/rv32m1-vega/img/menuconfig.png similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/img/menuconfig.png rename to Ubiquitous/XiZi/board/rv32m1-vega/img/menuconfig.png diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/img/multicore.jpg b/Ubiquitous/XiZi/board/rv32m1-vega/img/multicore.jpg similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/img/multicore.jpg rename to Ubiquitous/XiZi/board/rv32m1-vega/img/multicore.jpg diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/img/openocd.png b/Ubiquitous/XiZi/board/rv32m1-vega/img/openocd.png similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/img/openocd.png rename to Ubiquitous/XiZi/board/rv32m1-vega/img/openocd.png diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/img/riscv_gnu.png b/Ubiquitous/XiZi/board/rv32m1-vega/img/riscv_gnu.png similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/img/riscv_gnu.png rename to Ubiquitous/XiZi/board/rv32m1-vega/img/riscv_gnu.png diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/img/terminal.png b/Ubiquitous/XiZi/board/rv32m1-vega/img/terminal.png similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/img/terminal.png rename to Ubiquitous/XiZi/board/rv32m1-vega/img/terminal.png diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/img/vscode.jpg b/Ubiquitous/XiZi/board/rv32m1-vega/img/vscode.jpg similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/img/vscode.jpg rename to Ubiquitous/XiZi/board/rv32m1-vega/img/vscode.jpg diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/link.lds b/Ubiquitous/XiZi/board/rv32m1-vega/link.lds similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/link.lds rename to Ubiquitous/XiZi/board/rv32m1-vega/link.lds diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/Kconfig b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/Kconfig rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/Kconfig diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/Makefile b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/Makefile rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/Makefile diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/fsl_clock.c b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/fsl_clock.c similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/fsl_clock.c rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/fsl_clock.c diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/fsl_common.c b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/fsl_common.c similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/fsl_common.c rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/fsl_common.c diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/fsl_intmux.c b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/fsl_intmux.c similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/fsl_intmux.c rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/fsl_intmux.c diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/gpio/Kconfig b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/gpio/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/gpio/Kconfig rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/gpio/Kconfig diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/gpio/Makefile b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/gpio/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/gpio/Makefile rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/gpio/Makefile diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/gpio/pin_mux.c b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/gpio/pin_mux.c similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/gpio/pin_mux.c rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/gpio/pin_mux.c diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/clock_config.h b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/clock_config.h similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/clock_config.h rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/clock_config.h diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/connect_uart.h b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/connect_uart.h similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/connect_uart.h rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/connect_uart.h diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/fsl_clock.h b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/fsl_clock.h similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/fsl_clock.h rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/fsl_clock.h diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/fsl_common.h b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/fsl_common.h similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/fsl_common.h rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/fsl_common.h diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/fsl_intmux.h b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/fsl_intmux.h similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/fsl_intmux.h rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/fsl_intmux.h diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/fsl_lpuart.h b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/fsl_lpuart.h similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/fsl_lpuart.h rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/fsl_lpuart.h diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/fsl_msmc.h b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/fsl_msmc.h similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/fsl_msmc.h rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/fsl_msmc.h diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/fsl_port.h b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/fsl_port.h similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/fsl_port.h rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/fsl_port.h diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/pin_mux.h b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/pin_mux.h similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/include/pin_mux.h rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/include/pin_mux.h diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/sys_clock/Kconfig b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/sys_clock/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/sys_clock/Kconfig rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/sys_clock/Kconfig diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/sys_clock/Makefile b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/sys_clock/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/sys_clock/Makefile rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/sys_clock/Makefile diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/sys_clock/clock_config.c b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/sys_clock/clock_config.c similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/sys_clock/clock_config.c rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/sys_clock/clock_config.c diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/uart/Kconfig b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/uart/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/uart/Kconfig rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/uart/Kconfig diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/uart/Makefile b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/uart/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/uart/Makefile rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/uart/Makefile diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/uart/connect_uart.c b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/uart/connect_uart.c similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/uart/connect_uart.c rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/uart/connect_uart.c diff --git a/Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/uart/fsl_lpuart.c b/Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/uart/fsl_lpuart.c similarity index 100% rename from Ubiquitous/XiZi/board/rv32m1_vega/third_party_driver/uart/fsl_lpuart.c rename to Ubiquitous/XiZi/board/rv32m1-vega/third_party_driver/uart/fsl_lpuart.c diff --git a/Ubiquitous/XiZi/board/stm32f103-nano/README.md b/Ubiquitous/XiZi/board/stm32f103-nano/README.md index e2c87ed24..6a014fec7 100644 --- a/Ubiquitous/XiZi/board/stm32f103-nano/README.md +++ b/Ubiquitous/XiZi/board/stm32f103-nano/README.md @@ -191,7 +191,7 @@ make BOARD=stm32f103-nano menuconfig make BOARD=stm32f103-nano ``` -5.如果编译正确无误，会产生XiZi_stm32f103-nano.elf、XiZi_stm32f103-nano.bin文件。其中XiZi_stm32f103-nano.bin需要烧写到设备中进行运行。 +5.如果编译正确无误，会产生XiZi-stm32f103-nano.elf、XiZi-stm32f103-nano.bin文件。其中XiZi-stm32f103-nano.bin需要烧写到设备中进行运行。 ## 3. 烧写及执行 @@ -219,7 +219,7 @@ cd build/Release && make install DESTDIR=_install 代码根目录下执行st-flash工具烧录 ``` -sudo st-flash write build/XiZi_stm32f103-nano.bin 0x8000000 +sudo st-flash write build/XiZi-stm32f103-nano.bin 0x8000000 ``` ### 3.1 运行结果 diff --git a/Ubiquitous/XiZi/board/stm32f103-nano/config.mk b/Ubiquitous/XiZi/board/stm32f103-nano/config.mk index fcfe24708..3b4e2df0a 100644 --- a/Ubiquitous/XiZi/board/stm32f103-nano/config.mk +++ b/Ubiquitous/XiZi/board/stm32f103-nano/config.mk @@ -2,10 +2,10 @@ export CROSS_COMPILE ?=/usr/bin/arm-none-eabi- export CFLAGS := -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -fgnu89-inline -Wa,-mimplicit-it=thumb export AFLAGS := -c -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -x assembler-with-cpp -Wa,-mimplicit-it=thumb -gdwarf-2 -export LFLAGS := -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_stm32f103-nano.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds +export LFLAGS := -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-stm32f103-nano.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds export CXXFLAGS := -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -export APPLFLAGS := -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export DEFINES := -DHAVE_CCONFIG_H diff --git a/Ubiquitous/XiZi/board/stm32f407-st-discovery/README.md b/Ubiquitous/XiZi/board/stm32f407-st-discovery/README.md index dca064796..8cb542314 100644 --- a/Ubiquitous/XiZi/board/stm32f407-st-discovery/README.md +++ b/Ubiquitous/XiZi/board/stm32f407-st-discovery/README.md @@ -159,7 +159,7 @@ make BOARD=stm32f407-st-discovery menuconfig make BOARD=stm32f407-st-discovery ``` -4.如果编译正确无误，会产生XiZi_stm32f407-st-discovery.elf、XiZi_stm32f407-st-discovery.bin文件。其中XiZi_stm32f407-st-discovery.bin需要烧写到设备中进行运行。 +4.如果编译正确无误，会产生XiZi-stm32f407-st-discovery.elf、XiZi-stm32f407-st-discovery.bin文件。其中XiZi-stm32f407-st-discovery.bin需要烧写到设备中进行运行。 ## 3. 烧写及执行 @@ -189,7 +189,7 @@ cd build/Release && make install DESTDIR=_install 代码根目录下执行st-flash工具烧录 ``` -sudo st-flash write build/XiZi_stm32f407-st-discovery.bin 0x8000000 +sudo st-flash write build/XiZi-stm32f407-st-discovery.bin 0x8000000 ``` 此外，推荐用户使用putty作为终端工具，安装命令如下： diff --git a/Ubiquitous/XiZi/board/stm32f407-st-discovery/config.mk b/Ubiquitous/XiZi/board/stm32f407-st-discovery/config.mk index fc9af777a..a442aa7ac 100644 --- a/Ubiquitous/XiZi/board/stm32f407-st-discovery/config.mk +++ b/Ubiquitous/XiZi/board/stm32f407-st-discovery/config.mk @@ -2,10 +2,10 @@ export CROSS_COMPILE ?=/usr/bin/arm-none-eabi- export CFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -fgnu89-inline -Wa,-mimplicit-it=thumb -Werror export AFLAGS := -c -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -x assembler-with-cpp -Wa,-mimplicit-it=thumb -gdwarf-2 -export LFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_stm32f407-st-discovery.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds +export LFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-stm32f407-st-discovery.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds export CXXFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -Werror -export APPLFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export DEFINES := -DHAVE_CCONFIG_H -DSTM32F407xx -DUSE_HAL_DRIVER -DHAVE_SIGINFO diff --git a/Ubiquitous/XiZi/board/stm32f407zgt6/README.md b/Ubiquitous/XiZi/board/stm32f407zgt6/README.md index 7a519b8e9..ec34442f5 100644 --- a/Ubiquitous/XiZi/board/stm32f407zgt6/README.md +++ b/Ubiquitous/XiZi/board/stm32f407zgt6/README.md @@ -41,9 +41,9 @@ make BOARD=stm32f407zgt6 menuconfig ``` make BOARD=stm32f407zgt6 ``` ->5.如果编译正确无误，会产生XiZi_stm32f407zgt6.elf、XiZi_stm32f407zgt6.bin文件。其中XiZi_stm32f407zgt6.bin需要烧写到设备中进行运行。 +>5.如果编译正确无误，会产生XiZi-stm32f407zgt6.elf、XiZi-stm32f407zgt6.bin文件。其中XiZi-stm32f407zgt6.bin需要烧写到设备中进行运行。 ``` -sudo write build/XiZi_stm32f407zgt6.bin 0x8000000 +sudo write build/XiZi-stm32f407zgt6.bin 0x8000000 ``` >6.最后可以执行以下命令，清除配置文件和编译生成的文件 ``` @@ -71,7 +71,7 @@ git clone https://github.com/texane/stlink.git 在代码根目录下执行st-flash工具烧录 ``` -sudo st-flash write build/XiZi_stm32f407zgt6.bin 0x8000000 +sudo st-flash write build/XiZi-stm32f407zgt6.bin 0x8000000 ``` ### 3.1 运行结果 diff --git a/Ubiquitous/XiZi/board/stm32f407zgt6/config.mk b/Ubiquitous/XiZi/board/stm32f407zgt6/config.mk index ceb9874ac..763de6a63 100644 --- a/Ubiquitous/XiZi/board/stm32f407zgt6/config.mk +++ b/Ubiquitous/XiZi/board/stm32f407zgt6/config.mk @@ -5,7 +5,7 @@ export AFLAGS := -c -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard - export LFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds export CXXFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -Werror -export APPLFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export DEFINES := -DHAVE_CCONFIG_H -DSTM32F407xx -DUSE_HAL_DRIVER -DHAVE_SIGINFO diff --git a/Ubiquitous/XiZi/board/xidatong-arm32/README.md b/Ubiquitous/XiZi/board/xidatong-arm32/README.md index c5aaa5171..72630f452 100644 --- a/Ubiquitous/XiZi/board/xidatong-arm32/README.md +++ b/Ubiquitous/XiZi/board/xidatong-arm32/README.md @@ -151,20 +151,20 @@ make BOARD=xidatong-arm32 menuconfig make BOARD=xidatong-arm32 ``` -4.如果编译正确无误，会产生XiZi_xidatong.elf、XiZi_xidatong.bin文件。 +4.如果编译正确无误，会产生XiZi-xidatong-arm32.elf、XiZi-xidatong-arm32.bin文件。 ## 3. 烧写及运行 ### 3.1 烧写 1、烧写工具：NXP MCU Boot Utility，可参考[https://github.com/JayHeng/NXP-MCUBootUtility](https://github.com/JayHeng/NXP-MCUBootUtility) -2、xidatong开发板支持UART串口烧写程序，打开NXP MCU Boot Utility后，选择好芯片类型为i.MXRT105x，开发板上电，使用串口转USB线将开发板和PC连接，拨码开关设置为1 on 2 on 3 off 4 off，重新上电，选择对应的COM口和波特率（需关闭串口终端连接，确保该COM口空闲，否则会导致Utility工具连接失败），连接成功后，点击reconnect，等待NXP MCU Boot Utility中红色显示变成蓝色显示，则表示已正确识别并连接到了开发板。如下图所示： +2、xidatong-arm32开发板支持UART串口烧写程序，打开NXP MCU Boot Utility后，选择好芯片类型为i.MXRT105x，开发板上电，使用串口转USB线将开发板和PC连接，拨码开关设置为1 on 2 on 3 off 4 off，重新上电，选择对应的COM口和波特率（需关闭串口终端连接，确保该COM口空闲，否则会导致Utility工具连接失败），连接成功后，点击reconnect，等待NXP MCU Boot Utility中红色显示变成蓝色显示，则表示已正确识别并连接到了开发板。如下图所示： ![NXPBootUtility_1](./img/NXPBootUtility_1.png) -3、同时需要匹配xidatong开发板所使用的Flash型号，点击Boot Device Configuration，在Use Typical Device中选择Winbond_W25QxxxJV，然后点击ok。如下图所示： +3、同时需要匹配xidatong-arm32开发板所使用的Flash型号，点击Boot Device Configuration，在Use Typical Device中选择Winbond_W25QxxxJV，然后点击ok。如下图所示： ![flashconfig](./img/flashconfig.png) -4、选择编译生成的XiZi_xidatong.elf或bin文件路径，按照图示步骤，将文件烧写至Flash中（link.lds中已构造Flash Bootable image，如有修改Flash相关配置需求，可修改/xip目录内相关文件，无需NXPBootUtility再次构造），若烧写无误，则下列绿色进度条会执行到底。如下图所示： +4、选择编译生成的XiZi-xidatong-arm32.elf或bin文件路径，按照图示步骤，将文件烧写至Flash中（link.lds中已构造Flash Bootable image，如有修改Flash相关配置需求，可修改/xip目录内相关文件，无需NXPBootUtility再次构造），若烧写无误，则下列绿色进度条会执行到底。如下图所示： ![NXPBootUtility_2](./img/NXPBootUtility_2.png) ### 3.2 运行结果 diff --git a/Ubiquitous/XiZi/board/xidatong-arm32/config.mk b/Ubiquitous/XiZi/board/xidatong-arm32/config.mk index 53f596df6..1e068925e 100644 --- a/Ubiquitous/XiZi/board/xidatong-arm32/config.mk +++ b/Ubiquitous/XiZi/board/xidatong-arm32/config.mk @@ -6,14 +6,14 @@ export AFLAGS := -c -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections ### if use USB function, use special lds file because USB uses ITCM ifeq ($(CONFIG_BSP_USING_USB),y) -export LFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_xidatong.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link-usb.lds +export LFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-xidatong-arm32.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link-usb.lds else -export LFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_xidatong.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds +export LFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-xidatong-arm32.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds endif export CXXFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -export APPLFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export DEFINES := -DHAVE_CCONFIG_H -DCPU_MIMXRT1052CVL5B -DSKIP_SYSCLK_INIT -DEVK_MCIMXRM -DFSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1 -DXIP_EXTERNAL_FLASH=1 -D__STARTUP_INITIALIZE_NONCACHEDATA -D__STARTUP_CLEAR_BSS diff --git a/Ubiquitous/XiZi/link.mk b/Ubiquitous/XiZi/link.mk index ddaf43eea..19d534dea 100644 --- a/Ubiquitous/XiZi/link.mk +++ b/Ubiquitous/XiZi/link.mk @@ -5,6 +5,6 @@ $(TARGET): $(OBJS) @echo link $(TARGET) @$(CROSS_COMPILE)g++ -o $@ $($(LINK_FLAGS)) $(OBJS) -lc -lm @echo ------------------------------------------------ - @$(CROSS_COMPILE)objcopy -O binary $@ XiZi_$(BOARD)$(COMPILE_TYPE).bin + @$(CROSS_COMPILE)objcopy -O binary $@ XiZi-$(BOARD)$(COMPILE_TYPE).bin @$(CROSS_COMPILE)size $@ diff --git a/Ubiquitous/XiZi/mergebin.py b/Ubiquitous/XiZi/mergebin.py index 2b2f9c535..451e1ac1e 100644 --- a/Ubiquitous/XiZi/mergebin.py +++ b/Ubiquitous/XiZi/mergebin.py @@ -17,11 +17,11 @@ def mergeBinProccess( files, fileSaveName): f.write(bin) if __name__ == '__main__': - file1 = r'./build/XiZi_kd233_kernel.bin' + file1 = r'./build/XiZi-kd233_kernel.bin' file1_start_addr = 0 - file2 = r'./build/XiZi_kd233_app.bin' + file2 = r'./build/XiZi-kd233_app.bin' file2_start_addr = 1024 * 1024 + 4096 - newfile = r'./build/XiZi_kd233.bin' + newfile = r'./build/XiZi-kd233.bin' file = [ [file1 , file1_start_addr] , [file2 , file2_start_addr] ] mergeBinProccess(file, newfile) \ No newline at end of file diff --git a/Ubiquitous/XiZi/path_app.mk b/Ubiquitous/XiZi/path_app.mk index e38c34c6e..3c69c9794 100644 --- a/Ubiquitous/XiZi/path_app.mk +++ b/Ubiquitous/XiZi/path_app.mk @@ -39,6 +39,6 @@ COMPILE_APP: $(MAKE) -C $$dir; \ done @cp link.mk build/Makefile - @$(MAKE) -C build COMPILE_TYPE="_app" TARGET=XiZi_$(BOARD)_app.elf LINK_FLAGS=APPLFLAGS + @$(MAKE) -C build COMPILE_TYPE="_app" TARGET=XiZi-$(BOARD)_app.elf LINK_FLAGS=APPLFLAGS @rm build/Makefile build/make.obj diff --git a/Ubiquitous/XiZi/path_kernel.mk b/Ubiquitous/XiZi/path_kernel.mk index 378f0252f..fac90f611 100755 --- a/Ubiquitous/XiZi/path_kernel.mk +++ b/Ubiquitous/XiZi/path_kernel.mk @@ -118,9 +118,9 @@ KERNELPATHS :=-I$(BSP_ROOT) \ -I$(KERNEL_ROOT)/include # endif -ifeq ($(BSP_ROOT),$(KERNEL_ROOT)/board/rv32m1_vega) +ifeq ($(BSP_ROOT),$(KERNEL_ROOT)/board/rv32m1-vega) KERNELPATHS :=-I$(BSP_ROOT) \ - -I$(KERNEL_ROOT)/arch/risc-v/rv32m1_vega \ + -I$(KERNEL_ROOT)/arch/risc-v/rv32m1-vega \ -I$(BSP_ROOT)/include \ -I$(BSP_ROOT)/third_party_driver \ -I$(BSP_ROOT)/third_party_driver/include \ @@ -393,6 +393,6 @@ COMPILE_KERNEL: $(MAKE) -C $$dir; \ done @cp link.mk build/Makefile - @$(MAKE) -C build COMPILE_TYPE="_kernel" TARGET=XiZi_$(BOARD)_kernel.elf LINK_FLAGS=LFLAGS + @$(MAKE) -C build COMPILE_TYPE="_kernel" TARGET=XiZi-$(BOARD)_kernel.elf LINK_FLAGS=LFLAGS @rm build/Makefile build/make.obj From bc7913a713b360efd37ea1fe19e4e15225987cab Mon Sep 17 00:00:00 2001 From: Wang_Weigen Date: Wed, 22 Jun 2022 16:59:13 +0800 Subject: [PATCH 5/6] remove compile warning --- APP_Framework/Framework/connection/nbiot/bc28/Kconfig | 2 +- APP_Framework/lib/embedded_database/flashdb/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/APP_Framework/Framework/connection/nbiot/bc28/Kconfig b/APP_Framework/Framework/connection/nbiot/bc28/Kconfig index dcb7e3d5c..6897a6ae2 100644 --- a/APP_Framework/Framework/connection/nbiot/bc28/Kconfig +++ b/APP_Framework/Framework/connection/nbiot/bc28/Kconfig @@ -43,6 +43,6 @@ if ADD_RTTHREAD_FETURES string "BC28 device pin driver path" default "/dev/pin" config ADAPTER_BC28_RESETPIN - string "BC28 RESET pin number" + int "BC28 RESET pin number" default "100" endif diff --git a/APP_Framework/lib/embedded_database/flashdb/Kconfig b/APP_Framework/lib/embedded_database/flashdb/Kconfig index f8f3ca90c..98487f764 100644 --- a/APP_Framework/lib/embedded_database/flashdb/Kconfig +++ b/APP_Framework/lib/embedded_database/flashdb/Kconfig @@ -3,7 +3,7 @@ menuconfig USING_EMBEDDED_DATABASE_FLASHDB default n if USING_EMBEDDED_DATABASE_FLASHDB - comment " fal io is not supported so far" + comment "fal io is not supported so far" choice prompt "select io mode" default FDB_USING_FILE_POSIX_MODE From 578680f6e57d56192bd2739decc8ef756ab12e8c Mon Sep 17 00:00:00 2001 From: Wang_Weigen Date: Wed, 22 Jun 2022 17:11:04 +0800 Subject: [PATCH 6/6] rename board name 'gd32vf103_rvstar' as 'gd32vf103-rvstar' --- Ubiquitous/XiZi/Makefile | 2 +- Ubiquitous/XiZi/README.md | 2 +- Ubiquitous/XiZi/arch/risc-v/Makefile | 2 +- .../Makefile | 0 .../arch_interrupt.h | 0 .../boot.S | 0 .../interrupt.c | 0 .../intexc_gd32vf103.S | 0 .../tick.c | 0 .../Kconfig | 2 +- .../Makefile | 0 .../README.md | 18 +++++++++--------- .../board.c | 0 .../board.h | 0 .../config.mk | 0 .../gd32vf103v_rvstar.c | 0 .../gd32vf103v_rvstar.h | 0 .../img/GigaDevice.png | Bin .../img/ISP_support_usart.png | Bin .../img/bin_flash.png | Bin .../img/boot_mode.png | Bin .../img/gdb_load.png | Bin .../img/menuconfig.png | Bin .../img/openocd.png | Bin .../img/riscv_gnu.png | Bin .../img/terminal.png | Bin .../img/vscode.jpg | Bin .../link.lds | 0 .../nuclei_sdk_hal.h | 0 .../nuclei_sdk_soc.h | 0 .../third_party_driver/Kconfig | 0 .../third_party_driver/Makefile | 0 .../third_party_driver/gpio/Kconfig | 0 .../third_party_driver/gpio/Makefile | 0 .../third_party_driver/gpio/gd32vf103_gpio.c | 0 .../third_party_driver/include/connect_uart.h | 0 .../include/core_feature_base.h | 0 .../include/core_feature_eclic.h | 0 .../include/core_feature_timer.h | 0 .../third_party_driver/include/gd32vf103.h | 0 .../include/gd32vf103_gpio.h | 0 .../include/gd32vf103_rcu.h | 0 .../include/gd32vf103_timer.h | 0 .../include/gd32vf103_usart.h | 0 .../third_party_driver/include/nmsis_gcc.h | 0 .../third_party_driver/include/riscv_bits.h | 0 .../include/riscv_encoding.h | 0 .../third_party_driver/sys_clock/Kconfig | 0 .../third_party_driver/sys_clock/Makefile | 0 .../sys_clock/gd32vf103_rcu.c | 0 .../sys_clock/gd32vf103_soc.c | 0 .../third_party_driver/system_gd32vf103.c | 0 .../third_party_driver/system_gd32vf103.h | 0 .../third_party_driver/uart/Kconfig | 0 .../third_party_driver/uart/Makefile | 0 .../third_party_driver/uart/connect_uart.c | 0 .../third_party_driver/uart/gd32vf103_usart.c | 0 Ubiquitous/XiZi/kernel/Kconfig | 2 +- Ubiquitous/XiZi/path_kernel.mk | 4 ++-- 59 files changed, 16 insertions(+), 16 deletions(-) rename Ubiquitous/XiZi/arch/risc-v/{gd32vf103_rvstar => gd32vf103-rvstar}/Makefile (100%) rename Ubiquitous/XiZi/arch/risc-v/{gd32vf103_rvstar => gd32vf103-rvstar}/arch_interrupt.h (100%) rename Ubiquitous/XiZi/arch/risc-v/{gd32vf103_rvstar => gd32vf103-rvstar}/boot.S (100%) rename Ubiquitous/XiZi/arch/risc-v/{gd32vf103_rvstar => gd32vf103-rvstar}/interrupt.c (100%) rename Ubiquitous/XiZi/arch/risc-v/{gd32vf103_rvstar => gd32vf103-rvstar}/intexc_gd32vf103.S (100%) rename Ubiquitous/XiZi/arch/risc-v/{gd32vf103_rvstar => gd32vf103-rvstar}/tick.c (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/Kconfig (93%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/Makefile (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/README.md (94%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/board.c (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/board.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/config.mk (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/gd32vf103v_rvstar.c (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/gd32vf103v_rvstar.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/GigaDevice.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/ISP_support_usart.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/bin_flash.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/boot_mode.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/gdb_load.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/menuconfig.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/openocd.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/riscv_gnu.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/terminal.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/vscode.jpg (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/link.lds (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/nuclei_sdk_hal.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/nuclei_sdk_soc.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/Kconfig (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/Makefile (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/gpio/Kconfig (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/gpio/Makefile (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/gpio/gd32vf103_gpio.c (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/connect_uart.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/core_feature_base.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/core_feature_eclic.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/core_feature_timer.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/gd32vf103.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/gd32vf103_gpio.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/gd32vf103_rcu.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/gd32vf103_timer.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/gd32vf103_usart.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/nmsis_gcc.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/riscv_bits.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/riscv_encoding.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/sys_clock/Kconfig (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/sys_clock/Makefile (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/sys_clock/gd32vf103_rcu.c (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/sys_clock/gd32vf103_soc.c (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/system_gd32vf103.c (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/system_gd32vf103.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/uart/Kconfig (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/uart/Makefile (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/uart/connect_uart.c (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/uart/gd32vf103_usart.c (100%) diff --git a/Ubiquitous/XiZi/Makefile b/Ubiquitous/XiZi/Makefile index ada5ef36a..93f046a2c 100755 --- a/Ubiquitous/XiZi/Makefile +++ b/Ubiquitous/XiZi/Makefile @@ -5,7 +5,7 @@ MAKEFLAGS += --no-print-directory .PHONY:COMPILE_APP COMPILE_KERNEL -support :=kd233 stm32f407-st-discovery maix-go stm32f407zgt6 aiit-riscv64-board aiit-arm32-board hifive1-rev-B hifive1-emulator k210-emulator cortex-m3-emulator cortex-m4-emulator ok1052-c gapuino stm32f103-nano gd32vf103_rvstar cortex-m0-emulator rv32m1-vega nuvoton-m2354 +support :=kd233 stm32f407-st-discovery maix-go stm32f407zgt6 aiit-riscv64-board aiit-arm32-board hifive1-rev-B hifive1-emulator k210-emulator cortex-m3-emulator cortex-m4-emulator ok1052-c gapuino stm32f103-nano gd32vf103-rvstar cortex-m0-emulator rv32m1-vega nuvoton-m2354 support += xidatong-arm32 SRC_DIR := diff --git a/Ubiquitous/XiZi/README.md b/Ubiquitous/XiZi/README.md index 745303e72..12cb57a16 100644 --- a/Ubiquitous/XiZi/README.md +++ b/Ubiquitous/XiZi/README.md @@ -29,7 +29,7 @@ ARM架构系列的开发板有 RISC-V架构系列的开发板有 - aiit-riscv64-board gapuino gd32vf103_rvstar hifive1-rev-B kd233 maix-go rv32m1-vega + aiit-riscv64-board gapuino gd32vf103-rvstar hifive1-rev-B kd233 maix-go rv32m1-vega ## 开发环境 diff --git a/Ubiquitous/XiZi/arch/risc-v/Makefile b/Ubiquitous/XiZi/arch/risc-v/Makefile index 1b818a6b3..4b8d48fd7 100755 --- a/Ubiquitous/XiZi/arch/risc-v/Makefile +++ b/Ubiquitous/XiZi/arch/risc-v/Makefile @@ -21,7 +21,7 @@ SRC_DIR +=gap8 endif ifeq ($(CONFIG_BOARD_GD32VF103RVSTAR),y) -SRC_DIR +=gd32vf103_rvstar +SRC_DIR +=gd32vf103-rvstar endif ifeq ($(CONFIG_BOARD_RV32M1_VEGA),y) diff --git a/Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/Makefile b/Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/Makefile similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/Makefile rename to Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/Makefile diff --git a/Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/arch_interrupt.h b/Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/arch_interrupt.h similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/arch_interrupt.h rename to Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/arch_interrupt.h diff --git a/Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/boot.S b/Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/boot.S similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/boot.S rename to Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/boot.S diff --git a/Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/interrupt.c b/Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/interrupt.c similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/interrupt.c rename to Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/interrupt.c diff --git a/Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/intexc_gd32vf103.S b/Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/intexc_gd32vf103.S similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/intexc_gd32vf103.S rename to Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/intexc_gd32vf103.S diff --git a/Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/tick.c b/Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/tick.c similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/tick.c rename to Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/tick.c diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/Kconfig b/Ubiquitous/XiZi/board/gd32vf103-rvstar/Kconfig similarity index 93% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/Kconfig rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/Kconfig index ee5e727dd..f893d3ae1 100755 --- a/Ubiquitous/XiZi/board/gd32vf103_rvstar/Kconfig +++ b/Ubiquitous/XiZi/board/gd32vf103-rvstar/Kconfig @@ -17,7 +17,7 @@ config BOARD_GD32VF103RVSTAR source "$KERNEL_DIR/arch/Kconfig" -menu "gd32vf103_rvstar feature" +menu "gd32vf103-rvstar feature" source "$BSP_DIR/third_party_driver/Kconfig" endmenu diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/Makefile b/Ubiquitous/XiZi/board/gd32vf103-rvstar/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/Makefile rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/Makefile diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/README.md b/Ubiquitous/XiZi/board/gd32vf103-rvstar/README.md similarity index 94% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/README.md rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/README.md index be1f87f3c..86340a591 100755 --- a/Ubiquitous/XiZi/board/gd32vf103_rvstar/README.md +++ b/Ubiquitous/XiZi/board/gd32vf103-rvstar/README.md @@ -1,4 +1,4 @@ -# 从零开始构建矽璓工业物联操作系统：使用risc-v架构的gd32vf103_rvstar 开发板 +# 从零开始构建矽璓工业物联操作系统：使用risc-v架构的gd32vf103-rvstar 开发板 [XiUOS](http://xuos.io/) (X Industrial Ubiquitous Operating System) 矽璓工业物联操作系统是一款面向工业物联场景的泛在操作系统，来自泛在操作系统研究计划。所谓泛在操作系统(UOS: Ubiquitous Operating Systems)，是支持互联网时代人机物融合泛在计算应用模式的新型操作系统，是传统操作系统概念的泛化与延伸。在泛在操作系统技术体系中，不同的泛在计算设备和泛在应用场景需要符合各自特性的不同UOS，XiUOS即是面向工业物联场景的一种UOS，主要由一个极简的微型实时操作系统(RTOS)内核和其上的智能工业物联框架构成，支持工业物联网(IIoT: Industrial Internet of Things)应用。 @@ -83,9 +83,9 @@ export CROSS_COMPILE ?=/opt/Nuclei/gcc/bin/riscv-nuclei-elf- 若已存在`export CROSS_COMPILE ?=xxxx` 应该将原有的语句注释，再写入上面的语句。 -# 在gd32vf103_rvstar board 上创建第一个应用 +# 在gd32vf103-rvstar board 上创建第一个应用 -## 1.gd32vf103_rvstar board 简介 +## 1.gd32vf103-rvstar board 简介 | 硬件 | 描述 | | -- | -- | @@ -116,8 +116,8 @@ XiUOS板级当前支持使用UART。 ``` cd ./Ubiquitous/XiZi -make BOARD=gd32vf103_rvstar distclean -make BOARD=gd32vf103_rvstar menuconfig +make BOARD=gd32vf103-rvstar distclean +make BOARD=gd32vf103-rvstar menuconfig ``` 2.在menuconfig界面配置需要关闭和开启的功能，按回车键进入下级菜单，按Y键选中需要开启的功能，按N键选中需要关闭的功能，配置结束后选择Exit保存并退出 @@ -127,15 +127,15 @@ make BOARD=gd32vf103_rvstar menuconfig 3.继续执行以下命令，进行编译 ``` -make BOARD=gd32vf103_rvstar +make BOARD=gd32vf103-rvstar ``` -4.如果编译正确无误，build文件夹下会产生XiZi-gd32vf103_rvstar.elf、XiZi-gd32vf103_rvstar.bin文件。 +4.如果编译正确无误，build文件夹下会产生XiZi-gd32vf103-rvstar.elf、XiZi-gd32vf103-rvstar.bin文件。 >注：最后可以执行以下命令，清除配置文件和编译生成的文件 ``` -make BOARD=gd32vf103_rvstar distclean +make BOARD=gd32vf103-rvstar distclean ``` ## 3. 烧写及调试执行 @@ -177,7 +177,7 @@ screen /dev/ttyUSB0 115200 5、打开一个新的终端，进入编译生成的elf路径,输入例如： ``` -riscv-nuclei-elf-gdb build/XiZi-gd32vf103_rvstar.elf -ex "target remote localhost:3333" +riscv-nuclei-elf-gdb build/XiZi-gd32vf103-rvstar.elf -ex "target remote localhost:3333" ``` 结果如下图所示： ![gdb](./img/gdb_load.png) diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/board.c b/Ubiquitous/XiZi/board/gd32vf103-rvstar/board.c similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/board.c rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/board.c diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/board.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/board.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/board.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/board.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/config.mk b/Ubiquitous/XiZi/board/gd32vf103-rvstar/config.mk similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/config.mk rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/config.mk diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/gd32vf103v_rvstar.c b/Ubiquitous/XiZi/board/gd32vf103-rvstar/gd32vf103v_rvstar.c similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/gd32vf103v_rvstar.c rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/gd32vf103v_rvstar.c diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/gd32vf103v_rvstar.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/gd32vf103v_rvstar.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/gd32vf103v_rvstar.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/gd32vf103v_rvstar.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/GigaDevice.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/GigaDevice.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/GigaDevice.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/GigaDevice.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/ISP_support_usart.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/ISP_support_usart.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/ISP_support_usart.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/ISP_support_usart.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/bin_flash.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/bin_flash.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/bin_flash.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/bin_flash.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/boot_mode.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/boot_mode.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/boot_mode.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/boot_mode.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/gdb_load.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/gdb_load.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/gdb_load.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/gdb_load.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/menuconfig.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/menuconfig.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/menuconfig.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/menuconfig.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/openocd.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/openocd.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/openocd.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/openocd.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/riscv_gnu.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/riscv_gnu.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/riscv_gnu.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/riscv_gnu.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/terminal.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/terminal.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/terminal.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/terminal.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/vscode.jpg b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/vscode.jpg similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/vscode.jpg rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/vscode.jpg diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/link.lds b/Ubiquitous/XiZi/board/gd32vf103-rvstar/link.lds similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/link.lds rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/link.lds diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/nuclei_sdk_hal.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/nuclei_sdk_hal.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/nuclei_sdk_hal.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/nuclei_sdk_hal.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/nuclei_sdk_soc.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/nuclei_sdk_soc.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/nuclei_sdk_soc.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/nuclei_sdk_soc.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/Kconfig b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/Kconfig rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/Kconfig diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/Makefile b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/Makefile rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/Makefile diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/gpio/Kconfig b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/gpio/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/gpio/Kconfig rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/gpio/Kconfig diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/gpio/Makefile b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/gpio/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/gpio/Makefile rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/gpio/Makefile diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/gpio/gd32vf103_gpio.c b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/gpio/gd32vf103_gpio.c similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/gpio/gd32vf103_gpio.c rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/gpio/gd32vf103_gpio.c diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/connect_uart.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/connect_uart.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/connect_uart.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/connect_uart.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/core_feature_base.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/core_feature_base.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/core_feature_base.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/core_feature_base.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/core_feature_eclic.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/core_feature_eclic.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/core_feature_eclic.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/core_feature_eclic.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/core_feature_timer.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/core_feature_timer.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/core_feature_timer.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/core_feature_timer.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103_gpio.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103_gpio.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103_gpio.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103_gpio.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103_rcu.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103_rcu.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103_rcu.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103_rcu.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103_timer.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103_timer.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103_timer.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103_timer.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103_usart.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103_usart.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103_usart.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103_usart.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/nmsis_gcc.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/nmsis_gcc.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/nmsis_gcc.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/nmsis_gcc.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/riscv_bits.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/riscv_bits.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/riscv_bits.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/riscv_bits.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/riscv_encoding.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/riscv_encoding.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/riscv_encoding.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/riscv_encoding.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/sys_clock/Kconfig b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/sys_clock/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/sys_clock/Kconfig rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/sys_clock/Kconfig diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/sys_clock/Makefile b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/sys_clock/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/sys_clock/Makefile rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/sys_clock/Makefile diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/sys_clock/gd32vf103_rcu.c b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/sys_clock/gd32vf103_rcu.c similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/sys_clock/gd32vf103_rcu.c rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/sys_clock/gd32vf103_rcu.c diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/sys_clock/gd32vf103_soc.c b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/sys_clock/gd32vf103_soc.c similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/sys_clock/gd32vf103_soc.c rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/sys_clock/gd32vf103_soc.c diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/system_gd32vf103.c b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/system_gd32vf103.c similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/system_gd32vf103.c rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/system_gd32vf103.c diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/system_gd32vf103.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/system_gd32vf103.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/system_gd32vf103.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/system_gd32vf103.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/uart/Kconfig b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/uart/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/uart/Kconfig rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/uart/Kconfig diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/uart/Makefile b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/uart/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/uart/Makefile rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/uart/Makefile diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/uart/connect_uart.c b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/uart/connect_uart.c similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/uart/connect_uart.c rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/uart/connect_uart.c diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/uart/gd32vf103_usart.c b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/uart/gd32vf103_usart.c similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/uart/gd32vf103_usart.c rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/uart/gd32vf103_usart.c diff --git a/Ubiquitous/XiZi/kernel/Kconfig b/Ubiquitous/XiZi/kernel/Kconfig index 48ac755e0..9d8756ef8 100644 --- a/Ubiquitous/XiZi/kernel/Kconfig +++ b/Ubiquitous/XiZi/kernel/Kconfig @@ -97,7 +97,6 @@ menu "Kernel feature" config KERNEL_SOFTTIMER bool "Enable softtimer " - select KERNEL_WORKQUEUE default y endmenu @@ -210,6 +209,7 @@ menu "Kernel feature" config KERNEL_WORKQUEUE bool "Config kernel work queue" default y + select KERNEL_SOFTTIMER if KERNEL_WORKQUEUE config WORKQUEUE_KTASK_STACKSIZE diff --git a/Ubiquitous/XiZi/path_kernel.mk b/Ubiquitous/XiZi/path_kernel.mk index fac90f611..f980f0406 100755 --- a/Ubiquitous/XiZi/path_kernel.mk +++ b/Ubiquitous/XiZi/path_kernel.mk @@ -109,9 +109,9 @@ KERNELPATHS :=-I$(BSP_ROOT) \ -I$(KERNEL_ROOT)/include # endif -ifeq ($(BSP_ROOT),$(KERNEL_ROOT)/board/gd32vf103_rvstar) +ifeq ($(BSP_ROOT),$(KERNEL_ROOT)/board/gd32vf103-rvstar) KERNELPATHS :=-I$(BSP_ROOT) \ - -I$(KERNEL_ROOT)/arch/risc-v/gd32vf103_rvstar \ + -I$(KERNEL_ROOT)/arch/risc-v/gd32vf103-rvstar \ -I$(BSP_ROOT)/include \ -I$(BSP_ROOT)/third_party_driver \ -I$(BSP_ROOT)/third_party_driver/include \