diff options
| author | Tom Rini <trini@konsulko.com> | 2022-09-19 13:19:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-09-19 16:07:12 -0400 |
| commit | e9a1ff9724348408144c7f1c5b5cc26130ba46e5 (patch) | |
| tree | 68b56f117206d121b4a7e567b0209c02283c98e6 /disk | |
| parent | b6c50e5831f6ce3800d4b3cf3c7aa35dde8c48d9 (diff) | |
| parent | f76f3e3b44328fe6229650540109af93750fd5f0 (diff) | |
| download | u-boot-e9a1ff9724348408144c7f1c5b5cc26130ba46e5.tar.gz u-boot-e9a1ff9724348408144c7f1c5b5cc26130ba46e5.tar.bz2 u-boot-e9a1ff9724348408144c7f1c5b5cc26130ba46e5.zip | |
Merge branch 'master' into next
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'disk')
| -rw-r--r-- | disk/part.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/disk/part.c b/disk/part.c index 5705c229d5..47214c0ee9 100644 --- a/disk/part.c +++ b/disk/part.c @@ -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. |