diff options
author | Tom Rini <trini@konsulko.com> | 2017-08-01 15:38:23 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-08-01 15:38:23 -0400 |
commit | 5c6631beb27491f3f78b6a0ad888d38810e3d96b (patch) | |
tree | 3b02d26a83a2e58bbc0741f2b78474461f273b93 /drivers/block | |
parent | 6364a5d4bd55beeedc11171419acd0bdff17a599 (diff) | |
parent | 5c970013a661c630ab28ddc3dd6766fe6bf83ece (diff) | |
download | u-boot-5c6631beb27491f3f78b6a0ad888d38810e3d96b.tar.gz |
Merge git://git.denx.de/u-boot-mmc
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/Kconfig | 12 | ||||
-rw-r--r-- | drivers/block/Makefile | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index ca7692d8a5..26760895f9 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -10,6 +10,18 @@ config BLK be partitioned into several areas, called 'partitions' in U-Boot. A filesystem can be placed in each partition. +config SPL_BLK + bool "Support block devices in SPL" + depends on SPL_DM && BLK + default y + help + Enable support for block devices, such as SCSI, MMC and USB + flash sticks. These provide a block-level interface which permits + reading, writing and (in some cases) erasing blocks. Block + devices often have a partition table which allows the device to + be partitioned into several areas, called 'partitions' in U-Boot. + A filesystem can be placed in each partition. + config BLOCK_CACHE bool "Use block device cache" default n diff --git a/drivers/block/Makefile b/drivers/block/Makefile index a5e7307c97..dea2c15c14 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -5,9 +5,9 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_BLK) += blk-uclass.o +obj-$(CONFIG_$(SPL_)BLK) += blk-uclass.o -ifndef CONFIG_BLK +ifndef CONFIG_$(SPL_)BLK obj-y += blk_legacy.o endif |