kernel: allow skipping deprecated uImage.FIT partition parser

[openwrt/staging/wigyori.git] / target / linux / mediatek / files / block / partitions / fit.c

diff --git a/target/linux/mediatek/files/block/partitions/fit.c b/target/linux/mediatek/files/block/partitions/fit.c
index 91b25e0581e7e071205d8375f5a2f88bcb275c9c..463cd4e9abae6abac3125c31141b3ad15e81612a 100644 (file)
--- 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);