STM32F1xx devices clock configuration updated to make it similar to the newer STM32 devices.

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

16 files changed, 138 insertions, 32 deletions

diff --git a/testhal/STM32F1xx/ADC/mcuconf.h b/testhal/STM32F1xx/ADC/mcuconf.h
index 87f445909..c94d3a2a5 100644
--- a/testhal/STM32F1xx/ADC/mcuconf.h
+++ b/testhal/STM32F1xx/ADC/mcuconf.h
@@ -35,6 +35,11 @@
 /*

  * HAL driver system settings.

  */

+#define STM32_NO_INIT                       FALSE

+#define STM32_HSI_ENABLED                   TRUE

+#define STM32_LSI_ENABLED                   FALSE

+#define STM32_HSE_ENABLED                   TRUE

+#define STM32_LSE_ENABLED                   FALSE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

 #define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

@@ -43,8 +48,10 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USB_CLOCK_REQUIRED            TRUE

 #define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCO                           STM32_MCO_NOCLOCK

+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0

 

diff --git a/testhal/STM32F1xx/CAN/mcuconf.h b/testhal/STM32F1xx/CAN/mcuconf.h
index 87f445909..c94d3a2a5 100644
--- a/testhal/STM32F1xx/CAN/mcuconf.h
+++ b/testhal/STM32F1xx/CAN/mcuconf.h
@@ -35,6 +35,11 @@
 /*

  * HAL driver system settings.

  */

+#define STM32_NO_INIT                       FALSE

+#define STM32_HSI_ENABLED                   TRUE

+#define STM32_LSI_ENABLED                   FALSE

+#define STM32_HSE_ENABLED                   TRUE

+#define STM32_LSE_ENABLED                   FALSE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

 #define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

@@ -43,8 +48,10 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USB_CLOCK_REQUIRED            TRUE

 #define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCO                           STM32_MCO_NOCLOCK

+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0

 

diff --git a/testhal/STM32F1xx/EXT/mcuconf.h b/testhal/STM32F1xx/EXT/mcuconf.h
index 4f4b30d91..af94c6b27 100644
--- a/testhal/STM32F1xx/EXT/mcuconf.h
+++ b/testhal/STM32F1xx/EXT/mcuconf.h
@@ -35,6 +35,11 @@
 /*

  * HAL driver system settings.

  */

+#define STM32_NO_INIT                       FALSE

+#define STM32_HSI_ENABLED                   TRUE

+#define STM32_LSI_ENABLED                   FALSE

+#define STM32_HSE_ENABLED                   TRUE

+#define STM32_LSE_ENABLED                   FALSE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

 #define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

@@ -43,8 +48,10 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USB_CLOCK_REQUIRED            TRUE

 #define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCO                           STM32_MCO_NOCLOCK

+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0

 

diff --git a/testhal/STM32F1xx/EXT_WAKEUP/mcuconf.h b/testhal/STM32F1xx/EXT_WAKEUP/mcuconf.h
index 06882a795..a9e5e64f0 100644
--- a/testhal/STM32F1xx/EXT_WAKEUP/mcuconf.h
+++ b/testhal/STM32F1xx/EXT_WAKEUP/mcuconf.h
@@ -35,16 +35,23 @@
 /*

  * HAL driver system settings.

  */

-#define STM32_SW                            STM32_SW_HSI

+#define STM32_NO_INIT                       FALSE

+#define STM32_HSI_ENABLED                   TRUE

+#define STM32_LSI_ENABLED                   FALSE

+#define STM32_HSE_ENABLED                   TRUE

+#define STM32_LSE_ENABLED                   FALSE

+#define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

 #define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

 #define STM32_PLLMUL_VALUE                  9

 #define STM32_HPRE                          STM32_HPRE_DIV1

-#define STM32_PPRE1                         STM32_PPRE1_DIV1

-#define STM32_PPRE2                         STM32_PPRE2_DIV1

+#define STM32_PPRE1                         STM32_PPRE1_DIV2

+#define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USB_CLOCK_REQUIRED            TRUE

 #define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCO                           STM32_MCO_NOCLOCK

+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0

 

