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_elf.c | |
| parent | ec63b10b61fd68238d4c15c1cd04c0b38228e2c1 (diff) | |
| download | blackbird-obmc-uboot-a76adc8142c1d956385a109e0b70f9319ede4d66.tar.gz blackbird-obmc-uboot-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_elf.c')
| -rw-r--r-- | common/cmd_elf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_elf.c b/common/cmd_elf.c index 0e3d56f6bb..cc8a8daa70 100644 --- a/common/cmd_elf.c +++ b/common/cmd_elf.c @@ -23,7 +23,7 @@ DECLARE_GLOBAL_DATA_PTR; #endif -#if (CONFIG_COMMANDS & CFG_CMD_ELF) +#if (CONFIG_COMMANDS & CFG_CMD_ELF) || defined(CONFIG_CMD_ELF) #ifndef MAX #define MAX(a,b) ((a) > (b) ? (a) : (b)) @@ -101,7 +101,7 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) else addr = simple_strtoul (argv[1], NULL, 16); -#if (CONFIG_COMMANDS & CFG_CMD_NET) +#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET) /* Check to see if we need to tftp the image ourselves before starting */ if ((argc == 2) && (strcmp (argv[1], "tftp") == 0)) { |
