diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-02 10:52:31 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-03 08:43:24 -0500 |
| commit | 4df23e58a460cf246f9e76f79d572182d9d0f9bd (patch) | |
| tree | 7a6b429b06110b6641b5c2d13565536efd78073f | |
| parent | 56e5a393464161f973dfe43745571a532b8c77d0 (diff) | |
| download | u-boot-4df23e58a460cf246f9e76f79d572182d9d0f9bd.tar.gz | |
blk: Make use of CONFIG_HAVE_BLOCK_DEVICE more
When we do not have CONFIG_BLK (or SPL/TPL) enabled there are very few
cases where we need the blk_legacy code linked in. To catch these, build
when we have CONFIG_HAVE_BLOCK_DEVICE set. In addition, we only need
cmd/blk_common.o to be linked in when we have CONFIG_HAVE_BLOCK_DEVICE
set, so make use of that directly.
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | cmd/Makefile | 2 | ||||
| -rw-r--r-- | cmd/blk_common.c | 2 | ||||
| -rw-r--r-- | drivers/block/Makefile | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/cmd/Makefile b/cmd/Makefile index 2d723ea0f0..f823d16755 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -15,7 +15,7 @@ obj-$(CONFIG_CMD_AES) += aes.o obj-$(CONFIG_CMD_AB_SELECT) += ab_select.o obj-$(CONFIG_CMD_ADC) += adc.o obj-$(CONFIG_CMD_ARMFLASH) += armflash.o -obj-y += blk_common.o +obj-$(CONFIG_HAVE_BLOCK_DEVICE) += blk_common.o obj-$(CONFIG_CMD_SOURCE) += source.o obj-$(CONFIG_CMD_BCB) += bcb.o obj-$(CONFIG_CMD_BDI) += bdinfo.o diff --git a/cmd/blk_common.c b/cmd/blk_common.c index cee25a0d41..c5514cf8f8 100644 --- a/cmd/blk_common.c +++ b/cmd/blk_common.c @@ -11,7 +11,6 @@ #include <common.h> #include <blk.h> -#ifdef CONFIG_HAVE_BLOCK_DEVICE int blk_common_cmd(int argc, char * const argv[], enum if_type if_type, int *cur_devnump) { @@ -96,4 +95,3 @@ int blk_common_cmd(int argc, char * const argv[], enum if_type if_type, } } } -#endif diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 3feb0aa997..94ab5c6f90 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -6,7 +6,7 @@ obj-$(CONFIG_$(SPL_)BLK) += blk-uclass.o ifndef CONFIG_$(SPL_)BLK -obj-y += blk_legacy.o +obj-$(CONFIG_HAVE_BLOCK_DEVICE) += blk_legacy.o endif ifndef CONFIG_SPL_BUILD |