blk: Make use of CONFIG_HAVE_BLOCK_DEVICE more
PATCH v2 1/1 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.
---
Changes in v2:
- Reword commit message and make blk_legacy.o also use CONFIG_HAVE_BLOCK_DEVICE rather than CONFIG_PARTITIONS as it is more direct.
--- cmd/Makefile | 2 +- cmd/blk_common.c | 2 -- drivers/block/Makefile | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-)
cmd/Makefile +1 -1
@@ -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
cmd/blk_common.c +0 -2
@@ -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
drivers/block/Makefile +1 -1
@@ -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
Signature · 1 line
2.17.1
PATCH v2 1/1 blk: Make use of CONFIG_HAVE_BLOCK_DEVICE more
Quoted 7 lines · Tom Rini
When we do not have
CONFIG_BLK(or SPL/TPL) enabled there are very few cases where we need theblk_legacycode linked in. To catch these, build when we haveCONFIG_HAVE_BLOCK_DEVICEset. In addition, we only needcmd/blk_common.oto be linked in when we haveCONFIG_HAVE_BLOCK_DEVICEset, so make use of that directly.Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20191203/28748c0f/attachment.sig>