From de239311629e684e88a2e60d9d19c77d1fc35ae5 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Fri, 15 Jan 2016 18:31:12 -0700 Subject: [PATCH] flash/nor/spi: reorder to group micron devices Change-Id: Ic5b13e8b994d0741a0a12cd7ed427191b42958e2 Signed-off-by: Robert Jordens Reviewed-on: http://openocd.zylin.com/3207 Tested-by: jenkins Reviewed-by: Antonio Borneo --- src/flash/nor/spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/flash/nor/spi.c b/src/flash/nor/spi.c index fdbdec484e..b615ab9665 100644 --- a/src/flash/nor/spi.c +++ b/src/flash/nor/spi.c @@ -69,7 +69,8 @@ const struct flash_device flash_devices[] = { FLASH_ID("mac 25l1605", 0xd8, 0xc7, 0x001520c2, 0x100, 0x10000, 0x200000), FLASH_ID("mac 25l3205", 0xd8, 0xc7, 0x001620c2, 0x100, 0x10000, 0x400000), FLASH_ID("mac 25l6405", 0xd8, 0xc7, 0x001720c2, 0x100, 0x10000, 0x800000), - FLASH_ID("mcr n25q064", 0xd8, 0xc7, 0x0017ba20, 0x100, 0x10000, 0x800000), + FLASH_ID("micron n25q064", 0xd8, 0xc7, 0x0017ba20, 0x100, 0x10000, 0x800000), + FLASH_ID("micron n25q128", 0xd8, 0xc7, 0x0018ba20, 0x100, 0x10000, 0x1000000), FLASH_ID("win w25q80bv", 0xd8, 0xc7, 0x001440ef, 0x100, 0x10000, 0x100000), FLASH_ID("win w25q32fv", 0xd8, 0xc7, 0x001640ef, 0x100, 0x10000, 0x400000), FLASH_ID("win w25q32dw", 0xd8, 0xc7, 0x001660ef, 0x100, 0x10000, 0x400000), @@ -79,6 +80,5 @@ const struct flash_device flash_devices[] = { FLASH_ID("gd gd25q16c", 0xd8, 0xc7, 0x001540c8, 0x100, 0x10000, 0x200000), FLASH_ID("gd gd25q32c", 0xd8, 0xc7, 0x001640c8, 0x100, 0x10000, 0x400000), FLASH_ID("gd gd25q128c", 0xd8, 0xc7, 0x001840c8, 0x100, 0x10000, 0x1000000), - FLASH_ID("micron n25q128", 0xd8, 0xc7, 0x0018ba20, 0x100, 0x10000, 0x1000000), FLASH_ID(NULL, 0, 0, 0, 0, 0, 0) }; -- 2.30.2