From: Shiji Yang Date: Fri, 10 Apr 2026 11:00:25 +0000 (+0800) Subject: uboot-mediatek: drop upstreamed patch X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ede0b14894fb79d8a10f2ddb2f37fb31443b4c3;p=thirdparty%2Fopenwrt.git uboot-mediatek: drop upstreamed patch Patch 280 was already included in u-boot v2022.07. Link: https://github.com/u-boot/u-boot/commit/5f2d5915f8ea4785bc2b8a26955e176a7898c15b Signed-off-by: Shiji Yang Suggested-by: Daniel Golle --- diff --git a/package/boot/uboot-mediatek/patches/280-image-fdt-save-name-of-FIT-configuration-in-chosen-node.patch b/package/boot/uboot-mediatek/patches/280-image-fdt-save-name-of-FIT-configuration-in-chosen-node.patch deleted file mode 100644 index aa4a2529092..00000000000 --- a/package/boot/uboot-mediatek/patches/280-image-fdt-save-name-of-FIT-configuration-in-chosen-node.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5f2d5915f8ea4785bc2b8a26955e176a7898c15b Mon Sep 17 00:00:00 2001 -From: Daniel Golle -Date: Tue, 12 Apr 2022 21:00:43 +0100 -Subject: [PATCH] image-fdt: save name of FIT configuration in '/chosen' node - -It can be useful for the OS (Linux) to know which configuration has -been chosen by U-Boot when launching a FIT image. -Store the name of the FIT configuration node used in a new string -property called 'u-boot,bootconf' in the '/chosen' node in device tree. - -Signed-off-by: Daniel Golle -Reviewed-by: Tom Rini ---- - boot/image-fdt.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/boot/image-fdt.c -+++ b/boot/image-fdt.c -@@ -631,6 +631,12 @@ int image_setup_libfdt(struct bootm_head - images->fit_uname_cfg, - strlen(images->fit_uname_cfg) + 1, 1); - -+ /* Store name of configuration node as u-boot,bootconf in /chosen node */ -+ if (images->fit_uname_cfg) -+ fdt_find_and_setprop(blob, "/chosen", "u-boot,bootconf", -+ images->fit_uname_cfg, -+ strlen(images->fit_uname_cfg) + 1, 1); -+ - /* Update ethernet nodes */ - fdt_fixup_ethernet(blob); - #if IS_ENABLED(CONFIG_CMD_PSTORE)