From 00e32b52bf5774c30dd6676f5c1cdc22ee4aad31 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 26 Jan 2022 13:29:30 +1100 Subject: [PATCH] hwdef: removed unnecessary PLL overrides now we've properly filled in the F4 clocks we can use normal PLL settings --- .../AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef-bl.dat | 9 --------- .../AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat | 9 --------- .../AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef-bl.dat | 7 ------- libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef.dat | 6 ------ .../AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat | 10 ---------- .../AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat | 10 ---------- 6 files changed, 51 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef-bl.dat index ea7f9fe6f6..eb663a57c6 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef-bl.dat @@ -10,15 +10,6 @@ APJ_BOARD_ID 188 # crystal frequency, setup to use external oscillator OSCILLATOR_HZ 8000000 -define STM32_LSECLK 32768U -define STM32_LSEDRV (3U << 3U) - -define STM32_PLLSRC STM32_PLLSRC_HSE -define STM32_PLLM_VALUE 8 -define STM32_PLLN_VALUE 432 -define STM32_PLLP_VALUE 2 -define STM32_PLLQ_VALUE 9 - FLASH_SIZE_KB 1024 # bootloader starts at zero offset diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat index 496ec23b45..ef76c701d9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat @@ -9,15 +9,6 @@ APJ_BOARD_ID 188 # crystal frequency, setup to use external oscillator OSCILLATOR_HZ 8000000 -define STM32_LSECLK 32768U -define STM32_LSEDRV (3U << 3U) - -define STM32_PLLSRC STM32_PLLSRC_HSE -define STM32_PLLM_VALUE 8 -define STM32_PLLN_VALUE 432 -define STM32_PLLP_VALUE 2 -define STM32_PLLQ_VALUE 9 - FLASH_SIZE_KB 1024 # leave 2 sectors free diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef-bl.dat index 3197e1ebe4..20b703dfa6 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef-bl.dat @@ -81,10 +81,3 @@ define BOOTLOADER_BAUDRATE 57600 # use a small bootloader timeout define HAL_BOOTLOADER_TIMEOUT 1000 - -define HAL_CUSTOM_CLOCK_TREE -define STM32_PLLM_VALUE 8 -define STM32_PLLN_VALUE 168 -define STM32_PLLP_VALUE 2 -define STM32_PLLQ_VALUE 4 - diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef.dat index 3045716d17..7a22fbd3bf 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef.dat @@ -120,12 +120,6 @@ define HAL_PERIPH_ENABLE_NOTIFY # Enable the sensor voltage pin PC13 VDD_3V3_SENSORS_EN OUTPUT HIGH -define HAL_CUSTOM_CLOCK_TREE -define STM32_PLLM_VALUE 8 -define STM32_PLLN_VALUE 168 -define STM32_PLLP_VALUE 2 -define STM32_PLLQ_VALUE 4 - #GPS M9N PC11 M9EXTINT INPUT PC10 M9RST INPUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat index 79d0b5e565..65de1ed0b7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat @@ -9,16 +9,6 @@ APJ_BOARD_ID 9 # crystal frequency OSCILLATOR_HZ 24000000 -define HAL_CUSTOM_CLOCK_TREE -STM32_HSE_ENABLED FALSE -STM32_PLLM_VALUE 16 -STM32_PLLN_VALUE 384 -STM32_PLLP_VALUE 4 -STM32_PLLQ_VALUE 8 -STM32_PLLSRC STM32_PLLSRC_HSI -STM32_PREE1 STM32_PREE1_DIV2 -STM32_PREE2 STM32_PREE2_DIV1 - STM32_PWM_USE_TIM3 TRUE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat index 804c401c07..e30d74f8f5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat @@ -9,16 +9,6 @@ APJ_BOARD_ID 9 # crystal frequency OSCILLATOR_HZ 24000000 -define HAL_CUSTOM_CLOCK_TREE -STM32_HSE_ENABLED FALSE -STM32_PLLM_VALUE 16 -STM32_PLLN_VALUE 384 -STM32_PLLP_VALUE 4 -STM32_PLLQ_VALUE 8 -STM32_PLLSRC STM32_PLLSRC_HSI -STM32_PREE1 STM32_PREE1_DIV2 -STM32_PREE2 STM32_PREE2_DIV1 - STM32_PWM_USE_TIM3 TRUE