1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00

Merge remote-tracking branch 'origin/amorale/OP-1405_25qXXX_support' into next

This commit is contained in:
Alessio Morale 2014-08-13 15:25:16 +02:00
commit cefc182a5e
2 changed files with 30 additions and 1 deletions

View File

@ -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);

View File

@ -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