diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-28 09:37:39 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-28 13:02:55 -0500 |
| commit | 0f5db1a4b7188f1bd531db7de234deac60172e01 (patch) | |
| tree | a890fb14a06ca44bc84d6819dc82f3a94fd1149c | |
| parent | 4b19b89ca4a866b7baa642533e6dbd67cd832d27 (diff) | |
| download | u-boot-TEST/find-blk_legacy-users.tar.gz | |
HACK: Break boards that need blk_legacy.oTEST/find-blk_legacy-users
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..8443625091 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_PARTITIONS) += blk_legacy.o endif ifndef CONFIG_SPL_BUILD |