[openwrt/openwrt] kernel: allow skipping deprecated uImage.FIT partition parser

LEDE Commits lede-commits at lists.infradead.org
Thu Feb 15 11:34:49 PST 2024


dangole pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/cff4335245e0d23e27917c6cb8f3e1eefda5bb1e

commit cff4335245e0d23e27917c6cb8f3e1eefda5bb1e
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Fri Nov 24 12:22:27 2023 +0000

    kernel: allow skipping deprecated uImage.FIT partition parser
    
    In order to allow gradually migrating the boards currently using the
    uImage.FIT partition (deprecated/rejected) parser to the new fitblk
    driver, skip the partition parser code in case the new fitblk driver
    (which serves the same purpose) is used.
    
    As an indicator for the use of the new fitblk driver, check if the
    /chosen/rootdisk property is present in the Device Tree.
    
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 target/linux/mediatek/files/block/partitions/fit.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/target/linux/mediatek/files/block/partitions/fit.c b/target/linux/mediatek/files/block/partitions/fit.c
index 91b25e0581..463cd4e9ab 100644
--- a/target/linux/mediatek/files/block/partitions/fit.c
+++ b/target/linux/mediatek/files/block/partitions/fit.c
@@ -144,6 +144,10 @@ int parse_fit_partitions(struct parsed_partitions *state, u64 fit_start_sector,
 
 	np = of_find_node_by_path("/chosen");
 	if (np) {
+		/* new fitblk driver should take over if /chosen/rootdisk is defined */
+		if (of_get_property(np, "rootdisk", NULL))
+			return 0;
+
 		bootconf_c = of_get_property(np, "u-boot,bootconf", &bootconf_len);
 		if (bootconf_c && bootconf_len)
 			bootconf = kmemdup_nul(bootconf_c, bootconf_len, GFP_KERNEL);




More information about the lede-commits mailing list