From patchwork Sun Feb 21 01:06:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1442733 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DjnWP1cPxz9sSC for ; Sun, 21 Feb 2021 12:18:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3C9EB82939; Sun, 21 Feb 2021 02:10:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 0E1BA828AD; Sun, 21 Feb 2021 02:08:45 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D0F3482829 for ; Sun, 21 Feb 2021 02:07:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f45.google.com with SMTP id g3so4511942qvl.2 for ; Sat, 20 Feb 2021 17:07:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=bw5pmp/Ri1OnKsAVSjoH6nyAeyjBrIzvNBJrGtqSUlk=; b=hcIN292pLdqiDvYBSFAMCorYTDUnl9nDy+8vsw+bo+7+FNnwEC0TIXCj7IAlIVYTHm d43rqj+NzTT+t3eLNpVsLVzZBt9uKPBKneW2AMlOVgxZSAAcCqZFBcEH106crVJNEaGu 8yNi5fp6mEPVSQK19Kn7o5ysHUkjBw8draUi51TNHcDWZ18HvA965I4H9BDBxmlbs3Nx VHW/tLBCMuYbTOGtFkVZ/i21P3lqc7VrzCMKGaRnrn762hc8+zEZXntuLh2s2QJgE1pG xgOedIZFiH4jN8r3JpTiujJfphWZyIIs80JAgzdWbWHhLaYFDIMw8Pesdef8siNYz5bU /Rmw== X-Gm-Message-State: AOAM530cssNvQVqPfQRTOY66krLS6rZsnmRpYOgmkVRkKkR1q7a09GY9 Goure5jFIddjDfwnUHeK6yJqq9rLsQ== X-Google-Smtp-Source: ABdhPJwneig6quZcD4EH7qhsmMif4b59tyiVBQVXVFrovqc3e3XFtagGRfJvYdmkm8XMaM7PNTmMSw== X-Received: by 2002:ad4:4f84:: with SMTP id em4mr7809016qvb.31.1613869671414; Sat, 20 Feb 2021 17:07:51 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b07-927a-9c68-72b3-3fc3-46af.res6.spectrum.com. [2603:6081:7b07:927a:9c68:72b3:3fc3:46af]) by smtp.gmail.com with ESMTPSA id p12sm8233241qtw.27.2021.02.20.17.07.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Feb 2021 17:07:50 -0800 (PST) From: Tom Rini 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 Message-Id: <20210221010634.21310-58-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210221010634.21310-1-trini@konsulko.com> References: <20210221010634.21310-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean 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 --- 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