From: Marc Schink <openocd-dev@marcschink.de>
Date: Thu, 24 Aug 2017 15:42:28 +0000 (+0200)
Subject: stm32f2x: Fix left shift of negative value
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5fd8eaadf919f867b95682373d8e60da417f4556;p=openocd

stm32f2x: Fix left shift of negative value

Use unsigned constant for left shift operation in order to avoid the
following error with GCC >= 6.0:

../src/flash/nor/stm32f2x.c: In function ‘stm32x_handle_unlock_command’:
../src/flash/nor/stm32f2x.c:1324:67: error: left shift of negative value [-Werror=shift-negative-value]
   stm32x_info->option_bytes.optcr2_pcrop = OPTCR2_PCROP_RDP | (~1 << bank->num_sectors);

Change-Id: I0ac082bd0dbb8dc2f61ffff8fdf486ab7962d2e0
Signed-off-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-on: http://openocd.zylin.com/4207
Tested-by: jenkins
Reviewed-by: Andreas Bolsch <hyphen0break@gmail.com>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-by: Anton Fosselius <anton.fosselius@gmail.com>
Reviewed-by: Esben Haabendal <esbenhaabendal@gmail.com>
---

diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c
index 0e4abb53..65cb212b 100644
--- a/src/flash/nor/stm32f2x.c
+++ b/src/flash/nor/stm32f2x.c
@@ -1321,7 +1321,7 @@ COMMAND_HANDLER(stm32x_handle_unlock_command)
 	 * this will also force a device unlock if set */
 	stm32x_info->option_bytes.RDP = 0xAA;
 	if (stm32x_info->has_optcr2_pcrop) {
-		stm32x_info->option_bytes.optcr2_pcrop = OPTCR2_PCROP_RDP | (~1 << bank->num_sectors);
+		stm32x_info->option_bytes.optcr2_pcrop = OPTCR2_PCROP_RDP | (~1U << bank->num_sectors);
 	}
 
 	if (stm32x_write_options(bank) != ERROR_OK) {