git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10565 35acf78f-673a-0410-8e92-d51de3d6d3f4

3 files changed, 59 insertions, 23 deletions

diff --git a/testhal/STM32/multi/PAL/.cproject b/testhal/STM32/multi/PAL/.cproject
index 04a4ae302..0940ccb9e 100644
--- a/testhal/STM32/multi/PAL/.cproject
+++ b/testhal/STM32/multi/PAL/.cproject
@@ -341,6 +341,40 @@
 			</storageModule>

 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>

 		</cconfiguration>

+		<cconfiguration id="0.1093754934.366574680">

+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1093754934.366574680" moduleId="org.eclipse.cdt.core.settings" name="Build for STM32F429-Discovery">

+				<externalSettings/>

+				<extensions>

+					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+				</extensions>

+			</storageModule>

+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.1093754934.366574680" name="Build for STM32F429-Discovery" parent="org.eclipse.cdt.build.core.prefbase.cfg">

+					<folderInfo id="0.1093754934.366574680." name="/" resourcePath="">

+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1562927958" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1562927958.1915246864" name=""/>

+							<builder arguments="-f Makefile-stm32f429_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.314142481" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1495591965" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.1254094356" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1502836435" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							</tool>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.882694078" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1299993431" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							</tool>

+							<tool id="org.eclipse.cdt.build.core.settings.holder.2121525202" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1980923842" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

+							</tool>

+						</toolChain>

+					</folderInfo>

+				</configuration>

+			</storageModule>

+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>

+		</cconfiguration>

 	</storageModule>

 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

 		<project id="STM32-PAL.null.932840044" name="STM32-PAL"/>

@@ -362,6 +396,7 @@
 		<configuration configurationName="Build for STM32L053-Discovery">

 			<resource resourceType="PROJECT" workspacePath="/STM32-PAL"/>

 		</configuration>

+		<configuration configurationName="Build for STM32F103-Olimex"/>

 		<configuration configurationName="Build for STM32F373-Eval">

 			<resource resourceType="PROJECT" workspacePath="/STM32-PAL"/>

 		</configuration>

diff --git a/testhal/STM32/multi/PAL/Makefile b/testhal/STM32/multi/PAL/Makefile
index 4bf8672b6..c1d5dfdd7 100644
--- a/testhal/STM32/multi/PAL/Makefile
+++ b/testhal/STM32/multi/PAL/Makefile
@@ -36,15 +36,14 @@ all:
 	@make --no-print-directory -f Makefile-stm32f407_discovery all

 	@echo ====================================================================

 	@echo

-	@echo === Building for STM32F746-Discovery ===============================

-	@make --no-print-directory -f Makefile-stm32f746_discovery all

-	@echo ====================================================================

-	@echo

-	@echo

 	@echo === Building for STM32F429-Discovery ===============================

 	@make --no-print-directory -f Makefile-stm32f429_discovery all

 	@echo ====================================================================

 	@echo

+	@echo === Building for STM32F746-Discovery ===============================

+	@make --no-print-directory -f Makefile-stm32f746_discovery all

+	@echo ====================================================================

+	@echo

 

 clean:

 	@echo

@@ -64,10 +63,10 @@ clean:
 	@echo

 	-@make --no-print-directory -f Makefile-stm32f407_discovery clean

 	@echo

-	-@make --no-print-directory -f Makefile-stm32f746_discovery clean

-	@echo

 	-@make --no-print-directory -f Makefile-stm32f429_discovery clean

 	@echo

+	-@make --no-print-directory -f Makefile-stm32f746_discovery clean

+	@echo

 

 #

 ##############################################################################

diff --git a/testhal/STM32/multi/PAL/cfg-stm32f429_discovery/mcuconf.h b/testhal/STM32/multi/PAL/cfg-stm32f429_discovery/mcuconf.h
index 2c62a87f2..7f0088339 100644
--- a/testhal/STM32/multi/PAL/cfg-stm32f429_discovery/mcuconf.h
+++ b/testhal/STM32/multi/PAL/cfg-stm32f429_discovery/mcuconf.h
@@ -65,6 +65,24 @@
 #define STM32_BKPRAM_ENABLE                 FALSE

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_PRIORITY            6

+#define STM32_IRQ_EXTI1_PRIORITY            6

+#define STM32_IRQ_EXTI2_PRIORITY            6

+#define STM32_IRQ_EXTI3_PRIORITY            6

+#define STM32_IRQ_EXTI4_PRIORITY            6

+#define STM32_IRQ_EXTI5_9_PRIORITY          6

+#define STM32_IRQ_EXTI10_15_PRIORITY        6

+#define STM32_IRQ_EXTI16_PRIORITY           6

+#define STM32_IRQ_EXTI17_PRIORITY           15

+#define STM32_IRQ_EXTI18_PRIORITY           6

+#define STM32_IRQ_EXTI19_PRIORITY           6

+#define STM32_IRQ_EXTI20_PRIORITY           6

+#define STM32_IRQ_EXTI21_PRIORITY           15

+#define STM32_IRQ_EXTI22_PRIORITY           15

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_ADCPRE                    ADC_CCR_ADCPRE_DIV4   

@@ -75,22 +93,6 @@
 #define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     6

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI17_IRQ_PRIORITY       15

-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI22_IRQ_PRIORITY       15

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE