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.