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 /drivers/block | |
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 'drivers/block')
-rw-r--r-- | drivers/block/Kconfig | 7 | ||||
-rw-r--r-- | drivers/block/blk_legacy.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index e2c80f2075e..73836ada094 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -10,6 +10,11 @@ config BLK be partitioned into several areas, called 'partitions' in U-Boot. A filesystem can be placed in each partition. +config HAVE_BLOCK_DEVICE + bool "Enable Legacy Block Device" + help + Some devices require block support whether or not DM is enabled + config SPL_BLK bool "Support block devices in SPL" depends on SPL_DM && BLK @@ -33,6 +38,7 @@ config BLOCK_CACHE config IDE bool "Support IDE controllers" + select HAVE_BLOCK_DEVICE help Enables support for IDE (Integrated Drive Electronics) hard drives. This allows access to raw blocks and filesystems on an IDE drive @@ -41,6 +47,7 @@ config IDE config SYSTEMACE bool "Xilinx SystemACE support" + select HAVE_BLOCK_DEVICE help Adding this option adds support for Xilinx SystemACE chips attached via some sort of local bus. The address of the chip must also be diff --git a/drivers/block/blk_legacy.c b/drivers/block/blk_legacy.c index 16d3bfe7f28..ab42bf76d74 100644 --- a/drivers/block/blk_legacy.c +++ b/drivers/block/blk_legacy.c @@ -69,7 +69,7 @@ static int get_desc(struct blk_driver *drv, int devnum, struct blk_desc **descp) return drv->get_dev(devnum, descp); } -#ifdef HAVE_BLOCK_DEVICE +#ifdef CONFIG_HAVE_BLOCK_DEVICE int blk_list_part(enum if_type if_type) { struct blk_driver *drv; @@ -173,7 +173,7 @@ int blk_show_device(enum if_type if_type, int devnum) return 0; } -#endif /* HAVE_BLOCK_DEVICE */ +#endif /* CONFIG_HAVE_BLOCK_DEVICE */ struct blk_desc *blk_get_devnum_by_type(enum if_type if_type, int devnum) { |