LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib_ppc/: 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>
This commit is contained in:
Jon Loeliger 2007-06-11 19:02:58 -05:00 committed by Wolfgang Denk
parent 98b79003c2
commit 73f032021e
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib_ppc/board.c
View File

@ -35,13 +35,13 @@
#ifdef CONFIG_MPC5xxx #ifdef CONFIG_MPC5xxx
#include <mpc5xxx.h> #include <mpc5xxx.h>
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_IDE) #if (CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)
#include <ide.h> #include <ide.h>
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_SCSI) #if (CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI)
#include <scsi.h> #include <scsi.h>
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
#include <kgdb.h> #include <kgdb.h>
#endif #endif
#ifdef CONFIG_STATUS_LED #ifdef CONFIG_STATUS_LED
@ -80,14 +80,14 @@ extern int update_flash_size (int flash_size);
extern void sc3_read_eeprom(void); extern void sc3_read_eeprom(void);
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_DOC) #if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
void doc_init (void); void doc_init (void);
#endif #endif
#if defined(CONFIG_HARD_I2C) || \ #if defined(CONFIG_HARD_I2C) || \
defined(CONFIG_SOFT_I2C) defined(CONFIG_SOFT_I2C)
#include <i2c.h> #include <i2c.h>
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_NAND) #if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
void nand_init (void); void nand_init (void);
#endif #endif
@ -118,7 +118,7 @@ extern ulong __init_end;
extern ulong _end; extern ulong _end;
ulong monitor_flash_len; ulong monitor_flash_len;
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) #if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG)
#include <bedbug/type.h> #include <bedbug/type.h>
#endif #endif
@ -779,7 +779,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
spi_init_r (); spi_init_r ();
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_NAND) #if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
WATCHDOG_RESET (); WATCHDOG_RESET ();
puts ("NAND: "); puts ("NAND: ");
nand_init(); /* go init the NAND */ nand_init(); /* go init the NAND */
@ -941,7 +941,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
hermes_start_lxt980 ((int) bd->bi_ethspeed); hermes_start_lxt980 ((int) bd->bi_ethspeed);
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
WATCHDOG_RESET (); WATCHDOG_RESET ();
puts ("KGDB: "); puts ("KGDB: ");
kgdb_init (); kgdb_init ();
@ -973,7 +973,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
if ((s = getenv ("loadaddr")) != NULL) { if ((s = getenv ("loadaddr")) != NULL) {
load_addr = simple_strtoul (s, NULL, 16); load_addr = simple_strtoul (s, NULL, 16);
} }
#if (CONFIG_COMMANDS & CFG_CMD_NET) #if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
if ((s = getenv ("bootfile")) != NULL) { if ((s = getenv ("bootfile")) != NULL) {
copy_filename (BootFile, s, sizeof (BootFile)); copy_filename (BootFile, s, sizeof (BootFile));
} }
@ -981,19 +981,19 @@ void board_init_r (gd_t *id, ulong dest_addr)
WATCHDOG_RESET (); WATCHDOG_RESET ();
#if (CONFIG_COMMANDS & CFG_CMD_SCSI) #if (CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI)
WATCHDOG_RESET (); WATCHDOG_RESET ();
puts ("SCSI: "); puts ("SCSI: ");
scsi_init (); scsi_init ();
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_DOC) #if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
WATCHDOG_RESET (); WATCHDOG_RESET ();
puts ("DOC: "); puts ("DOC: ");
doc_init (); doc_init ();
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_NET) #if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
#if defined(CONFIG_NET_MULTI) #if defined(CONFIG_NET_MULTI)
WATCHDOG_RESET (); WATCHDOG_RESET ();
puts ("Net: "); puts ("Net: ");
@ -1001,7 +1001,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
eth_initialize (bd); eth_initialize (bd);
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_NET) && ( \ #if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && ( \
defined(CONFIG_CCM) || \ defined(CONFIG_CCM) || \
defined(CONFIG_ELPT860) || \ defined(CONFIG_ELPT860) || \
defined(CONFIG_EP8260) || \ defined(CONFIG_EP8260) || \
@ -1026,13 +1026,14 @@ void board_init_r (gd_t *id, ulong dest_addr)
post_run (NULL, POST_RAM | post_bootmode_get(0)); post_run (NULL, POST_RAM | post_bootmode_get(0));
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) && !(CONFIG_COMMANDS & CFG_CMD_IDE) #if ((CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)) \
&& !((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE))
WATCHDOG_RESET (); WATCHDOG_RESET ();
puts ("PCMCIA:"); puts ("PCMCIA:");
pcmcia_init (); pcmcia_init ();
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_IDE) #if (CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)
WATCHDOG_RESET (); WATCHDOG_RESET ();
# ifdef CONFIG_IDE_8xx_PCCARD # ifdef CONFIG_IDE_8xx_PCCARD
puts ("PCMCIA:"); puts ("PCMCIA:");
@ -1057,7 +1058,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
last_stage_init (); last_stage_init ();
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) #if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG)
WATCHDOG_RESET (); WATCHDOG_RESET ();
bedbug_init (); bedbug_init ();
#endif #endif

2
lib_ppc/kgdb.c
View File

@ -1,7 +1,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) #if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
#include <kgdb.h> #include <kgdb.h>
#include <asm/signal.h> #include <asm/signal.h>