From mboxrd@z Thu Jan  1 00:00:00 1970
From: Robert P. J. Day <rpjday@crashcourse.ca>
Date: Thu, 19 Nov 2009 11:08:17 -0500 (EST)
Subject: [U-Boot] [PATCH] Move preprocessor test for cmd_nand.c to Makefile
Message-ID: <alpine.LFD.2.00.0911191105530.9676@localhost>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de


Move the CONFIG_CMD_NAND preprocessor test out of common/cmd_nand.c
and into the Makefile for consistency with other commands.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

---

  AFAICT, this doesn't affect any functionality, right?

diff --git a/common/Makefile b/common/Makefile
index 3781738..b8c596c 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -116,7 +116,7 @@ COBJS-$(CONFIG_CMD_MISC) += cmd_misc.o
 COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o
 COBJS-$(CONFIG_MP) += cmd_mp.o
 COBJS-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.o
-COBJS-y += cmd_nand.o
+COBJS-$(CONFIG_CMD_NAND) += cmd_nand.o
 COBJS-$(CONFIG_CMD_NET) += cmd_net.o
 COBJS-$(CONFIG_CMD_ONENAND) += cmd_onenand.o
 COBJS-$(CONFIG_CMD_OTP) += cmd_otp.o
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 158a55f..1b17159 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -19,8 +19,6 @@
 #include <common.h>
 #include <linux/mtd/mtd.h>

-#if defined(CONFIG_CMD_NAND)
-
 #include <command.h>
 #include <watchdog.h>
 #include <malloc.h>
@@ -686,4 +684,3 @@ U_BOOT_CMD(nboot, 4, 1, do_nandboot,
 	"boot from NAND device",
 	"[partition] | [[[loadAddr] dev] offset]"
 );
-#endif

========================================================================
Robert P. J. Day                               Waterloo, Ontario, CANADA

            Linux Consulting, Training and Kernel Pedantry.

Web page:                                          http://crashcourse.ca
Twitter:                                       http://twitter.com/rpjday
========================================================================