From 28af17c090856082986e46a153fc58e7061a632f Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 16 Nov 2014 18:43:53 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7517 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h | 2 +- demos/STM32/RT-STM32F030R8-NUCLEO/mcuconf.h | 2 +- demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h | 2 +- os/hal/ports/STM32/STM32F0xx/hal_lld.h | 5 ----- testhal/STM32/STM32F0xx/ADC/mcuconf.h | 2 +- testhal/STM32/STM32F0xx/EXT/mcuconf.h | 2 +- testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h | 2 +- testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h | 2 +- testhal/STM32/STM32F0xx/SPI/mcuconf.h | 2 +- testhal/STM32/STM32F0xx/UART/mcuconf.h | 2 +- 10 files changed, 9 insertions(+), 14 deletions(-) diff --git a/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h b/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h index e33697c97..6a5228639 100644 --- a/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h +++ b/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h @@ -42,7 +42,7 @@ #define STM32_HSE_ENABLED FALSE #define STM32_LSE_ENABLED FALSE #define STM32_SW STM32_SW_PLL -#define STM32_PLLSRC STM32_PLLSRC_HSI +#define STM32_PLLSRC STM32_PLLSRC_HSI_DIV2 #define STM32_PREDIV_VALUE 1 #define STM32_PLLMUL_VALUE 12 #define STM32_HPRE STM32_HPRE_DIV1 diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32F030R8-NUCLEO/mcuconf.h index b0cc0fc8d..65c1172b2 100644 --- a/demos/STM32/RT-STM32F030R8-NUCLEO/mcuconf.h +++ b/demos/STM32/RT-STM32F030R8-NUCLEO/mcuconf.h @@ -42,7 +42,7 @@ #define STM32_HSE_ENABLED FALSE #define STM32_LSE_ENABLED FALSE #define STM32_SW STM32_SW_PLL -#define STM32_PLLSRC STM32_PLLSRC_HSI +#define STM32_PLLSRC STM32_PLLSRC_HSI_DIV2 #define STM32_PREDIV_VALUE 1 #define STM32_PLLMUL_VALUE 12 #define STM32_HPRE STM32_HPRE_DIV1 diff --git a/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h index e33697c97..6a5228639 100644 --- a/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h +++ b/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h @@ -42,7 +42,7 @@ #define STM32_HSE_ENABLED FALSE #define STM32_LSE_ENABLED FALSE #define STM32_SW STM32_SW_PLL -#define STM32_PLLSRC STM32_PLLSRC_HSI +#define STM32_PLLSRC STM32_PLLSRC_HSI_DIV2 #define STM32_PREDIV_VALUE 1 #define STM32_PLLMUL_VALUE 12 #define STM32_HPRE STM32_HPRE_DIV1 diff --git a/os/hal/ports/STM32/STM32F0xx/hal_lld.h b/os/hal/ports/STM32/STM32F0xx/hal_lld.h index 3d7665308..e92ed269e 100644 --- a/os/hal/ports/STM32/STM32F0xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32F0xx/hal_lld.h @@ -31,10 +31,6 @@ * Low Density devices. * - STM32F051x8, STM32F058xx, STM32F071xB, STM32F072xB, * STM32F078xx for Medium Density devices. - * - * - STM32F030 for Value Line devices. - * - STM32F0XX_LD for Low Density devices. - * - STM32F0XX_MD for Medium Density devices. * . * * @addtogroup HAL @@ -520,7 +516,6 @@ #if (STM32_SW == STM32_SW_PLL) && (STM32_PLLSRC == STM32_PLLSRC_HSI48) #error "HSI48 not enabled, required by STM32_SW and STM32_PLLSRC" #endif -#endif #endif /* !STM32_HSI48_ENABLED */ diff --git a/testhal/STM32/STM32F0xx/ADC/mcuconf.h b/testhal/STM32/STM32F0xx/ADC/mcuconf.h index 4bf2368b8..ad866ae41 100644 --- a/testhal/STM32/STM32F0xx/ADC/mcuconf.h +++ b/testhal/STM32/STM32F0xx/ADC/mcuconf.h @@ -42,7 +42,7 @@ #define STM32_HSE_ENABLED FALSE #define STM32_LSE_ENABLED FALSE #define STM32_SW STM32_SW_PLL -#define STM32_PLLSRC STM32_PLLSRC_HSI +#define STM32_PLLSRC STM32_PLLSRC_HSI_DIV2 #define STM32_PREDIV_VALUE 1 #define STM32_PLLMUL_VALUE 12 #define STM32_HPRE STM32_HPRE_DIV1 diff --git a/testhal/STM32/STM32F0xx/EXT/mcuconf.h b/testhal/STM32/STM32F0xx/EXT/mcuconf.h index 6a543a74c..84c08b25c 100644 --- a/testhal/STM32/STM32F0xx/EXT/mcuconf.h +++ b/testhal/STM32/STM32F0xx/EXT/mcuconf.h @@ -42,7 +42,7 @@ #define STM32_HSE_ENABLED FALSE #define STM32_LSE_ENABLED FALSE #define STM32_SW STM32_SW_PLL -#define STM32_PLLSRC STM32_PLLSRC_HSI +#define STM32_PLLSRC STM32_PLLSRC_HSI_DIV2 #define STM32_PREDIV_VALUE 1 #define STM32_PLLMUL_VALUE 12 #define STM32_HPRE STM32_HPRE_DIV1 diff --git a/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h b/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h index 6b6aa6bd1..7bb2a9449 100644 --- a/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h +++ b/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h @@ -42,7 +42,7 @@ #define STM32_HSE_ENABLED FALSE #define STM32_LSE_ENABLED FALSE #define STM32_SW STM32_SW_PLL -#define STM32_PLLSRC STM32_PLLSRC_HSI +#define STM32_PLLSRC STM32_PLLSRC_HSI_DIV2 #define STM32_PREDIV_VALUE 1 #define STM32_PLLMUL_VALUE 12 #define STM32_HPRE STM32_HPRE_DIV1 diff --git a/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h b/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h index 3be851320..829f72e64 100644 --- a/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h +++ b/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h @@ -42,7 +42,7 @@ #define STM32_HSE_ENABLED FALSE #define STM32_LSE_ENABLED FALSE #define STM32_SW STM32_SW_PLL -#define STM32_PLLSRC STM32_PLLSRC_HSI +#define STM32_PLLSRC STM32_PLLSRC_HSI_DIV2 #define STM32_PREDIV_VALUE 1 #define STM32_PLLMUL_VALUE 12 #define STM32_HPRE STM32_HPRE_DIV1 diff --git a/testhal/STM32/STM32F0xx/SPI/mcuconf.h b/testhal/STM32/STM32F0xx/SPI/mcuconf.h index 26f86f8eb..32af71e98 100644 --- a/testhal/STM32/STM32F0xx/SPI/mcuconf.h +++ b/testhal/STM32/STM32F0xx/SPI/mcuconf.h @@ -42,7 +42,7 @@ #define STM32_HSE_ENABLED FALSE #define STM32_LSE_ENABLED FALSE #define STM32_SW STM32_SW_PLL -#define STM32_PLLSRC STM32_PLLSRC_HSI +#define STM32_PLLSRC STM32_PLLSRC_HSI_DIV2 #define STM32_PREDIV_VALUE 1 #define STM32_PLLMUL_VALUE 12 #define STM32_HPRE STM32_HPRE_DIV1 diff --git a/testhal/STM32/STM32F0xx/UART/mcuconf.h b/testhal/STM32/STM32F0xx/UART/mcuconf.h index a0a19d3d3..779e82817 100644 --- a/testhal/STM32/STM32F0xx/UART/mcuconf.h +++ b/testhal/STM32/STM32F0xx/UART/mcuconf.h @@ -42,7 +42,7 @@ #define STM32_HSE_ENABLED FALSE #define STM32_LSE_ENABLED FALSE #define STM32_SW STM32_SW_PLL -#define STM32_PLLSRC STM32_PLLSRC_HSI +#define STM32_PLLSRC STM32_PLLSRC_HSI_DIV2 #define STM32_PREDIV_VALUE 1 #define STM32_PLLMUL_VALUE 12 #define STM32_HPRE STM32_HPRE_DIV1