> -----Original Message-----
> From: Simon Glass [mailto:s...@chromium.org]
> Sent: Thursday, October 13, 2022 9:29 PM
> To: U-Boot Mailing List <u-boot@lists.denx.de>
> Cc: Tom Rini <tr...@konsulko.com>; Simon Glass <s...@chromium.org>; Andrew
> Scull
> <asc...@google.com>; Heinrich Schuchardt <xypron.g...@gmx.de>; Jaehoon Chung
> <jh80.ch...@samsung.com>; Marek Vasut <ma...@denx.de>; Mark Kettenis
> <kette...@openbsd.org>; Pavel
> Herrmann <morpheus.i...@gmail.com>; Peng Fan <peng....@nxp.com>; Stefan Roese
> <s...@denx.de>; Ye Li
> <ye...@nxp.com>
> Subject: [PATCH v2 21/45] 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 <s...@chromium.org>
Reviewed-by: Jaehoon Chung <jh80.ch...@samsung.com>
Best Regards,
Jaehoon Chung
> ---
>
> Changes in v2:
> - Disable TPL_BLK by default
>
> drivers/Makefile | 2 +-
> drivers/block/Kconfig | 1 -
> drivers/block/Makefile | 2 +-
> drivers/mmc/Makefile | 2 +-
> 4 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/Makefile b/drivers/Makefile
> index 9d9f69a3c9a..a1700c819de 100644
> --- a/drivers/Makefile
> +++ b/drivers/Makefile
> @@ -1,5 +1,6 @@
> # SPDX-License-Identifier: GPL-2.0+
>
> +obj-$(CONFIG_$(SPL_TPL_)BLK) += block/
> obj-$(CONFIG_$(SPL_TPL_)BOOTCOUNT_LIMIT) += bootcount/
> obj-$(CONFIG_$(SPL_TPL_)BUTTON) += button/
> obj-$(CONFIG_$(SPL_TPL_)CACHE) += cache/
> @@ -60,7 +61,6 @@ obj-$(CONFIG_SPL_USB_HOST) += usb/host/
> obj-$(CONFIG_OMAP_USB_PHY) += usb/phy/
> obj-$(CONFIG_SPL_SATA) += ata/ scsi/
> obj-$(CONFIG_SPL_LEGACY_BLOCK) += block/
> -obj-$(CONFIG_SPL_BLK) += block/
> obj-$(CONFIG_SPL_THERMAL) += thermal/
>
> endif
> diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
> index 707e2bcd238..e95da48bdc0 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 f48d3e12140..19d9317c825 100644
> --- a/drivers/block/Makefile
> +++ b/drivers/block/Makefile
> @@ -3,7 +3,7 @@
> # (C) Copyright 2000-2007
> # Wolfgang Denk, DENX Software Engineering, w...@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
> diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
> index 5d5104bbf1d..3a664c2ebbb 100644
> --- a/drivers/mmc/Makefile
> +++ b/drivers/mmc/Makefile
> @@ -10,7 +10,7 @@ ifdef CONFIG_$(SPL_TPL_)DM_MMC
> obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += mmc_bootdev.o
> endif
>
> -obj-$(CONFIG_$(SPL_)MMC_WRITE) += mmc_write.o
> +obj-$(CONFIG_$(SPL_TPL_)MMC_WRITE) += mmc_write.o
> obj-$(CONFIG_MMC_PWRSEQ) += mmc-pwrseq.o
> obj-$(CONFIG_MMC_SDHCI_ADMA_HELPERS) += sdhci-adma.o
>
> --
> 2.38.0.rc1.362.ged0d419d3c-goog
