diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-02-21 15:10:15 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-02-24 14:21:08 +0100 |
commit | fafe99b62d9c6e5ec3233d221113972023773450 (patch) | |
tree | c14c0f580d2f2a290ca0029f9734370e65799411 /target/linux/generic/pending-4.14/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch | |
parent | bfee12cec638eed9b2197e3a12570a678839a1eb (diff) | |
download | upstream-fafe99b62d9c6e5ec3233d221113972023773450.tar.gz upstream-fafe99b62d9c6e5ec3233d221113972023773450.tar.bz2 upstream-fafe99b62d9c6e5ec3233d221113972023773450.zip |
kernel: bump 4.14 to 4.14.171
Refreshed all patches.
Fixes:
- CVE-2013-1798
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.14/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch')
-rw-r--r-- | target/linux/generic/pending-4.14/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/target/linux/generic/pending-4.14/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch b/target/linux/generic/pending-4.14/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch index 5c71c9cf70..e9b9028430 100644 --- a/target/linux/generic/pending-4.14/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch +++ b/target/linux/generic/pending-4.14/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch @@ -8,22 +8,17 @@ Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com> drivers/mtd/spi-nor/spi-nor.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c -index f4afe123e9dc..a34fa42d47a2 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -2346,6 +2346,11 @@ static const struct flash_info spi_nor_ids[] = { - { "mb85rs1mt", INFO(0x047f27, 0, 128 * 1024, 1, SPI_NOR_NO_ERASE) }, +@@ -974,6 +974,11 @@ static const struct flash_info spi_nor_i /* GigaDevice */ -+ { + { + "gd25d05", INFO(0xc84010, 0, 64 * 1024, 1, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | + SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) + }, - { ++ { "gd25q16", INFO(0xc84015, 0, 64 * 1024, 32, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | --- -2.17.1 - + SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) |