From patchwork Sat Nov 7 13:46:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 541308 X-Patchwork-Delegate: jagannadh.teki@gmail.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 6C5B71402D4 for ; Sun, 8 Nov 2015 00:48:46 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 09CC34BEFF; Sat, 7 Nov 2015 14:48:09 +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 RwFoweujfFgS; Sat, 7 Nov 2015 14:48:08 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A8DCD4BF03; Sat, 7 Nov 2015 14:47:53 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 474A34BEDA for ; Sat, 7 Nov 2015 14:47:45 +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 EJspvkoEJ6Mc for ; Sat, 7 Nov 2015 14:47:45 +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-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) by theia.denx.de (Postfix) with ESMTPS id 0E2F84BEA9 for ; Sat, 7 Nov 2015 14:47:39 +0100 (CET) Received: by pabfh17 with SMTP id fh17so151340159pab.0 for ; Sat, 07 Nov 2015 05:47:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FljpIoKfO550wquH+O3yv5hyL2o9DzExhngC2UmEJR4=; b=DwPxvM5qKsvon8TISJ3xaOjS58WtUHEH57Uhwp7VQSICuxIVmTCO/v4ldmZgU4+Y47 v/N/oi6j26963MKVFbScPwoxNSwlzE0MBnJ6c46HM2zUwMtaCT9pczjEHg+utyaJR3bn vyUAfSYOA+JwZuRE/XES1U9oeE20F3qaCyWOI8RMGBVNf5Lw1JkrPffmgMwm3+7JP14S pWjSzOVaDAQ7g9q5jmbApL3RTR6h4/I2pjkSVefzNoYmOxxY9zofCwhUCOD9gPpAdE2i +kA3SjsEHz9uZZLByGjkPB+sjM58zVqYSorxrMHi1ruuKZzRtpdMplYjuYxUC8iHd5sX 8xCA== X-Received: by 10.68.69.35 with SMTP id b3mr25999918pbu.22.1446904058297; Sat, 07 Nov 2015 05:47:38 -0800 (PST) Received: from localhost.localdomain ([123.236.183.133]) by smtp.gmail.com with ESMTPSA id kh9sm4865008pad.11.2015.11.07.05.47.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 07 Nov 2015 05:47:36 -0800 (PST) From: Jagan Teki To: u-boot@lists.denx.de Date: Sat, 7 Nov 2015 19:16:20 +0530 Message-Id: <1446903997-1864-7-git-send-email-jteki@openedev.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446903997-1864-1-git-send-email-jteki@openedev.com> References: <1446903997-1864-1-git-send-email-jteki@openedev.com> Cc: Jagan Teki , Tom Rini Subject: [U-Boot] [PATCH v6 06/23] sf: Fix 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" This patch removes unneeded ifdef and fixed accordingly. Signed-off-by: Jagan Teki --- drivers/mtd/spi/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile index ff48b25..66c4424 100644 --- a/drivers/mtd/spi/Makefile +++ b/drivers/mtd/spi/Makefile @@ -12,11 +12,7 @@ obj-$(CONFIG_SPL_SPI_LOAD) += spi_spl_load.o obj-$(CONFIG_SPL_SPI_BOOT) += fsl_espi_spl.o endif -#ifndef CONFIG_DM_SPI -obj-$(CONFIG_SPI_FLASH) += sf_probe.o -#endif -obj-$(CONFIG_CMD_SF) += sf.o -obj-$(CONFIG_SPI_FLASH) += sf_ops.o sf_params.o +obj-$(CONFIG_SPI_FLASH) += sf_probe.o sf_ops.o sf_params.o sf.o obj-$(CONFIG_SPI_FLASH_DATAFLASH) += sf_dataflash.o obj-$(CONFIG_SPI_FLASH_MTD) += sf_mtd.o obj-$(CONFIG_SPI_FLASH_SANDBOX) += sandbox.o