From 581d04f14d7a39b63d418e2a21e44101233096d1 Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Thu, 15 Oct 2009 10:48:18 -0500 Subject: [PATCH] cmd_nand: Move conditional compilation to Makefile Signed-off-by: Peter Tyser --- common/Makefile | 2 +- common/cmd_nand.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/common/Makefile b/common/Makefile index 3781738e19..b8c596c7cd 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 404ef9cf78..075a8afb60 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -10,9 +10,6 @@ #include #include - -#if defined(CONFIG_CMD_NAND) - #include #include #include @@ -678,4 +675,3 @@ U_BOOT_CMD(nboot, 4, 1, do_nandboot, "boot from NAND device", "[partition] | [[[loadAddr] dev] offset]" ); -#endif -- 2.39.2