minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-12 21:46:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

cmd_nand: Move conditional compilation to Makefile

Browse Source 
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
This commit is contained in:
Peter Tyser 2009-10-15 10:48:18 -05:00 committed by Scott Wood
parent 9574fd63a9
commit 581d04f14d
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/Makefile
View File

@ -116,7 +116,7 @@ COBJS-$(CONFIG_CMD_MISC) += cmd_misc.o
COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o
COBJS-$(CONFIG_MP) += cmd_mp.o COBJS-$(CONFIG_MP) += cmd_mp.o
COBJS-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.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_NET) += cmd_net.o
COBJS-$(CONFIG_CMD_ONENAND) += cmd_onenand.o COBJS-$(CONFIG_CMD_ONENAND) += cmd_onenand.o
COBJS-$(CONFIG_CMD_OTP) += cmd_otp.o COBJS-$(CONFIG_CMD_OTP) += cmd_otp.o

4
common/cmd_nand.c
View File

@ -10,9 +10,6 @@
#include <common.h> #include <common.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#if defined(CONFIG_CMD_NAND)
#include <command.h> #include <command.h>
#include <watchdog.h> #include <watchdog.h>
#include <malloc.h> #include <malloc.h>
@ -678,4 +675,3 @@ U_BOOT_CMD(nboot, 4, 1, do_nandboot,
"boot from NAND device", "boot from NAND device",
"[partition] | [[[loadAddr] dev] offset]" "[partition] | [[[loadAddr] dev] offset]"
); );
#endif