diff --git a/testhal/STM32F1xx/GPT/mcuconf.h b/testhal/STM32F1xx/GPT/mcuconf.h
index 9d9300daf..ca00b20d6 100644
--- a/testhal/STM32F1xx/GPT/mcuconf.h
+++ b/testhal/STM32F1xx/GPT/mcuconf.h
@@ -35,6 +35,11 @@
 /*

  * HAL driver system settings.

  */

+#define STM32_NO_INIT                       FALSE

+#define STM32_HSI_ENABLED                   TRUE

+#define STM32_LSI_ENABLED                   FALSE

+#define STM32_HSE_ENABLED                   TRUE

+#define STM32_LSE_ENABLED                   FALSE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

 #define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

@@ -43,8 +48,10 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USB_CLOCK_REQUIRED            TRUE

 #define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCO                           STM32_MCO_NOCLOCK

+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0

 

diff --git a/testhal/STM32F1xx/I2C/mcuconf.h b/testhal/STM32F1xx/I2C/mcuconf.h
index c31eef7a2..d449b1d0e 100644
--- a/testhal/STM32F1xx/I2C/mcuconf.h
+++ b/testhal/STM32F1xx/I2C/mcuconf.h
@@ -34,6 +34,11 @@
 /*

  * HAL driver system settings.

  */

+#define STM32_NO_INIT                       FALSE

+#define STM32_HSI_ENABLED                   TRUE

+#define STM32_LSI_ENABLED                   FALSE

+#define STM32_HSE_ENABLED                   TRUE

+#define STM32_LSE_ENABLED                   FALSE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

 #define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

@@ -42,7 +47,10 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_MCO                           STM32_MCO_NOCLOCK

+#define STM32_USB_CLOCK_REQUIRED            TRUE

+#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0

 

diff --git a/testhal/STM32F1xx/IRQ_STORM/mcuconf.h b/testhal/STM32F1xx/IRQ_STORM/mcuconf.h
index ea55a44f8..9841a6985 100644
--- a/testhal/STM32F1xx/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32F1xx/IRQ_STORM/mcuconf.h
@@ -35,6 +35,11 @@
 /*

  * HAL driver system settings.

  */

+#define STM32_NO_INIT                       FALSE

+#define STM32_HSI_ENABLED                   TRUE

+#define STM32_LSI_ENABLED                   FALSE

+#define STM32_HSE_ENABLED                   TRUE

+#define STM32_LSE_ENABLED                   FALSE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

 #define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

@@ -43,8 +48,10 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USB_CLOCK_REQUIRED            TRUE

 #define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCO                           STM32_MCO_NOCLOCK

+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0

 

diff --git a/testhal/STM32F1xx/MAC/mcuconf.h b/testhal/STM32F1xx/MAC/mcuconf.h
index 2890f7d5e..984ad7cd8 100644
--- a/testhal/STM32F1xx/MAC/mcuconf.h
+++ b/testhal/STM32F1xx/MAC/mcuconf.h
@@ -35,23 +35,23 @@
 /*

  * HAL driver system settings.

  */

-#define STM32_ACTIVATE_PLL1                 TRUE

-#define STM32_ACTIVATE_PLL2                 TRUE

-#define STM32_ACTIVATE_PLL3                 TRUE

+#define STM32_NO_INIT                       FALSE

+#define STM32_HSI_ENABLED                   TRUE

+#define STM32_LSI_ENABLED                   FALSE

+#define STM32_HSE_ENABLED                   TRUE

+#define STM32_LSE_ENABLED                   FALSE

 #define STM32_SW                            STM32_SW_PLL

-#define STM32_PLLSRC                        STM32_PLLSRC_PREDIV1

-#define STM32_PREDIV1SRC                    STM32_PREDIV1SRC_PLL2

-#define STM32_PREDIV1_VALUE                 5

+#define STM32_PLLSRC                        STM32_PLLSRC_HSE

+#define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

 #define STM32_PLLMUL_VALUE                  9

-#define STM32_PREDIV2_VALUE                 5

-#define STM32_PLL2MUL_VALUE                 8

