From 75c216582774549aede37db1d5d6b8485acfce17 Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 19 Oct 2012 18:56:39 +0200 Subject: build common .o files everywhere (fixes issue #29) vector.o, nvic.o, scb.o and assert.o are available on every platform, but at least some of them differ between the implementations. they already got built explicityly on some platforms; now adding them to the common Makefile.include. --- lib/stm32/f4/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/stm32/f4/Makefile') diff --git a/lib/stm32/f4/Makefile b/lib/stm32/f4/Makefile index fd0b279..180e537 100644 --- a/lib/stm32/f4/Makefile +++ b/lib/stm32/f4/Makefile @@ -29,10 +29,9 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ -ffunction-sections -fdata-sections -MD -DSTM32F4 # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = vector.o rcc.o gpio.o usart.o spi.o flash.o nvic.o \ - i2c.o systick.o exti.o scb.o pwr.o timer.o \ - usb.o usb_standard.o usb_control.o usb_f107.o \ - assert.o +OBJS = rcc.o gpio.o usart.o spi.o flash.o nvic.o \ + i2c.o exti.o pwr.o timer.o \ + usb.o usb_standard.o usb_control.o usb_f107.o VPATH += ../../usb:../:../../cm3 -- cgit v1.2.3 From f62eee7644f0dc329be0268633a39d0db11cd463 Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 19 Oct 2012 19:29:06 +0200 Subject: remove nvic.o from stm32/f[24]'s explicit list this was missed out in 75c216582, see there for details --- lib/stm32/f2/Makefile | 2 +- lib/stm32/f4/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/stm32/f4/Makefile') diff --git a/lib/stm32/f2/Makefile b/lib/stm32/f2/Makefile index 69521da..5cbb977 100644 --- a/lib/stm32/f2/Makefile +++ b/lib/stm32/f2/Makefile @@ -28,7 +28,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ -ffunction-sections -fdata-sections -MD -DSTM32F2 # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = rcc.o gpio.o usart.o spi.o flash.o nvic.o \ +OBJS = rcc.o gpio.o usart.o spi.o flash.o \ i2c.o exti.o timer.o VPATH += ../../usb:../:../../cm3 diff --git a/lib/stm32/f4/Makefile b/lib/stm32/f4/Makefile index 180e537..e09ef26 100644 --- a/lib/stm32/f4/Makefile +++ b/lib/stm32/f4/Makefile @@ -29,7 +29,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ -ffunction-sections -fdata-sections -MD -DSTM32F4 # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = rcc.o gpio.o usart.o spi.o flash.o nvic.o \ +OBJS = rcc.o gpio.o usart.o spi.o flash.o \ i2c.o exti.o pwr.o timer.o \ usb.o usb_standard.o usb_control.o usb_f107.o -- cgit v1.2.3