fix: wrong types in comments

This commit is contained in:
IOsetting 2022-12-12 01:58:38 +08:00
parent 76f4a683aa
commit 688ba2b4f2
6 changed files with 14 additions and 13 deletions

View File

@ -13,7 +13,7 @@
*/ */
.syntax unified .syntax unified
.cpu cortex-m0 .cpu cortex-m0plus
.fpu softvfp .fpu softvfp
.thumb .thumb

View File

@ -1,7 +1,7 @@
/** /**
****************************************************************************** ******************************************************************************
* @file startup_py32f003x6.s * @file startup_py32f030x6.s
* @brief PY32F003X6 devices vector table for GCC toolchain. * @brief PY32F030X6 devices vector table for GCC toolchain.
* This module performs: * This module performs:
* - Set the initial SP * - Set the initial SP
* - Set the initial PC == Reset_Handler, * - Set the initial PC == Reset_Handler,
@ -13,7 +13,7 @@
*/ */
.syntax unified .syntax unified
.cpu cortex-m0 .cpu cortex-m0plus
.fpu softvfp .fpu softvfp
.thumb .thumb

View File

@ -3,7 +3,7 @@
** **
** File : LinkerScript.ld ** File : LinkerScript.ld
** **
** Abstract : Linker script for PY32F003x6 series ** Abstract : Linker script for PY32F030x6 series
** Set heap size, stack size and stack location according ** Set heap size, stack size and stack location according
** to application requirements. ** to application requirements.
** Set memory bank area and size if external memory is used. ** Set memory bank area and size if external memory is used.

View File

@ -3,7 +3,7 @@
** **
** File : LinkerScript.ld ** File : LinkerScript.ld
** **
** Abstract : Linker script for PY32F003x8 series ** Abstract : Linker script for PY32F030x8 series
** Set heap size, stack size and stack location according ** Set heap size, stack size and stack location according
** to application requirements. ** to application requirements.
** Set memory bank area and size if external memory is used. ** Set memory bank area and size if external memory is used.

View File

@ -18,19 +18,20 @@ ARM_TOOCHAIN ?= /opt/gcc-arm/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi/bi
# path to JLinkExe # path to JLinkExe
JLINKEXE ?= /opt/SEGGER/JLink/JLinkExe JLINKEXE ?= /opt/SEGGER/JLink/JLinkExe
# MCU type: PY32F003X4, PY32F003X6, PY32F003X8 # JLink device type, options: PY32F003X4, PY32F003X6, PY32F003X8, PY32F030X6, PY32F030X7, PY32F030X8
JLINK_DEVICE ?= PY32F003X6 JLINK_DEVICE ?= PY32F003X8
# path to PyOCD # path to PyOCD,
PYOCD_EXE ?= pyocd PYOCD_EXE ?= pyocd
PYOCD_DEVICE ?= py32f003x6 # PyOCD device type, options: py32f003x4, py32f003x6, py32f003x8, py32f030x3, py32f030x4, py32f030x6, py32f030x7, py32f030x8
PYOCD_DEVICE ?= py32f003x8
##### Paths ############ ##### Paths ############
# Link descript file # Link descript file
LDSCRIPT = Libraries/LDScripts/py32f003x6.ld LDSCRIPT = Libraries/LDScripts/py32f003x8.ld
# Library build flags: PY32F030x3, PY32F030x4, PY32F030x6, PY32F030x7, PY32F030x8, PY32F003x4, PY32F003x6, PY32F003x8 # Library build flags: PY32F030x3, PY32F030x4, PY32F030x6, PY32F030x7, PY32F030x8, PY32F003x4, PY32F003x6, PY32F003x8
LIB_FLAGS = PY32F003x6 LIB_FLAGS = PY32F003x8
# C source folders # C source folders
CDIRS := User \ CDIRS := User \

View File

@ -106,7 +106,7 @@ flash:
ifeq ($(FLASH_PROGRM),jlink) ifeq ($(FLASH_PROGRM),jlink)
$(JLINKEXE) -device $(JLINK_DEVICE) -if swd -speed 4000 -CommanderScript $(TOP)/Misc/flash.jlink $(JLINKEXE) -device $(JLINK_DEVICE) -if swd -speed 4000 -CommanderScript $(TOP)/Misc/flash.jlink
else ifeq ($(FLASH_PROGRM),pyocd) else ifeq ($(FLASH_PROGRM),pyocd)
$(PYOCD_EXE) erase -c -t $(PYOCD_DEVICE) --config $(TOP)/Misc/pyocd.yaml $(PYOCD_EXE) erase -t $(PYOCD_DEVICE) --chip --config $(TOP)/Misc/pyocd.yaml
$(PYOCD_EXE) load $(BDIR)/$(PROJECT).hex -t $(PYOCD_DEVICE) --config $(TOP)/Misc/pyocd.yaml $(PYOCD_EXE) load $(BDIR)/$(PROJECT).hex -t $(PYOCD_DEVICE) --config $(TOP)/Misc/pyocd.yaml
else else
@echo "FLASH_PROGRM is invalid\n" @echo "FLASH_PROGRM is invalid\n"