Skip to content

Commit

Permalink
platforms/nuttx/src/*/microchip: Change global device_info variable i…
Browse files Browse the repository at this point in the history
…nto device_boot_info

To avoid clashing variable names in px4

Signed-off-by: Jukka Laitinen <[email protected]>
  • Loading branch information
jlaitine committed Nov 1, 2023
1 parent f86b747 commit e0136d1
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit e0136d1

Please sign in to comment.