Merge branch 'master' into next

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
2022-09-19 13:19:39 -04:00
340 changed files with 13232 additions and 2087 deletions

View File

@@ -457,7 +457,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str,
}
#endif
#ifdef CONFIG_CMD_UBIFS
#if IS_ENABLED(CONFIG_CMD_UBIFS) && !IS_ENABLED(CONFIG_SPL_BUILD)
/*
* Special-case ubi, ubi goes through a mtd, rather than through
* a regular block device.