Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

common/* non-cmd*: Remove obsolete references to CONFIG_COMMANDS

Browse Source 
Signed-off-by: Jon Loeliger <jdl@freescale.com>
master
Jon Loeliger 18 years ago
parent fd9bcaa35b
commit c3517f919d
12 changed files with 19 additions and 19 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      common/command.c
  2. 4
      common/docecc.c
  3. 2
      common/env_flash.c
  4. 2
      common/env_nand.c
  5. 4
      common/exports.c
  6. 2
      common/hush.c
  7. 2
      common/kgdb.c
  8. 4
      common/lcd.c
  9. 4
      common/main.c
  10. 4
      common/miiphyutil.c
  11. 4
      common/usb.c
  12. 2
      common/usb_storage.c

4
common/command.c
Unescape View File

@ -42,7 +42,7 @@ U_BOOT_CMD(
NULL NULL
); );
#if (CONFIG_COMMANDS & CFG_CMD_ECHO) || defined(CONFIG_CMD_ECHO) #if 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) || defined(CONFIG_CMD_RUN) #if defined(CONFIG_CMD_RUN)
install_auto_complete_handler("run", var_complete); install_auto_complete_handler("run", var_complete);
#endif #endif
} }

4
common/docecc.c
Unescape View File

@ -31,7 +31,7 @@
#undef ECC_DEBUG #undef ECC_DEBUG
#undef PSYCHO_DEBUG #undef PSYCHO_DEBUG
#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC) #if defined(CONFIG_CMD_DOC)
#include <linux/mtd/doc2000.h> #include <linux/mtd/doc2000.h>
@ -514,4 +514,4 @@ int doc_decode_ecc(unsigned char sector[SECTOR_SIZE], unsigned char ecc1[6])
return nb_errors; return nb_errors;
} }
#endif /* (CONFIG_COMMANDS & CFG_CMD_DOC) */ #endif

2
common/env_flash.c
Unescape 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)) || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) #if 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
Unescape 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)) || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) #if 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

4
common/exports.c
Unescape View File

@ -32,8 +32,8 @@ 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) || defined(CONFIG_CMD_I2C) #if 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
} }

2
common/hush.c
Unescape 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) || defined(CONFIG_CMD_BOOTD) #if 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
Unescape View File

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

4
common/lcd.c
Unescape 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_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN) #if 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.
@ -700,7 +700,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
return (0); return (0);
} }
#endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) || CONFIG_SPLASH_SCREEN */ #endif
static void *lcd_logo (void) static void *lcd_logo (void)

4
common/main.c
Unescape View File

@ -1311,7 +1311,7 @@ int run_command (const char *cmd, int flag)
continue; continue;
} }
#if (CONFIG_COMMANDS & CFG_CMD_BOOTD) || defined(CONFIG_CMD_BOOTD) #if 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) || defined(CONFIG_CMD_RUN) #if 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;

4
common/miiphyutil.c
Unescape 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) || defined(CONFIG_CMD_MII) #if defined(CONFIG_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>
@ -470,4 +470,4 @@ int miiphy_link (char *devname, unsigned char addr)
} }
#endif #endif
#endif /* CONFIG_MII || (CONFIG_COMMANDS & CFG_CMD_MII) */ #endif /* CONFIG_MII */

4
common/usb.c
Unescape 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) || defined(CONFIG_CMD_USB) #if defined(CONFIG_CMD_USB)
#include <usb.h> #include <usb.h>
#ifdef CONFIG_4xx #ifdef CONFIG_4xx
@ -1247,6 +1247,6 @@ int usb_hub_probe(struct usb_device *dev, int ifnum)
return ret; return ret;
} }
#endif /* (CONFIG_COMMANDS & CFG_CMD_USB) */ #endif
/* EOF */ /* EOF */

2
common/usb_storage.c
Unescape View File

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

Write Preview
Loading…
Cancel
Save