From c01d459011302d6f86c39e71c550fcf47e1893fc Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Sun, 31 Jan 2021 14:34:16 +0300 Subject: [PATCH] Add support for STM32F42x/STM32F43x rev. 5/B (#15407) * stm32_common: Add support for STM32F42x/STM32F43x rev. 5/B According to ST, both 5 and B share the same REV_ID. Signed-off-by: Alexey Rogachevskiy * stm32_common: Change comment to match code, change enum names to match revisions --- .../px4/stm/stm32_common/version/board_mcu_version.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/platforms/nuttx/src/px4/stm/stm32_common/version/board_mcu_version.c b/platforms/nuttx/src/px4/stm/stm32_common/version/board_mcu_version.c index e440f625c4..99c115789d 100644 --- a/platforms/nuttx/src/px4/stm/stm32_common/version/board_mcu_version.c +++ b/platforms/nuttx/src/px4/stm/stm32_common/version/board_mcu_version.c @@ -48,8 +48,10 @@ enum MCU_REV { MCU_REV_STM32F4_REV_Y = 0x1003, MCU_REV_STM32F4_REV_1 = 0x1007, MCU_REV_STM32F4_REV_3 = 0x2001, - MCU_REV_STM32F7_REV_X = MCU_REV_STM32F4_REV_3, - MCU_REV_STM32F7_REV_V = 0x2003 + MCU_REV_STM32F4_REV_5 = 0x2003, + MCU_REV_STM32F4_REV_B = MCU_REV_STM32F4_REV_5, + MCU_REV_STM32H7_REV_X = MCU_REV_STM32F4_REV_3, + MCU_REV_STM32H7_REV_V = 0x2003 }; /* Define any issues with the Silicon as lines separated by \n @@ -151,8 +153,10 @@ int board_mcu_version(char *rev, const char **revstr, const char **errata) chip_errata = NULL; break; - case MCU_REV_STM32F7_REV_V: - *rev = 'V'; + case MCU_REV_STM32F4_REV_5: + // MCU_REV_STM32F4_REV_B shares the same REV_ID + // MCU_REV_STM32H7_REV_V shares the same REV_ID + *rev = chip_version == STM32H74xx_75xx ? 'V' : '5'; chip_errata = NULL; break;