diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-30 18:05:15 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-30 18:05:15 -0400 |
| commit | b641dd3ec8dc3f6b18d2fa945ac3ab597063d191 (patch) | |
| tree | 98fe84b2d017589f42da3a410f27c2358fd49ddd /include/linux | |
| parent | 78021b63373de32335bd204471d6cb7c7e18bc52 (diff) | |
| parent | 286bcdb40f11def282117e16401bb85502e426a8 (diff) | |
| download | u-boot-b641dd3ec8dc3f6b18d2fa945ac3ab597063d191.tar.gz u-boot-b641dd3ec8dc3f6b18d2fa945ac3ab597063d191.tar.xz u-boot-b641dd3ec8dc3f6b18d2fa945ac3ab597063d191.zip | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-spi
- distro boot support for SPI flash
- sifive spi flash driver
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mtd/spi-nor.h | 1 | ||||
| -rw-r--r-- | include/linux/mtd/spinand.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index ec144a08d8..233fdc341a 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -22,6 +22,7 @@ #define SNOR_MFR_INTEL CFI_MFR_INTEL #define SNOR_MFR_ST CFI_MFR_ST /* ST Micro <--> Micron */ #define SNOR_MFR_MICRON CFI_MFR_MICRON /* ST Micro <--> Micron */ +#define SNOR_MFR_ISSI CFI_MFR_PMC #define SNOR_MFR_MACRONIX CFI_MFR_MACRONIX #define SNOR_MFR_SPANSION CFI_MFR_AMD #define SNOR_MFR_SST CFI_MFR_SST diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h index be01e1e82e..83eafb184e 100644 --- a/include/linux/mtd/spinand.h +++ b/include/linux/mtd/spinand.h @@ -204,6 +204,7 @@ struct spinand_manufacturer { extern const struct spinand_manufacturer gigadevice_spinand_manufacturer; extern const struct spinand_manufacturer macronix_spinand_manufacturer; extern const struct spinand_manufacturer micron_spinand_manufacturer; +extern const struct spinand_manufacturer toshiba_spinand_manufacturer; extern const struct spinand_manufacturer winbond_spinand_manufacturer; /** |