From patchwork Wed Jan 15 01:22:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 2034465 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=HMBlgn4d; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4YXpDH2v6Fz1xph for ; Wed, 15 Jan 2025 12:23:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E8BC180735; Wed, 15 Jan 2025 02:23:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="HMBlgn4d"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C396280716; Wed, 15 Jan 2025 02:23:35 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) (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 850F6806D4 for ; Wed, 15 Jan 2025 02:23:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qv1-xf2e.google.com with SMTP id 6a1803df08f44-6d8f75b31bfso53777626d6.3 for ; Tue, 14 Jan 2025 17:23:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1736904211; x=1737509011; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ppSx3aFmsX9Piz9dzlux/P+kWXMOWmJT47tUj/aqWc0=; b=HMBlgn4dtbKLTJ78Zur+o0PrszCGdu8Idcz+2zjmiwyDm1Sw+kdg3OF/3wNUsyLv6W qDqo+mEwDKh74w4h/3zWkeQv5QsVc7GpGtyjZ1RYT2lSCJEhRFgugpVagBtdHV2DYyPd cb+Om0iwwcDReWI4A+7rkxhIRYFGekz5lT2F8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736904211; x=1737509011; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ppSx3aFmsX9Piz9dzlux/P+kWXMOWmJT47tUj/aqWc0=; b=MdGGJVsdkBoSedZQErPAb7qDDKYxu8aR5c2WAtCLgyWOun63nSK+Uy2rQhpMfKBw7Y cXqpnKF6TgwAyb9gj0a1pm+mZ+udSoxI9v8VtISLAacEimK7pGgis+bFdL/4bhIDMG6T bRpkz6ZEBf+tT1EpBpG+mTUrMpJzIXwoHpoRGkqwUg4qW4Dax9S/g9TXyGMktJQfs97l UZO5qdkqUUhtqkCmpsrpRagkpxqe+PdEpAl1Tk5u49jdNLPvR0I6XnjNoeR0IbfWmiyI u/mBRg7xf4EUuSESiSt0b6tSGRpV/csIstfzobuFLZoPVvrve5wmLiAf008+XA+UAjdH 0wiw== X-Gm-Message-State: AOJu0YzgNk36u/EzQHvPu9CFm/XegRTBEhJTC/3QJ/ceE+k1gQkuQxrT fjRgK9hmlcmGTAy9SRfX+ZmRnu6dKH4EgAjh9j3J/5eTosmjukNTeHl//W9BxoL0suGdqBpBmEu 1 X-Gm-Gg: ASbGncvMffJC/pJOAda2YRgtL718TSWKkVcazMgAAZElurU/Zix3E2DKT4Y/jocxbOZ Yp2dfRGH9OtUlSLatIugokUNh64IZPKL2tgMXvGmTP3Zftcw8S2svImk86lG4tHBo+8E+6xJJDR bN+wRpC+hjER0JcK+MM01kgJGfHx082seu1N4ynVHYj3c+/Cmpg1T3/Y87SHdNx7U0MqwVs57wv 1O6PkV6rv3YMbIQ4s9Xrrv/wKz5gBYKBXJzFPwFgcaCXIqaRd2u0mKXvRW4cCd100cYxRA6PVzC X-Google-Smtp-Source: AGHT+IG4W5rz8hs71iF0g5AGzBccToiiy7ca1b58gAlzEWe6C0IR3w/7Z1cEmxBQ9GDoJv479YZM/A== X-Received: by 2002:a05:6214:2b83:b0:6e0:86ab:4b46 with SMTP id 6a1803df08f44-6e086ab4bd5mr212120926d6.31.1736904211415; Tue, 14 Jan 2025 17:23:31 -0800 (PST) Received: from bill-the-cat.tail58a08.ts.net ([187.144.16.9]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6dfad9a2358sm59817096d6.50.2025.01.14.17.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 17:23:30 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Jaehoon Chung , Quentin Schulz Subject: [PATCHv2 1/6] drivers/mmc/Kconfig: Remove extraneous BLK dependencies Date: Tue, 14 Jan 2025 19:22:08 -0600 Message-ID: <20250115012322.215243-2-trini@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250115012322.215243-1-trini@konsulko.com> References: <20241220222612.1757884-1-trini@konsulko.com> <20250115012322.215243-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean At this point in time, we know that with the MMC symbol enabled we will always also have the BLK symbol enabled, so we do not need to list that as a dependency for MMC drivers. Signed-off-by: Tom Rini Reviewed-by: Jaehoon Chung Reviewed-by: Quentin Schulz --- Changes in v2: - Reword the body of the commit to try and be clearer, requested by Quentin --- drivers/mmc/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index f4fdf15242ce..9f2fecce3826 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -338,7 +338,7 @@ config MMC_MXC config MMC_OWL bool "Actions OWL Multimedia Card Interface support" - depends on ARCH_OWL && DM_MMC && BLK + depends on ARCH_OWL && DM_MMC help This selects the OWL SD/MMC host controller found on board based on Actions S700/S900 SoC. @@ -633,7 +633,7 @@ config MMC_SDHCI_AM654 bool "SDHCI Controller on TI's Am654 devices" depends on ARCH_K3 depends on MMC_SDHCI - depends on DM_MMC && OF_CONTROL && BLK + depends on DM_MMC && OF_CONTROL depends on REGMAP select MMC_SDHCI_IO_ACCESSORS help @@ -716,7 +716,7 @@ config MMC_SDHCI_PIC32 config MMC_SDHCI_ROCKCHIP bool "Arasan SDHCI controller for Rockchip support" depends on ARCH_ROCKCHIP - depends on DM_MMC && BLK + depends on DM_MMC depends on MMC_SDHCI help Support for Arasan SDHCI host controller on Rockchip ARM SoCs platform @@ -764,7 +764,7 @@ config MMC_SDHCI_XENON config MMC_SDHCI_TANGIER bool "Tangier SDHCI controller support" - depends on DM_MMC && BLK + depends on DM_MMC depends on MMC_SDHCI help This selects support for SDHCI controller on Tanginer @@ -800,7 +800,7 @@ config TEGRA124_MMC_DISABLE_EXT_LOOPBACK config MMC_SDHCI_ZYNQ bool "Arasan SDHCI controller support" - depends on DM_MMC && OF_CONTROL && BLK + depends on DM_MMC && OF_CONTROL depends on MMC_SDHCI help Support for Arasan SDHCI host controller on Zynq/ZynqMP ARM SoCs platform @@ -842,7 +842,7 @@ config MMC_SUNXI_HAS_MODE_SWITCH config MMC_PITON bool "MMC support for OpenPiton SoC" - depends on DM_MMC && BLK + depends on DM_MMC help This selects support for the SD host controller on OpenPiton SoC. Note that this SD controller directly exposes the contents of the From patchwork Wed Jan 15 01:22:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 2034466 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=HN8UkHwz; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4YXpDR6tKlz1xph for ; Wed, 15 Jan 2025 12:23:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 686A580757; Wed, 15 Jan 2025 02:23:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="HN8UkHwz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D94F380702; Wed, 15 Jan 2025 02:23:36 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf2f.google.com (mail-qv1-xf2f.google.com [IPv6:2607:f8b0:4864:20::f2f]) (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 1213D80702 for ; Wed, 15 Jan 2025 02:23:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qv1-xf2f.google.com with SMTP id 6a1803df08f44-6e17d3e92d9so16950526d6.1 for ; Tue, 14 Jan 2025 17:23:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1736904213; x=1737509013; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w+H2bCDG3yobM4iQyLzlnG+a6x54HhyfNUBydFQCtj4=; b=HN8UkHwz0z1fIDbCEL59dVgeKuvOcIEzydkFK3UQDg7ds63B8D6lcb0SaFCjJeTtBl pRO1MYh/6HNSapByXz6+zZckJMX2cVmRlPEMufww4MhGO+yeAbD2RAw+ztPd/KpmBArI SU6mcC54ls3yMl0HnP+Jv+5cUPTn+NFj6sa50= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736904213; x=1737509013; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w+H2bCDG3yobM4iQyLzlnG+a6x54HhyfNUBydFQCtj4=; b=F98M5onjgALDUyWcBIYLNJn+/Ap4bh0FhV6XpR9abyzZ8aDBaTYD+h7V0DqZPZRZp3 2Xthps1IUfVNhunwXLfGItO4QK+wlldxSkJ6zdsjmOlTujqUub1zUJF1Ry3G1Ru7e8fK 8JF4diYffBSyKMAH6og3mNL3TrPkwgIonfHKWv3aWELIVn5VXlaWjXKcibO4KIsNg85N 08CeNzmJ+xv6zwLWA5o17lxQDJdv3T1logdkIkiUmoDJnotBPNAfWUNHJz0P1Qqx/c52 CRDwkNFd7ubeQhIBoENQ3mASllBbdFzHCr43LpPHYRHCTF6U+6nrYcSnWc0IBvDhZaDt 4PTQ== X-Gm-Message-State: AOJu0YykOrbloo6T6HQ4cs1JuGNjMkg+aj+AmJ9vZHvD9+Az37bKFaNT z6OTau4SNldL28ih1BJzZOmgnAs8+Y/duVGJ/OIQQtwGTCJf3x41QEFYQwtro4koT3CAQA3seuV 9 X-Gm-Gg: ASbGnctQpmm84En3uTa2uqhq/QhXwUC0ZLtg59MXcL5BesozUx/NacoKGJX1WZE5JbR idcekdmvYt2oR2tEvu75GXc6lGBt4GF6dWEbjCi8DxvkF25RvUtMJOCDhTm6LMeh8bfj1A4EVSy Y+tgtWX8Dw+Ux/is5Zl+joA5uOkXZiIAgU2jjMR2W8Nr9e+pi/xIuUvL/Uz/Xl1GdDeclQrqX/k Ha52kfJwAaCWpIv1IjopqbQPQ+YsQeEpMIZWGRTXIeQ2rXpbF3gty8C87LTO7tOq3TFqEr6MkSs X-Google-Smtp-Source: AGHT+IGFpKezWchXeCJaaWUuw2Zl4MWq/Fmcdu1Hd0tbCqCEyJPizg7t36vv8rl5ePOzs5dD4erGcQ== X-Received: by 2002:a05:6214:5bc2:b0:6d8:a730:110d with SMTP id 6a1803df08f44-6df9b0eea41mr427913426d6.0.1736904212787; Tue, 14 Jan 2025 17:23:32 -0800 (PST) Received: from bill-the-cat.tail58a08.ts.net ([187.144.16.9]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6dfad9a2358sm59817096d6.50.2025.01.14.17.23.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 17:23:32 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Peter Robinson Subject: [PATCHv2 2/6] drivers/mmc/Kconfig: Make DM_MMC a hidden symbol Date: Tue, 14 Jan 2025 19:22:09 -0600 Message-ID: <20250115012322.215243-3-trini@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250115012322.215243-1-trini@konsulko.com> References: <20241220222612.1757884-1-trini@konsulko.com> <20250115012322.215243-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean At this point in time, DM is always enabled. So if MMC is enabled, it should select DM_MMC. No drivers need to depend on DM_MMC being enabled now, so remove that from dependency lists. This now means that a number of platforms which select'd DM_MMC need to select MMC instead. Signed-off-by: Tom Rini Reviewed-by: Peter Robinson --- Changes in v2: - None. --- arch/Kconfig | 2 +- arch/arm/Kconfig | 18 +++------ arch/arm/mach-exynos/Kconfig | 8 ++-- arch/arm/mach-imx/mx5/Kconfig | 2 +- arch/arm/mach-imx/mx6/Kconfig | 32 +++++++-------- arch/arm/mach-omap2/omap3/Kconfig | 2 +- arch/arm/mach-s5pc1xx/Kconfig | 2 +- arch/arm/mach-tegra/Kconfig | 2 +- drivers/mmc/Kconfig | 65 +++++++++++-------------------- 9 files changed, 52 insertions(+), 81 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index bb2e7bedd106..14e914366593 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -180,13 +180,13 @@ config SANDBOX select DM_GPIO select DM_I2C select DM_KEYBOARD - select DM_MMC select DM_SERIAL select DM_SPI select DM_SPI_FLASH select GZIP_COMPRESSED select IO_TRACE select LZO + select MMC select MTD select OF_BOARD_SETUP select PCI_ENDPOINT diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3ed9494dfe4e..127241e608c4 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1164,7 +1164,6 @@ config ARCH_SUNXI select DM_SPI if SPI select DM_SPI_FLASH if SPI && MTD select DM_KEYBOARD - select DM_MMC if MMC select DM_SERIAL select OF_BOARD_SETUP select OF_CONTROL @@ -1212,7 +1211,6 @@ config ARCH_U8500 select CPU_V7A select DM select DM_GPIO - select DM_MMC if MMC select DM_SERIAL select DM_USB_GADGET if DM_USB select OF_CONTROL @@ -1237,7 +1235,6 @@ config ARCH_VERSAL select ARM64 select CLK select DM - select DM_MMC if MMC select DM_SERIAL select GICV3 select OF_CONTROL @@ -1250,7 +1247,6 @@ config ARCH_VERSAL2 select ARM64 select CLK select DM - select DM_MMC if MMC select DM_SERIAL select OF_CONTROL imply BOARD_LATE_INIT @@ -1262,7 +1258,6 @@ config ARCH_VERSAL_NET select ARM64 select CLK select DM - select DM_MMC if MMC select DM_SERIAL select OF_CONTROL imply BOARD_LATE_INIT @@ -1287,7 +1282,6 @@ config ARCH_ZYNQ select CPU_V7A select DEBUG_UART_BOARD_INIT if SPL && DEBUG_UART select DM - select DM_MMC if MMC select DM_SERIAL select DM_SPI select DM_SPI_FLASH @@ -1316,7 +1310,6 @@ config ARCH_ZYNQMP_R5 select CLK select CPU_V7R select DM - select DM_MMC if MMC select DM_SERIAL select OF_CONTROL imply CMD_DM @@ -1330,7 +1323,6 @@ config ARCH_ZYNQMP select DM select DEBUG_UART_BOARD_INIT if SPL && DEBUG_UART imply DM_MAILBOX - select DM_MMC if MMC select DM_SERIAL select MTD select DM_SPI if SPI @@ -1398,8 +1390,8 @@ config TARGET_TOTAL_COMPUTE select PL01X_SERIAL select DM select DM_SERIAL - select DM_MMC select DM_GPIO + select MMC imply OF_HAS_PRIOR_STAGE imply MISC_INIT_R @@ -1905,7 +1897,7 @@ config TARGET_SL28 select DM select DM_GPIO select DM_I2C - select DM_MMC + select MMC select MTD select DM_SPI_FLASH select DM_MDIO @@ -1946,10 +1938,10 @@ config ARCH_UNIPHIER select DM select DM_GPIO select DM_I2C - select DM_MMC select DM_MTD select DM_RESET select DM_SERIAL + select MMC select OF_BOARD_SETUP select OF_CONTROL select OF_LIBFDT @@ -1993,9 +1985,9 @@ config ARCH_STI select BLK select CPU_V7A select DM - select DM_MMC select DM_RESET select DM_SERIAL + select MMC imply CMD_DM help Support for STMicroelectronics STiH407/10 SoC family. @@ -2042,7 +2034,6 @@ config ARCH_ROCKCHIP select DM select DM_GPIO select DM_I2C - select DM_MMC select DM_PWM select DM_REGULATOR select DM_SERIAL @@ -2051,6 +2042,7 @@ config ARCH_ROCKCHIP select DM_USB_GADGET if USB_DWC3_GADGET select ENABLE_ARM_SOC_BOOT0_HOOK select OF_CONTROL + select MMC select MTD select SPI select SPL_DM if SPL diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 3fee5a4299b8..7e6959510087 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -19,7 +19,7 @@ config ARCH_EXYNOS4 select BOARD_EARLY_INIT_F select CPU_V7A select BLK - select DM_MMC + select MMC help Samsung Exynos4 SoC family are based on ARM Cortex-A9 CPU. There are multiple SoCs in this family including Exynos4210, Exynos4412, @@ -40,7 +40,7 @@ config ARCH_EXYNOS5 imply USB_ETHER_RTL8152 imply USB_ETHER_SMSC95XX select BLK - select DM_MMC + select MMC help Samsung Exynos5 SoC family are based on ARM Cortex-A15 CPU (and @@ -52,7 +52,7 @@ config ARCH_EXYNOS7 select ARM64 select BOARD_EARLY_INIT_F select BLK - select DM_MMC + select MMC help Samsung Exynos7 SoC family are based on ARM Cortex-A57 CPU or Cortex-A53 CPU (and some in a big.LITTLE configuration). There are @@ -62,7 +62,7 @@ config ARCH_EXYNOS9 bool "Exynos9 SoC family" select ARM64 select BLK - select DM_MMC + select MMC help Samsung Exynos9 SoC family are based on ARMv8 Cortex CPU. There are multiple SoCs in this family including Exynos850. diff --git a/arch/arm/mach-imx/mx5/Kconfig b/arch/arm/mach-imx/mx5/Kconfig index d282663dcf1f..4d1e07b14d32 100644 --- a/arch/arm/mach-imx/mx5/Kconfig +++ b/arch/arm/mach-imx/mx5/Kconfig @@ -26,9 +26,9 @@ config TARGET_KP_IMX53 select DM_I2C select DM_PMIC select DM_SERIAL - select DM_MMC select BLK select DM_REGULATOR + select MMC select MX53 imply CMD_DM diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 1f8022ee6853..4020e16d92dc 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -81,8 +81,8 @@ config MX6UL_OPOS6UL select BOARD_LATE_INIT select DM select DM_GPIO - select DM_MMC select DM_THERMAL + select MMC select SPL_DM if SPL select SPL_OF_CONTROL if SPL select SPL_PINCTRL if SPL @@ -176,9 +176,9 @@ config TARGET_DART_6UL select DM select DM_GPIO select DM_I2C - select DM_MMC select DM_SERIAL select DM_THERMAL + select MMC select SUPPORT_SPL config TARGET_DHCOMIMX6 @@ -197,10 +197,10 @@ config TARGET_DISPLAY5 depends on MX6Q select DM select DM_I2C - select DM_MMC select DM_SPI select DM_GPIO select DM_SERIAL + select MMC select MTD select SUPPORT_SPL imply CMD_DM @@ -245,7 +245,7 @@ config TARGET_KOSAGI_NOVENA bool "Kosagi Novena" select BOARD_LATE_INIT select DM_GPIO - select DM_MMC + select MMC select PCI select SCSI select VIDEO @@ -280,8 +280,8 @@ config TARGET_MX6LOGICPD select DM select DM_GPIO select DM_I2C - select DM_MMC select DM_PMIC + select MMC select OF_CONTROL imply CMD_DM @@ -300,10 +300,10 @@ config TARGET_MX6DL_MAMOJ select DM select DM_GPIO select DM_I2C - select DM_MMC select DM_PMIC select DM_PMIC_PFUZE100 select DM_THERMAL + select MMC select OF_CONTROL select PINCTRL select SPL @@ -332,8 +332,8 @@ config TARGET_MX6Q_ENGICAM select DM select DM_GPIO select DM_I2C - select DM_MMC select DM_THERMAL + select MMC select OF_CONTROL select SPL_DM if SPL select SPL_OF_CONTROL if SPL @@ -352,8 +352,8 @@ config TARGET_MX6Q_ACC select DM select DM_GPIO select DM_I2C - select DM_MMC select DM_THERMAL + select MMC select SUPPORT_SPL config TARGET_MX6S_SIELAFF @@ -453,8 +453,8 @@ config TARGET_MX6UL_ENGICAM select DM select DM_GPIO select DM_I2C - select DM_MMC select DM_THERMAL + select MMC select OF_CONTROL select SPL_DM if SPL select SPL_OF_CONTROL if SPL @@ -490,9 +490,9 @@ config TARGET_MYS_6ULX select DM select DM_GPIO select DM_I2C - select DM_MMC select DM_SERIAL select DM_THERMAL + select MMC select SUPPORT_SPL config TARGET_NITROGEN6X @@ -507,10 +507,10 @@ config TARGET_NPI_IMX6ULL bool "Seeed NPI-IMX6ULL" depends on MX6ULL select DM - select DM_MMC select DM_GPIO select DM_SERIAL select DM_THERMAL + select MMC select SUPPORT_SPL config TARGET_OPOS6ULDEV @@ -566,9 +566,9 @@ config TARGET_PCL063 select DM select DM_GPIO select DM_I2C - select DM_MMC select DM_SERIAL select DM_THERMAL + select MMC select SUPPORT_SPL config TARGET_PCL063_ULL @@ -577,9 +577,9 @@ config TARGET_PCL063_ULL select DM select DM_GPIO select DM_I2C - select DM_MMC select DM_SERIAL select DM_THERMAL + select MMC select SUPPORT_SPL config TARGET_SOMLABS_VISIONSOM_6ULL @@ -588,9 +588,9 @@ config TARGET_SOMLABS_VISIONSOM_6ULL select BOARD_LATE_INIT select DM select DM_GPIO - select DM_MMC select DM_SERIAL select DM_THERMAL + select MMC imply CMD_DM config TARGET_TBS2910 @@ -605,7 +605,7 @@ config TARGET_KP_IMX6Q_TPC select DM select SPL_DM if SPL select DM_THERMAL - select DM_MMC + select MMC select DM_REGULATOR select SPL_DM_REGULATOR if SPL select DM_SERIAL @@ -673,7 +673,7 @@ config TARGET_BRPPT2 select DM select DM_GPIO select DM_I2C - select DM_MMC + select MMC select SUPPORT_SPL select SPL_DM if SPL select SPL_OF_CONTROL if SPL diff --git a/arch/arm/mach-omap2/omap3/Kconfig b/arch/arm/mach-omap2/omap3/Kconfig index f15f44fe7d4b..a175e5ce6edc 100644 --- a/arch/arm/mach-omap2/omap3/Kconfig +++ b/arch/arm/mach-omap2/omap3/Kconfig @@ -30,8 +30,8 @@ config TARGET_AM3517_EVM select DM select DM_GPIO select DM_I2C - select DM_MMC select DM_SERIAL + select MMC imply CMD_DM config TARGET_CM_T35 diff --git a/arch/arm/mach-s5pc1xx/Kconfig b/arch/arm/mach-s5pc1xx/Kconfig index b6a4b0b653fb..b15b2e7b6a01 100644 --- a/arch/arm/mach-s5pc1xx/Kconfig +++ b/arch/arm/mach-s5pc1xx/Kconfig @@ -8,8 +8,8 @@ config TARGET_S5P_GONI bool "S5P Goni board" select OF_CONTROL select BLK - select DM_MMC select MISC_COMMON + select MMC config TARGET_SMDKC100 bool "Support smdkc100 board" diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 04612895576a..78b89729f191 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -48,13 +48,13 @@ config TEGRA_COMMON select DM_GPIO select DM_I2C select DM_KEYBOARD - select DM_MMC select DM_PWM select DM_RESET select DM_SERIAL select DM_SPI select DM_SPI_FLASH select MISC + select MMC select MTD select OF_CONTROL select SPI diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 9f2fecce3826..46513db0d6e3 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -3,7 +3,7 @@ menu "MMC Host controller Support" config MMC bool "MMC/SD/SDIO card support" default ARM || PPC || SANDBOX - select DM_MMC if DM + select DM_MMC help This selects MultiMediaCard, Secure Digital and Secure Digital I/O support. @@ -39,14 +39,14 @@ config MMC_BROKEN_CD If card detection feature is broken, just poll to detect. config DM_MMC - bool "Enable MMC controllers using Driver Model" + bool depends on DM help - This enables the MultiMediaCard (MMC) uclass which supports MMC and - Secure Digital I/O (SDIO) cards. Both removable (SD, micro-SD, etc.) - and non-removable (e.g. eMMC chip) devices are supported. These - appear as block devices in U-Boot and can support filesystems such - as EXT4 and FAT. + This enables the MultiMediaCard (MMC) driver model uclass which + supports MMC and Secure Digital I/O (SDIO) cards. Both removable (SD, + micro-SD, etc.) and non-removable (e.g. eMMC chip) devices are + supported. These appear as block devices in U-Boot and can support + filesystems such as EXT4 and FAT. config SPL_DM_MMC bool "Enable MMC controllers using Driver Model in SPL" @@ -79,7 +79,7 @@ config MMC_SDHCI_ADMA_HELPERS config MMC_SPI bool "Support for SPI-based MMC controller" - depends on DM_MMC && DM_SPI + depends on DM_SPI help This selects SPI-based MMC controllers. If you have an MMC controller on a SPI bus, say Y here. @@ -97,7 +97,6 @@ config MMC_SPI_CRC_ON config ARM_PL180_MMCI bool "ARM AMBA Multimedia Card Interface and compatible support" - depends on DM_MMC help This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card Interface (PL180, PL181 and compatible) support. @@ -258,7 +257,6 @@ config MMC_DW config MMC_DW_CORTINA bool "Cortina specific extensions for Synopsys DW Memory Card Interface" - depends on DM_MMC depends on MMC_DW help This selects support for Cortina SoC specific extensions to the @@ -285,7 +283,7 @@ config MMC_DW_K3 config MMC_DW_ROCKCHIP bool "Rockchip SD/MMC controller support" - depends on DM_MMC && OF_CONTROL + depends on OF_CONTROL depends on MMC_DW help This enables support for the Rockchip SD/MMM controller, which is @@ -306,7 +304,6 @@ config MMC_DW_SOCFPGA config MMC_DW_SNPS bool "Extensions for DW Memory Card Interface used in Synopsys ARC devboards" depends on MMC_DW - depends on DM_MMC depends on OF_CONTROL depends on CLK help @@ -317,13 +314,12 @@ config NEXELL_DWMMC bool "Nexell SD/MMC controller support" depends on ARCH_NEXELL depends on MMC_DW - depends on DM_MMC depends on PINCTRL_NEXELL default y config MMC_MESON_GX bool "Meson GX EMMC controller support" - depends on DM_MMC && ARCH_MESON + depends on ARCH_MESON help Support for EMMC host controller on Meson GX ARM SoCs platform (S905) @@ -338,7 +334,7 @@ config MMC_MXC config MMC_OWL bool "Actions OWL Multimedia Card Interface support" - depends on ARCH_OWL && DM_MMC + depends on ARCH_OWL help This selects the OWL SD/MMC host controller found on board based on Actions S700/S900 SoC. @@ -366,7 +362,6 @@ config MMC_PCI config MMC_OCTEONTX bool "Marvell Octeon Multimedia Card Interface support" depends on (ARCH_OCTEON || ARCH_OCTEONTX || ARCH_OCTEONTX2) - depends on DM_MMC select MMC_SUPPORTS_TUNING if ARCH_OCTEONTX2 help This selects the Octeon Multimedia card Interface. @@ -377,7 +372,7 @@ config MMC_OCTEONTX config MVEBU_MMC bool "Kirkwood MMC controller support" - depends on DM_MMC && ARCH_KIRKWOOD + depends on ARCH_KIRKWOOD help Support for MMC host controller on Kirkwood SoCs. If you are on a Kirkwood architecture, say Y here. @@ -386,8 +381,7 @@ config MVEBU_MMC config MMC_OMAP_HS bool "TI OMAP High Speed Multimedia Card Interface support" - select DM_REGULATOR_PBIAS if DM_MMC && DM_REGULATOR - select DM_REGULATOR_PBIAS if DM_MMC && DM_REGULATOR + select DM_REGULATOR_PBIAS if DM_REGULATOR help This selects the TI OMAP High Speed Multimedia card Interface. If you have an omap2plus board with a Multimedia Card slot, @@ -430,7 +424,6 @@ config SH_MMCIF config MMC_UNIPHIER bool "UniPhier SD/MMC Host Controller support" depends on ARCH_UNIPHIER - depends on DM_MMC depends on OF_CONTROL help This selects support for the Matsushita SD/MMC Host Controller on @@ -439,7 +432,6 @@ config MMC_UNIPHIER config RENESAS_SDHI bool "Renesas R-Car SD/MMC Host Controller support" depends on ARCH_RENESAS - depends on DM_MMC depends on OF_CONTROL select BOUNCE_BUFFER help @@ -449,7 +441,6 @@ config RENESAS_SDHI config MMC_BCM2835 bool "BCM2835 family custom SD/MMC Host Controller support" depends on ARCH_BCM283X - depends on DM_MMC depends on OF_CONTROL default y help @@ -469,7 +460,7 @@ config JZ47XX_MMC config MMC_SANDBOX bool "Sandbox MMC support" depends on SANDBOX - depends on DM_MMC && OF_CONTROL + depends on OF_CONTROL help This select a dummy sandbox MMC driver. At present this does nothing other than allow sandbox to be build with MMC support. This @@ -559,7 +550,6 @@ config FIXED_SDHCI_ALIGNED_BUFFER config MMC_SDHCI_ASPEED bool "Aspeed SDHCI controller" depends on ARCH_ASPEED - depends on DM_MMC depends on MMC_SDHCI select MISC help @@ -571,7 +561,7 @@ config MMC_SDHCI_ASPEED config MMC_SDHCI_ATMEL bool "Atmel SDHCI controller support" depends on ARCH_AT91 - depends on DM_MMC && ARCH_AT91 + depends on ARCH_AT91 depends on MMC_SDHCI help This enables support for the Atmel SDHCI controller, which supports @@ -606,7 +596,6 @@ config MMC_SDHCI_BCMSTB config MMC_SDHCI_CADENCE bool "SDHCI support for the Cadence SD/SDIO/eMMC controller" - depends on DM_MMC depends on MMC_SDHCI depends on OF_CONTROL help @@ -618,7 +607,6 @@ config MMC_SDHCI_CADENCE config MMC_SDHCI_CV1800B bool "SDHCI support for the CV1800B SD/SDIO/eMMC controller" - depends on DM_MMC depends on MMC_SDHCI depends on OF_CONTROL help @@ -633,7 +621,7 @@ config MMC_SDHCI_AM654 bool "SDHCI Controller on TI's Am654 devices" depends on ARCH_K3 depends on MMC_SDHCI - depends on DM_MMC && OF_CONTROL + depends on OF_CONTROL depends on REGMAP select MMC_SDHCI_IO_ACCESSORS help @@ -653,7 +641,6 @@ config MMC_SDHCI_IPROC config MMC_SDHCI_F_SDH30 bool "SDHCI support for Fujitsu Semiconductor/Socionext F_SDH30" - depends on DM_MMC depends on MMC_SDHCI help This selects the Secure Digital Host Controller Interface (SDHCI) @@ -673,7 +660,6 @@ config MMC_SDHCI_KONA config MMC_SDHCI_MSM bool "Qualcomm SDHCI controller" - depends on DM_MMC depends on MMC_SDHCI help Enables support for SDHCI 2.0 controller present on some Qualcomm @@ -685,7 +671,6 @@ config MMC_SDHCI_MV bool "SDHCI support on Marvell platform" depends on ARCH_MVEBU depends on MMC_SDHCI - depends on DM_MMC help This selects the Secure Digital Host Controller Interface on Marvell platform. @@ -697,7 +682,6 @@ config MMC_SDHCI_MV config MMC_SDHCI_NPCM bool "SDHCI support on Nuvoton NPCM device" depends on MMC_SDHCI - depends on DM_MMC help This selects the Secure Digital Host Controller Interface (SDHCI) on Nuvoton NPCM device. @@ -708,7 +692,7 @@ config MMC_SDHCI_NPCM config MMC_SDHCI_PIC32 bool "Microchip PIC32 on-chip SDHCI support" - depends on DM_MMC && MACH_PIC32 + depends on MACH_PIC32 depends on MMC_SDHCI help Support for Microchip PIC32 SDHCI controller. @@ -716,7 +700,6 @@ config MMC_SDHCI_PIC32 config MMC_SDHCI_ROCKCHIP bool "Arasan SDHCI controller for Rockchip support" depends on ARCH_ROCKCHIP - depends on DM_MMC depends on MMC_SDHCI help Support for Arasan SDHCI host controller on Rockchip ARM SoCs platform @@ -735,7 +718,6 @@ config MMC_SDHCI_S5P config MMC_SDHCI_SNPS bool "Synopsys DesignWare SDHCI controller" depends on MMC_SDHCI - depends on DM_MMC help Support for DesignWare SDHCI host controller on Alibaba TH1520 SoC. This is a highly configurable and programmable, high performance @@ -753,7 +735,7 @@ config MMC_SDHCI_STI config MMC_SDHCI_XENON bool "SDHCI support for the Xenon SDHCI controller" - depends on MMC_SDHCI && DM_MMC && OF_CONTROL + depends on MMC_SDHCI && OF_CONTROL help Support for Xenon SDHCI host controller on Marvell Armada 3700 7k/8k ARM SoCs platforms @@ -764,7 +746,6 @@ config MMC_SDHCI_XENON config MMC_SDHCI_TANGIER bool "Tangier SDHCI controller support" - depends on DM_MMC depends on MMC_SDHCI help This selects support for SDHCI controller on Tanginer @@ -800,7 +781,7 @@ config TEGRA124_MMC_DISABLE_EXT_LOOPBACK config MMC_SDHCI_ZYNQ bool "Arasan SDHCI controller support" - depends on DM_MMC && OF_CONTROL + depends on OF_CONTROL depends on MMC_SDHCI help Support for Arasan SDHCI host controller on Zynq/ZynqMP ARM SoCs platform @@ -842,7 +823,6 @@ config MMC_SUNXI_HAS_MODE_SWITCH config MMC_PITON bool "MMC support for OpenPiton SoC" - depends on DM_MMC help This selects support for the SD host controller on OpenPiton SoC. Note that this SD controller directly exposes the contents of the @@ -851,7 +831,7 @@ config MMC_PITON config GENERIC_ATMEL_MCI bool "Atmel Multimedia Card Interface support" - depends on DM_MMC && ARCH_AT91 + depends on ARCH_AT91 help This enables support for Atmel High Speed Multimedia Card Interface (HSMCI), which supports the MultiMedia Card (MMC) Specification V4.3, @@ -860,7 +840,7 @@ config GENERIC_ATMEL_MCI config STM32_SDMMC2 bool "STMicroelectronics STM32H7 SD/MMC Host Controller support" - depends on DM_MMC && OF_CONTROL + depends on OF_CONTROL help This selects support for the SD/MMC controller on STM32H7 SoCs. If you have a board based on such a SoC and with a SD/MMC slot, @@ -880,7 +860,6 @@ config FTSDC010_SDIO config MMC_MTK bool "MediaTek SD/MMC Card Interface support" depends on ARCH_MEDIATEK || ARCH_MTMIPS - depends on DM_MMC depends on OF_CONTROL help This selects the MediaTek(R) Secure digital and Multimedia card Interface. @@ -911,7 +890,7 @@ config FSL_ESDHC_SUPPORT_ADMA2 config FSL_ESDHC_33V_IO_RELIABILITY_WORKAROUND bool "enable eSDHC workaround for 3.3v IO reliability issue" - depends on FSL_ESDHC && DM_MMC + depends on FSL_ESDHC help When eSDHC operates at 3.3v, damage can accumulate in an internal level shifter at a higher than expected rate. The faster the interface From patchwork Wed Jan 15 01:22:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 2034467 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=DlJJfjOD; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4YXpDb39fhz1xph for ; Wed, 15 Jan 2025 12:23:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BE35480719; Wed, 15 Jan 2025 02:23:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="DlJJfjOD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 479DC80755; Wed, 15 Jan 2025 02:23:38 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) (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 ECE188060C for ; Wed, 15 Jan 2025 02:23:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x830.google.com with SMTP id d75a77b69052e-4678664e22fso59180391cf.2 for ; Tue, 14 Jan 2025 17:23:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1736904215; x=1737509015; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ri7CVdRdc+ubSLzMJwwdGA28mAhatcB+G4KC7zxxDiM=; b=DlJJfjODllfMi8v0G2ZpRPeB2VZUv/i4VU7xq940BDbcYAO3xCQFDGwfTEujaxhuZ3 P2F1+scVCbOmMSBT0uhvdEDueG8LbseAnnvDU1VLzxf8MH9YcHxkdwc0saYgHQZ04ivO 4CXTvMlQEPhNhGHRH1DH39jktLgVBXQlUvHwM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736904215; x=1737509015; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ri7CVdRdc+ubSLzMJwwdGA28mAhatcB+G4KC7zxxDiM=; b=hCUMKFdkiP4tyUl+9Fdw3wRa9Kl8SYegEIxRq+/FzW67VI3VCDJ4qMuzCB6G4cDOOW UkxIVzY5B5RUZtNTBLeBuEZKkTislten9Cru1kFGJotfl9zIILp/MmvqUZ0RqdDmar8u aZ699u5CFrlZ1FRKQYKXah8dIbXFuatLRDb9geod2GVJNZ2Y+AXPyv30OVeTf2k/58wO BtZlarhCBiHUJsH3wXTq706/imPBJS68eS8uZ6LxGRz38LbqjUumsJG9K/EVoDWV4k5C 0VKx+ZcMJBz0OUPTHg6Vm1V2AgWs27G5DzgXeBSmgJOpo1u7GBqX3ZjTC9LtfyrSDkQ/ v+Xg== X-Gm-Message-State: AOJu0Ywk4Er9fKdn7A7tzKuHjsA7GpfAuz59hYFkVodzG0N33sZJ2oZW +Ldp+nMCJ20/yV/Rbi/d/RYT7f1fn1Eu8b4MUZ34s60yQsn0cdB0XbkDQL2iK4/yjX+A1PuS8OH h X-Gm-Gg: ASbGncvq7BLBMoMLm3ZKThiocqVRhxnnwP9On1qNxtVUIW8bbpj2tmAezG0vNbcbbfk k+AWi91mthm2r4E28z5bPfR2XSrU3Kc/JyJTUzQXGzEVAeFPb6OR0CNiCoUpqM/G5LhRu6crKel O2sntcDmmsUjSODKrwqJF0tcpyb5amUKwOXHuBvpIZFBpbT0GiTyrbQLSO7eYvM8Ps9hCDdZOeU Nkt6T2xgkifmdspU1Ppoadm37PqizzZ8mVa+gKAYGMQvwAfpwjQ7LK186s1aJoAjTLTiCZggQFi X-Google-Smtp-Source: AGHT+IHa97EDdcRcs96cKQdFfdgDATJ3O7zrrbJRDuFCYtpL/QuiPmEyc5s9NP84g9ztZMz0nQDdQg== X-Received: by 2002:a05:622a:1196:b0:467:65d4:42aa with SMTP id d75a77b69052e-46c710e4ef9mr485480181cf.37.1736904214773; Tue, 14 Jan 2025 17:23:34 -0800 (PST) Received: from bill-the-cat.tail58a08.ts.net ([187.144.16.9]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6dfad9a2358sm59817096d6.50.2025.01.14.17.23.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 17:23:33 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Heinrich Schuchardt Subject: [PATCHv2 3/6] efi_loader: Depend on BLK Date: Tue, 14 Jan 2025 19:22:10 -0600 Message-ID: <20250115012322.215243-4-trini@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250115012322.215243-1-trini@konsulko.com> References: <20241220222612.1757884-1-trini@konsulko.com> <20250115012322.215243-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean In reworking the BLK usage in Kconfig, I found there's a few issues with EFI_LOADER=y and BLK=n. In general, we can easily say that lib/efi_loader/efi_file.c also should only be built with CONFIG_BLK. That however leaves the bootmgr code, eficonfig code and then parts of efi_device_path.c, efi_boottime.c and efi_setup.c which functionally depend on BLK. While these calls can be if'd out, I'm unsure if the result is usable. So rather than leave that buildable and imply that it is, I'm leaving that combination non-buildable and commenting that EFI_LOADER depends on BLK in the Kconfig currently. Signed-off-by: Tom Rini Reviewed-by: Heinrich Schuchardt --- Changes in v2: - None. --- lib/efi_loader/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index c46ffe3a9d89..798dced475e0 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -8,13 +8,14 @@ config EFI_LOADER SYS_CPU = armv7 || \ SYS_CPU = armv8) || \ X86 || RISCV || SANDBOX) + # We have not fully removed the requirement for some block device + depends on BLK # We need EFI_STUB_64BIT to be set on x86_64 with EFI_STUB depends on !EFI_STUB || !X86_64 || EFI_STUB_64BIT # We need EFI_STUB_32BIT to be set on x86_32 with EFI_STUB depends on !EFI_STUB || !X86 || X86_64 || EFI_STUB_32BIT depends on !EFI_APP default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8 - select BLK select CHARSET # We need to send DM events, dynamically, in the EFI block driver select DM_EVENT From patchwork Wed Jan 15 01:22:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 2034468 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=okF0o366; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4YXpDl34Rzz1xph for ; Wed, 15 Jan 2025 12:24:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2CEF5806D6; Wed, 15 Jan 2025 02:23:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="okF0o366"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5F25680771; Wed, 15 Jan 2025 02:23:40 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf2d.google.com (mail-qv1-xf2d.google.com [IPv6:2607:f8b0:4864:20::f2d]) (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 9885D80753 for ; Wed, 15 Jan 2025 02:23:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qv1-xf2d.google.com with SMTP id 6a1803df08f44-6dcd4f1aaccso17139966d6.2 for ; Tue, 14 Jan 2025 17:23:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1736904216; x=1737509016; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NvcN0Gsxv6sfjYaWd94oSK4C+hYmU2NEkdTn4eDJ2N4=; b=okF0o366AU+d6u7O72CxeFBwyqiL6ery8Uni6q7SEdDUrJisDJyKnK7Qx3nuMklM7F 77jVXYlZqRqok2f+WEqliyPRA+3t6CNAFbxvNGzZmrmMRRpe1VuGHTClnz/a2rEYZUFV iWbhwyqqReuys/XChmFDdIEISdTDUQN9DVR1U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736904216; x=1737509016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NvcN0Gsxv6sfjYaWd94oSK4C+hYmU2NEkdTn4eDJ2N4=; b=CA8F1QKMHdfv6bu8y7mmBU+ewNlCzDAjEUpEP9aplAMcGiETZJEROWR3StQNcc4zbw +X+bQgcSCU4/N1gwDyXZG/UEGyEtGaLgUonWOxwIippLhlyFugLGNAAvAV7IfcerVhoP /fVQXzb+5ARrjmBDAAoLvCv6fDN+vWFW0cuqcKGAD1pQmwL1RCYYtKyvFFdcQr4ObWwG GU5DrjbTW/p8S4egMFdivPkKSjpOxfwnq4RWBvPIQRlszRwx1PPMFTqcTBhfvKZWaCvf T/6QcFg6vwSDn/IZgfiXnl+Gm6h/oR2ehZkiKnE87f13YwBllXfzHFWpQ56CzFUTkVGn xbAA== X-Gm-Message-State: AOJu0Yzk86IUbr9lwXAyCeqLahltlXQGTW2FLKB9F8i20vxuiLdxPe8t YcjnhyjfYJ+Lk4AhT12c5NQH9iZxV8N6de1LqMjL6IMvg9nB0W593BRNzdFWeeqPPMQAlsIPjpd 5 X-Gm-Gg: ASbGncv5R9YjtnsaNNmIozCBTmQTnIOog525e0zQf5QcP4wrMY7KeRV8uS2PfrJgjB8 BPkRS1r3Y/3L/SurihcBcbuPv5GItbXUp3TXWZkyXTQtVn2qXafA8CYJW9kV51QRl/Ixf8V8y7C thlEm3M/lqQjlN8fw0OYb0GTBpNpMTQaLL2Gsw/WSj0Wqe+oODbgrN3vi65sxIw/mda/J6PcaHJ T2taRrz4xuzWXmM2WXVALezs3+clRK4XUu2DHny9NfjbSrWvNKU3fqITgJ7lSKcsrLTWUt/JzEj X-Google-Smtp-Source: AGHT+IEjeLyeGIxg2Wm/xKIDgakb0iCm7EBEjhf+USv0hm4T9BzMVrbF87XvQ7Ug74AuvzDze8D+eQ== X-Received: by 2002:a05:6214:c8b:b0:6d8:e0a0:a949 with SMTP id 6a1803df08f44-6df9b28d637mr450090876d6.32.1736904216449; Tue, 14 Jan 2025 17:23:36 -0800 (PST) Received: from bill-the-cat.tail58a08.ts.net ([187.144.16.9]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6dfad9a2358sm59817096d6.50.2025.01.14.17.23.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 17:23:35 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Peter Robinson Subject: [PATCHv2 4/6] blk: Make block subsystems select BLK Date: Tue, 14 Jan 2025 19:22:11 -0600 Message-ID: <20250115012322.215243-5-trini@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250115012322.215243-1-trini@konsulko.com> References: <20241220222612.1757884-1-trini@konsulko.com> <20250115012322.215243-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean The BLK symbol has a few meanings, one of which is that it controls the driver model portion of a "block device". Rather than having this hidden symbol be "default y if ..." it should be select'd by the various block subsystems. Signed-off-by: Tom Rini Reviewed-by: Peter Robinson Reviewed-by: Quentin Schulz --- Changes in v2: - None. --- drivers/ata/Kconfig | 2 ++ drivers/block/Kconfig | 7 +++---- drivers/mmc/Kconfig | 1 + drivers/nvme/Kconfig | 1 + drivers/scsi/Kconfig | 1 + drivers/usb/Kconfig | 1 + drivers/virtio/Kconfig | 1 + 7 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 4fbb63a148ac..29ceab849c02 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -1,6 +1,7 @@ config AHCI bool "Support SATA controllers with driver model" depends on DM + select BLK help This enables a uclass for disk controllers in U-Boot. Various driver types can use this, such as AHCI/SATA. It does not provide any standard @@ -9,6 +10,7 @@ config AHCI config SATA bool "Support SATA controllers" + select BLK help This enables support for SATA (Serial Advanced Technology Attachment), a serial bus standard for connecting to hard drives and diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 5283d8981e09..cc75bad02b8c 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -1,8 +1,5 @@ config BLK - bool # "Support block devices" - depends on DM - def_bool y if MMC || USB || SCSI || NVME || IDE || AHCI || SATA - def_bool y if EFI_MEDIA || VIRTIO_BLK || PVBLOCK + bool help Enable support for block devices, such as SCSI, MMC and USB flash sticks. These provide a block-level interface which permits @@ -100,6 +97,7 @@ config TPL_BLOCK_CACHE config EFI_MEDIA bool "Support EFI media drivers" default y if EFI || SANDBOX + select BLK help Enable this to support media devices on top of UEFI. This enables just the uclass so you also need a specific driver to make this do @@ -139,6 +137,7 @@ endif # EFI_MEDIA config IDE bool "Support IDE controllers" + select BLK help Enables support for IDE (Integrated Drive Electronics) hard drives. This allows access to raw blocks and filesystems on an IDE drive diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 46513db0d6e3..4827834b4aab 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -3,6 +3,7 @@ menu "MMC Host controller Support" config MMC bool "MMC/SD/SDIO card support" default ARM || PPC || SANDBOX + select BLK select DM_MMC help This selects MultiMediaCard, Secure Digital and Secure diff --git a/drivers/nvme/Kconfig b/drivers/nvme/Kconfig index 73edb3551606..d138867666bd 100644 --- a/drivers/nvme/Kconfig +++ b/drivers/nvme/Kconfig @@ -4,6 +4,7 @@ config NVME bool "NVM Express device support" + select BLK help This option enables support for NVM Express devices. It supports basic functions of NVMe (read/write). diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 7e21c4ae2bb8..fc87d34cca39 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -1,5 +1,6 @@ config SCSI bool "Support SCSI controllers with driver model" + select BLK help This enables support for SCSI (Small Computer System Interface), a parallel interface widely used with storage peripherals such as diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 960b6a906ac4..99c6649e4178 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -1,5 +1,6 @@ menuconfig USB bool "USB support" + select BLK ---help--- Universal Serial Bus (USB) is a specification for a serial bus subsystem which offers higher speeds and more features than the diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig index 1de68867d52e..512ac376f185 100644 --- a/drivers/virtio/Kconfig +++ b/drivers/virtio/Kconfig @@ -64,6 +64,7 @@ config VIRTIO_NET config VIRTIO_BLK bool "virtio block driver" depends on VIRTIO + select BLK help This is the virtual block driver for virtio. It can be used with QEMU based targets. From patchwork Wed Jan 15 01:22:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 2034469 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=GmvbN3jJ; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4YXpDv2gjfz1xph for ; Wed, 15 Jan 2025 12:24:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7DB358073F; Wed, 15 Jan 2025 02:23:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="GmvbN3jJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6BA74806D4; Wed, 15 Jan 2025 02:23:41 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (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 B90C680761 for ; Wed, 15 Jan 2025 02:23:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qv1-xf29.google.com with SMTP id 6a1803df08f44-6dcf63155b0so28107646d6.1 for ; Tue, 14 Jan 2025 17:23:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1736904217; x=1737509017; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5jRA12D15okh0TJIP9l2WSBsuKMAfqiIvN5isH6TVcs=; b=GmvbN3jJykuCRr5XgzOG9NrMkvx+XiOdEy098jVsUjFEgQBxlSOtPLR9qEwcgR2KKN 8ZZ98kvlCHgqV1LqijggW7xqUogR6QQmQVNgSF2mkKbLIR5LufXMZxcagYJQMI2x9Qu6 LUJODk8HBZsSRsg3oGi3nzS9ChytUbj+VgXPk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736904217; x=1737509017; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5jRA12D15okh0TJIP9l2WSBsuKMAfqiIvN5isH6TVcs=; b=pIVVmd+LvWMUOAT70lD/AxchZdsCvoQr6Oos/fDnyicHyFiZHNNzLagkDSvO1Jvdh2 zWFfFfk/+QjZcklg9YaEdacHqIDIo0snnhFKU7RVHp4SxatXEdFcHpZ044CrWdKBWu5g mnz3vnYunyw1uICxhhYlzSOqEW9cyzKAeHIpnwANKk/1y5a2rAzfk3YXvFO0xFTXKU5b J+5+ZSQ4CpSUwiMZCbfE9USUzUg1GXZDG2xMufgVyF/QJmfFPO6O2cL4CSgOw9Po0//T 1n9KOhf5eF7gXv+8ArMT4VVAtPMjczIKeagJlCMIgz/ei/uxZblgl77oyre6powV/VTf obyw== X-Gm-Message-State: AOJu0Yxxwo+K3QT2sjMHLwnZaSglmkVD6YgmMLHjn0rlRQAFaP30kMAS TB/9GxW+rzKT3+CatlOUTd1wsMBobuIScAQvssKYxshM0aMXNJloY5RiKZd9UsxKm1x340VQwKT c X-Gm-Gg: ASbGncs5M38u2Cd6IXJljH58LGF07nOw1wJrch1GxxdUzmnlhygW1egJQF38MzSpabW MrDKC9gK0t7FICC9aAwXhcpejXlnKXaZRYyj/Y9EXtT3or1gJS0RuLm+eOY7JaPc9TyYxjNvosE ejRU3xmiwSzJL82+vs409oWjrqBaEKUURXMJ+EsobkODyWF4U1hoSI/XKgXsIGWz7GKBzNmwp6B Xv5ZQ73oRIaZfdTxURrlwtqQ2RmS/fpcVIyR6rlGuGQDJkN2IRGyxlxHMHfRyDp2kKff7ynQl7I X-Google-Smtp-Source: AGHT+IFSYvPGTIIYx3OMNTUj02hyMSj9Y+3hOdq1SO5MbICbciWuAsk7sU/rI7Zdol1CWodbvB0peA== X-Received: by 2002:a05:6214:e6a:b0:6d4:3b7a:313a with SMTP id 6a1803df08f44-6df9b2d36c0mr396277636d6.32.1736904217720; Tue, 14 Jan 2025 17:23:37 -0800 (PST) Received: from bill-the-cat.tail58a08.ts.net ([187.144.16.9]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6dfad9a2358sm59817096d6.50.2025.01.14.17.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 17:23:37 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Quentin Schulz Subject: [PATCHv2 5/6] mtd: Correct dependency of BLK Date: Tue, 14 Jan 2025 19:22:12 -0600 Message-ID: <20250115012322.215243-6-trini@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250115012322.215243-1-trini@konsulko.com> References: <20241220222612.1757884-1-trini@konsulko.com> <20250115012322.215243-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean In the case of MTD_BLOCK and UBI_BLOCK they should be select'ing BLK as they provide block device functionality and not depending on some other block device already being enabled too (as is the typical case). Signed-off-by: Tom Rini Reviewed-by: Quentin Schulz --- Changes in v2: - None. --- drivers/mtd/Kconfig | 2 +- drivers/mtd/ubi/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index c71c1e5547cc..185e83462135 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -34,7 +34,7 @@ config MTD_CONCAT config MTD_BLOCK bool "Enable block device access to MTD devices" - depends on BLK + select BLK help Enable support for block device access to MTD devices using blk_ops abstraction. diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig index c027d898a640..ba77c0347365 100644 --- a/drivers/mtd/ubi/Kconfig +++ b/drivers/mtd/ubi/Kconfig @@ -116,7 +116,7 @@ config MTD_UBI_FM_DEBUG config UBI_BLOCK bool "Enable UBI block device support" - depends on BLK + select BLK help Enable UBI block device support using blk_ops abstraction. From patchwork Wed Jan 15 01:22:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 2034470 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=OIwdIrrN; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4YXpF33mzkz1xph for ; Wed, 15 Jan 2025 12:24:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CC85C80762; Wed, 15 Jan 2025 02:23:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="OIwdIrrN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6927380716; Wed, 15 Jan 2025 02:23:42 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) (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 06FC88076E for ; Wed, 15 Jan 2025 02:23:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x82c.google.com with SMTP id d75a77b69052e-468f6b3a439so57007331cf.1 for ; Tue, 14 Jan 2025 17:23:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1736904219; x=1737509019; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ajO16SdBAGvYRnrK7hYQq/k8cX5Ov/IabPqVCI3ZZOg=; b=OIwdIrrNSDDLQqaoBwDnViMe8RaSfciqDf88PejwOQ+TrD/64DQ7qJjufBAWHQ/Rq3 KSRfYwg5wQ6v7cGQaRgg6Aw0Pqy73yfqWiAwQwdjhOrRU3bd1iXaIo4ciAJKJyCoSIkK 0O2GObEGGQNCacBfgyrXngfH0nWa6eBP/LkOY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736904219; x=1737509019; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ajO16SdBAGvYRnrK7hYQq/k8cX5Ov/IabPqVCI3ZZOg=; b=aTZBDf1/j5GH3cuwOC6nYavzBgYz7OYBuMFcOxBD3UWoIcXqEKMquDx48AfKFLKM17 hhjIHS7BIjsJcF+twLrmsQ3iegqex/Kj8r02h0kLfQUIWb6tdC5cFG6EtsadN/hOpgTa YnrS1BM4+U11YhbEQf/2UpFyXbdmgueAe77xEcdHABrRzHwH/EisJhW/meVaKwRsJIOs szGnJfjDsoTEHxOY+JFtuc+SdaZk2/vTFKOGwlZAl5TtDuymf4+aUB0jZiyDE9VfWyOb p295/3Wbu2SD7kwASGaslbTVk1efJTrvBa2OfGtkFRXWGgSeXH50q8nTokpkC1NVc6fr pjsw== X-Gm-Message-State: AOJu0YzmtWiaMuUvMefRu3fZFHnbFe+i+ooG2G7jIyWPS0jlsNOTwW4a utQeR/noxOIV4Hmq/dvCWLU4C27Kq7a3zq9RowQkpKH7nAw9wL0f57R2gy6g0xcvPs+lq5CYARJ 1 X-Gm-Gg: ASbGncux54/abbDbadYa6lXl0qMPYkBP9BZMhDF9s6pYsmywwK9hugbNRkH/+A5SQ5H NlzPzih/hhoDu3Fwm65T1rnmZ2yXBKTT24qZy/ITWysLobr9o+Ze0jnEM0yibSM0IK+GXqxPdrH o9h2uoYFiSg0EmpgrblDBzPFto6DaQ1DLAF2vb52tGo9Pg2IutJc41p0oHE9YFDJhGv0lOa6Ufs 251ZCr0v1j34a78Hrco65XHC5vKVQH25iLXMuavOHdBtJW+iSSfzG2a6a7oBnTuJedEYiRBwwUo X-Google-Smtp-Source: AGHT+IGRyWGXshHMCR4rbmNQ3KC3cVOdOD9AmTpLGH1VYkfQ3mVE0Qskqh+g51kNTeX6tqnRIXFhJg== X-Received: by 2002:ac8:5d0d:0:b0:467:5f17:94d with SMTP id d75a77b69052e-46c7109f2bcmr383130731cf.52.1736904218956; Tue, 14 Jan 2025 17:23:38 -0800 (PST) Received: from bill-the-cat.tail58a08.ts.net ([187.144.16.9]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6dfad9a2358sm59817096d6.50.2025.01.14.17.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 17:23:38 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Peter Robinson Subject: [PATCHv2 6/6] block: Remove "select BLK" from non-block drivers Date: Tue, 14 Jan 2025 19:22:13 -0600 Message-ID: <20250115012322.215243-7-trini@konsulko.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250115012322.215243-1-trini@konsulko.com> References: <20241220222612.1757884-1-trini@konsulko.com> <20250115012322.215243-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean Now that block drivers are all selecting the BLK symbol, there's no need for other options to be select'ing BLK so that other required functionality can be enabled. Remove these places. Signed-off-by: Tom Rini Reviewed-by: Peter Robinson --- Changes in v2: - None. --- arch/arm/Kconfig | 4 ---- arch/arm/mach-exynos/Kconfig | 4 ---- arch/arm/mach-imx/mx5/Kconfig | 2 +- arch/arm/mach-s5pc1xx/Kconfig | 1 - 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 127241e608c4..314916527c9e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1372,7 +1372,6 @@ config ARCH_VEXPRESS64 select PL01X_SERIAL select OF_CONTROL select CLK - select BLK select MTD_NOR_FLASH if MTD select FLASH_CFI_DRIVER if MTD select ENV_IS_IN_FLASH if MTD @@ -1982,7 +1981,6 @@ config ARCH_STM32 config ARCH_STI bool "Support STMicroelectronics SoCs" - select BLK select CPU_V7A select DM select DM_RESET @@ -2029,7 +2027,6 @@ config ARCH_STM32MP config ARCH_ROCKCHIP bool "Support Rockchip SoCs" - select BLK select BINMAN if SPL_OPTEE || SPL select DM select DM_GPIO @@ -2117,7 +2114,6 @@ config TARGET_POMELO select AHCI select SCSI_AHCI select AHCI_PCI - select BLK select PCI select DM_PCI select SCSI diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 7e6959510087..28193039cb84 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -18,7 +18,6 @@ config ARCH_EXYNOS4 bool "Exynos4 SoC family" select BOARD_EARLY_INIT_F select CPU_V7A - select BLK select MMC help Samsung Exynos4 SoC family are based on ARM Cortex-A9 CPU. There @@ -39,7 +38,6 @@ config ARCH_EXYNOS5 imply USB_ETHER_ASIX imply USB_ETHER_RTL8152 imply USB_ETHER_SMSC95XX - select BLK select MMC help @@ -51,7 +49,6 @@ config ARCH_EXYNOS7 bool "Exynos7 SoC family" select ARM64 select BOARD_EARLY_INIT_F - select BLK select MMC help Samsung Exynos7 SoC family are based on ARM Cortex-A57 CPU or @@ -61,7 +58,6 @@ config ARCH_EXYNOS7 config ARCH_EXYNOS9 bool "Exynos9 SoC family" select ARM64 - select BLK select MMC help Samsung Exynos9 SoC family are based on ARMv8 Cortex CPU. There are diff --git a/arch/arm/mach-imx/mx5/Kconfig b/arch/arm/mach-imx/mx5/Kconfig index 4d1e07b14d32..0dfd68496875 100644 --- a/arch/arm/mach-imx/mx5/Kconfig +++ b/arch/arm/mach-imx/mx5/Kconfig @@ -26,7 +26,7 @@ config TARGET_KP_IMX53 select DM_I2C select DM_PMIC select DM_SERIAL - select BLK + select DM_MMC select DM_REGULATOR select MMC select MX53 diff --git a/arch/arm/mach-s5pc1xx/Kconfig b/arch/arm/mach-s5pc1xx/Kconfig index b15b2e7b6a01..d8b85f80e631 100644 --- a/arch/arm/mach-s5pc1xx/Kconfig +++ b/arch/arm/mach-s5pc1xx/Kconfig @@ -7,7 +7,6 @@ choice config TARGET_S5P_GONI bool "S5P Goni board" select OF_CONTROL - select BLK select MISC_COMMON select MMC