From: Jonas Gorski Date: Tue, 7 Feb 2017 13:20:25 +0000 (+0100) Subject: brcm63xx: do not require fixed partitions when probing from DT X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=31c3ac11182f24f20340ba9a8c8fa0470433145f;p=openwrt%2Fstaging%2Fadrian.git brcm63xx: do not require fixed partitions when probing from DT Allow the parser to be invoked from DT without fixed cfe/linux/nvram partitions. This allows flash to be probed from DT also for multi flash-size images. Signed-off-by: Jonas Gorski --- diff --git a/target/linux/brcm63xx/patches-4.4/425-bcm63xxpart_parse_paritions_from_dt.patch b/target/linux/brcm63xx/patches-4.4/425-bcm63xxpart_parse_paritions_from_dt.patch index 330ec1ecaf..d208a07fc7 100644 --- a/target/linux/brcm63xx/patches-4.4/425-bcm63xxpart_parse_paritions_from_dt.patch +++ b/target/linux/brcm63xx/patches-4.4/425-bcm63xxpart_parse_paritions_from_dt.patch @@ -342,7 +342,7 @@ + struct mtd_partition **pparts, + struct mtd_part_parser_data *data) +{ -+ if (mtd_get_of_node(master)) ++ if (mtd_get_of_node(master) && of_get_child_count(mtd_get_of_node(master))) + return bcm63xx_parse_cfe_partitions_of(master, pparts, data); + else + return bcm63xx_parse_cfe_partitions(master, pparts, data);