summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2009-10-15 10:48:18 -0500
committerScott Wood <scottwood@freescale.com>2009-11-13 16:56:14 -0600
commit581d04f14d7a39b63d418e2a21e44101233096d1 (patch)
treef9cfee07f72152f5494a144bb155fbae5dbac1c1 /common
parent9574fd63a97d080e379f30b6a81a1221eaeb797e (diff)
downloadu-boot-imx-581d04f14d7a39b63d418e2a21e44101233096d1.zip
u-boot-imx-581d04f14d7a39b63d418e2a21e44101233096d1.tar.gz
u-boot-imx-581d04f14d7a39b63d418e2a21e44101233096d1.tar.bz2
cmd_nand: Move conditional compilation to Makefile
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Diffstat (limited to 'common')
-rw-r--r--common/Makefile2
-rw-r--r--common/cmd_nand.c4
2 files changed, 1 insertions, 5 deletions
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 404ef9c..075a8af 100644
--- 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