summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-08-30 23:47:41 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 21:09:37 +0200
commite5648acab153f0f429bfc714902c5aaa7879f71b (patch)
treef6f18176c0c8094b281cc6def2887ebaebc35813
parent2d02d91d530e831f2dab228085963fc1d5b71cb0 (diff)
downloadu-boot-imx-e5648acab153f0f429bfc714902c5aaa7879f71b.zip
u-boot-imx-e5648acab153f0f429bfc714902c5aaa7879f71b.tar.gz
u-boot-imx-e5648acab153f0f429bfc714902c5aaa7879f71b.tar.bz2
cmd_fdc: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r--common/Makefile2
-rw-r--r--common/cmd_fdc.c12
2 files changed, 1 insertions, 13 deletions
diff --git a/common/Makefile b/common/Makefile
index 1d8ec87..e9f75f4 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -84,7 +84,7 @@ COBJS-y += cmd_eeprom.o
COBJS-$(CONFIG_CMD_ELF) += cmd_elf.o
COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o
COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o
-COBJS-y += cmd_fdc.o
+COBJS-$(CONFIG_CMD_FDC)$(CONFIG_CMD_FDOS) += cmd_fdc.o
COBJS-$(CONFIG_OF_LIBFDT) += cmd_fdt.o fdt_support.o
COBJS-$(CONFIG_CMD_FDOS) += cmd_fdos.o
COBJS-$(CONFIG_CMD_FLASH) += cmd_flash.o
diff --git a/common/cmd_fdc.c b/common/cmd_fdc.c
index 8493def..b663d60 100644
--- a/common/cmd_fdc.c
+++ b/common/cmd_fdc.c
@@ -50,8 +50,6 @@
/*#include <rtc.h> */
/*#endif */
-#if defined(CONFIG_CMD_FDC) || defined(CONFIG_CMD_FDOS)
-
typedef struct {
int flags; /* connected drives ect */
unsigned long blnr; /* Logical block nr */
@@ -705,7 +703,6 @@ int fdc_setup(int drive, FDC_COMMAND_STRUCT *pCMD, FD_GEO_STRUCT *pFG)
return TRUE;
}
-#endif
#if defined(CONFIG_CMD_FDOS)
@@ -903,15 +900,6 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return rcode;
}
-
-#endif
-
-
-/***************************************************/
-
-
-#if defined(CONFIG_CMD_FDC)
-
U_BOOT_CMD(
fdcboot, 3, 1, do_fdcboot,
"fdcboot - boot from floppy device\n",