From e52b67e87f5ae2fcef035584de5f38477f6b478e Mon Sep 17 00:00:00 2001
From: barthess <barthess@yandex.ru>
Date: Tue, 21 Oct 2014 22:23:46 +0300
Subject: Fixed eclipse project files

---
 testhal/STM32/STM32F4xx/FSMC_NAND/.cproject  |  2 +-
 testhal/STM32/STM32F4xx/FSMC_NAND/.project   | 12 +-----------
 testhal/STM32/STM32F4xx/FSMC_SDRAM/.cproject |  2 +-
 testhal/STM32/STM32F4xx/FSMC_SDRAM/.project  | 12 +-----------
 testhal/STM32/STM32F4xx/FSMC_SDRAM/Makefile  |  8 ++++----
 testhal/STM32/STM32F4xx/FSMC_SRAM/.cproject  |  2 +-
 testhal/STM32/STM32F4xx/FSMC_SRAM/.project   | 12 +-----------
 7 files changed, 10 insertions(+), 40 deletions(-)

(limited to 'testhal')

diff --git a/testhal/STM32/STM32F4xx/FSMC_NAND/.cproject b/testhal/STM32/STM32F4xx/FSMC_NAND/.cproject
index ba71b3f..5915dc0 100644
--- a/testhal/STM32/STM32F4xx/FSMC_NAND/.cproject
+++ b/testhal/STM32/STM32F4xx/FSMC_NAND/.cproject
@@ -40,7 +40,7 @@
 		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="STM32F4xx-GPT.null.188687308" name="STM32F4xx-GPT"/>
+		<project id="STM32F4xx-FSMC_NAND.null.188687308" name="STM32F4xx-FSMC_NAND"/>
 	</storageModule>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
diff --git a/testhal/STM32/STM32F4xx/FSMC_NAND/.project b/testhal/STM32/STM32F4xx/FSMC_NAND/.project
index 4e4e72f..1992c80 100644
--- a/testhal/STM32/STM32F4xx/FSMC_NAND/.project
+++ b/testhal/STM32/STM32F4xx/FSMC_NAND/.project
@@ -27,17 +27,7 @@
 		<link>
 			<name>os</name>
 			<type>2</type>
-			<locationURI>CHIBIOS1/os</locationURI>
+			<locationURI>CHIBIOS/os</locationURI>
 		</link>
 	</linkedResources>
-	<variableList>
-		<variable>
-			<name>CHIBIOS</name>
-			<value>file:/home/barthess/projects/chibios-svn</value>
-		</variable>
-		<variable>
-			<name>CHIBIOS1</name>
-			<value>$%7BPARENT-4-PROJECT_LOC%7D</value>
-		</variable>
-	</variableList>
 </projectDescription>
diff --git a/testhal/STM32/STM32F4xx/FSMC_SDRAM/.cproject b/testhal/STM32/STM32F4xx/FSMC_SDRAM/.cproject
index ba71b3f..527852a 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SDRAM/.cproject
+++ b/testhal/STM32/STM32F4xx/FSMC_SDRAM/.cproject
@@ -40,7 +40,7 @@
 		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="STM32F4xx-GPT.null.188687308" name="STM32F4xx-GPT"/>
+		<project id="STM32F4xx-FSMC_SDRAM.null.188687308" name="STM32F4xx-FSMC_SDRAM"/>
 	</storageModule>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
diff --git a/testhal/STM32/STM32F4xx/FSMC_SDRAM/.project b/testhal/STM32/STM32F4xx/FSMC_SDRAM/.project
index dd1a643..dd98b90 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SDRAM/.project
+++ b/testhal/STM32/STM32F4xx/FSMC_SDRAM/.project
@@ -27,17 +27,7 @@
 		<link>
 			<name>os</name>
 			<type>2</type>
-			<locationURI>CHIBIOS1/os</locationURI>
+			<locationURI>CHIBIOS/os</locationURI>
 		</link>
 	</linkedResources>
-	<variableList>
-		<variable>
-			<name>CHIBIOS</name>
-			<value>file:/home/barthess/projects/chibios-svn</value>
-		</variable>
-		<variable>
-			<name>CHIBIOS1</name>
-			<value>$%7BPARENT-4-PROJECT_LOC%7D</value>
-		</variable>
-	</variableList>
 </projectDescription>
diff --git a/testhal/STM32/STM32F4xx/FSMC_SDRAM/Makefile b/testhal/STM32/STM32F4xx/FSMC_SDRAM/Makefile
index e09fda5..5443c63 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SDRAM/Makefile
+++ b/testhal/STM32/STM32F4xx/FSMC_SDRAM/Makefile
@@ -80,10 +80,10 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../..
-include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.mk
-include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
+CHIBIOS = ../../../../..
+include $(CHIBIOS)/community/os/hal/hal.mk
+include $(CHIBIOS)/community/os/hal/boards/NONSTANDARD_STM32F4_BARTHESS2/board.mk
+include $(CHIBIOS)/community/os/hal/ports/STM32/STM32F4xx/platform.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/.cproject b/testhal/STM32/STM32F4xx/FSMC_SRAM/.cproject
index ba71b3f..e658cfa 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SRAM/.cproject
+++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/.cproject
@@ -40,7 +40,7 @@
 		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="STM32F4xx-GPT.null.188687308" name="STM32F4xx-GPT"/>
+		<project id="STM32F4xx-FSMC_SRAM.null.188687308" name="STM32F4xx-FSMC_SRAM"/>
 	</storageModule>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/.project b/testhal/STM32/STM32F4xx/FSMC_SRAM/.project
index 6acca11..333f431 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SRAM/.project
+++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/.project
@@ -27,17 +27,7 @@
 		<link>
 			<name>os</name>
 			<type>2</type>
-			<locationURI>CHIBIOS1/os</locationURI>
+			<locationURI>CHIBIOS/os</locationURI>
 		</link>
 	</linkedResources>
-	<variableList>
-		<variable>
-			<name>CHIBIOS</name>
-			<value>file:/home/barthess/projects/chibios-svn</value>
-		</variable>
-		<variable>
-			<name>CHIBIOS1</name>
-			<value>$%7BPARENT-4-PROJECT_LOC%7D</value>
-		</variable>
-	</variableList>
 </projectDescription>
-- 
cgit v1.2.3