diff options
| author | Jon Loeliger <jdl@jdl.com> | 2007-06-11 19:01:43 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-04 00:23:08 +0200 |
| commit | a76adc8142c1d956385a109e0b70f9319ede4d66 (patch) | |
| tree | af5cd7bc45acf37dbcb217a42523c66e05a811c7 /common/cmd_fdc.c | |
| parent | ec63b10b61fd68238d4c15c1cd04c0b38228e2c1 (diff) | |
| download | u-boot-a76adc8142c1d956385a109e0b70f9319ede4d66.tar.gz u-boot-a76adc8142c1d956385a109e0b70f9319ede4d66.tar.xz u-boot-a76adc8142c1d956385a109e0b70f9319ede4d66.zip | |
common/cmd_[a-f]* : Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).
This is a compatibility step that allows both the older form
and the new form to co-exist for a while until the older can
be removed entirely.
All transformations are of the form:
Before:
#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
After:
#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'common/cmd_fdc.c')
| -rw-r--r-- | common/cmd_fdc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/common/cmd_fdc.c b/common/cmd_fdc.c index 03f4ce6d34..3c2ba56bb3 100644 --- a/common/cmd_fdc.c +++ b/common/cmd_fdc.c @@ -47,11 +47,12 @@ #endif -/*#if (CONFIG_COMMANDS & CFG_CMD_DATE) */ +/*#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE) */ /*#include <rtc.h> */ /*#endif */ -#if ((CONFIG_COMMANDS & CFG_CMD_FDC) || (CONFIG_COMMANDS & CFG_CMD_FDOS)) +#if (CONFIG_COMMANDS & CFG_CMD_FDC) || defined(CONFIG_CMD_FDC) \ + || (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS) typedef struct { @@ -709,7 +710,7 @@ int fdc_setup(int drive, FDC_COMMAND_STRUCT *pCMD, FD_GEO_STRUCT *pFG) } #endif /* ((CONFIG_COMMANDS & CFG_CMD_FDC)||(CONFIG_COMMANDS & CFG_CMD_FDOS))*/ -#if (CONFIG_COMMANDS & CFG_CMD_FDOS) +#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS) /* Low level functions for the Floppy-DOS layer */ @@ -774,7 +775,7 @@ int fdc_fdos_read (void *buffer, int len) } #endif /* (CONFIG_COMMANDS & CFG_CMD_FDOS) */ -#if (CONFIG_COMMANDS & CFG_CMD_FDC) +#if (CONFIG_COMMANDS & CFG_CMD_FDC) || defined(CONFIG_CMD_FDC) /**************************************************************************** * main routine do_fdcboot */ @@ -886,7 +887,7 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) /***************************************************/ -#if (CONFIG_COMMANDS & CFG_CMD_FDC) +#if (CONFIG_COMMANDS & CFG_CMD_FDC) || defined(CONFIG_CMD_FDC) U_BOOT_CMD( fdcboot, 3, 1, do_fdcboot, |