From patchwork Tue May 9 11:31:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 98906 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1772093qge; Tue, 9 May 2017 04:33:46 -0700 (PDT) X-Received: by 10.80.144.118 with SMTP id z51mr20842109edz.143.1494329626134; Tue, 09 May 2017 04:33:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494329626; cv=none; d=google.com; s=arc-20160816; b=VRsafaRkDfri7T8qLSnPVT5H8S2SuY5vcWQnTEM83FJZwUPzjiC3iN8FucRgGIaCPQ 0ZL3rI/q7KkssOWmtrq+HTrAXPXfAUmBTJlM4DH4b1rPlsh6ReijQWPdbcBWKMHsfjFE drurQ1cahak407QPqvVLL0Xvlj3uNeHm5hokPlm69aQAQ5N27/BIjDlN13GAOb2MhDcP l+alkKWj16RCw+DFNH41jqDpkImdCzLp0r4bmCNoYYY1zP8HE1xoedKTZPq6SzBTMW7S 9ZuYGLOx8rdocH99UTIta4Bjw3HS5x0Ss5x8d7RcXSO+4wWDi1kGHQus6pah8b670xlv OwVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=HUL8UB9C/6FGIzww5Zb/QQ9vw1ByBswF8G6BCC7TA0Y=; b=WM9qcytpS2B/ihs2MAexsMSom7YrBPfTeL3dWUc8rWEMCXJkns1fa98c1wV4xwK0kd xERoNfqzf1oZj0tbgs2zXYCqmRD1OrMvdfGboEWG1NyafrbuDLq3Y1z8NwbEVDdMSlrY KXVhlBnzggBZ9Ze7K1LRup8hLBQChqMapQQTz8IjrHgph0e/LTkwONminCaOGwjyXCuA HwoxKYSNirTnV6ia0l16Y2FKBaOPSofxM/hcHUIv2mRUaTM0sGkRj3XUiI9HDnP1C076 +bKsiU7xZdH1EZRkUs0JgFCNO6jlevP4KKG3FI9z/Ad7FTZujb2iT4yZDeGvSkrH9Rh8 pHSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id e23si7400862edj.33.2017.05.09.04.33.45; Tue, 09 May 2017 04:33:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id AA549C21C71; Tue, 9 May 2017 11:33:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B043BC21C3A; Tue, 9 May 2017 11:32:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1010CC21CB9; Tue, 9 May 2017 11:32:33 +0000 (UTC) Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by lists.denx.de (Postfix) with ESMTPS id 3AC72C21C30 for ; Tue, 9 May 2017 11:32:29 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id v49BVsWb001830; Tue, 9 May 2017 20:31:57 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v49BVsWb001830 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1494329517; bh=ZcV9eXnah4gHSBpJ7vWAjETG7nvBXx7cQ7HYSQPmQBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G/JekU2XxMPhOXu0rl1oUz2DQPq7n/agQGOFXpkvB6MYny0PQfnRslFL8l0aJ893C 5fbZlDmoCaj0Nag3B0U1rUqvPL4IaM4G+HRsoi4HkW0fTmXh+55SZcjpnNf0fPeRuy bIxGOPdxsAWp4Qbeiw9S0fiPtm1uVfEycVDxvB5L0knHkB1jwe7WaOEto46gNunTzZ gVwG491aPuw/0lS3YlFuXyMmnUDm3JbLbUlT5PDu1U1LxJ21wUrQIdAxrwIUkUG7IQ CgWL5cTqSASo1ycVBIsl0Br0Uk5RjDnb/1rtO26WWixdexn4ggnJU1unF4XQfHzDP/ ovs42X6ZMMQwg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 9 May 2017 20:31:37 +0900 Message-Id: <1494329500-19364-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494329500-19364-1-git-send-email-yamada.masahiro@socionext.com> References: <1494329500-19364-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH 1/4] sandbox_noblk_defconfig: disable CONFIG_GENERIC_MMC X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" As commit 54925327fa11 ("mmc: move CONFIG_GENERIC_MMC to Kconfig") addressed, this is one of the last weird defconfigs that define CONFIG_GENERIC_MMC without CONFIG_MMC. Now I took a closer look at this. Given that neither CONFIG_CMD_MMC nor CONFIG_MMC is set for this defconfig, CONFIG_GENERIC_MMC should be disabled. Signed-off-by: Masahiro Yamada --- configs/sandbox_noblk_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig index fb98ab8..4cd6faa 100644 --- a/configs/sandbox_noblk_defconfig +++ b/configs/sandbox_noblk_defconfig @@ -105,7 +105,6 @@ CONFIG_CROS_EC_SPI=y CONFIG_PWRSEQ=y CONFIG_SPL_PWRSEQ=y # CONFIG_MMC is not set -CONFIG_GENERIC_MMC=y CONFIG_SPI_FLASH_SANDBOX=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y From patchwork Tue May 9 11:31:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 98905 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1772027qge; Tue, 9 May 2017 04:33:36 -0700 (PDT) X-Received: by 10.80.169.42 with SMTP id l39mr49249762edc.105.1494329616782; Tue, 09 May 2017 04:33:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494329616; cv=none; d=google.com; s=arc-20160816; b=TlKH4OgVI5TGGsD9ft3h19DMIhaLLUmtk67btVlijJE+TEKJAkiPVSAcf769DPnjqO 689U/vkw/6VRxklT4t4Ti+p2CNhviZ5Nstih3cl4bg4X2/fP/M+MygSLT6GpQ/W9fxNk E8U6+brkvbeBbJXRHpqy6s2FfbMIXfWbmOFvTBVU4KkDbFi78rJTAo5AHXRZ0dNSH1Ka 7F/0KfvjgrBBtnI/LVokF0V1RI36c6FJQSJop2h+HLvH4z5GhhCeME26uf4P7rx8cZN0 GpSrVCIRGCvn1EFrp3NzOsuA8JyScD2v14JNHe52HFt0yEJdCrH2jMSu85Db+y8trDKh Lbuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=0sRZBnJCZlx+MRbvY45bQtVo0pmIYDpZuPueXpHI9ZQ=; b=t50uXsIFZpWXQHnO63v4a8s3z0+0wcrWV8uVHTFyxfYGm3ut6KiRlNZqDy2kygJ0X1 u4G0J12stDUzSsn6wxwRxe4ZzmYC595I9DO/d+i5BwmTd5gy0JnrU0VFx7z7D/h7SeZ2 0d3m7OrDz/NGlYmRn4ZPFezuc3SqwEWqcAmcUWzjEeILEiS/mBK+cgW44krHidE+97Jj 1B5maFFEPwWAk0dGHx39aCHEYqGJTR0i4mNusxb2wVWIYlsS/inPt1lQqLjViK8P/ykc D7/SG2It7TgxlGb70JmGdv3gDswqyYsQg5TVdxJdfzZ3XBLlv9DiU9Mp7D619LW/ccht /sHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id p23si14391670edc.0.2017.05.09.04.33.36; Tue, 09 May 2017 04:33:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 51ADDC21CD2; Tue, 9 May 2017 11:32:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id BFCB2C21C6D; Tue, 9 May 2017 11:32:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AE152C21C30; Tue, 9 May 2017 11:32:20 +0000 (UTC) Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by lists.denx.de (Postfix) with ESMTPS id 6621CC21C31 for ; Tue, 9 May 2017 11:32:19 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id v49BVsWc001830; Tue, 9 May 2017 20:31:57 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v49BVsWc001830 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1494329517; bh=VgDYXQRzvECSfPx29avQ5YGPF082XexUIROS3ucEL78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C6pBJOApVRSaTMFXP/sI/nVhIExKs0rlKIGcnYSUZAEGnOknY7xcfcViGSBTEvcPh kmyW7FySe0pC8EXxXjIQFdJkDKMAq4DjahafWRmT7ia3THrOFQ80Eq54FjIeMW+fMv igUtmLBKMYdSCAA/aSrWTyPprj/hzqDW+jCQKXVY/QIYIBYrNQCBObHv4AWR6bH1cO +XKwxle3yHD2KlMf2JDJGJIph0eEbdm9gUi72QCgG6l0u8AOUslCBrbiY4Iuaty2Xt 2CrkftENITKkpUBg7ZEgWaIP8fKNsnfZ/Rb/7zXKsnL7csLQmAyaQ3XXxVdTr+TptF c5ir0JXSIq+nw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 9 May 2017 20:31:38 +0900 Message-Id: <1494329500-19364-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494329500-19364-1-git-send-email-yamada.masahiro@socionext.com> References: <1494329500-19364-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH 2/4] blanche_defconfig: enable CONFIG_MMC X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" As commit 54925327fa11 ("mmc: move CONFIG_GENERIC_MMC to Kconfig") addressed, this is one of the last weird defconfigs that define CONFIG_GENERIC_MMC without CONFIG_MMC. Now I took a closer look at this. Given that both CONFIG_CMD_MMC and CONFIG_GENERIC_MMC are set for this defconfig, CONFIG_MMC should be enabled. Signed-off-by: Masahiro Yamada --- configs/blanche_defconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index 5664421..a963802 100644 --- a/configs/blanche_defconfig +++ b/configs/blanche_defconfig @@ -15,8 +15,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y -# CONFIG_MMC is not set -CONFIG_GENERIC_MMC=y +CONFIG_MMC=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y From patchwork Tue May 9 11:31:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 98907 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1779558qge; Tue, 9 May 2017 04:54:41 -0700 (PDT) X-Received: by 10.80.205.212 with SMTP id h20mr21953424edj.58.1494330881667; Tue, 09 May 2017 04:54:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494330881; cv=none; d=google.com; s=arc-20160816; b=z4W3miRsJouT7Mhle/Rfk8Jzvuouu3cVH5gnCesD3Wyw1H6GoiqwsO4Usgud0jkITd Ck5cWIQREoRBdLhPoJaYrOKJHmvr80u2ZeKUzUKN6ZMeH+hbbvqjv01V7BBvAvBD2hKw lXDa2ypgtTnJT6Usj4G/5/0aN8+m8reCcy+F3tvRXj+Hbp/YhOkowd1KXxzQdrJB6Lwp W9S3e323VSOrMbzqG3suTKKmeXwydyvVhcNJIWfBGrGaem+k+CFCsvAwmpdYFbBYWJA6 w32lHG6HdRpE7kp1SspK0Y4JGNBpC8CTg7FqyUM9vXNvxclwSnnxxoDsfdC/jBR65l4L +kQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=nElRGGHt+GqVuVSDtlPLEINY13tE0JySyi0510LqyGY=; b=EtuS3auZ6cqT0gcuiPWYtpzYqELMVeQOIFjiohNHvWSCuy5BGh3LBZHlzfSXIUxZU+ ibjGg0p/piEEzUGdo5QBLjGYrPnKM/xcK3TDh4WHPQi9oljmMtsUNxmjgAFGy4iKriwV poSzb6S7fV3XZhdEUynvlAW0KI8xpWh6k+NDeWjXgSCDZ24gISN/nU/jF2k0hUk5X4ho UQycdpt7TpqzS4l6a4dG61MwBN6/Nob6yMTqb6khlc14WEBBh/lAczixyukgdQl6v1th fxfv7A+xRfdFE6YFL1HJlIpiSw6dJ5gWgiwA8Br2zukUn2Ro/8c42GYgxCQk0wV5RtZe iJ9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id 21si9675307eds.84.2017.05.09.04.54.41; Tue, 09 May 2017 04:54:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id CD239C21CCA; Tue, 9 May 2017 11:54:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=KHOP_BIG_TO_CC, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3D11BC21C31; Tue, 9 May 2017 11:54:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 17D1BC21CC5; Tue, 9 May 2017 11:32:58 +0000 (UTC) Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by lists.denx.de (Postfix) with ESMTPS id B4538C21CCE for ; Tue, 9 May 2017 11:32:57 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id v49BVsWd001830; Tue, 9 May 2017 20:31:58 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v49BVsWd001830 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1494329520; bh=/q3eisqRfuH9yhpYciEO0WOwoQhrGlYRhUi0ioCg/is=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k6aB0xvwj5wPuRrQqff9I7+OJMTjGyCKz5Itqd6HmQ0ieCTHvNkQtixZjXCbVLcOQ tAAgugtM5CQXYCIcf6x+h1/vWmuIuyCKqqVDy8KK8L6hf7yEZdA7d3PDPzXqn36Yei DstRTyJSQknWXKw4Eqx9BrFKx6CwSKfZbp1YCqYFe+KKO5p/CEWFRLFMMt62JholSV tvzi80BZLNW4EARZPuc7CPWFDoZsZ3WELRKCE5l+9IDm3aKyARE1R5OieXSJcFlQuO WNVf3yQ71zFdqepose24P0rBDtRUuTgtP8DNuaYYWYBRDnnEVHxvdRurkcRFymCUl8 JaA+MgWapqA0A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 9 May 2017 20:31:39 +0900 Message-Id: <1494329500-19364-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494329500-19364-1-git-send-email-yamada.masahiro@socionext.com> References: <1494329500-19364-1-git-send-email-yamada.masahiro@socionext.com> X-Mailman-Approved-At: Tue, 09 May 2017 11:54:34 +0000 Cc: "Albert ARIBAUD \(3ADEV\)" , Stefan Roese , Chander Kashyap , Jagan Teki , Nagendra T S , Vaibhav Hiremath , Ash Charles , Thomas Weber , Robert Baldyga , Vitaly Andrianov , Hans de Goede , Maxime Ripard Subject: [U-Boot] [PATCH 3/4] mmc: replace CONFIG_GENERIC_MMC with CONFIG_MMC X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Now CONFIG_GENERIC_MMC and CONFIG_MMC match for all defconfig. We do not need two options for the same feature. Deprecate the former. This commit was generated with the sed script 's/GENERIC_MMC/MMC/' and manual fixup of drivers/mmc/Kconfig. Signed-off-by: Masahiro Yamada --- arch/arm/Kconfig | 2 +- board/BuR/common/common.c | 2 +- board/bosch/shc/board.c | 2 +- board/compulab/cl-som-am57x/cl-som-am57x.c | 4 ++-- board/compulab/cm_t35/cm_t35.c | 4 ++-- board/compulab/cm_t3517/cm_t3517.c | 2 +- board/compulab/cm_t54/cm_t54.c | 2 +- board/corscience/tricorder/tricorder.c | 4 ++-- board/gumstix/duovero/duovero.c | 2 +- board/hisilicon/hikey/hikey.c | 2 +- board/isee/igep00x0/igep00x0.c | 4 ++-- board/logicpd/am3517evm/am3517evm.c | 2 +- board/logicpd/omap3som/omap3logic.c | 4 ++-- board/logicpd/zoom1/zoom1.c | 2 +- board/overo/overo.c | 4 ++-- board/pandora/pandora.c | 2 +- board/quipos/cairo/cairo.c | 2 +- board/samsung/arndale/arndale.c | 2 +- board/samsung/common/board.c | 2 +- board/samsung/common/misc.c | 4 ++-- board/samsung/goni/goni.c | 2 +- board/samsung/smdkv310/smdkv310.c | 2 +- board/sunxi/board.c | 2 +- board/technexion/tao3530/tao3530.c | 4 ++-- board/ti/am3517crane/am3517crane.c | 2 +- board/ti/am57xx/board.c | 2 +- board/ti/beagle/beagle.c | 4 ++-- board/ti/dra7xx/evm.c | 2 +- board/ti/evm/evm.c | 4 ++-- board/ti/ks2_evm/board_k2g.c | 2 +- board/ti/omap5_uevm/evm.c | 2 +- board/ti/panda/panda.c | 2 +- board/ti/sdp4430/sdp.c | 2 +- board/ti/ti814x/evm.c | 2 +- board/timll/devkit8000/devkit8000.c | 4 ++-- common/board_r.c | 4 ++-- common/spl/Kconfig | 2 +- drivers/mmc/Kconfig | 4 ---- drivers/mmc/Makefile | 10 +++++----- drivers/mmc/davinci_mmc.c | 2 +- 40 files changed, 55 insertions(+), 59 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b2d6e80..a17ba2c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -654,7 +654,7 @@ config ARCH_SUNXI imply SPL_LIBCOMMON_SUPPORT imply SPL_LIBDISK_SUPPORT imply SPL_LIBGENERIC_SUPPORT - imply SPL_MMC_SUPPORT if GENERIC_MMC + imply SPL_MMC_SUPPORT if MMC imply SPL_POWER_SUPPORT imply SPL_SERIAL_SUPPORT diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c index 5cc82c9..b1ae079 100644 --- a/board/BuR/common/common.c +++ b/board/BuR/common/common.c @@ -684,7 +684,7 @@ int board_eth_init(bd_t *bis) return rv; } #endif /* defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD) */ -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(1, 0, 0, -1, -1); diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c index e90693f..38577f3 100644 --- a/board/bosch/shc/board.c +++ b/board/bosch/shc/board.c @@ -632,7 +632,7 @@ void arch_preboot_os(void) leds_set_finish(); } -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { int ret; diff --git a/board/compulab/cl-som-am57x/cl-som-am57x.c b/board/compulab/cl-som-am57x/cl-som-am57x.c index 4701b71..389eebb 100644 --- a/board/compulab/cl-som-am57x/cl-som-am57x.c +++ b/board/compulab/cl-som-am57x/cl-som-am57x.c @@ -33,7 +33,7 @@ int board_init(void) return 0; } -#ifdef CONFIG_GENERIC_MMC +#ifdef CONFIG_MMC #define SB_SOM_CD_GPIO 187 #define SB_SOM_WP_GPIO 188 @@ -51,7 +51,7 @@ int board_mmc_init(bd_t *bis) return ret0 && ret1; } -#endif /* CONFIG_GENERIC_MMC */ +#endif /* CONFIG_MMC */ int misc_init_r(void) { diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c index 2d9dd9d..f169125 100644 --- a/board/compulab/cm_t35/cm_t35.c +++ b/board/compulab/cm_t35/cm_t35.c @@ -372,7 +372,7 @@ void set_muxconf_regs(void) cm_t3730_set_muxconf(); } -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) #define SB_T35_WP_GPIO 59 int board_mmc_getcd(struct mmc *mmc) @@ -391,7 +391,7 @@ int board_mmc_init(bd_t *bis) } #endif -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) void board_mmc_power_init(void) { twl4030_power_mmc_init(0); diff --git a/board/compulab/cm_t3517/cm_t3517.c b/board/compulab/cm_t3517/cm_t3517.c index b55ded0..38eb641 100644 --- a/board/compulab/cm_t3517/cm_t3517.c +++ b/board/compulab/cm_t3517/cm_t3517.c @@ -115,7 +115,7 @@ int misc_init_r(void) return 0; } -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) #define SB_T35_CD_GPIO 144 #define SB_T35_WP_GPIO 59 diff --git a/board/compulab/cm_t54/cm_t54.c b/board/compulab/cm_t54/cm_t54.c index 7b58fcd..456ff24 100644 --- a/board/compulab/cm_t54/cm_t54.c +++ b/board/compulab/cm_t54/cm_t54.c @@ -96,7 +96,7 @@ uint mmc_get_env_part(struct mmc *mmc) } #endif -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) #define SB_T54_CD_GPIO 228 #define SB_T54_WP_GPIO 229 diff --git a/board/corscience/tricorder/tricorder.c b/board/corscience/tricorder/tricorder.c index 48d65e8..730b8ca 100644 --- a/board/corscience/tricorder/tricorder.c +++ b/board/corscience/tricorder/tricorder.c @@ -140,14 +140,14 @@ void set_muxconf_regs(void) MUX_TRICORDER(); } -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); } #endif -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) void board_mmc_power_init(void) { twl4030_power_mmc_init(0); diff --git a/board/gumstix/duovero/duovero.c b/board/gumstix/duovero/duovero.c index 11d2d7f..ea32f4a 100644 --- a/board/gumstix/duovero/duovero.c +++ b/board/gumstix/duovero/duovero.c @@ -110,7 +110,7 @@ void set_muxconf_regs(void) sizeof(struct pad_conf_entry)); } -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c index 0f0eb3a..47bce4d 100644 --- a/board/hisilicon/hikey/hikey.c +++ b/board/hisilicon/hikey/hikey.c @@ -341,7 +341,7 @@ int board_init(void) return 0; } -#ifdef CONFIG_GENERIC_MMC +#ifdef CONFIG_MMC static int init_dwmmc(void) { diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c index d3914a1..843d35e 100644 --- a/board/isee/igep00x0/igep00x0.c +++ b/board/isee/igep00x0/igep00x0.c @@ -199,14 +199,14 @@ int board_eth_init(bd_t *bis) static inline void setup_net_chip(void) {} #endif -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); } #endif -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) void board_mmc_power_init(void) { twl4030_power_mmc_init(0); diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c index 1aaeb8d..5d2d997 100644 --- a/board/logicpd/am3517evm/am3517evm.c +++ b/board/logicpd/am3517evm/am3517evm.c @@ -152,7 +152,7 @@ void set_muxconf_regs(void) MUX_AM3517EVM(); } -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 4ad496e..179d7c7 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -231,14 +231,14 @@ int board_late_init(void) } #endif -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); } #endif -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) void board_mmc_power_init(void) { twl4030_power_mmc_init(0); diff --git a/board/logicpd/zoom1/zoom1.c b/board/logicpd/zoom1/zoom1.c index 0fad23a..e91f874 100644 --- a/board/logicpd/zoom1/zoom1.c +++ b/board/logicpd/zoom1/zoom1.c @@ -106,7 +106,7 @@ void set_muxconf_regs(void) MUX_ZOOM1_MDK(); } -#ifdef CONFIG_GENERIC_MMC +#ifdef CONFIG_MMC int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/overo/overo.c b/board/overo/overo.c index 5e44726..f1a3d73 100644 --- a/board/overo/overo.c +++ b/board/overo/overo.c @@ -379,14 +379,14 @@ int board_eth_init(bd_t *bis) } #endif -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); } #endif -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) void board_mmc_power_init(void) { twl4030_power_mmc_init(0); diff --git a/board/pandora/pandora.c b/board/pandora/pandora.c index b371a40..3502bbf 100644 --- a/board/pandora/pandora.c +++ b/board/pandora/pandora.c @@ -121,7 +121,7 @@ void set_muxconf_regs(void) } } -#ifdef CONFIG_GENERIC_MMC +#ifdef CONFIG_MMC int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/quipos/cairo/cairo.c b/board/quipos/cairo/cairo.c index 7a1a61e..5fce45e 100644 --- a/board/quipos/cairo/cairo.c +++ b/board/quipos/cairo/cairo.c @@ -62,7 +62,7 @@ void set_muxconf_regs(void) MUX_CAIRO(); } -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c index 405ed3b..49ed324 100644 --- a/board/samsung/arndale/arndale.c +++ b/board/samsung/arndale/arndale.c @@ -71,7 +71,7 @@ int dram_init_banksize(void) return 0; } -#ifdef CONFIG_GENERIC_MMC +#ifdef CONFIG_MMC int board_mmc_init(bd_t *bis) { int ret; diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index 49e4db2..1762696 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -250,7 +250,7 @@ int board_eth_init(bd_t *bis) return 0; } -#ifdef CONFIG_GENERIC_MMC +#ifdef CONFIG_MMC static int init_mmc(void) { #ifdef CONFIG_MMC_SDHCI diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c index 203136f..dc4dead 100644 --- a/board/samsung/common/misc.c +++ b/board/samsung/common/misc.c @@ -208,7 +208,7 @@ mode_cmd[BOOT_MODE_EXIT + 1] = { static void display_board_info(void) { -#ifdef CONFIG_GENERIC_MMC +#ifdef CONFIG_MMC struct mmc *mmc = find_mmc_device(0); #endif vidinfo_t *vid = &panel_info; @@ -226,7 +226,7 @@ static void display_board_info(void) lcd_printf("\tDRAM banks: %u\n", CONFIG_NR_DRAM_BANKS); lcd_printf("\tDRAM size: %u MB\n", gd->ram_size / SZ_1M); -#ifdef CONFIG_GENERIC_MMC +#ifdef CONFIG_MMC if (mmc) { if (!mmc->capacity) mmc_init(mmc); diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index 35ed398..1259383 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -72,7 +72,7 @@ int checkboard(void) } #endif -#ifdef CONFIG_GENERIC_MMC +#ifdef CONFIG_MMC int board_mmc_init(bd_t *bis) { int i, ret, ret_sd = 0; diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c index c730ac0..027755d 100644 --- a/board/samsung/smdkv310/smdkv310.c +++ b/board/samsung/smdkv310/smdkv310.c @@ -87,7 +87,7 @@ int checkboard(void) } #endif -#ifdef CONFIG_GENERIC_MMC +#ifdef CONFIG_MMC int board_mmc_init(bd_t *bis) { int i, err; diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 01de42d..4404edb 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -284,7 +284,7 @@ void board_nand_init(void) } #endif -#ifdef CONFIG_GENERIC_MMC +#ifdef CONFIG_MMC static void mmc_pinmux_setup(int sdc) { unsigned int pin; diff --git a/board/technexion/tao3530/tao3530.c b/board/technexion/tao3530/tao3530.c index cba48d4..21944c7 100644 --- a/board/technexion/tao3530/tao3530.c +++ b/board/technexion/tao3530/tao3530.c @@ -179,7 +179,7 @@ void set_muxconf_regs(void) #endif } -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { omap_mmc_init(0, 0, 0, -1, -1); @@ -188,7 +188,7 @@ int board_mmc_init(bd_t *bis) } #endif -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) void board_mmc_power_init(void) { twl4030_power_mmc_init(0); diff --git a/board/ti/am3517crane/am3517crane.c b/board/ti/am3517crane/am3517crane.c index faa95d7..5fa319d 100644 --- a/board/ti/am3517crane/am3517crane.c +++ b/board/ti/am3517crane/am3517crane.c @@ -63,7 +63,7 @@ void set_muxconf_regs(void) MUX_AM3517CRANE(); } -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 6d444e0..3be697a 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -661,7 +661,7 @@ err: } #endif -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index e90fe1a..dc38a80 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -524,14 +524,14 @@ void set_muxconf_regs(void) MUX_BEAGLE(); } -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); } #endif -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) void board_mmc_power_init(void) { twl4030_power_mmc_init(0); diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index d8e48dd..8c02add 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -702,7 +702,7 @@ err: } #endif -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index 4f132e5..fe8e793 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -259,14 +259,14 @@ int board_eth_init(bd_t *bis) } #endif /* CONFIG_CMD_NET */ -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); } #endif -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) void board_mmc_power_init(void) { twl4030_power_mmc_init(0); diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c index 6e03f6b..21aec8f 100644 --- a/board/ti/ks2_evm/board_k2g.c +++ b/board/ti/ks2_evm/board_k2g.c @@ -196,7 +196,7 @@ s16 divn_val[16] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { if (psc_enable_module(KS2_LPSC_MMC)) { diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c index 64d772c..447f82c 100644 --- a/board/ti/omap5_uevm/evm.c +++ b/board/ti/omap5_uevm/evm.c @@ -211,7 +211,7 @@ void set_muxconf_regs(void) sizeof(struct pad_conf_entry)); } -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c index 187ff3c..4db8f82 100644 --- a/board/ti/panda/panda.c +++ b/board/ti/panda/panda.c @@ -287,7 +287,7 @@ void set_muxconf_regs(void) sizeof(struct pad_conf_entry)); } -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c index 0eb60e4..bc8d32f 100644 --- a/board/ti/sdp4430/sdp.c +++ b/board/ti/sdp4430/sdp.c @@ -73,7 +73,7 @@ void set_muxconf_regs(void) sizeof(struct pad_conf_entry)); } -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { omap_mmc_init(0, 0, 0, -1, -1); diff --git a/board/ti/ti814x/evm.c b/board/ti/ti814x/evm.c index e85794c..055a29d 100644 --- a/board/ti/ti814x/evm.c +++ b/board/ti/ti814x/evm.c @@ -111,7 +111,7 @@ int board_init(void) return 0; } -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { omap_mmc_init(1, 0, 0, -1, -1); diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c index 5f57956..d31eeb8 100644 --- a/board/timll/devkit8000/devkit8000.c +++ b/board/timll/devkit8000/devkit8000.c @@ -131,14 +131,14 @@ void set_muxconf_regs(void) MUX_DEVKIT8000(); } -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); } #endif -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) void board_mmc_power_init(void) { twl4030_power_mmc_init(0); diff --git a/common/board_r.c b/common/board_r.c index d69a33c..9f34b85 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -432,7 +432,7 @@ static int initr_onenand(void) } #endif -#ifdef CONFIG_GENERIC_MMC +#ifdef CONFIG_MMC static int initr_mmc(void) { puts("MMC: "); @@ -815,7 +815,7 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_CMD_ONENAND initr_onenand, #endif -#ifdef CONFIG_GENERIC_MMC +#ifdef CONFIG_MMC initr_mmc, #endif #ifdef CONFIG_HAS_DATAFLASH diff --git a/common/spl/Kconfig b/common/spl/Kconfig index ea6fbb6..bbdb60d 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -371,7 +371,7 @@ config SPL_LIBGENERIC_SUPPORT config SPL_MMC_SUPPORT bool "Support MMC" - depends on SPL && GENERIC_MMC + depends on SPL && MMC help Enable support for MMC (Multimedia Card) within SPL. This enables the MMC protocol implementation and allows any enabled drivers to diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 6ac26dd..7f3540b 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -10,10 +10,6 @@ config MMC If you want MMC/SD/SDIO support, you should say Y here and also to your specific host controller driver. -config GENERIC_MMC - bool "Generic MMC driver framework" - default MMC - config DM_MMC bool "Enable MMC controllers using Driver Model" depends on DM diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index de91f14..75a7cd3 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -6,11 +6,11 @@ # ifdef CONFIG_DM_MMC -obj-$(CONFIG_GENERIC_MMC) += mmc-uclass.o +obj-$(CONFIG_MMC) += mmc-uclass.o endif ifndef CONFIG_BLK -obj-$(CONFIG_GENERIC_MMC) += mmc_legacy.o +obj-$(CONFIG_MMC) += mmc_legacy.o endif obj-$(CONFIG_ARM_PL180_MMCI) += arm_pl180_mmci.o @@ -23,9 +23,9 @@ obj-$(CONFIG_MMC_DW_ROCKCHIP) += rockchip_dw_mmc.o obj-$(CONFIG_MMC_DW_SOCFPGA) += socfpga_dw_mmc.o obj-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o obj-$(CONFIG_FTSDC010) += ftsdc010_mci.o -obj-$(CONFIG_GENERIC_MMC) += mmc.o +obj-$(CONFIG_MMC) += mmc.o ifdef CONFIG_SUPPORT_EMMC_BOOT -obj-$(CONFIG_GENERIC_MMC) += mmc_boot.o +obj-$(CONFIG_MMC) += mmc_boot.o endif obj-$(CONFIG_GENERIC_ATMEL_MCI) += gen_atmel_mci.o obj-$(CONFIG_MMC_MESON_GX) += meson_gx_mmc.o @@ -46,7 +46,7 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_MMC_BOOT) += fsl_esdhc_spl.o obj-$(CONFIG_SPL_SAVEENV) += mmc_write.o else -obj-$(CONFIG_GENERIC_MMC) += mmc_write.o +obj-$(CONFIG_MMC) += mmc_write.o endif # SDHCI diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c index 9edb668..dd78429 100644 --- a/drivers/mmc/davinci_mmc.c +++ b/drivers/mmc/davinci_mmc.c @@ -347,7 +347,7 @@ static int dmmc_init(struct mmc *mmc) return 0; } -/* Set buswidth or clock as indicated by the GENERIC_MMC framework */ +/* Set buswidth or clock as indicated by the MMC framework */ static int dmmc_set_ios(struct mmc *mmc) { struct davinci_mmc *host = mmc->priv; From patchwork Tue May 9 11:31:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 98904 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1771662qge; Tue, 9 May 2017 04:32:35 -0700 (PDT) X-Received: by 10.80.158.99 with SMTP id z90mr13429481ede.50.1494329555138; Tue, 09 May 2017 04:32:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494329555; cv=none; d=google.com; s=arc-20160816; b=nHafjYMhjgfe0uATJO7RRuYYgEM0vxlBfEOMedtpoSZTzn+hEdG+KIIPeTqfRgIYd3 2JilbNSB6aO2IqkpgBqhVPpJUjNNhZNlLC7Za0ADTJZIc8Zs4NliOatnm4zBtBJiewQr S1mNWT3yUBeeUmN5MadtGbp3hNmEF+HGr8k79o8pEo/i91jKM2OpHEKSwA3NtWMW5pWq FHveklyBFNmGI3vnGdjp77FmEjjdudqs8NhjVcGeCvHX6XZoswvwTLHWGsJo8u0vK4wT 0jo+ndsqmbQAOIT1ua3GQRBvx4sp91rrz5tS8F8axHJHaDMIj/BlBzPwuJv2xgLIV984 jdlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=c4ZVg0zLE1KfOM37Ua3vSrJ52kp2r8nLp+ZKnbyVqhg=; b=lDpXXiJz4WI+0cUxZBjUbCOG0YEaGw7kzs1FzeMgILCyfhXpoK8wjU4QBiwH4ZY+NW cFocvFPwgYiF7eJDy9e45STKgGR87gTdDpQwWn14HQkMtLWup6WQvTIb0jV3gsmLtHBN oRTF+ScTHFbhi/odTmffS7ktA/yIgp2/b+Un7N4QBQVbs66aNw3dQAGH22wYkMhUf9wb uMHJ0Sc83fppFXwixmHaouBXjIEhMmKNq9f4YA9sCdYRnuH03Ub4T7VARcxZKoZ3IB+6 Tc17roKA+iGgZHb1jIuCvrRk9cWxGevzrQNrHWsFZHUv1kFeterOQVHZIKKPfr2o0/zl MVsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id m9si15178406edf.279.2017.05.09.04.32.34; Tue, 09 May 2017 04:32:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id A8F90C21CB5; Tue, 9 May 2017 11:32:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D5560C21C31; Tue, 9 May 2017 11:32:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A3CF4C21C33; Tue, 9 May 2017 11:32:20 +0000 (UTC) Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by lists.denx.de (Postfix) with ESMTPS id 4DF6EC21C30 for ; Tue, 9 May 2017 11:32:19 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id v49BVsWe001830; Tue, 9 May 2017 20:32:00 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v49BVsWe001830 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1494329520; bh=JReA/KrcBITkm1uI5g7Vjc6alM9vW1ZzceweXhFfnj8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cCXdKFjF1zHe9comzqZIgVQ/PdFEZQzpPbbA2oOAhHdb0dCRozuKvVuuqlVlBN8gK IfYL+W8r3pXWGVG7jPYjyzfHdFxZOW6kL4WoDETVEbXRLM1+s6lgBkwR52UCjDr9W9 AsLic+lkPFeJr6VN/zKRnj4NkXXeNabHU2kc8E55xZJmjLbpOqQLDduVvJiVHMBili GROCPMz2NfV3ZNfxyPHM2iLHSVkUNK4HVq9O8Qm3qnA9ppKVjDDVVjTUak8bRbViQ4 gTMZ/eMal0M2IYC1sMfYXQlenV42MHz0uoyH3w0q+4rnAyarNsvqz1SgMtY9Ur7JH8 3nUMogB38WswQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 9 May 2017 20:31:40 +0900 Message-Id: <1494329500-19364-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494329500-19364-1-git-send-email-yamada.masahiro@socionext.com> References: <1494329500-19364-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH 4/4] mmc: descend into drivers/mmc only when CONFIG_MMC is enabled X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This simplifies makefiles. Also, arrange the order of objects in drivers/mmc/Makefile so that the framework objects are listed before drivers. Signed-off-by: Masahiro Yamada --- Makefile | 1 - common/spl/Kconfig | 2 +- drivers/Makefile | 1 + drivers/mmc/Makefile | 28 ++++++++++++---------------- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 600a4d6..2d3909d 100644 --- a/Makefile +++ b/Makefile @@ -653,7 +653,6 @@ libs-y += drivers/ libs-y += drivers/dma/ libs-y += drivers/gpio/ libs-y += drivers/i2c/ -libs-y += drivers/mmc/ libs-y += drivers/mtd/ libs-$(CONFIG_CMD_NAND) += drivers/mtd/nand/ libs-y += drivers/mtd/onenand/ diff --git a/common/spl/Kconfig b/common/spl/Kconfig index bbdb60d..dbc53ec 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -724,7 +724,7 @@ config TPL_MPC8XXX_INIT_DDR_SUPPORT config TPL_MMC_SUPPORT bool "Support MMC" - depends on TPL + depends on TPL && MMC help Enable support for MMC within TPL. See SPL_MMC_SUPPORT for details. diff --git a/drivers/Makefile b/drivers/Makefile index 4a4b237..adf8169 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -75,6 +75,7 @@ obj-y += firmware/ obj-$(CONFIG_FPGA) += fpga/ obj-y += hwmon/ obj-y += misc/ +obj-$(CONFIG_MMC) += mmc/ obj-y += pcmcia/ obj-y += dfu/ obj-$(CONFIG_X86) += pch/ diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 75a7cd3..a078649 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -5,17 +5,24 @@ # SPDX-License-Identifier: GPL-2.0+ # -ifdef CONFIG_DM_MMC -obj-$(CONFIG_MMC) += mmc-uclass.o -endif +obj-y += mmc.o +obj-$(CONFIG_DM_MMC) += mmc-uclass.o ifndef CONFIG_BLK -obj-$(CONFIG_MMC) += mmc_legacy.o +obj-y += mmc_legacy.o +endif + +obj-$(CONFIG_SUPPORT_EMMC_BOOT) += mmc_boot.o + +ifdef CONFIG_SPL_BUILD +obj-$(CONFIG_SPL_MMC_BOOT) += fsl_esdhc_spl.o +obj-$(CONFIG_SPL_SAVEENV) += mmc_write.o +else +obj-y += mmc_write.o endif obj-$(CONFIG_ARM_PL180_MMCI) += arm_pl180_mmci.o obj-$(CONFIG_MMC_DAVINCI) += davinci_mmc.o - obj-$(CONFIG_MMC_DW) += dw_mmc.o obj-$(CONFIG_MMC_DW_EXYNOS) += exynos_dw_mmc.o obj-$(CONFIG_MMC_DW_K3) += hi6220_dw_mmc.o @@ -23,10 +30,6 @@ obj-$(CONFIG_MMC_DW_ROCKCHIP) += rockchip_dw_mmc.o obj-$(CONFIG_MMC_DW_SOCFPGA) += socfpga_dw_mmc.o obj-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o obj-$(CONFIG_FTSDC010) += ftsdc010_mci.o -obj-$(CONFIG_MMC) += mmc.o -ifdef CONFIG_SUPPORT_EMMC_BOOT -obj-$(CONFIG_MMC) += mmc_boot.o -endif obj-$(CONFIG_GENERIC_ATMEL_MCI) += gen_atmel_mci.o obj-$(CONFIG_MMC_MESON_GX) += meson_gx_mmc.o obj-$(CONFIG_MMC_SPI) += mmc_spi.o @@ -42,13 +45,6 @@ obj-$(CONFIG_MMC_SANDBOX) += sandbox_mmc.o obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o obj-$(CONFIG_SH_SDHI) += sh_sdhi.o -ifdef CONFIG_SPL_BUILD -obj-$(CONFIG_SPL_MMC_BOOT) += fsl_esdhc_spl.o -obj-$(CONFIG_SPL_SAVEENV) += mmc_write.o -else -obj-$(CONFIG_MMC) += mmc_write.o -endif - # SDHCI obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_MMC_SDHCI_ATMEL) += atmel_sdhci.o