-#define STM32_PLL3MUL_VALUE                 10

 #define STM32_HPRE                          STM32_HPRE_DIV1

 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_OTGFSPRE                      STM32_OTGFSPRE_DIV3

-#define STM32_MCO                           STM32_MCO_PLL3

+#define STM32_USB_CLOCK_REQUIRED            TRUE

+#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0

 

diff --git a/testhal/STM32F1xx/PVD/mcuconf.h b/testhal/STM32F1xx/PVD/mcuconf.h
index 51d1e12ab..af94c6b27 100644
--- a/testhal/STM32F1xx/PVD/mcuconf.h
+++ b/testhal/STM32F1xx/PVD/mcuconf.h
@@ -35,6 +35,11 @@
 /*

  * HAL driver system settings.

  */

+#define STM32_NO_INIT                       FALSE

+#define STM32_HSI_ENABLED                   TRUE

+#define STM32_LSI_ENABLED                   FALSE

+#define STM32_HSE_ENABLED                   TRUE

+#define STM32_LSE_ENABLED                   FALSE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

 #define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

@@ -43,10 +48,12 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USB_CLOCK_REQUIRED            TRUE

 #define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCO                           STM32_MCO_NOCLOCK

-#define STM32_PVD_ENABLE                    TRUE

-#define STM32_PLS                           STM32_PLS_LEV7

+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

+#define STM32_PVD_ENABLE                    FALSE

+#define STM32_PLS                           STM32_PLS_LEV0

 

 /*

  * ADC driver system settings.

diff --git a/testhal/STM32F1xx/PWM-ICU/mcuconf.h b/testhal/STM32F1xx/PWM-ICU/mcuconf.h
index 87f445909..c94d3a2a5 100644
--- a/testhal/STM32F1xx/PWM-ICU/mcuconf.h
+++ b/testhal/STM32F1xx/PWM-ICU/mcuconf.h
@@ -35,6 +35,11 @@
 /*

  * HAL driver system settings.

  */

+#define STM32_NO_INIT                       FALSE

+#define STM32_HSI_ENABLED                   TRUE

+#define STM32_LSI_ENABLED                   FALSE

+#define STM32_HSE_ENABLED                   TRUE

+#define STM32_LSE_ENABLED                   FALSE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

 #define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

@@ -43,8 +48,10 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USB_CLOCK_REQUIRED            TRUE

 #define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCO                           STM32_MCO_NOCLOCK

+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0

 

diff --git a/testhal/STM32F1xx/RTC/mcuconf.h b/testhal/STM32F1xx/RTC/mcuconf.h
index 054b3bc03..1a38f9876 100644
--- a/testhal/STM32F1xx/RTC/mcuconf.h
+++ b/testhal/STM32F1xx/RTC/mcuconf.h
@@ -34,6 +34,11 @@
 /*

  * HAL driver system settings.

  */

+#define STM32_NO_INIT                       FALSE

+#define STM32_HSI_ENABLED                   TRUE

+#define STM32_LSI_ENABLED                   FALSE

+#define STM32_HSE_ENABLED                   TRUE

+#define STM32_LSE_ENABLED                   FALSE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

 #define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

@@ -42,8 +47,10 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

-#define STM32_MCO                           STM32_MCO_NOCLOCK

-#define STM32_RTC                           STM32_RTC_LSE

+#define STM32_USB_CLOCK_REQUIRED            TRUE

+#define STM32_USBPRE                        STM32_USBPRE_DIV1P5

+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0

 

diff --git a/testhal/STM32F1xx/SDC/mcuconf.h b/testhal/STM32F1xx/SDC/mcuconf.h
index 4acb6f58d..e25d3a8cb 100644
--- a/testhal/STM32F1xx/SDC/mcuconf.h
+++ b/testhal/STM32F1xx/SDC/mcuconf.h
@@ -35,6 +35,11 @@
 /*

  * HAL driver system settings.

  */

+#define STM32_NO_INIT                       FALSE

+#define STM32_HSI_ENABLED                   TRUE

+#define STM32_LSI_ENABLED                   FALSE

+#define STM32_HSE_ENABLED                   TRUE

