From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [PATCH 57/57] DM: DM_MMC migration is now mandatory for non-SPL
Date: Sat, 20 Feb 2021 20:06:34 -0500 [thread overview]
Message-ID: <20210221010634.21310-58-trini@konsulko.com> (raw)
In-Reply-To: <20210221010634.21310-1-trini@konsulko.com>
As it has been now two years past the migration deadline, it is required
to have migrated. Remove the check from the Makefile and rework some of
the Kconfig logic slightly to get the functional dependencies of DM_MMC
/ BLK right in both the SPL and non-SPL case.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Makefile | 10 ----------
drivers/block/Kconfig | 2 +-
drivers/mmc/Kconfig | 4 +++-
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 4da46dea39b0..bfc353be2d1b 100644
--- a/Makefile
+++ b/Makefile
@@ -1044,16 +1044,6 @@ ifneq ($(CONFIG_DM),y)
@echo >&2 "See doc/driver-model/migration.rst for more info."
@echo >&2 "===================================================="
endif
-ifeq ($(CONFIG_MMC),y)
-ifneq ($(CONFIG_DM_MMC)$(CONFIG_BLK),yy)
- @echo >&2 "===================== WARNING ======================"
- @echo >&2 "This board does not use CONFIG_DM_MMC. Please update"
- @echo >&2 "the board to use CONFIG_DM_MMC before the v2019.04 release."
- @echo >&2 "Failure to update by the deadline may result in board removal."
- @echo >&2 "See doc/driver-model/migration.rst for more info."
- @echo >&2 "===================================================="
-endif
-endif
ifeq ($(CONFIG_USB),y)
ifneq ($(CONFIG_DM_USB)$(CONFIG_OF_CONTROL)$(CONFIG_BLK),yyy)
@echo >&2 "===================== WARNING ======================"
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 1e6dad86927f..ebc638cb0fad 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -18,7 +18,7 @@ config HAVE_BLOCK_DEVICE
config SPL_BLK
bool "Support block devices in SPL"
depends on SPL_DM && BLK
- default y
+ default y if SPL_DM_MMC
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/mmc/Kconfig b/drivers/mmc/Kconfig
index 59a9999ea01f..ae6cabd093c7 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -4,6 +4,7 @@ config MMC
bool "MMC/SD/SDIO card support"
default ARM || PPC || SANDBOX
select HAVE_BLOCK_DEVICE
+ select DM_MMC if DM
help
This selects MultiMediaCard, Secure Digital and Secure
Digital I/O support.
@@ -33,6 +34,7 @@ config MMC_BROKEN_CD
config DM_MMC
bool "Enable MMC controllers using Driver Model"
depends on DM
+ select BLK
help
This enables the MultiMediaCard (MMC) uclass which supports MMC and
Secure Digital I/O (SDIO) cards. Both removable (SD, micro-SD, etc.)
@@ -42,7 +44,7 @@ config DM_MMC
config SPL_DM_MMC
bool "Enable MMC controllers using Driver Model in SPL"
- depends on SPL_DM && DM_MMC
+ depends on SPL_DM && DM_MMC && SPL_OF_LIBFDT
default y
help
This enables the MultiMediaCard (MMC) uclass which supports MMC and
--
2.17.1
prev parent reply other threads:[~2021-02-21 1:06 UTC|newest]
Thread overview: 126+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-21 1:05 [PATCH 00/57] Enforce DM_MMC migration and remove platforms Tom Rini
2021-02-21 1:05 ` [PATCH 01/57] arm: Remove xfi3 board Tom Rini
2021-04-12 0:25 ` Tom Rini
2021-02-21 1:05 ` [PATCH 02/57] arm: Remove MX23_OLINUXINO board Tom Rini
2021-02-21 1:05 ` [PATCH 03/57] arm: Remove SANSA_FUZE_PLUS board Tom Rini
2021-04-12 0:25 ` Tom Rini
2021-02-21 1:05 ` [PATCH 04/57] arm: Remove sc_sps_1 board Tom Rini
2021-04-12 0:25 ` Tom Rini
2021-02-21 1:05 ` [PATCH 05/57] arm: Remove ts4600 board Tom Rini
2021-04-12 0:25 ` Tom Rini
2021-02-21 1:05 ` [PATCH 06/57] arm: Remove apf27 board Tom Rini
2021-04-12 0:25 ` Tom Rini
2021-02-21 1:05 ` [PATCH 07/57] arm: Remove mx25pdk board Tom Rini
2021-02-21 12:32 ` Fabio Estevam
2021-02-25 18:21 ` Tom Rini
2021-02-21 1:05 ` [PATCH 08/57] arm: Remove openrd board Tom Rini
2021-02-21 1:05 ` [PATCH 09/57] arm: Remove sheevaplug board Tom Rini
2021-02-21 1:05 ` [PATCH 10/57] arm: Remove vexpress_ca15_tc2 board Tom Rini
2021-04-12 0:25 ` Tom Rini
2021-02-21 1:05 ` [PATCH 11/57] arm: Remove secomx6quq7 board Tom Rini
2021-04-12 0:25 ` Tom Rini
2021-02-21 1:05 ` [PATCH 12/57] arm: Remove s32v234evb board Tom Rini
2021-04-12 0:25 ` Tom Rini
2021-02-21 1:05 ` [PATCH 13/57] arm: Remove bcm958712k board Tom Rini
2021-04-12 0:26 ` Tom Rini
2021-02-21 1:05 ` [PATCH 14/57] arm: Remove wb45n board Tom Rini
2021-04-12 0:26 ` Tom Rini
2021-02-21 1:05 ` [PATCH 15/57] arm: Remove wb50n board Tom Rini
2021-04-12 0:26 ` Tom Rini
2021-02-21 1:05 ` [PATCH 16/57] arm: Remove picosam9g45 board Tom Rini
2021-04-12 0:26 ` Tom Rini
2021-02-21 1:05 ` [PATCH 17/57] arm: Remove bcm28155_ap board Tom Rini
2021-04-12 0:26 ` Tom Rini
2021-02-21 1:05 ` [PATCH 18/57] arm: Remove bcm23550_w1d board Tom Rini
2021-04-12 0:26 ` Tom Rini
2021-02-21 1:05 ` [PATCH 19/57] arm: Remove warp board Tom Rini
2021-02-21 1:05 ` [PATCH 20/57] arm: Remove Broadcom Cygnus boards Tom Rini
2021-04-12 0:26 ` Tom Rini
2021-02-21 1:05 ` [PATCH 21/57] arm: Remove platinum_picon board Tom Rini
2021-04-12 0:26 ` Tom Rini
2021-02-21 1:05 ` [PATCH 22/57] arm: Remove embest mx6boards support Tom Rini
2021-02-21 1:06 ` [PATCH 23/57] arm: Remove udoo and udoo_neo boards Tom Rini
2021-02-21 1:06 ` [PATCH 24/57] arm: Remove tricorder board Tom Rini
2021-04-12 0:26 ` Tom Rini
2021-02-21 1:06 ` [PATCH 25/57] arm: Remove omap3_ha board Tom Rini
2021-04-12 0:26 ` Tom Rini
2021-02-21 1:06 ` [PATCH 26/57] arm: Remove am3517_crane board Tom Rini
2021-04-12 0:26 ` Tom Rini
2021-02-21 1:06 ` [PATCH 27/57] arm: Remove kc1 board Tom Rini
2021-04-12 0:27 ` Tom Rini
2021-02-21 1:06 ` [PATCH 28/57] arm: Remove usbarmory board Tom Rini
2021-02-21 1:06 ` [PATCH 29/57] arm: Remove xpress board Tom Rini
2021-04-12 0:27 ` Tom Rini
2021-02-21 1:06 ` [PATCH 30/57] arm: Remove dms-ba16 board Tom Rini
2021-02-21 1:06 ` [PATCH 31/57] arm: Remove zc5202 and zc5601 boards Tom Rini
2021-04-12 0:27 ` Tom Rini
2021-02-21 1:06 ` [PATCH 32/57] arm: Remove pfla02 board Tom Rini
2021-04-12 0:27 ` Tom Rini
2021-02-21 1:06 ` [PATCH 33/57] arm: Remove mx53ard board Tom Rini
2021-02-21 12:34 ` Fabio Estevam
2021-02-25 18:22 ` Tom Rini
2021-02-21 1:06 ` [PATCH 34/57] arm: Remove mx53evk board Tom Rini
2021-04-12 0:27 ` Tom Rini
2021-02-21 1:06 ` [PATCH 35/57] arm: Remove mx53smd board Tom Rini
2021-02-21 12:34 ` Fabio Estevam
2021-02-25 18:22 ` Tom Rini
2021-02-21 1:06 ` [PATCH 36/57] arm: Remove ts4800 board Tom Rini
2021-04-12 0:27 ` Tom Rini
2021-02-21 1:06 ` [PATCH 37/57] arm: Remove titanium board Tom Rini
2021-04-12 0:27 ` Tom Rini
2021-02-21 1:06 ` [PATCH 38/57] arm: Remove cgtqmx6eval board Tom Rini
2021-04-12 0:27 ` Tom Rini
2021-02-21 1:06 ` [PATCH 39/57] arm: Remove mx6dlarm2 board Tom Rini
2021-04-12 0:28 ` Tom Rini
2021-02-21 1:06 ` [PATCH 40/57] arm: Remove sksimx6 board Tom Rini
2021-02-24 16:25 ` Stefano Babic
2021-02-25 18:22 ` Tom Rini
2021-02-21 1:06 ` [PATCH 41/57] arm: Remove tqma6s_wru4_mmc config Tom Rini
2021-04-12 0:28 ` Tom Rini
2021-02-21 1:06 ` [PATCH 42/57] ppc: Remove T1040RDB boards Tom Rini
2021-02-22 6:16 ` Priyanka Jain
2021-02-22 8:54 ` Y.b. Lu
2021-02-22 13:13 ` Tom Rini
2021-02-23 10:38 ` Priyanka Jain
2021-02-23 12:44 ` Tom Rini
2021-02-21 1:06 ` [PATCH 43/57] ppc: Remove TARGET_T1040QDS references Tom Rini
2021-04-12 0:28 ` Tom Rini
2021-02-21 1:06 ` [PATCH 44/57] ppc: Remove T2081QDS board and ARCH_T2081 support Tom Rini
2021-02-21 6:46 ` Chris Packham
2021-02-21 16:16 ` Tom Rini
2021-04-12 0:28 ` Tom Rini
2021-02-21 1:06 ` [PATCH 45/57] ppc: Remove MPC8308RDB board Tom Rini
2021-04-12 0:28 ` Tom Rini
2021-02-21 1:06 ` [PATCH 46/57] ppc: Remove gdsys strider boards Tom Rini
2021-04-12 0:28 ` Tom Rini
2021-02-21 1:06 ` [PATCH 47/57] ppc: Remove gdsys hrcon boards Tom Rini
2021-04-12 0:28 ` Tom Rini
2021-02-21 1:06 ` [PATCH 48/57] ppc: Remove controlcenterd boards Tom Rini
2021-04-12 0:28 ` Tom Rini
2021-02-21 1:06 ` [PATCH 49/57] ppc: Remove ARCH_P1022 support Tom Rini
2021-02-22 6:19 ` Priyanka Jain
2021-04-12 0:28 ` Tom Rini
2021-02-21 1:06 ` [PATCH 50/57] ppc: Remove MPC837XERDB board Tom Rini
2021-02-21 1:06 ` [PATCH 51/57] ppc: configs: Remove a few non-updated build configurations Tom Rini
2021-02-22 6:21 ` Priyanka Jain
2021-02-25 18:22 ` Tom Rini
2021-02-21 1:06 ` [PATCH 52/57] ppc: Remove MPC8569MDS board Tom Rini
2021-02-22 6:27 ` Priyanka Jain
2021-02-25 18:22 ` Tom Rini
2021-02-21 1:06 ` [PATCH 53/57] ppc: Remove Cyrus_P5020 and P5040 boards Tom Rini
2021-02-22 6:25 ` Priyanka Jain
2021-02-22 14:04 ` [aperez@alexperez.com: Re: [PATCH 53/57] ppc: Remove Cyrus_P5020 and P5040 boards] Tom Rini
2021-04-12 0:29 ` [PATCH 53/57] ppc: Remove Cyrus_P5020 and P5040 boards Tom Rini
2021-02-21 1:06 ` [PATCH 54/57] ppc: Remove MPC837XEMDS board Tom Rini
2021-02-22 6:32 ` Priyanka Jain
2021-04-12 0:29 ` Tom Rini
2021-02-21 1:06 ` [PATCH 55/57] ppc: Remove T1023RDB board Tom Rini
2021-02-22 7:22 ` Priyanka Jain
2021-02-22 8:58 ` Y.b. Lu
2021-02-22 13:40 ` Tom Rini
2021-02-21 1:06 ` [PATCH 56/57] ppc: Remove T4160RDB board Tom Rini
2021-02-22 7:24 ` Priyanka Jain
2021-02-22 9:00 ` Y.b. Lu
2021-02-22 13:39 ` Tom Rini
2021-02-23 10:40 ` Priyanka Jain
2021-02-21 1:06 ` Tom Rini [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210221010634.21310-58-trini@konsulko.com \
--to=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox