EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved minor conflict

Browse Source
This commit is contained in:
Michael Ossmann
2012-06-04 18:00:20 -06:00
parent e7941eace9 d7a7fd9d30
commit 3a4a6b75de
11 changed files with 1087 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lpc43xx/Makefile
View File

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