[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1203-gbed021557

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  bed0215573269cd9f85d23eaa15a27ce13a53e87 (commit)
      from  38d205ecc5335191214dbd0f714f4561a7b7b746 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bed0215573269cd9f85d23eaa15a27ce13a53e87
Author: Ilya Kharin <ak...@gm...>
Date:   Thu Apr 16 03:21:30 2020 +0400

    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 <ak...@gm...>
    Reviewed-on: http://openocd.zylin.com/5590
    Tested-by: jenkins
    Reviewed-by: Andreas Bolsch <hyp...@gm...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index 2cc378a90..4b7edae5f 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);

-----------------------------------------------------------------------

Summary of changes:
 src/flash/nor/stm32l4x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository