Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-19 03:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

common/ non-cmd: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).

Browse source 
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>
This commit is contained in:
Jon Loeliger 2007-06-11 19:02:05 -05:00 • committed by Wolfgang Denk
parent 65c450b47a
commit b453960d4f
13 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/bedbug.c
View file

@ -2,7 +2,7 @@
#include <common.h> #include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) #if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG)
#include <linux/ctype.h> #include <linux/ctype.h>
#include <bedbug/bedbug.h> #include <bedbug/bedbug.h>

4
common/command.c
View file

@ -42,7 +42,7 @@ U_BOOT_CMD(
NULL NULL
); );
#if (CONFIG_COMMANDS & CFG_CMD_ECHO) #if (CONFIG_COMMANDS & CFG_CMD_ECHO) || defined(CONFIG_CMD_ECHO)
int int
do_echo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) do_echo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@ -409,7 +409,7 @@ void install_auto_complete(void)
{ {
install_auto_complete_handler("printenv", var_complete); install_auto_complete_handler("printenv", var_complete);
install_auto_complete_handler("setenv", var_complete); install_auto_complete_handler("setenv", var_complete);
#if (CONFIG_COMMANDS & CFG_CMD_RUN) #if (CONFIG_COMMANDS & CFG_CMD_RUN) || defined(CONFIG_CMD_RUN)
install_auto_complete_handler("run", var_complete); install_auto_complete_handler("run", var_complete);
#endif #endif
} }

2
common/docecc.c
View file

@ -31,7 +31,7 @@
#undef ECC_DEBUG #undef ECC_DEBUG
#undef PSYCHO_DEBUG #undef PSYCHO_DEBUG
#if (CONFIG_COMMANDS & CFG_CMD_DOC) #if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
#include <linux/mtd/doc2000.h> #include <linux/mtd/doc2000.h>

2
common/env_flash.c
View file

@ -37,7 +37,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if ((CONFIG_COMMANDS&(CFG_CMD_ENV|CFG_CMD_FLASH)) == (CFG_CMD_ENV|CFG_CMD_FLASH)) #if ((CONFIG_COMMANDS&(CFG_CMD_ENV|CFG_CMD_FLASH)) == (CFG_CMD_ENV|CFG_CMD_FLASH)) || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH))
#define CMD_SAVEENV #define CMD_SAVEENV
#elif defined(CFG_ENV_ADDR_REDUND) #elif defined(CFG_ENV_ADDR_REDUND)
#error Cannot use CFG_ENV_ADDR_REDUND without CFG_CMD_ENV & CFG_CMD_FLASH #error Cannot use CFG_ENV_ADDR_REDUND without CFG_CMD_ENV & CFG_CMD_FLASH

2
common/env_nand.c
View file

@ -39,7 +39,7 @@
#include <malloc.h> #include <malloc.h>
#include <nand.h> #include <nand.h>
#if ((CONFIG_COMMANDS&(CFG_CMD_ENV|CFG_CMD_NAND)) == (CFG_CMD_ENV|CFG_CMD_NAND)) #if ((CONFIG_COMMANDS&(CFG_CMD_ENV|CFG_CMD_NAND)) == (CFG_CMD_ENV|CFG_CMD_NAND)) || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND))
#define CMD_SAVEENV #define CMD_SAVEENV
#elif defined(CFG_ENV_OFFSET_REDUND) #elif defined(CFG_ENV_OFFSET_REDUND)
#error Cannot use CFG_ENV_OFFSET_REDUND without CFG_CMD_ENV & CFG_CMD_NAND #error Cannot use CFG_ENV_OFFSET_REDUND without CFG_CMD_ENV & CFG_CMD_NAND

2
common/exports.c
View file

@ -32,7 +32,7 @@ void jumptable_init (void)
gd->jt[XF_install_hdlr] = (void *) irq_install_handler; gd->jt[XF_install_hdlr] = (void *) irq_install_handler;
gd->jt[XF_free_hdlr] = (void *) irq_free_handler; gd->jt[XF_free_hdlr] = (void *) irq_free_handler;
#endif /* I386 || PPC */ #endif /* I386 || PPC */
#if (CONFIG_COMMANDS & CFG_CMD_I2C) #if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C)
gd->jt[XF_i2c_write] = (void *) i2c_write; gd->jt[XF_i2c_write] = (void *) i2c_write;
gd->jt[XF_i2c_read] = (void *) i2c_read; gd->jt[XF_i2c_read] = (void *) i2c_read;
#endif /* CFG_CMD_I2C */ #endif /* CFG_CMD_I2C */

2
common/hush.c
View file

@ -1682,7 +1682,7 @@ static int run_pipe_real(struct pipe *pi)
return -1; /* give up after bad command */ return -1; /* give up after bad command */
} else { } else {
int rcode; int rcode;
#if (CONFIG_COMMANDS & CFG_CMD_BOOTD) #if (CONFIG_COMMANDS & CFG_CMD_BOOTD) || defined(CONFIG_CMD_BOOTD)
extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
/* avoid "bootd" recursion */ /* avoid "bootd" recursion */

2
common/kgdb.c
View file

@ -92,7 +92,7 @@
#include <kgdb.h> #include <kgdb.h>
#include <command.h> #include <command.h>
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
#undef KGDB_DEBUG #undef KGDB_DEBUG

2
common/lcd.c
View file

@ -571,7 +571,7 @@ void bitmap_plot (int x, int y)
#endif /* CONFIG_LCD_LOGO */ #endif /* CONFIG_LCD_LOGO */
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
#if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN) #if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
/* /*
* Display the BMP file located at address bmp_image. * Display the BMP file located at address bmp_image.
* Only uncompressed. * Only uncompressed.

4
common/main.c
View file

@ -1311,7 +1311,7 @@ int run_command (const char *cmd, int flag)
continue; continue;
} }
#if (CONFIG_COMMANDS & CFG_CMD_BOOTD) #if (CONFIG_COMMANDS & CFG_CMD_BOOTD) || defined(CONFIG_CMD_BOOTD)
/* avoid "bootd" recursion */ /* avoid "bootd" recursion */
if (cmdtp->cmd == do_bootd) { if (cmdtp->cmd == do_bootd) {
#ifdef DEBUG_PARSER #ifdef DEBUG_PARSER
@ -1344,7 +1344,7 @@ int run_command (const char *cmd, int flag)
/****************************************************************************/ /****************************************************************************/
#if (CONFIG_COMMANDS & CFG_CMD_RUN) #if (CONFIG_COMMANDS & CFG_CMD_RUN) || defined(CONFIG_CMD_RUN)
int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{ {
int i; int i;

2
common/miiphyutil.c
View file

@ -29,7 +29,7 @@
#include <common.h> #include <common.h>
#include <miiphy.h> #include <miiphy.h>
#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) #if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII)
#include <asm/types.h> #include <asm/types.h>
#include <linux/list.h> #include <linux/list.h>
#include <malloc.h> #include <malloc.h>

2
common/usb.c
View file

@ -49,7 +49,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#if (CONFIG_COMMANDS & CFG_CMD_USB) #if (CONFIG_COMMANDS & CFG_CMD_USB) || defined(CONFIG_CMD_USB)
#include <usb.h> #include <usb.h>
#ifdef CONFIG_4xx #ifdef CONFIG_4xx

2
common/usb_storage.c
View file

@ -55,7 +55,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#if (CONFIG_COMMANDS & CFG_CMD_USB) #if (CONFIG_COMMANDS & CFG_CMD_USB) || defined(CONFIG_CMD_USB)
#include <part.h> #include <part.h>
#include <usb.h> #include <usb.h>