summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Carré2013-02-12 18:33:58 +0100
committerThierry Carré2013-02-14 10:42:10 +0100
commit1880572901faf70f265df3f0650cf3d1d88b0af0 (patch)
tree0683b5bfd765d0c4dcefc36bd168707b53dcbc18
parent1d501a6435cf939e3f2e6efa8df554cd882e57f1 (diff)
common/include: remove SECT_4K on all flash, no refs
This commit is done, for compatibility of userfs between : - mse500-200 - mse500-500 The problem have been seen on autoswitch tests feature.
-rw-r--r--common/include/all_flash.h35
1 files changed, 17 insertions, 18 deletions
diff --git a/common/include/all_flash.h b/common/include/all_flash.h
index 059358abe8..b9456ecd10 100644
--- a/common/include/all_flash.h
+++ b/common/include/all_flash.h
@@ -32,15 +32,15 @@
#define FLASH_ARRAY(t) { \
/* Atmel
* -- some are (confusingly) marketed as "DataFlash". */ \
- FLASH (t, "at25fs010", 0x1f6601, 32 * 1024, 4, SECT_4K) \
- FLASH (t, "at25fs040", 0x1f6604, 64 * 1024, 8, SECT_4K) \
+ FLASH (t, "at25fs010", 0x1f6601, 32 * 1024, 4, ) \
+ FLASH (t, "at25fs040", 0x1f6604, 64 * 1024, 8, ) \
\
- FLASH (t, "at25df041a", 0x1f4401, 64 * 1024, 8, SECT_4K) \
+ FLASH (t, "at25df041a", 0x1f4401, 64 * 1024, 8, ) \
\
- FLASH (t, "at26f004", 0x1f0400, 64 * 1024, 8, SECT_4K) \
- FLASH (t, "at26df081a", 0x1f4501, 64 * 1024, 16, SECT_4K) \
- FLASH (t, "at26df161a", 0x1f4601, 64 * 1024, 32, SECT_4K) \
- FLASH (t, "at26df321", 0x1f4700, 64 * 1024, 64, SECT_4K) \
+ FLASH (t, "at26f004", 0x1f0400, 64 * 1024, 8, ) \
+ FLASH (t, "at26df081a", 0x1f4501, 64 * 1024, 16, ) \
+ FLASH (t, "at26df161a", 0x1f4601, 64 * 1024, 32, ) \
+ FLASH (t, "at26df321", 0x1f4700, 64 * 1024, 64, ) \
\
/* Eon */ \
FLASH (t, "en25q32", 0x1c3016, 64 * 1024, 64, ) \
@@ -48,9 +48,9 @@
FLASH (t, "en25q128", 0x1c3018, 64 * 1024, 256, ) \
\
/* Macronix */ \
- FLASH (t, "mx25l3205d", 0xc22016, 64 * 1024, 64, SECT_4K) \
- FLASH (t, "mx25l6406e", 0xc22017, 64 * 1024, 128, SECT_4K) \
- FLASH (t, "mx25l128", 0xc22018, 64 * 1024, 256, SECT_4K) \
+ FLASH (t, "mx25l3205d", 0xc22016, 64 * 1024, 64, ) \
+ FLASH (t, "mx25l6406e", 0xc22017, 64 * 1024, 128, ) \
+ FLASH (t, "mx25l128", 0xc22018, 64 * 1024, 256, ) \
\
/* Spansion
* -- single (large) sector size only, at least
@@ -62,12 +62,11 @@
FLASH (t, "s25sl032a", 0x010215, 64 * 1024, 64, ) \
FLASH (t, "s25sl064a", 0x010216, 64 * 1024, 128, ) \
\
- /* SST
- * -- large erase sizes are "overlays", "sectors" are 4K. */ \
- FLASH (t, "sst25vf040b", 0xbf258d, 64 * 1024, 8, SECT_4K) \
- FLASH (t, "sst25vf080b", 0xbf258e, 64 * 1024, 16, SECT_4K) \
- FLASH (t, "sst25vf016b", 0xbf2541, 64 * 1024, 32, SECT_4K) \
- FLASH (t, "sst25vf032b", 0xbf254a, 64 * 1024, 64, SECT_4K) \
+ /* SST */ \
+ FLASH (t, "sst25vf040b", 0xbf258d, 64 * 1024, 8, ) \
+ FLASH (t, "sst25vf080b", 0xbf258e, 64 * 1024, 16, ) \
+ FLASH (t, "sst25vf016b", 0xbf2541, 64 * 1024, 32, ) \
+ FLASH (t, "sst25vf032b", 0xbf254a, 64 * 1024, 64, ) \
\
/* ST Microelectronics
* -- newer production may have feature updates. */ \
@@ -85,9 +84,9 @@
FLASH (t, "m45pe16", 0x204015, 64 * 1024, 32, ) \
\
FLASH (t, "m25pe80", 0x208014, 64 * 1024, 16, ) \
- FLASH (t, "m25pe16", 0x208015, 64 * 1024, 32, SECT_4K) \
+ FLASH (t, "m25pe16", 0x208015, 64 * 1024, 32, ) \
\
- FLASH (t, "n25q128", 0x20ba18, 64 * 1024, 256, SECT_4K) \
+ FLASH (t, "n25q128", 0x20ba18, 64 * 1024, 256, ) \
\
/* Winbond */ \
FLASH (t, "w25x10", 0xef3011, 64 * 1024, 2, ) \