aio-3399b
/
coolsnowwolf_lede
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel: generic: use chosen bootconf in FIT partition parser 

If the selected boot configuration is stored by U-Boot in '/chosen'
node as 'bootconf' attribute, use that configuration to resolve the
block device used as rootfs. Fall back to use the default configuration
in case 'bootconf' is not present.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2022-03-21 23:31:38 +00:00
parent 9072333533
commit b87a11fc43
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
target/linux/generic/files/block/partitions/fit.c
View File

@ -93,6 +93,14 @@ int parse_fit_partitions(struct parsed_partitions *state, u64 fit_start_sector,
config_description_len, config_loadables_len;
sector_t start_sect, nr_sects;
size_t label_min;
struct device_node *np = NULL;
const char *bootconf;
np = of_find_node_by_path("/chosen");
if (np)
bootconf = of_get_property(np, "bootconf", NULL);
else
bootconf = NULL;
if (fit_start_sector % (1<<(PAGE_SHIFT - SECTOR_SHIFT)))
return -ERANGE;
@ -147,15 +155,15 @@ int parse_fit_partitions(struct parsed_partitions *state, u64 fit_start_sector,
config_default = fdt_getprop(fit, config, FIT_DEFAULT_PROP, &config_default_len);
if (!config_default) {
if (!config_default && !bootconf) {
printk(KERN_ERR "FIT: Cannot find default configuration\n");
ret = -ENOENT;
goto ret_out;
}
node = fdt_subnode_offset(fit, config, config_default);
node = fdt_subnode_offset(fit, config, bootconf?:config_default);
if (node < 0) {
printk(KERN_ERR "FIT: Cannot find %s node: %d\n", config_default, node);
printk(KERN_ERR "FIT: Cannot find %s node: %d\n", bootconf?:config_default, node);
ret = -ENOENT;
goto ret_out;
}
@ -163,7 +171,8 @@ int parse_fit_partitions(struct parsed_partitions *state, u64 fit_start_sector,
config_description = fdt_getprop(fit, node, FIT_DESC_PROP, &config_description_len);
config_loadables = fdt_getprop(fit, node, FIT_LOADABLE_PROP, &config_loadables_len);
printk(KERN_DEBUG "FIT: Default configuration: \"%s\"%s%s%s\n", config_default,
printk(KERN_DEBUG "FIT: %s configuration: \"%s\"%s%s%s\n",
bootconf?"Selected":"Default", bootconf?:config_default,
config_description?" (":"", config_description?:"", config_description?")":"");
images = fdt_path_offset(fit, FIT_IMAGES_PATH);