xmc4xxx: Make sector sizes const

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 <afaerber@suse.de>
Reviewed-on: http://openocd.zylin.com/3131
Tested-by: jenkins
Reviewed-by: Jeff Ciesielski <jeffciesielski@gmail.com>
Reviewed-by: Paul Fertser <fercerpav@gmail.com>

diff --git a/src/flash/nor/xmc4xxx.c b/src/flash/nor/xmc4xxx.c
index f47995079923b2b4d58c8fc4e15dba402ff34b5c..d4242a24df20e9312a996bd0663ee47c15d32f4d 100644 (file)
--- 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 */