From e0136d16858c00ee83d66a630d868fbdf608d81b Mon Sep 17 00:00:00 2001 From: Jukka Laitinen Date: Tue, 31 Oct 2023 12:41:16 +0200 Subject: [PATCH] platforms/nuttx/src/*/microchip: Change global device_info variable into device_boot_info To avoid clashing variable names in px4 Signed-off-by: Jukka Laitinen --- .../nuttx/src/px4/microchip/mpfs/version/board_mcu_version.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platforms/nuttx/src/px4/microchip/mpfs/version/board_mcu_version.c b/platforms/nuttx/src/px4/microchip/mpfs/version/board_mcu_version.c index a4e12c44b182..868337052276 100644 --- a/platforms/nuttx/src/px4/microchip/mpfs/version/board_mcu_version.c +++ b/platforms/nuttx/src/px4/microchip/mpfs/version/board_mcu_version.c @@ -75,7 +75,7 @@ static char hw_info[HW_INFO_SIZE] = {0}; static mfguid_t device_serial_number = { 0 }; -devinfo_t device_info __attribute__((section(".deviceinfo"))); +devinfo_t device_boot_info __attribute__((section(".deviceinfo"))); static void determine_hw(void); @@ -130,7 +130,7 @@ int board_mcu_version(char *rev, const char **revstr, const char **errata) const char *board_bl_version_string(void) { - return device_info.bl_version; + return device_boot_info.bl_version; } int board_get_px4_guid(px4_guid_t px4_guid)