From: drowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Thu, 23 May 2013 01:03:36 +0000 (+0000)
Subject: mods to support gcc-arm-none-eabi-4_7-2013q1
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=ac6c365c5d418c1073faf96c534fb44116ce105e;p=freetel-svn-tracking.git

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 b4efc996..110749e1 100644
--- 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 a724e407..527141d4 100644
--- 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 326b2057..c1d2356f 100644
--- a/codec2-dev/stm32/src/main.c
+++ b/codec2-dev/stm32/src/main.c
@@ -154,11 +154,3 @@ int main(void) {
     return 0;
 }
 
-
-/*
- * Dummy function to avoid compiler error
- */
-void _init() {
-
-}
-