mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-31 05:54:26 -04:00
6951526792
1. Rename function _do_env_set() to env_do_env_set(). 2. Replace kwbimage hack with UBOOT_CUSTOMIZE_CONFIG: "--disable TOOLS_KWBIMAGE" and "--disable TOOLS_LIBCRYPTO". 3. Disable CONFIG_CMD_BOOTEFI_BOOTMGR for all supported devices because the newly added UEFI bootmenu entries doesn't work. 4. Enable CONFIG_VERSION_VARIABLE for the OpenWrt One. Signed-off-by: Shiji Yang <yangshiji66@qq.com> Co-authored-by: Daniel Golle <daniel@makrotopia.org>
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 5f2d5915f8ea4785bc2b8a26955e176a7898c15b Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
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 <daniel@makrotopia.org>
|
|
Reviewed-by: Tom Rini <trini@konsulko.com>
|
|
---
|
|
boot/image-fdt.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
--- a/boot/image-fdt.c
|
|
+++ b/boot/image-fdt.c
|
|
@@ -618,6 +618,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)
|