cmd_nand: push CONFIG check to Makefile
PATCH 1/1 cmd_nand: push CONFIG check to Makefile
Signed-off-by Mike Frysinger <[email protected]>
--- common/Makefile | 2 +- common/cmd_nand.c | 4 ---- 2 files changed, 1 insertions(+), 5 deletions(-)
common/Makefile +1 -1
@@ -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
common/cmd_nand.c +0 -4
@@ -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
Signature · 1 line
1.6.5.2
PATCH 1/1 cmd_nand: push CONFIG check to Makefile
Quoted 34 lines · Mike Frysinger
Signed-off-by Mike Frysinger <[email protected]>--- common/Makefile | 2 +- common/cmd_nand.c | 4 ---- 2 files changed, 1 insertions(+), 5 deletions(-)common/Makefile +1
-1@@ -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.ocommon/cmd_nand.c +0
-3@@ -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>
common/cmd_nand.c U_BOOT_CMD(nboot, 4, 1, do_nandboot, · line 689
Quoted 4 lines
common/cmd_nand.c +0
-1@@ -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