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/001-mtk-0023-spl-nand-support-loading-legacy-image-with-payload-c.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/001-mtk-0023-spl-nand-support-loading-legacy-image-with-payload-c.patch')
-rw-r--r-- | package/boot/uboot-mediatek/patches/001-mtk-0023-spl-nand-support-loading-legacy-image-with-payload-c.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/package/boot/uboot-mediatek/patches/001-mtk-0023-spl-nand-support-loading-legacy-image-with-payload-c.patch b/package/boot/uboot-mediatek/patches/001-mtk-0023-spl-nand-support-loading-legacy-image-with-payload-c.patch deleted file mode 100644 index 1ef16c9955..0000000000 --- a/package/boot/uboot-mediatek/patches/001-mtk-0023-spl-nand-support-loading-legacy-image-with-payload-c.patch +++ /dev/null @@ -1,59 +0,0 @@ -From b4e5137067d34a099efd921532ece177560789ca Mon Sep 17 00:00:00 2001 -From: Weijie Gao <weijie.gao@mediatek.com> -Date: Fri, 20 May 2022 11:24:04 +0800 -Subject: [PATCH 23/25] spl: nand: support loading legacy image with payload - compressed - -Add support to load legacy image with payload compressed. This redirects -the boot flow for all legacy images. If the payload is not compressed, the -actual behavior will remain unchanged. - -Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> -Signed-off-by: Weijie Gao <weijie.gao@mediatek.com> ---- - common/spl/spl_nand.c | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - ---- a/common/spl/spl_nand.c -+++ b/common/spl/spl_nand.c -@@ -56,6 +56,21 @@ static ulong spl_nand_fit_read(struct sp - return size / load->bl_len; - } - -+static ulong spl_nand_legacy_read(struct spl_load_info *load, ulong offs, -+ ulong size, void *dst) -+{ -+ int err; -+ -+ debug("%s: offs %lx, size %lx, dst %p\n", -+ __func__, offs, size, dst); -+ -+ err = nand_spl_load_image(offs, size, dst); -+ if (err) -+ return 0; -+ -+ return size; -+} -+ - struct mtd_info * __weak nand_get_mtd(void) - { - return NULL; -@@ -93,6 +108,18 @@ static int spl_nand_load_element(struct - load.bl_len = bl_len; - load.read = spl_nand_fit_read; - return spl_load_imx_container(spl_image, &load, offset / bl_len); -+ } else if (IS_ENABLED(CONFIG_SPL_LEGACY_IMAGE_FORMAT) && -+ image_get_magic(header) == IH_MAGIC) { -+ struct spl_load_info load; -+ -+ debug("Found legacy image\n"); -+ load.dev = NULL; -+ load.priv = NULL; -+ load.filename = NULL; -+ load.bl_len = 1; -+ load.read = spl_nand_legacy_read; -+ -+ return spl_load_legacy_img(spl_image, bootdev, &load, offset); - } else { - err = spl_parse_image_header(spl_image, bootdev, header); - if (err) |