fix h5 self-update build

adafruit · Dec 3, 2024 · 6afd422 · 6afd422
1 parent 3ba5d71
commit 6afd422
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -29,13 +29,14 @@ Supported features are
 Not all features are implemented for all MCUs, following is supported MCUs and its feature
 
 | MCU         | MSC  | Double Reset | Self-update | Write Protection | Neopixel | TFT  |
-| :---------- | :--: | :----------: | :---------: | :--------------: | :------: | :--: |
+|:------------| :--: | :----------: |:-----------:| :--------------: |:--------:| :--: |
 | ESP32 S2/S3 |  ✔   |   Need RC    |      ✔      |                  |    ✔     |  ✔   |
 | K32L2       |  ✔   |      ✔       |             |                  |          |      |
 | LPC55       |  ✔   |      ✔       |             |                  |    ✔     |      |
 | iMXRT       |  ✔   |      ✔       |      ✔      |                  |    ✔     |      |
 | STM32F3     |  ✔   |      ✔       |      ✔      |        ✔         |    ✔     |      |
 | STM32F4     |  ✔   |      ✔       |      ✔      |        ✔         |    ✔     |      |
+| STM32H5     |  ✔   |      ✔       |             |        ✔         |          |      |
 
 ## Build and Flash
 
@@ -108,12 +109,7 @@ By default log message is printed via on-board UART which is slow and take lots
   - Cons: requires jlink as the debugger.
   - Pros: work with most if not all MCUs
   - Software viewer is JLink RTT Viewer/Client/Logger which is bundled with JLink driver package.
-- `LOGGER=swo`: Use dedicated SWO pin of ARM Cortex SWD debug header.
-  - Cons: only work with ARM Cortex MCUs minus M0
-  - Pros: should be compatible with more debugger that support SWO.
-  - Software viewer should be provided along with your debugger driver.
 
 ```
 $ make BOARD=feather_stm32f405_express LOG=2 LOGGER=rtt all
-$ make BOARD=feather_stm32f405_express LOG=2 LOGGER=swo all
 ```
diff --git a/ports/stm32h5/board_flash.c b/ports/stm32h5/board_flash.c
@@ -196,13 +196,12 @@ bool board_flash_protect_bootloader(bool protect) {
 
 #ifdef TINYUF2_SELF_UPDATE
 
-bool is_new_bootloader_valid(const uint8_t * bootloader_bin, uint32_t bootloader_len)
-{
+bool is_new_bootloader_valid(const uint8_t* bootloader_bin, uint32_t bootloader_len) {
   // at least larger than vector table
-  if (bootloader_len < 512 ) return false;
+  if (bootloader_len < 1024) return false;
 
   // similar to board_app_valid() check
-  uint32_t const * app_vector = (uint32_t const*) bootloader_bin;
+  uint32_t const* app_vector = (uint32_t const*)bootloader_bin;
   uint32_t sp = app_vector[0];
   uint32_t boot_entry = app_vector[1];
 
@@ -217,27 +216,23 @@ bool is_new_bootloader_valid(const uint8_t * bootloader_bin, uint32_t bootloader
   return true;
 }
 
-void board_self_update(const uint8_t * bootloader_bin, uint32_t bootloader_len)
-{
+void board_self_update(const uint8_t* bootloader_bin, uint32_t bootloader_len) {
   // check if the bootloader payload is valid
-  if ( is_new_bootloader_valid(bootloader_bin, bootloader_len) )
-  {
-#if TINYUF2_PROTECT_BOOTLOADER
+  if (is_new_bootloader_valid(bootloader_bin, bootloader_len)) {
+    #if TINYUF2_PROTECT_BOOTLOADER
     // Note: Don't protect bootloader when done, leave that to the new bootloader
     // since it may or may not enable protection.
     board_flash_protect_bootloader(false);
-#endif
+    #endif
 
     // keep writing until flash contents matches new bootloader data
-    while( memcmp((const void*) FLASH_BASE_ADDR, bootloader_bin, bootloader_len) )
-    {
+    while (memcmp((const void*)FLASH_BASE_ADDR, bootloader_bin, bootloader_len)) {
       uint32_t sector_addr = FLASH_BASE_ADDR;
-      const uint8_t * data = bootloader_bin;
+      const uint8_t* data = bootloader_bin;
       uint32_t len = bootloader_len;
 
-      for ( uint32_t i = 0; i < 4 && len > 0; i++ )
-      {
-        uint32_t const size = (flash_sector_size(i) < len ? flash_sector_size(i) : len);
+      for (uint32_t i = 0; i < 4 && len > 0; i++) {
+        uint32_t const size = (FLASH_SECTOR_SIZE < len ? FLASH_SECTOR_SIZE : len);
         board_flash_write(sector_addr, data, size);
 
         sector_addr += size;
@@ -252,8 +247,8 @@ void board_self_update(const uint8_t * bootloader_bin, uint32_t bootloader_len)
   __disable_irq();
   HAL_FLASH_Unlock();
 
-  uint32_t null_arr[4] = {0};
-  HAL_FLASH_Program(FLASH_TYPEPROGRAM_QUADWORD, BOARD_FLASH_APP_START, (uint32_t) null_arr);
+  uint32_t null_arr[4] = { 0 };
+  HAL_FLASH_Program(FLASH_TYPEPROGRAM_QUADWORD, BOARD_FLASH_APP_START, (uint32_t)null_arr);
 
   HAL_FLASH_Lock();