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