aboutsummaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2022-10-20 18:22:57 -0600
committerTom Rini <trini@konsulko.com>2022-10-31 11:02:44 -0400
commit879a9416d1e7197f99f428edc1c32bf59e6e8d3b (patch)
tree58a2701d49ed9b10201818d1c213c035c68f1e4a /drivers/block
parent6a318b102c04f4f0ae99247a3473e39febee42ef (diff)
downloadu-boot-879a9416d1e7197f99f428edc1c32bf59e6e8d3b.zip
u-boot-879a9416d1e7197f99f428edc1c32bf59e6e8d3b.tar.gz
u-boot-879a9416d1e7197f99f428edc1c32bf59e6e8d3b.tar.bz2
dm: blk: mmc: Tidy up some Makefile rules for SPL
Use the correct SPL_TPL_ variable so that these features can be enabled in TPL and VPL as needed. Disable it by default in TPL to avoid any code-size increase. No boards are actually using it since the Makefile rules don't allow including drivers/block/ with TPL_DM enabled. It can be manually enabled as needed. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/Kconfig1
-rw-r--r--drivers/block/Makefile2
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 707e2bc..e95da48 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -37,7 +37,6 @@ config SPL_BLK
config TPL_BLK
bool "Support block devices in TPL"
depends on TPL_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
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index f48d3e1..19d9317 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -3,7 +3,7 @@
# (C) Copyright 2000-2007
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-obj-$(CONFIG_$(SPL_)BLK) += blk-uclass.o
+obj-$(CONFIG_$(SPL_TPL_)BLK) += blk-uclass.o
ifndef CONFIG_$(SPL_)BLK
obj-$(CONFIG_SPL_LEGACY_BLOCK) += blk_legacy.o