From: Daniel Golle Date: Wed, 20 Apr 2022 14:10:07 +0000 (+0100) Subject: uboot-mediatek: replace patch with accepted commit X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=079828fa54a81b9672c55f7f1d02bd2879a4944a;p=openwrt%2Fstaging%2Fmkresin.git uboot-mediatek: replace patch with accepted commit Replace pending patch with version accepted upstream. Other than in the first suggested version, the new property is now called 'u-boot,bootconf' instead of 'bootconf'. Signed-off-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 index 76e272a2c9..8517ffb97c 100644 --- 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 @@ -1,60 +1,36 @@ -From patchwork Mon Mar 21 23:22:23 2022 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Daniel Golle -X-Patchwork-Id: 1607954 -Return-Path: -X-Original-To: incoming@patchwork.ozlabs.org -Delivered-To: patchwork-incoming@bilbo.ozlabs.org -Date: Mon, 21 Mar 2022 23:22:23 +0000 +From 5f2d5915f8ea4785bc2b8a26955e176a7898c15b Mon Sep 17 00:00:00 2001 From: Daniel Golle -To: u-boot@lists.denx.de -Cc: Simon Glass , Alexandru Gagniuc , - Patrick Delaunay , - Heinrich Schuchardt +Date: Tue, 12 Apr 2022 21:00:43 +0100 Subject: [PATCH] image-fdt: save name of FIT configuration in '/chosen' node -Message-ID: -MIME-Version: 1.0 -Content-Disposition: inline -X-BeenThere: u-boot@lists.denx.de -X-Mailman-Version: 2.1.39 -Precedence: list -List-Id: U-Boot discussion -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Errors-To: u-boot-bounces@lists.denx.de -Sender: "U-Boot" 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 -attribute called 'bootconf' in the '/chosen' node in device tree. +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(+) diff --git a/boot/image-fdt.c b/boot/image-fdt.c -index 692a9ad3e4..4017bc94a6 100644 +index 692a9ad3e4..fdb69926a2 100644 --- a/boot/image-fdt.c +++ b/boot/image-fdt.c @@ -601,6 +601,12 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, goto err; } -+ /* Store name of configuration node as bootconf in /chosen node */ ++ /* Store name of configuration node as u-boot,bootconf in /chosen node */ + if (images->fit_uname_cfg) -+ fdt_find_and_setprop(blob, "/chosen", "bootconf", ++ 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 CONFIG_IS_ENABLED(CMD_PSTORE) +-- +2.35.3 +