diff --git a/src/cmsis/src/st/system_stm32fxxx.c b/src/cmsis/src/st/system_stm32fxxx.c index 6d3f2a0ef..a4e8801a6 100644 --- a/src/cmsis/src/st/system_stm32fxxx.c +++ b/src/cmsis/src/st/system_stm32fxxx.c @@ -180,7 +180,7 @@ void SystemClock_Config(void) #if defined(MCU_SERIES_H7) /* Supply configuration update enable */ - MODIFY_REG(PWR->CR3, PWR_CR3_SCUEN, 0); + HAL_PWREx_ConfigSupply(PWR_LDO_SUPPLY); #else /* Enable Power Control clock */ __PWR_CLK_ENABLE(); @@ -192,6 +192,7 @@ void SystemClock_Config(void) #if defined(MCU_SERIES_H7) // Enable VSCALE0 for revision V devices. if (HAL_GetREVID() >= 0x2003) { + __HAL_RCC_SYSCFG_CLK_ENABLE(); __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE0); } else { #else @@ -201,11 +202,8 @@ void SystemClock_Config(void) } // Wait for PWR_FLAG_VOSRDY - #if defined(MCU_SERIES_F4) || defined(MCU_SERIES_F7) - //while (!__HAL_PWR_GET_FLAG(PWR_FLAG_VOSRDY)) { - //} - #elif defined(MCU_SERIES_H7) - while ((PWR->D3CR & (PWR_D3CR_VOSRDY)) != PWR_D3CR_VOSRDY) { + #if defined(MCU_SERIES_H7) + while (__HAL_PWR_GET_FLAG(PWR_FLAG_VOSRDY) == RESET) { } #endif diff --git a/src/micropython b/src/micropython index dac67f735..00069f12c 160000 --- a/src/micropython +++ b/src/micropython @@ -1 +1 @@ -Subproject commit dac67f735da2fc2138a76947936521ffe914b8f4 +Subproject commit 00069f12cf48d12f6a84c242cc33966008637dfa