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-15-cmd-sf-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-15-cmd-sf-add-support-to-read-flash-unique-ID.patch')
-rw-r--r-- | package/boot/uboot-mediatek/patches/100-15-cmd-sf-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-15-cmd-sf-add-support-to-read-flash-unique-ID.patch b/package/boot/uboot-mediatek/patches/100-15-cmd-sf-add-support-to-read-flash-unique-ID.patch index 972a022d4b..e372944383 100644 --- a/package/boot/uboot-mediatek/patches/100-15-cmd-sf-add-support-to-read-flash-unique-ID.patch +++ b/package/boot/uboot-mediatek/patches/100-15-cmd-sf-add-support-to-read-flash-unique-ID.patch @@ -12,7 +12,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com> --- a/cmd/sf.c +++ b/cmd/sf.c -@@ -391,6 +391,14 @@ static int do_spi_protect(int argc, char +@@ -403,6 +403,14 @@ static int do_spi_protect(int argc, char return ret == 0 ? 0 : 1; } @@ -27,7 +27,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com> enum { STAGE_ERASE, STAGE_CHECK, -@@ -587,6 +595,8 @@ static int do_spi_flash(struct cmd_tbl * +@@ -599,6 +607,8 @@ static int do_spi_flash(struct cmd_tbl * ret = do_spi_flash_erase(argc, argv); else if (strcmp(cmd, "protect") == 0) ret = do_spi_protect(argc, argv); @@ -36,7 +36,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com> else if (IS_ENABLED(CONFIG_CMD_SF_TEST) && !strcmp(cmd, "test")) ret = do_spi_flash_test(argc, argv); else -@@ -617,7 +627,8 @@ static const char long_help[] = +@@ -629,7 +639,8 @@ static const char long_help[] = " at `addr' to flash at `offset'\n" " or to start of mtd `partition'\n" "sf protect lock/unlock sector len - protect/unprotect 'len' bytes starting\n" |