From 532396e5e67f7d0a2e9c400deb919e125f71b920 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 2 Sep 2021 19:01:33 +1000 Subject: [PATCH] REVERT: HAL_ChibiOS: Rename STM32F412 hw definition file This reverts commit 5de6c690d81e09cfb59895e1904db13d5621dbd0. That commit broke the build for the affected board as the chibios headers rely on the name of the file matching a ifdef --- libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat | 2 +- .../hwdef/scripts/{STM32F412xx.py => STM32F412Rx.py} | 0 libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename libraries/AP_HAL_ChibiOS/hwdef/scripts/{STM32F412xx.py => STM32F412Rx.py} (100%) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat index bfcc4b9b3c444..5fd155440d52f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat @@ -3,7 +3,7 @@ # MCU class and specific type # note: the device is STM32F412CE, not all F412 pins are available -MCU STM32F4xx STM32F412xx +MCU STM32F4xx STM32F412Rx FLASH_RESERVE_START_KB 0 # two sectors for bootloader, two for storage diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat index 6e16fc940d8ef..3d7c89e1c7fe8 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat @@ -3,7 +3,7 @@ # MCU class and specific type # note: the device is STM32F412CE, not all F412 pins are available -MCU STM32F4xx STM32F412xx +MCU STM32F4xx STM32F412Rx # bootloader starts firmware at 64k FLASH_RESERVE_START_KB 64 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat index d3477fa251f50..ba5234a856d4b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat @@ -1,7 +1,7 @@ # hw definition file for processing by chibios_pins.py # MCU class and specific type -MCU STM32F4xx STM32F412xx +MCU STM32F4xx STM32F412Rx FLASH_RESERVE_START_KB 0 # two sectors for bootloader, two for storage diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat index c8cbcebf5857a..dfef2f43b9752 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat @@ -2,7 +2,7 @@ # MCU class and specific type # MCU class and specific type -MCU STM32F4xx STM32F412xx +MCU STM32F4xx STM32F412Rx # bootloader starts firmware at 64k FLASH_RESERVE_START_KB 64 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat index 954df0302f5e0..53f03ca225944 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat @@ -1,7 +1,7 @@ # hw definition file for processing by chibios_pins.py # MCU class and specific type -MCU STM32F4xx STM32F412xx +MCU STM32F4xx STM32F412Rx FLASH_RESERVE_START_KB 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat index 42f023a9ff7b9..30551f087fcc3 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat @@ -2,7 +2,7 @@ # MCU class and specific type # MCU class and specific type -MCU STM32F4xx STM32F412xx +MCU STM32F4xx STM32F412Rx # bootloader starts firmware at 64k FLASH_RESERVE_START_KB 64 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F412xx.py b/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F412Rx.py similarity index 100% rename from libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F412xx.py rename to libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F412Rx.py 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 647d52d41fed1..b333d85f09ec9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat @@ -1,7 +1,7 @@ # hw definition file for processing by chibios_pins.py # old F412 layout -MCU STM32F4xx STM32F412xx +MCU STM32F4xx STM32F412Rx # board ID for firmware load APJ_BOARD_ID 9 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat index edab8b7b6599b..f65056e9707a8 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat @@ -1,7 +1,7 @@ # hw definition file for processing by chibios_pins.py # new SkyViper 2018 Journey -MCU STM32F4xx STM32F412xx +MCU STM32F4xx STM32F412Rx # board ID for firmware load APJ_BOARD_ID 9