From cd8d657f1bb2b41aa7ee1ca3cc87cba840b00fd5 Mon Sep 17 00:00:00 2001
From: tkl <tkl@blackfinn.de>
Date: Thu, 18 Aug 2016 11:57:20 +0200
Subject: [PATCH] swich to official arm toolchain finished

---
 .cproject                | 17 +++++++----------
 config/make/stm32f4xx.mk |  4 ++--
 source/test/uart/main.c  |  8 +-------
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/.cproject b/.cproject
index 3c9689e..67f4bf4 100755
--- a/.cproject
+++ b/.cproject
@@ -146,6 +146,7 @@
 		<buildTargets>
 			<target name="all" path="software/source/test/firmware/kernel/list" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
+				<buildArguments/>
 				<buildTarget>all</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
@@ -153,6 +154,7 @@
 			</target>
 			<target name="clean" path="software/source/test/firmware/kernel/list" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
+				<buildArguments/>
 				<buildTarget>clean</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
@@ -160,7 +162,6 @@
 			</target>
 			<target name="distclean" path="software/source" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
-				<buildArguments/>
 				<buildTarget>distclean</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>false</useDefaultCommand>
@@ -216,6 +217,7 @@
 			</target>
 			<target name="all" path="software/test/firmware/kernel/list" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
+				<buildArguments/>
 				<buildTarget>all</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
@@ -247,6 +249,7 @@
 			</target>
 			<target name="distclean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
+				<buildArguments/>
 				<buildTarget>distclean</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
@@ -260,7 +263,7 @@
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
-			<target name="uart debug test" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+			<target name="uart test" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
 				<buildArguments>TEST_APP=uart BOARD=stm32f4-discovery DEBUG=y</buildArguments>
 				<buildTarget>test</buildTarget>
@@ -268,14 +271,6 @@
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
-			<target name="uart debug install" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>make</buildCommand>
-				<buildArguments> TEST_APP=uart BOARD=stm32f4-discovery DEBUG=y</buildArguments>
-				<buildTarget>install</buildTarget>
-				<stopOnError>true</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>true</runAllBuilders>
-			</target>
 			<target name="shell test" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
 				<buildArguments>TEST_APP=shell BOARD=stm32f4-discovery DEBUG=y</buildArguments>
@@ -318,6 +313,7 @@
 			</target>
 			<target name="all" path="software/source/test/firmware/kernel/ringbuffer" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
+				<buildArguments/>
 				<buildTarget>all</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
@@ -325,6 +321,7 @@
 			</target>
 			<target name="clean" path="software/source/test/firmware/kernel/ringbuffer" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
+				<buildArguments/>
 				<buildTarget>clean</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
diff --git a/config/make/stm32f4xx.mk b/config/make/stm32f4xx.mk
index 784d33e..f5c58bc 100644
--- a/config/make/stm32f4xx.mk
+++ b/config/make/stm32f4xx.mk
@@ -9,8 +9,8 @@ endif
 CROSS_COMPILE ?= arm-none-eabi-
 
 INCLUDES += \
-	/opt/arm-2011.09/arm-none-eabi/include \
-	/opt/arm-2011.09/lib/gcc/arm-none-eabi/4.6.1/include
+	/opt/gcc-arm-none-eabi-5_4-2016q2/arm-none-eabi/include \
+	/opt/gcc-arm-none-eabi-5_4-2016q2/lib/gcc/arm-none-eabi/5.4.1/include
 
 GEN_FLAGS += \
 	-mcpu=cortex-m4 \
diff --git a/source/test/uart/main.c b/source/test/uart/main.c
index 1f9a9ae..fe17ca3 100644
--- a/source/test/uart/main.c
+++ b/source/test/uart/main.c
@@ -26,15 +26,9 @@ struct thread_context th_ctx;
 static void th_func(void *arg)
 {
 	drv_open(&uart_1);
-	drv_open(&gpio_d12);
-	drv_write(&gpio_d12, "0", 1);
 	while(1) {
+		drv_write(&uart_1, "test\r\n", 6);
 		sleep_ms(1000);
-		drv_write(&uart_1, "set_led\r\n", 9);
-		drv_write(&gpio_d12, "1", 1);
-		sleep_ms(1000);
-		drv_write(&uart_1, "unset_led\r\n", 11);
-		drv_write(&gpio_d12, "0", 1);
 	}
 }