From patchwork Sat Feb 11 13:43:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 93822 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp326060qgi; Sat, 11 Feb 2017 05:44:36 -0800 (PST) X-Received: by 10.28.174.14 with SMTP id x14mr29718118wme.75.1486820676151; Sat, 11 Feb 2017 05:44:36 -0800 (PST) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id s136si5193333wmd.98.2017.02.11.05.44.35; Sat, 11 Feb 2017 05:44:36 -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 BBB49A79B9; Sat, 11 Feb 2017 14:44:34 +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 804XcRL3I48U; Sat, 11 Feb 2017 14:44:34 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0E3B74B6E9; Sat, 11 Feb 2017 14:44:34 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 16B0D4B6E9 for ; Sat, 11 Feb 2017 14:44: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 odqTVTiD5m8T for ; Sat, 11 Feb 2017 14:44: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-07.nifty.com (conuserg-07.nifty.com [210.131.2.74]) by theia.denx.de (Postfix) with ESMTPS id 615834B6AC for ; Sat, 11 Feb 2017 14:44:25 +0100 (CET) Received: from grover.sesame (FL1-111-169-71-157.osk.mesh.ad.jp [111.169.71.157]) (authenticated) by conuserg-07.nifty.com with ESMTP id v1BDi0Lp029899; Sat, 11 Feb 2017 22:44:05 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v1BDi0Lp029899 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1486820646; bh=64X1oBG9LhVPeCeRK8KTeVVI7+cFN2GrkMzz+vpxdHY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N/+kTBCNrtPeJ1M7u5JY2kbPi72xx4pW4WE4DiCPqoBVU2USTj4IsyaSf35ykU9hk 23cHpVzU2HIm5QxNAPFiQ78azr0vYbUT1V4RROCXw9CsTeeduVtPfyunJhZ0SDozTn Rof6maM+YDJWJQXdTCDRuDOc0j6PWL3SKuMpNiuPolsa93PJcD7DuHVL3qLNhnUdC3 zP+sOD88uQUxishAeWxWoXyUDtLlCe0BUlGpfbryy+fVpAqcy4JcNrjzh/d9CNxjdJ 6Hv7h0QDL1flqIRTftPhmYj2Do5z7w5MC13tgLunoaH4u6qSi+Vy/XIGOspArXAXMa Sf9IX7b29/dVQ== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sat, 11 Feb 2017 22:43:55 +0900 Message-Id: <1486820635-8467-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486820635-8467-1-git-send-email-yamada.masahiro@socionext.com> References: <1486820635-8467-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini , Michal Simek , Siva Durga Prasad Paladugu , Stefan Roese Subject: [U-Boot] [PATCH 3/3] flash: compile common/flash.c iif CONFIG_MTD_NO_FLASH is enabled 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" The whole of common/flash.c is guarded by #if defined() ... #endif. Move the conditional to common/Makefile. Signed-off-by: Masahiro Yamada --- common/Makefile | 2 +- common/flash.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) -- 2.7.4 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/common/Makefile b/common/Makefile index ecc23e6..86225f1 100644 --- a/common/Makefile +++ b/common/Makefile @@ -67,7 +67,7 @@ endif # others obj-$(CONFIG_BOOTSTAGE) += bootstage.o obj-$(CONFIG_CONSOLE_MUX) += iomux.o -obj-y += flash.o +obj-$(CONFIG_MTD_NOR_FLASH) += flash.o obj-$(CONFIG_CMD_KGDB) += kgdb.o kgdb_stubs.o obj-$(CONFIG_I2C_EDID) += edid.o obj-$(CONFIG_KALLSYMS) += kallsyms.o diff --git a/common/flash.c b/common/flash.c index 6d492c7..587ef60 100644 --- a/common/flash.c +++ b/common/flash.c @@ -10,7 +10,6 @@ #include #include -#if defined(CONFIG_MTD_NOR_FLASH) #include extern flash_info_t flash_info[]; /* info for FLASH chips */ @@ -218,7 +217,3 @@ void flash_perror (int err) break; } } - -/*----------------------------------------------------------------------- - */ -#endif /* !CONFIG_MTD_NOR_FLASH */