[U-Boot] [PATCH 1/1] cmd_nand: push CONFIG check to Makefile

Signed-off-by: Mike Frysinger vapier@gentoo.org --- common/Makefile | 2 +- common/cmd_nand.c | 4 ---- 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 158a55f..a5d2074 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -18,9 +18,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 +683,3 @@ U_BOOT_CMD(nboot, 4, 1, do_nandboot, "boot from NAND device", "[partition] | [[[loadAddr] dev] offset]" ); -#endif

Mike Frysinger wrote:
Signed-off-by: Mike Frysinger vapier@gentoo.org
common/Makefile | 2 +- common/cmd_nand.c | 4 ---- 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 158a55f..a5d2074 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -18,9 +18,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 +683,3 @@ U_BOOT_CMD(nboot, 4, 1, do_nandboot, "boot from NAND device", "[partition] | [[[loadAddr] dev] offset]" ); -#endif
I already have a patch in u-boot-nand-flash/next from Peter Tyser that does this.
-Scott
participants (2)
-
Mike Frysinger
-
Scott Wood