From a6502518beb95ce58919937770d03150a0dd4351 Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Sun, 29 Jun 2014 15:19:03 +0200 Subject: [PATCH] OP-1405 - Add support for 25qxxx series of flash memories --- flight/pios/inc/pios_flash_jedec_catalog.h | 29 +++++++++++++++++++++- flight/pios/inc/pios_flash_jedec_priv.h | 2 ++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/flight/pios/inc/pios_flash_jedec_catalog.h b/flight/pios/inc/pios_flash_jedec_catalog.h index 32e5a70c8..f35473538 100644 --- a/flight/pios/inc/pios_flash_jedec_catalog.h +++ b/flight/pios/inc/pios_flash_jedec_catalog.h @@ -71,7 +71,34 @@ const struct pios_flash_jedec_cfg pios_flash_jedec_catalog[] = .chip_erase = 0x60, .fast_read = 0x0B, .fast_read_dummy_bytes = 1, - } + }, + { // 25q512 + .expect_manufacturer = JEDEC_MANUFACTURER_MICRON, + .expect_memorytype = 0xBA, + .expect_capacity = 0x20, + .sector_erase = 0xD8, + .chip_erase = 0xC7, + .fast_read = 0x0B, + .fast_read_dummy_bytes = 1, + }, + { // 25q256 + .expect_manufacturer = JEDEC_MANUFACTURER_NUMORIX, + .expect_memorytype = 0xBA, + .expect_capacity = 0x19, + .sector_erase = 0xD8, + .chip_erase = 0xC7, + .fast_read = 0x0B, + .fast_read_dummy_bytes = 1, + }, + { // 25q128 + .expect_manufacturer = JEDEC_MANUFACTURER_MICRON, + .expect_memorytype = 0xBA, + .expect_capacity = 0x18, + .sector_erase = 0xD8, + .chip_erase = 0xC7, + .fast_read = 0x0B, + .fast_read_dummy_bytes = 1, + }, }; const uint32_t pios_flash_jedec_catalog_size = NELEMENTS(pios_flash_jedec_catalog); diff --git a/flight/pios/inc/pios_flash_jedec_priv.h b/flight/pios/inc/pios_flash_jedec_priv.h index 6d1d3353d..765acf6e1 100644 --- a/flight/pios/inc/pios_flash_jedec_priv.h +++ b/flight/pios/inc/pios_flash_jedec_priv.h @@ -36,6 +36,8 @@ extern const struct pios_flash_driver pios_jedec_flash_driver; #define JEDEC_MANUFACTURER_ST 0x20 +#define JEDEC_MANUFACTURER_MICRON 0x20 +#define JEDEC_MANUFACTURER_NUMORIX 0x20 #define JEDEC_MANUFACTURER_MACRONIX 0xC2 #define JEDEC_MANUFACTURER_WINBOND 0xEF