From: Ilya Kharin Date: Wed, 15 Apr 2020 23:21:30 +0000 (+0400) Subject: flash/nor/stm32l4x: cast wrpxxr_mask to uint16_to to print X-Git-Tag: v0.11.0-rc1~326 X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=bed0215573269cd9f85d23eaa15a27ce13a53e87 flash/nor/stm32l4x: cast wrpxxr_mask to uint16_to to print Fix build error on Mac OS X Catalina (10.15.4) caused by formatting stm32l4_info->wrpxxr_mask, which is uint32_t, as uint16_t in the debug log message. Adding casting to uint16_t before substitution because only lower 16 bits are significant for debug purposes. Change-Id: Iddb87cd156dfc84ab1f91cd15a1ddee6b646d412 Signed-off-by: Ilya Kharin Reviewed-on: http://openocd.zylin.com/5590 Tested-by: jenkins Reviewed-by: Andreas Bolsch Reviewed-by: Antonio Borneo --- diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c index 2cc378a901..4b7edae5fc 100644 --- a/src/flash/nor/stm32l4x.c +++ b/src/flash/nor/stm32l4x.c @@ -1038,7 +1038,7 @@ static int stm32l4_probe(struct flash_bank *bank) /* in dual bank mode number of pages is doubled, but extra bit is bank selection */ stm32l4_info->wrpxxr_mask = ((max_pages >> (stm32l4_info->dual_bank_mode ? 1 : 0)) - 1); assert((stm32l4_info->wrpxxr_mask & 0xFFFF0000) == 0); - LOG_DEBUG("WRPxxR mask 0x%04" PRIx16, stm32l4_info->wrpxxr_mask); + LOG_DEBUG("WRPxxR mask 0x%04" PRIx16, (uint16_t)stm32l4_info->wrpxxr_mask); if (bank->sectors) { free(bank->sectors);