From patchwork Fri Nov 2 12:12:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_Bie=C3=9Fmann?= X-Patchwork-Id: 196551 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 99A0A2C0331 for ; Fri, 2 Nov 2012 23:12:40 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 111B24A315; Fri, 2 Nov 2012 13:12:37 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 U7NRc0JPE0jz; Fri, 2 Nov 2012 13:12:36 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9C1CB4A35D; Fri, 2 Nov 2012 13:12:35 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EF2984A35D for ; Fri, 2 Nov 2012 13:12:33 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 6RK2Hf1lGix6 for ; Fri, 2 Nov 2012 13:12:33 +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 mail-bk0-f44.google.com (mail-bk0-f44.google.com [209.85.214.44]) by theia.denx.de (Postfix) with ESMTPS id 403DD4A315 for ; Fri, 2 Nov 2012 13:12:31 +0100 (CET) Received: by mail-bk0-f44.google.com with SMTP id jc3so1409682bkc.3 for ; Fri, 02 Nov 2012 05:12:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=jf2hs7vmCUtfvJUnM86FmUphgcWeXDmDyMnJ0i5xdl8=; b=kv+AfV/stcbVU1dNMl1ArqEhmvWMFxcFebNcNpdz3uH7mNqsKLNlC831Ll+tECBmBz 5n51WCultG4H+UHfyBEKPK/1CM+qU8QvFEBeKCbZbmnYtmkmWHlkEuW9eueFusXbmRbm yF0uKAOCUYxE3wqOp6hVq1l7qMmBpIgOV1c4sjNLyh/V5/fTD4bRe2QBiD9FAZs3U3yS uMFE7rBVFM5YLfOXUg2XY+ItxeHveP8OR1koP/HLaWREOZDrMTZe5QaJThtxCyyJmho6 1UNRUzNdIoOCBajZ02ejXbUcAuD8JftZHUiKtedjpZdxM9NHtAcefPMlsoNwN4XjtBdG bRkw== Received: by 10.204.149.135 with SMTP id t7mr312877bkv.103.1351858351221; Fri, 02 Nov 2012 05:12:31 -0700 (PDT) Received: from localhost ([2a01:198:47b:1:210:75ff:fe1a:cd1e]) by mx.google.com with ESMTPS id j24sm6473001bkv.0.2012.11.02.05.12.29 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 05:12:30 -0700 (PDT) From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= To: u-boot@lists.denx.de Date: Fri, 2 Nov 2012 13:12:20 +0100 Message-Id: <1351858340-17062-1-git-send-email-andreas.devel@googlemail.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Cc: Scott Wood Subject: [U-Boot] [PATCH] mtd/nand/Makefile: simplify ifdefs X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Signed-off-by: Andreas Bießmann Cc: Scott Wood --- drivers/mtd/nand/Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index beb99ca..862fad2 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -27,12 +27,8 @@ LIB := $(obj)libnand.o ifdef CONFIG_CMD_NAND ifdef CONFIG_SPL_BUILD -ifdef CONFIG_SPL_NAND_SIMPLE -COBJS-y += nand_spl_simple.o -endif -ifdef CONFIG_SPL_NAND_LOAD -COBJS-y += nand_spl_load.o -endif +COBJS-$(CONFIG_SPL_NAND_SIMPLE) += nand_spl_simple.o +COBJS-$(CONFIG_SPL_NAND_LOAD) += nand_spl_load.o else COBJS-y += nand.o COBJS-y += nand_bbt.o