From 493b4dcf9a13b34dc5801e61d4e8add85fd8303d Mon Sep 17 00:00:00 2001 From: jake Date: Wed, 22 Jan 2025 20:53:31 -0800 Subject: [PATCH] removed commented out AVR stuff --- stm32-toolchain.cmake | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/stm32-toolchain.cmake b/stm32-toolchain.cmake index b398091..04e0504 100644 --- a/stm32-toolchain.cmake +++ b/stm32-toolchain.cmake @@ -24,11 +24,9 @@ set(CMAKE_SYSTEM_VERSION 1) #set(MCU STM32F103xx) # set(MCU STM32F441xx) # set(MCU STM32F446xx) -# set(MCU STM32G0B1xx) +set(MCU STM32G0B1CBTx) -#set(MCU_DIR include/STM32F1xx/) -#set(MCU_DIR include/STM32F4xx/) -set(MCU_DIR include/STM32G0xx/) +set(MCU_DIR inc/${MCU}/) #set(MCU_SPEC cortex-m3) #set(MCU_SPEC cortex-m4) @@ -36,8 +34,8 @@ set(MCU_SPEC cortex-m0plus) # Might need to change? # set(FLOAT_SPEC "-mfloat-abi=hard -mfpu=fpv4-sp-d16") # The Startup(ASM) files - string(TOLOWER startup_${MCU}.s STARTUP_FILE_NAME) + set(STARTUP_FILE ${MCU_DIR}/Source/Templates/gcc/${STARTUP_FILE_NAME}) set(SYSTEM_FILE ${MCU_DIR}/Source/Templates/system_stm32f4xx.c) @@ -49,8 +47,8 @@ set(HSE_VAL 8000000) set(LINKER_SCRIPT linker.ld) # Programmer and debugging -set(PROGRAMMER serialupdi) -set(PORT /dev/ttyU0) +#set(PROGRAMMER serialupdi) +#set(PORT /dev/ttyU0) #------------------- # HAL Setup @@ -81,26 +79,6 @@ set(CMSIS_DIR components/CMSIS/CMSIS) # Advanced Section ################################################## -#------------------- -# General Flags -#------------------- - -# The old AVR ones I had written -# Define the toolchain executables -#set(CMAKE_C_COMPILER avr-gcc) -#set(CMAKE_CXX_COMPILER avr-g++) -#set(CMAKE_ASM_COMPILER avr-gcc) -#set(CMAKE_LINKER avr-ld) -#set(CMAKE_OBJCOPY avr-objcopy) -#set(CMAKE_SIZE avr-size) - - -# Define compile options -#set(CMAKE_C_FLAGS " -Os -mmcu=${AVR_MCU} -DF_CPU=${F_CPU}") -#set(CMAKE_CXX_FLAGS "-mmcu=${AVR_MCU} -DF_CPU=${F_CPU}") -#set(CMAKE_EXE_LINKER_FLAGS_INIT "-mmcu=${AVR_MCU}") - - #------------------- # General Flags #-------------------