cmd_nand: Move conditional compilation to Makefile

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

diff --git a/common/Makefile b/common/Makefile
index 3781738e19ad1b5d1a802fd19e457e8e16c3ae80..b8c596c7cd79e343e0254f7c01005064736ffe05 100644 (file)
--- 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 404ef9cf78849eae186a585bc224a118586f2655..075a8afb60a4c22494095d80be9e74c11dba732d 100644 (file)
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -10,9 +10,6 @@
 
 #include <common.h>
 #include <linux/mtd/mtd.h>
-
-#if defined(CONFIG_CMD_NAND)
-
 #include <command.h>
 #include <watchdog.h>
 #include <malloc.h>
@@ -678,4 +675,3 @@ U_BOOT_CMD(nboot, 4, 1, do_nandboot,
        "boot from NAND device",
        "[partition] | [[[loadAddr] dev] offset]"
 );
-#endif