jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

build common .o files everywhere (fixes issue #29)

Browse Source 
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.
This commit is contained in:
chrysn 2012-10-19 18:56:39 +02:00
parent 6706899551
commit 75c2165827
7 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Makefile.include
View File

@ -23,6 +23,9 @@ ifneq ($(V),1)
Q := @ Q := @
endif endif
# common objects
OBJS += vector.o systick.o scb.o nvic.o assert.o
all: $(SRCLIBDIR)/$(LIBNAME).a all: $(SRCLIBDIR)/$(LIBNAME).a
$(SRCLIBDIR)/$(LIBNAME).a: $(SRCLIBDIR)/$(LIBNAME).ld $(OBJS) $(SRCLIBDIR)/$(LIBNAME).a: $(SRCLIBDIR)/$(LIBNAME).ld $(OBJS)

2
lib/lpc13xx/Makefile
View File

@ -28,7 +28,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../include -fno-common \
-ffunction-sections -fdata-sections -MD -ffunction-sections -fdata-sections -MD
# ARFLAGS = rcsv # ARFLAGS = rcsv
ARFLAGS = rcs ARFLAGS = rcs
OBJS = gpio.o assert.o vector.o OBJS = gpio.o
VPATH += ../cm3 VPATH += ../cm3

2
lib/lpc17xx/Makefile
View File

@ -28,7 +28,7 @@ CFLAGS = -O0 -g -Wall -Wextra -I../../include -fno-common \
-ffunction-sections -fdata-sections -MD -ffunction-sections -fdata-sections -MD
# ARFLAGS = rcsv # ARFLAGS = rcsv
ARFLAGS = rcs ARFLAGS = rcs
OBJS = gpio.o vector.o assert.o OBJS = gpio.o
VPATH += ../cm3 VPATH += ../cm3

3
lib/lpc43xx/Makefile
View File

@ -31,8 +31,7 @@ CFLAGS = -O2 -g3 -Wall -Wextra -I../../include -fno-common \
-mfloat-abi=hard -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mfpu=fpv4-sp-d16
# ARFLAGS = rcsv # ARFLAGS = rcsv
ARFLAGS = rcs ARFLAGS = rcs
OBJS = gpio.o vector.o scu.o i2c.o ssp.o nvic.o systick.o \ OBJS = gpio.o scu.o i2c.o ssp.o
assert.o
VPATH += ../cm3 VPATH += ../cm3

6
lib/stm32/f1/Makefile
View File

@ -28,10 +28,10 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \
-ffunction-sections -fdata-sections -MD -DSTM32F1 -ffunction-sections -fdata-sections -MD -DSTM32F1
# ARFLAGS = rcsv # ARFLAGS = rcsv
ARFLAGS = rcs ARFLAGS = rcs
OBJS = vector.o rcc.o gpio.o usart.o adc.o spi.o flash.o nvic.o \ OBJS = rcc.o gpio.o usart.o adc.o spi.o flash.o \
rtc.o i2c.o dma.o systick.o exti.o scb.o ethernet.o \ rtc.o i2c.o dma.o exti.o ethernet.o \
usb_f103.o usb.o usb_control.o usb_standard.o can.o \ usb_f103.o usb.o usb_control.o usb_standard.o can.o \
timer.o usb_f107.o desig.o crc.o assert.o dac.o iwdg.o pwr.o timer.o usb_f107.o desig.o crc.o dac.o iwdg.o pwr.o
VPATH += ../../usb:../:../../cm3 VPATH += ../../usb:../:../../cm3

4
lib/stm32/f2/Makefile
View File

@ -28,8 +28,8 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \
-ffunction-sections -fdata-sections -MD -DSTM32F2 -ffunction-sections -fdata-sections -MD -DSTM32F2
# ARFLAGS = rcsv # ARFLAGS = rcsv
ARFLAGS = rcs ARFLAGS = rcs
OBJS = vector.o rcc.o gpio.o usart.o spi.o flash.o nvic.o \ OBJS = rcc.o gpio.o usart.o spi.o flash.o nvic.o \
i2c.o systick.o exti.o scb.o timer.o assert.o i2c.o exti.o timer.o
VPATH += ../../usb:../:../../cm3 VPATH += ../../usb:../:../../cm3

7
lib/stm32/f4/Makefile
View File

@ -29,10 +29,9 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \
-ffunction-sections -fdata-sections -MD -DSTM32F4 -ffunction-sections -fdata-sections -MD -DSTM32F4
# ARFLAGS = rcsv # ARFLAGS = rcsv
ARFLAGS = rcs ARFLAGS = rcs
OBJS = vector.o rcc.o gpio.o usart.o spi.o flash.o nvic.o \ OBJS = rcc.o gpio.o usart.o spi.o flash.o nvic.o \
i2c.o systick.o exti.o scb.o pwr.o timer.o \ i2c.o exti.o pwr.o timer.o \
usb.o usb_standard.o usb_control.o usb_f107.o \ usb.o usb_standard.o usb_control.o usb_f107.o
assert.o
VPATH += ../../usb:../:../../cm3 VPATH += ../../usb:../:../../cm3