diff options
| author | Adam Ford <aford173@gmail.com> | 2018-02-06 12:43:56 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-02-08 19:09:03 -0500 |
| commit | 1811a928c6c7604d6d05a84b4d552a7c31b4994e (patch) | |
| tree | 7290cbb48a592acd901b0fab235dd08efb54b8ee /cmd | |
| parent | 560eeee8c2953badfe2a12737ff8e66fefad7944 (diff) | |
Move most CONFIG_HAVE_BLOCK_DEVICE to Kconfig
config_fallbacks.h has some logic that sets HAVE_BLOCK_DEVICE
based on a list of enabled options. Moving HAVE_BLOCK_DEVICE to
Kconfig allows us to drastically shrink the logic in
config_fallbacks.h
Signed-off-by: Adam Ford <aford173@gmail.com>
[trini: Rename HAVE_BLOCK_DEVICE to CONFIG_BLOCK_DEVICE]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 3 | ||||
| -rw-r--r-- | cmd/blk_common.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 4d9ef87e94..7368b6df52 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -672,6 +672,7 @@ config CMD_GPT bool "GPT (GUID Partition Table) command" select PARTITION_UUIDS select EFI_PARTITION + select HAVE_BLOCK_DEVICE imply RANDOM_UUID help Enable the 'gpt' command to ready and write GPT style partition @@ -819,6 +820,7 @@ config CMD_ONENAND config CMD_PART bool "part" select PARTITION_UUIDS + select HAVE_BLOCK_DEVICE help Read and display information about the partition table on various media. @@ -911,6 +913,7 @@ config CMD_UNIVERSE config CMD_USB bool "usb" + select HAVE_BLOCK_DEVICE help USB support. diff --git a/cmd/blk_common.c b/cmd/blk_common.c index bf2f626dd6..643fd0bfbc 100644 --- a/cmd/blk_common.c +++ b/cmd/blk_common.c @@ -12,7 +12,7 @@ #include <common.h> #include <blk.h> -#ifdef HAVE_BLOCK_DEVICE +#ifdef CONFIG_HAVE_BLOCK_DEVICE int blk_common_cmd(int argc, char * const argv[], enum if_type if_type, int *cur_devnump) { |