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