diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-05-09 18:02:08 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-05-09 18:02:08 +0000 |
| commit | 302956a3d929002fb5c1b2ef03c331186f498d01 (patch) | |
| tree | cf3cb4ff8af437558ace303d536d2a1f20002b57 | |
| parent | bf0c75c33e3c4ec0e19637d5da45e24f537295d9 (diff) | |
| download | ChibiOS-302956a3d929002fb5c1b2ef03c331186f498d01.tar.gz ChibiOS-302956a3d929002fb5c1b2ef03c331186f498d01.tar.bz2 ChibiOS-302956a3d929002fb5c1b2ef03c331186f498d01.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1912 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | demos/ARMCM3-STM32F103-FATFS-GCC/mcuconf.h | 5 | ||||
| -rw-r--r-- | demos/ARMCM3-STM32F103-GCC/mcuconf.h | 4 | ||||
| -rw-r--r-- | testhal/STM32/Makefile | 2 | ||||
| -rw-r--r-- | testhal/STM32/mcuconf.h | 5 |
4 files changed, 13 insertions, 3 deletions
diff --git a/demos/ARMCM3-STM32F103-FATFS-GCC/mcuconf.h b/demos/ARMCM3-STM32F103-FATFS-GCC/mcuconf.h index 28ae05e73..b4b44dd33 100644 --- a/demos/ARMCM3-STM32F103-FATFS-GCC/mcuconf.h +++ b/demos/ARMCM3-STM32F103-FATFS-GCC/mcuconf.h @@ -34,7 +34,10 @@ /*
* HAL driver system settings.
*/
-#define STM32_SYSCLK 72
+#define STM32_SW STM32_SW_PLL
+#define STM32_PLLSRC STM32_PLLSRC_HSE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV1
+#define STM32_PLLCLKOUT 72000000
/*
* ADC driver system settings.
diff --git a/demos/ARMCM3-STM32F103-GCC/mcuconf.h b/demos/ARMCM3-STM32F103-GCC/mcuconf.h index f96d0421a..b4b44dd33 100644 --- a/demos/ARMCM3-STM32F103-GCC/mcuconf.h +++ b/demos/ARMCM3-STM32F103-GCC/mcuconf.h @@ -34,6 +34,10 @@ /*
* HAL driver system settings.
*/
+#define STM32_SW STM32_SW_PLL
+#define STM32_PLLSRC STM32_PLLSRC_HSE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV1
+#define STM32_PLLCLKOUT 72000000
/*
* ADC driver system settings.
diff --git a/testhal/STM32/Makefile b/testhal/STM32/Makefile index a7f9c9091..88b47a725 100644 --- a/testhal/STM32/Makefile +++ b/testhal/STM32/Makefile @@ -118,7 +118,7 @@ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ MCU = cortex-m3
-TRGT = arm-elf-
+TRGT = arm-none-eabi-
CC = $(TRGT)gcc
CPPC = $(TRGT)g++
# Enable loading with g++ only if you need C++ runtime support.
diff --git a/testhal/STM32/mcuconf.h b/testhal/STM32/mcuconf.h index 5d690faa0..ed863801d 100644 --- a/testhal/STM32/mcuconf.h +++ b/testhal/STM32/mcuconf.h @@ -38,7 +38,10 @@ /*
* HAL driver system settings.
*/
-#define STM32_SYSCLK 72
+#define STM32_SW STM32_SW_PLL
+#define STM32_PLLSRC STM32_PLLSRC_HSE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV1
+#define STM32_PLLCLKOUT 72000000
/*
* ADC driver system settings.
|