+#define STM32_LSE_ENABLED                   FALSE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

 #define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

@@ -43,8 +48,10 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USB_CLOCK_REQUIRED            TRUE

 #define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCO                           STM32_MCO_NOCLOCK

+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0

 

diff --git a/testhal/STM32F1xx/SPI/mcuconf.h b/testhal/STM32F1xx/SPI/mcuconf.h
index 87f445909..c94d3a2a5 100644
--- a/testhal/STM32F1xx/SPI/mcuconf.h
+++ b/testhal/STM32F1xx/SPI/mcuconf.h
@@ -35,6 +35,11 @@
 /*

  * HAL driver system settings.

  */

+#define STM32_NO_INIT                       FALSE

+#define STM32_HSI_ENABLED                   TRUE

+#define STM32_LSI_ENABLED                   FALSE

+#define STM32_HSE_ENABLED                   TRUE

+#define STM32_LSE_ENABLED                   FALSE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

 #define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

@@ -43,8 +48,10 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USB_CLOCK_REQUIRED            TRUE

 #define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCO                           STM32_MCO_NOCLOCK

+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0

 

diff --git a/testhal/STM32F1xx/UART/mcuconf.h b/testhal/STM32F1xx/UART/mcuconf.h
index 27278f054..9b69c18cb 100644
--- a/testhal/STM32F1xx/UART/mcuconf.h
+++ b/testhal/STM32F1xx/UART/mcuconf.h
@@ -35,6 +35,11 @@
 /*

  * HAL driver system settings.

  */

+#define STM32_NO_INIT                       FALSE

+#define STM32_HSI_ENABLED                   TRUE

+#define STM32_LSI_ENABLED                   FALSE

+#define STM32_HSE_ENABLED                   TRUE

+#define STM32_LSE_ENABLED                   FALSE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

 #define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

@@ -43,8 +48,10 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USB_CLOCK_REQUIRED            TRUE

 #define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCO                           STM32_MCO_NOCLOCK

+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0

 

diff --git a/testhal/STM32F1xx/USB_CDC/mcuconf.h b/testhal/STM32F1xx/USB_CDC/mcuconf.h
index 87f445909..c94d3a2a5 100644
--- a/testhal/STM32F1xx/USB_CDC/mcuconf.h
+++ b/testhal/STM32F1xx/USB_CDC/mcuconf.h
@@ -35,6 +35,11 @@
 /*

  * HAL driver system settings.

  */

+#define STM32_NO_INIT                       FALSE

+#define STM32_HSI_ENABLED                   TRUE

+#define STM32_LSI_ENABLED                   FALSE

+#define STM32_HSE_ENABLED                   TRUE

+#define STM32_LSE_ENABLED                   FALSE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

 #define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

@@ -43,8 +48,10 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USB_CLOCK_REQUIRED            TRUE

 #define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCO                           STM32_MCO_NOCLOCK

+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0

 

diff --git a/testhal/STM32F1xx/USB_MSC/mcuconf.h b/testhal/STM32F1xx/USB_MSC/mcuconf.h
index 87f445909..c94d3a2a5 100644
--- a/testhal/STM32F1xx/USB_MSC/mcuconf.h
+++ b/testhal/STM32F1xx/USB_MSC/mcuconf.h
@@ -35,6 +35,11 @@
 /*

  * HAL driver system settings.

  */

+#define STM32_NO_INIT                       FALSE

+#define STM32_HSI_ENABLED                   TRUE

+#define STM32_LSI_ENABLED                   FALSE

+#define STM32_HSE_ENABLED                   TRUE

+#define STM32_LSE_ENABLED                   FALSE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

 #define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

@@ -43,8 +48,10 @@
 #define STM32_PPRE1                         STM32_PPRE1_DIV2

 #define STM32_PPRE2                         STM32_PPRE2_DIV2

 #define STM32_ADCPRE                        STM32_ADCPRE_DIV4

+#define STM32_USB_CLOCK_REQUIRED            TRUE

 #define STM32_USBPRE                        STM32_USBPRE_DIV1P5

-#define STM32_MCO                           STM32_MCO_NOCLOCK

+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0