From patchwork Mon Jan 30 10:46:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 92817 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1371853qgi; Mon, 30 Jan 2017 02:48:15 -0800 (PST) X-Received: by 10.28.229.193 with SMTP id c184mr14724197wmh.83.1485773295616; Mon, 30 Jan 2017 02:48:15 -0800 (PST) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id e71si12857767wmc.105.2017.01.30.02.48.15; Mon, 30 Jan 2017 02:48:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; 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 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D85854ABD8; Mon, 30 Jan 2017 11:48:00 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ch7mtR29NOGj; Mon, 30 Jan 2017 11:48:00 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 664FC4B5B4; Mon, 30 Jan 2017 11:47:41 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5672A4AAA7 for ; Mon, 30 Jan 2017 11:47:30 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZlVZHMC8SwH8 for ; Mon, 30 Jan 2017 11:47:30 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by theia.denx.de (Postfix) with ESMTPS id B19694A99B for ; Mon, 30 Jan 2017 11:47:29 +0100 (CET) Received: from pug.jp.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id v0UAl9kv032281; Mon, 30 Jan 2017 19:47:10 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v0UAl9kv032281 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1485773230; bh=dmbCaxnyjZIHS4y2p8cL1/nFJl+NQ5pQYkp33Q+esrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x5fiCk8Vw+dEC2LhgcBFTZw7y948tLSSo0ZGaS4KVUm4cVyrV0MaXcDN9OP3/I8Qy v2dXkB+51u/89FN6PrdYtwa3QNuC6iZyfk8jmjqDhWS4JLE1VEncE7d7p9IeqXER+7 BWreSZVNiVCeuuJEpRrAjFXI7RLn4bcuwWHrOwomHyHpvjJsRhw51SD2gPWEf8nz99 EG3sc89gYn+QZ3ngfPhJ8gOeJURzVfoC4OmCtnoOnHRfPdAtDuEkv7M3mBL6pgCRZD Pe3ePAv53u4FUyeG2qXGqtwRzgwvHYGyLQ5ds2vLZtiXrxtzOG4ajtEJqKI9vkmw+R K4/ATBTJe446Q== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Mon, 30 Jan 2017 19:46:50 +0900 Message-Id: <1485773215-8797-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485773215-8797-1-git-send-email-yamada.masahiro@socionext.com> References: <1485773215-8797-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH 2/7] mmc: sandbox: rename CONFIG, fix dependency, and use it in Makefile X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" [1] Rename CONFIG_SANDBOX_MMC to CONFIG_MMC_SANDBOX for consistency I want all MMC driver options prefixed with CONFIG_MMC_. [2] Fix dependency Add necessary depends on to avoid compile error. Instead "depends on MMC" is unneeded because this config entry resides inside of "if MMC". [3] Currently, this config symbol is not referenced at all. Use it to enable/disable the driver in Makefile. Signed-off-by: Masahiro Yamada --- Changes in v2: None configs/sandbox_defconfig | 2 +- configs/sandbox_spl_defconfig | 2 +- drivers/mmc/Kconfig | 5 +++-- drivers/mmc/Makefile | 6 +----- 4 files changed, 6 insertions(+), 9 deletions(-) -- 2.7.4 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 877aa94..01f6f5d 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -94,7 +94,7 @@ CONFIG_CROS_EC_SPI=y CONFIG_PWRSEQ=y CONFIG_SPL_PWRSEQ=y CONFIG_I2C_EEPROM=y -CONFIG_SANDBOX_MMC=y +CONFIG_MMC_SANDBOX=y CONFIG_SPI_FLASH_SANDBOX=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 0569647..896b15d 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -104,7 +104,7 @@ CONFIG_CROS_EC_SANDBOX=y CONFIG_CROS_EC_SPI=y CONFIG_PWRSEQ=y CONFIG_SPL_PWRSEQ=y -CONFIG_SANDBOX_MMC=y +CONFIG_MMC_SANDBOX=y CONFIG_SPI_FLASH_SANDBOX=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index df4913b..97d245e 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -187,9 +187,10 @@ config MMC_UNIPHIER help This selects support for the SD/MMC Host Controller on UniPhier SoCs. -config SANDBOX_MMC +config MMC_SANDBOX bool "Sandbox MMC support" - depends on MMC && SANDBOX + depends on SANDBOX + depends on BLK && DM_MMC_OPS && 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 diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 6af7f79..2747deb 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -40,11 +40,7 @@ obj-$(CONFIG_X86) += pci_mmc.o obj-$(CONFIG_PXA_MMC_GENERIC) += pxa_mmc_gen.o obj-$(CONFIG_SUPPORT_EMMC_RPMB) += rpmb.o obj-$(CONFIG_S3C_SDI) += s3c_sdi.o -ifdef CONFIG_BLK -ifdef CONFIG_GENERIC_MMC -obj-$(CONFIG_SANDBOX) += sandbox_mmc.o -endif -endif +obj-$(CONFIG_MMC_SANDBOX) += sandbox_mmc.o obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o obj-$(CONFIG_SH_SDHI) += sh_sdhi.o obj-$(CONFIG_ZYNQ_SDHCI) += zynq_sdhci.o