From e3a81e2e7bd533d1fbb048d9573d89483da6e830 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20F=C3=A4rber?= Date: Sun, 29 Nov 2015 01:32:17 +0100 Subject: [PATCH] xmc4xxx: Make sector sizes const MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit They are only used to initialize the flash bank sectors and never modified. Explicitly specify the array length while at it. Cleanup before adding XMC4800 support. Change-Id: I2985b9a9946b67798dbfd47d8b219d93a7ffc3da Signed-off-by: Andreas Färber Reviewed-on: http://openocd.zylin.com/3131 Tested-by: jenkins Reviewed-by: Jeff Ciesielski Reviewed-by: Paul Fertser --- src/flash/nor/xmc4xxx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/flash/nor/xmc4xxx.c b/src/flash/nor/xmc4xxx.c index f479950799..d4242a24df 100644 --- a/src/flash/nor/xmc4xxx.c +++ b/src/flash/nor/xmc4xxx.c @@ -239,15 +239,15 @@ struct xmc4xxx_command_seq { }; /* Sector capacities. See section 8 of xmc4x00_rm */ -static unsigned int sector_capacity_8[] = { +static const unsigned int sector_capacity_8[8] = { 16, 16, 16, 16, 16, 16, 16, 128 }; -static unsigned int sector_capacity_9[] = { +static const unsigned int sector_capacity_9[9] = { 16, 16, 16, 16, 16, 16, 16, 128, 256 }; -static unsigned int sector_capacity_12[] = { +static const unsigned int sector_capacity_12[12] = { 16, 16, 16, 16, 16, 16, 16, 16, 128, 256, 256, 256 }; @@ -269,7 +269,7 @@ static int xmc4xxx_write_command_sequence(struct flash_bank *bank, static int xmc4xxx_load_bank_layout(struct flash_bank *bank) { - unsigned int *capacity = NULL; + const unsigned int *capacity = NULL; /* At this point, we know which flash controller ID we're * talking to and simply need to fill out the bank structure accordingly */ -- 2.30.2