From ca19c82d94ae8448520d40b1c4fc3abd44afb857 Mon Sep 17 00:00:00 2001 From: Tim Newsome Date: Fri, 23 Sep 2016 14:08:21 -0700 Subject: Make OpenOCD build using -Og. With -Og gcc doesn't perform as many optimizations, and as a result warns about some code that it wouldn't otherwise warn about. These fixes all assign values to otherwise uninitialized variables. Change-Id: I9a6ea5eadd73673891ecfec568b8b00d78b596a5 Signed-off-by: Tim Newsome Reviewed-on: http://openocd.zylin.com/3779 Tested-by: jenkins Reviewed-by: Tomas Vanek Reviewed-by: Freddie Chopin --- src/flash/nor/xmc4xxx.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/flash/nor/xmc4xxx.c') diff --git a/src/flash/nor/xmc4xxx.c b/src/flash/nor/xmc4xxx.c index f396ca3d..b7619514 100644 --- a/src/flash/nor/xmc4xxx.c +++ b/src/flash/nor/xmc4xxx.c @@ -998,11 +998,6 @@ static int xmc4xxx_flash_unprotect(struct flash_bank *bank, int32_t level) uint32_t addr; int res; - if ((level < 0) || (level > 1)) { - LOG_ERROR("Invalid user level. Must be 0-1"); - return ERROR_FAIL; - } - switch (level) { case 0: addr = UCB0_BASE; @@ -1010,6 +1005,9 @@ static int xmc4xxx_flash_unprotect(struct flash_bank *bank, int32_t level) case 1: addr = UCB1_BASE; break; + default: + LOG_ERROR("Invalid user level. Must be 0-1"); + return ERROR_FAIL; } res = xmc4xxx_erase_sector(bank, addr, true); -- cgit v1.2.3-18-g5258