Browse Source

More stm32f4 build fixes.

master
Solomon Peachy 7 years ago
parent
commit
a1ca8cf0df
  1. 5
      .gitignore
  2. 8
      Makefile.opts.sample
  3. 12
      libs/stm32f4xx.mk

5
.gitignore vendored

@ -21,3 +21,8 @@ inc/version.h
TAGS
tags
.toolchain-*
# Other stuff
Makefile.opts

8
Makefile.opts.sample

@ -7,8 +7,12 @@
#MCU=stm32f2xx
MCU=stm32f4xx
MCU_SUBTYPE=stm32f40xx
#MCU_SUBTYPE=stm32f427x
#MCU_SUBTYPE=stm32f401xx
#MCU_SUBTYPE=stm32f40_41xxx
#MCU_SUBTYPE=stm32f411xe
#MCU_SUBTYPE=stm32f427_437xx
#MCU_SUBTYPE=stm32f429_439xx
MCU_SUBTYPE=stm32f446xx
#MCU=stm32f10x
#MCU_SUBTYPE=stm32f10x_cl

12
libs/stm32f4xx.mk

@ -6,7 +6,7 @@ MCU_INCLUDE += -I$(LIBDIR)/STM32F4xx_StdPeriph_Driver/inc
# Set up CFLAGS
MATH_CPPFLAGS += -D__FPU_PRESENT=1
MCU_CPPFLAGS += -D$(shell echo -n $(MCU_SUBTYPE) | tr a-z A-Z )
MCU_CPPFLAGS += -D$(shell echo -n $(MCU_SUBTYPE) | tr a-z A-Z | tr X x )
MCU_CPPFLAGS += -D"assert_param(expr)=((void)0)"
MCU_CFLAGS += -mcpu=cortex-m4 -mthumb -Wa,-mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard
@ -16,7 +16,7 @@ STARTUP_OBJS = $(LIBDIR)/CMSIS/Device/ST/STM32F4xx/Source/Templates/system_stm32
# Standard Peripheral Library
STM32F4xx_OBJSR = misc.o stm32f4xx_dma.o stm32f4xx_rcc.o stm32f4xx_adc.o \
stm32f4xx_exti.o stm32f4xx_rng.o stm32f4xx_can.o stm32f4xx_flash.o \
stm32f4xx_rtc.o stm32f4xx_crc.o stm32f4xx_fsmc.o stm32f4xx_sdio.o \
stm32f4xx_rtc.o stm32f4xx_crc.o stm32f4xx_sdio.o \
stm32f4xx_cryp_aes.o stm32f4xx_gpio.o stm32f4xx_spi.o \
stm32f4xx_cryp.o stm32f4xx_hash.o stm32f4xx_syscfg.o \
stm32f4xx_cryp_des.o stm32f4xx_hash_md5.o stm32f4xx_tim.o \
@ -27,7 +27,13 @@ STM32F4xx_OBJSR = misc.o stm32f4xx_dma.o stm32f4xx_rcc.o stm32f4xx_adc.o \
stm32f4xx_cec.o stm32f4xx_fmpi2c.o stm32f4xx_qspi.o \
stm32f4xx_spdifrx.o stm32f4xx_flash_ramfunc.o
ifeq ($(MCU_SUBTYPE),stm32f427x)
ifeq ($(MCU_SUBTYPE),stm32f40_41xx)
STM32F4xx_OBJSR += stm32f4xx_fsmc.o
endif
ifeq ($(MCU_SUBTYPE),stm32f427_437xx)
STM32F4xx_OBJSR += stm32f4xx_fmc.o
endif
ifeq ($(MCU_SUBTYPE),stm32f429_439xx)
STM32F4xx_OBJSR += stm32f4xx_fmc.o # 427x/437x/429x/439x
endif

Loading…
Cancel
Save