From 61f9996d6ba7829d6cc119da1dea3515a79a5a5b Mon Sep 17 00:00:00 2001 From: Jari van Ewijk Date: Tue, 19 May 2020 14:09:07 +0200 Subject: [PATCH] S32K1XX: Report right MCU version --- .../nuttx/src/px4/nxp/s32k1xx/version/board_mcu_version.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platforms/nuttx/src/px4/nxp/s32k1xx/version/board_mcu_version.c b/platforms/nuttx/src/px4/nxp/s32k1xx/version/board_mcu_version.c index 2cb5859c1a..93ebd40505 100644 --- a/platforms/nuttx/src/px4/nxp/s32k1xx/version/board_mcu_version.c +++ b/platforms/nuttx/src/px4/nxp/s32k1xx/version/board_mcu_version.c @@ -44,7 +44,7 @@ #include "arm_arch.h" #include "hardware/s32k1xx_sim.h" -#define CHIP_TAG "S32K1XX" +#define CHIP_TAG "S32KXXX" #define CHIP_TAG_LEN sizeof(CHIP_TAG)-1 int board_mcu_version(char *rev, const char **revstr, const char **errata) @@ -52,8 +52,9 @@ int board_mcu_version(char *rev, const char **revstr, const char **errata) uint32_t sim_sdid = getreg32(S32K1XX_SIM_SDID); static char chip[sizeof(CHIP_TAG)] = CHIP_TAG; - chip[CHIP_TAG_LEN - 2] = '0' + ((sim_sdid & SIM_SDID_GENERATION_MASK) >> SIM_SDID_GENERATION_SHIFT); - chip[CHIP_TAG_LEN - 1] = '0' + ((sim_sdid & SIM_SDID_SUBSERIES_MASK) >> SIM_SDID_SUBSERIES_SHIFT); + chip[CHIP_TAG_LEN - 3] = '0' + ((sim_sdid & SIM_SDID_GENERATION_MASK) >> SIM_SDID_GENERATION_SHIFT); + chip[CHIP_TAG_LEN - 2] = '0' + ((sim_sdid & SIM_SDID_SUBSERIES_MASK) >> SIM_SDID_SUBSERIES_SHIFT); + chip[CHIP_TAG_LEN - 1] = '0' + ((sim_sdid & SIM_SDID_DERIVATE_MASK) >> SIM_SDID_DERIVATE_SHIFT); *revstr = chip; *rev = '0' + ((sim_sdid & SIM_SDID_REVID_MASK) >> SIM_SDID_REVID_SHIFT);