diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2022-10-18 14:28:53 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-10-18 20:08:35 +0100 |
| commit | 537b423d9fea5afad323fde8c100cca4b48bbea1 (patch) | |
| tree | 8b6938ac90ee1c09d07dc7ad6233440bc809a737 /package/boot/uboot-mediatek/patches/100-14-mtd-spi-nor-add-support-to-read-flash-unique-ID.patch | |
| parent | 51ee5fb274928c17b9dcb170c12e57e44a7661c9 (diff) | |
| download | upstream-537b423d9fea5afad323fde8c100cca4b48bbea1.tar.gz upstream-537b423d9fea5afad323fde8c100cca4b48bbea1.tar.bz2 upstream-537b423d9fea5afad323fde8c100cca4b48bbea1.zip | |
uboot-mediatek: update to U-Boot 2022.10
Remove patches adding support for MT7621 which have been merged upsteam.
Patches for MT7981 and MT7986 have been merged too, but not in time to
be included in the 2022.10 release, so we have to keep carrying them
until the 2023.01 release.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package/boot/uboot-mediatek/patches/100-14-mtd-spi-nor-add-support-to-read-flash-unique-ID.patch')
| -rw-r--r-- | package/boot/uboot-mediatek/patches/100-14-mtd-spi-nor-add-support-to-read-flash-unique-ID.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/boot/uboot-mediatek/patches/100-14-mtd-spi-nor-add-support-to-read-flash-unique-ID.patch b/package/boot/uboot-mediatek/patches/100-14-mtd-spi-nor-add-support-to-read-flash-unique-ID.patch index 6a61045955..8696fc1f16 100644 --- a/package/boot/uboot-mediatek/patches/100-14-mtd-spi-nor-add-support-to-read-flash-unique-ID.patch +++ b/package/boot/uboot-mediatek/patches/100-14-mtd-spi-nor-add-support-to-read-flash-unique-ID.patch @@ -13,7 +13,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com> --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c -@@ -2742,6 +2742,100 @@ static int spi_nor_init_params(struct sp +@@ -2791,6 +2791,100 @@ static int spi_nor_init_params(struct sp return 0; } @@ -114,7 +114,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com> static int spi_nor_hwcaps2cmd(u32 hwcaps, const int table[][2], size_t size) { size_t i; -@@ -3719,6 +3813,7 @@ int spi_nor_scan(struct spi_nor *nor) +@@ -3858,6 +3952,7 @@ int spi_nor_scan(struct spi_nor *nor) nor->write = spi_nor_write_data; nor->read_reg = spi_nor_read_reg; nor->write_reg = spi_nor_write_reg; @@ -132,7 +132,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com> #define SNOR_MFR_CYPRESS 0x34 /* -@@ -547,6 +548,7 @@ struct spi_nor { +@@ -558,6 +559,7 @@ struct spi_nor { void (*unprepare)(struct spi_nor *nor, enum spi_nor_ops ops); int (*read_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len); int (*write_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len); |