mods to support gcc-arm-none-eabi-4_7-2013q1

git-svn-id: https://svn.code.sf.net/p/freetel/code@1265 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/stm32/Makefile b/codec2-dev/stm32/Makefile
index b4efc9966a1c7c4bac1ed3918156231ab090ca04..110749e1e3f5ef43d7826708daacae97ffdc7ca1 100644 (file)
--- a/codec2-dev/stm32/Makefile
+++ b/codec2-dev/stm32/Makefile
@@ -7,7 +7,7 @@ FLOAT_TYPE=hard
 
 ###################################################
 
-BINPATH=~/sat/bin
+BINPATH=~/gcc-arm-none-eabi-4_7-2013q1/bin
 CC=$(BINPATH)/arm-none-eabi-gcc
 OBJCOPY=$(BINPATH)/arm-none-eabi-objcopy
 SIZE=$(BINPATH)/arm-none-eabi-size
@@ -75,8 +75,8 @@ CFLAGS += -D__EMBEDDED__ -DTIMER
 #enable this for dump files to help verify optimisation
 #CFLAGS += -DDUMP
 
-CFLAGS += -I/home/david/codec2-dev/src
-CFLAGS += -I/home/david/codec2-dev/unittest
+CFLAGS += -I../src
+CFLAGS += -I../unittest
 CFLAGS += -Iinc
 
 FFT_TEST_SRCS = \
@@ -104,7 +104,7 @@ LIBS = libstm32f4.a -lg -lnosys -lm
 
 # startup file
 
-SRCS += src/startup_stm32f4xx.s
+SRCS += src/startup_stm32f4xx.s src/init.c
 
 OBJS = $(SRCS:.c=.o)
 
@@ -115,7 +115,7 @@ all: libstm32f4.a $(PROJ_NAME).elf fft_test.elf dactest.elf
 dl/$(PERIPHLIBZIP):
        mkdir -p dl
        cd dl; wget $(PERIPHLIBURL)/$(PERIPHLIBZIP)
-       
+
 $(PERIPHLIBDIR): dl/$(PERIPHLIBZIP)
        cd dl; unzip $(PERIPHLIBZIP)
        mv dl/$(PERIPHLIBDIR) $(PERIPHLIBDIR)

diff --git a/codec2-dev/stm32/src/init.c b/codec2-dev/stm32/src/init.c
index a724e40723d2846b1b4807a111b577ffe526b53d..527141d44f1a9b2c088dee636c8b19e77f4a4bba 100644 (file)
--- a/codec2-dev/stm32/src/init.c
+++ b/codec2-dev/stm32/src/init.c
@@ -4,4 +4,7 @@
 void _init() {
 
 }
+void _fini() {
+
+}
 

diff --git a/codec2-dev/stm32/src/main.c b/codec2-dev/stm32/src/main.c
index 326b205708445e59ae0df483944dde8ef8f0b213..c1d2356f48a116b19f6490f0064b327f5d7ce0ce 100644 (file)
--- a/codec2-dev/stm32/src/main.c
+++ b/codec2-dev/stm32/src/main.c
@@ -154,11 +154,3 @@ int main(void) {
     return 0;\r
 }\r
 \r
-\r
-/*\r
- * Dummy function to avoid compiler error\r
- */\r
-void _init() {\r
-\r
-}\r
-\r