Discussion:
[U-Boot] [PATCH] blk: Rework guard around part_init call
Tom Rini
2018-11-25 17:37:12 UTC
Permalink
The function part_init() will only be built when we have both
CONFIG_PARTITIONS and CONFIG_HAVE_BLOCK_DEVICE set. Protect the call to
this function with both of these tests now.

Cc: Simon Glass <***@chromium.org>
Signed-off-by: Tom Rini <***@konsulko.com>
---
drivers/block/blk-uclass.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c
index 65a766e586d6..baaf431e5e0c 100644
--- a/drivers/block/blk-uclass.c
+++ b/drivers/block/blk-uclass.c
@@ -639,7 +639,7 @@ int blk_unbind_all(int if_type)

static int blk_post_probe(struct udevice *dev)
{
-#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBDISK_SUPPORT)
+#if defined(CONFIG_PARTITIONS) && defined(CONFIG_HAVE_BLOCK_DEVICE)
struct blk_desc *desc = dev_get_uclass_platdata(dev);

part_init(desc);
--
2.7.4
Simon Glass
2018-12-11 01:03:41 UTC
Permalink
Post by Tom Rini
The function part_init() will only be built when we have both
CONFIG_PARTITIONS and CONFIG_HAVE_BLOCK_DEVICE set. Protect the call to
this function with both of these tests now.
---
drivers/block/blk-uclass.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Yes I think we need this for now.

Reviewed-by: Simon Glass <***@chromium.org>

Loading...