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

cpu/m*: Remove obsolete references to CONFIG_COMMANDS

Browse Source 
Signed-off-by: Jon Loeliger <jdl@freescale.com>
master
Jon Loeliger 17 years ago
parent 3a1ed1e1f9
commit 4431283c7e
31 changed files with 109 additions and 109 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. 14
      cpu/mcf52x2/fec.c
  2. 2
      cpu/microblaze/cache.c
  3. 4
      cpu/microblaze/interrupts.c
  4. 8
      cpu/mips/au1x00_eth.c
  5. 4
      cpu/mpc5xx/interrupts.c
  6. 16
      cpu/mpc5xx/traps.c
  7. 2
      cpu/mpc5xxx/cpu_init.c
  8. 6
      cpu/mpc5xxx/fec.c
  9. 2
      cpu/mpc5xxx/interrupts.c
  10. 16
      cpu/mpc5xxx/traps.c
  11. 2
      cpu/mpc8220/cpu_init.c
  12. 6
      cpu/mpc8220/fec.c
  13. 16
      cpu/mpc8220/traps.c
  14. 4
      cpu/mpc824x/traps.c
  15. 2
      cpu/mpc8260/bedbug_603e.c
  16. 6
      cpu/mpc8260/ether_fcc.c
  17. 2
      cpu/mpc8260/ether_scc.c
  18. 4
      cpu/mpc8260/interrupts.c
  19. 2
      cpu/mpc8260/kgdb.S
  20. 16
      cpu/mpc8260/traps.c
  21. 4
      cpu/mpc83xx/interrupts.c
  22. 14
      cpu/mpc83xx/traps.c
  23. 6
      cpu/mpc85xx/ether_fcc.c
  24. 4
      cpu/mpc85xx/interrupts.c
  25. 14
      cpu/mpc85xx/traps.c
  26. 2
      cpu/mpc8xx/bedbug_860.c
  27. 18
      cpu/mpc8xx/fec.c
  28. 2
      cpu/mpc8xx/kgdb.S
  29. 2
      cpu/mpc8xx/scc.c
  30. 2
      cpu/mpc8xx/serial.c
  31. 16
      cpu/mpc8xx/traps.c

14
cpu/mcf52x2/fec.c
Unescape View File

@ -53,7 +53,7 @@
#undef ET_DEBUG #undef ET_DEBUG
#undef MII_DEBUG #undef MII_DEBUG
#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(FEC_ENET) #if defined(CONFIG_CMD_NET) && defined(FEC_ENET)
#ifdef CFG_DISCOVER_PHY #ifdef CFG_DISCOVER_PHY
#include <miiphy.h> #include <miiphy.h>
@ -363,7 +363,7 @@ void eth_halt (void)
} }
#if defined(CFG_DISCOVER_PHY) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) #if defined(CFG_DISCOVER_PHY) || defined(CONFIG_CMD_MII)
static int phyaddr = -1; /* didn't find a PHY yet */ static int phyaddr = -1; /* didn't find a PHY yet */
static uint phytype; static uint phytype;
@ -419,7 +419,7 @@ static uint mii_send (uint mii_cmd)
#endif #endif
return (mii_reply & 0xffff); /* data read from phy */ return (mii_reply & 0xffff); /* data read from phy */
} }
#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CFG_CMD_MII) */ #endif
#if defined(CFG_DISCOVER_PHY) #if defined(CFG_DISCOVER_PHY)
static void mii_discover_phy (void) static void mii_discover_phy (void)
@ -485,7 +485,7 @@ static void mii_discover_phy (void)
} }
#endif /* CFG_DISCOVER_PHY */ #endif /* CFG_DISCOVER_PHY */
#if ((CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII)) && !defined(CONFIG_BITBANGMII) #if defined(CONFIG_CMD_MII) && !defined(CONFIG_BITBANGMII)
static int mii_init_done = 0; static int mii_init_done = 0;
@ -591,13 +591,13 @@ int mcf52x2_miiphy_write (char *devname, unsigned char addr,
return 0; return 0;
} }
#endif /* (CONFIG_COMMANDS & CFG_CMD_MII) && !defined(CONFIG_BITBANGMII) */ #endif
#endif /* CFG_CMD_NET, FEC_ENET */ #endif /* CFG_CMD_NET, FEC_ENET */
int mcf52x2_miiphy_initialize(bd_t *bis) int mcf52x2_miiphy_initialize(bd_t *bis)
{ {
#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(FEC_ENET) #if defined(CONFIG_CMD_NET) && defined(FEC_ENET)
#if ((CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII)) && !defined(CONFIG_BITBANGMII) #if defined(CONFIG_CMD_MII) && !defined(CONFIG_BITBANGMII)
miiphy_register("mcf52x2phy", mcf52x2_miiphy_read, mcf52x2_miiphy_write); miiphy_register("mcf52x2phy", mcf52x2_miiphy_read, mcf52x2_miiphy_write);
#endif #endif
#endif #endif

2
cpu/microblaze/cache.c
Unescape View File

@ -25,7 +25,7 @@
#include <common.h> #include <common.h>
#include <asm/asm.h> #include <asm/asm.h>
#if (CONFIG_COMMANDS & CFG_CMD_CACHE) || defined(CONFIG_CMD_CACHE) #if defined(CONFIG_CMD_CACHE)
int dcache_status (void) int dcache_status (void)
{ {

4
cpu/microblaze/interrupts.c
Unescape View File

@ -190,7 +190,7 @@ void interrupt_handler (void)
} }
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_IRQ) || defined(CONFIG_CMD_IRQ) #if defined(CONFIG_CMD_IRQ)
#ifdef CFG_INTC_0 #ifdef CFG_INTC_0
int do_irqinfo (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) int do_irqinfo (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{ {
@ -217,4 +217,4 @@ int do_irqinfo (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
puts ("Undefined interrupt controller\n"); puts ("Undefined interrupt controller\n");
} }
#endif #endif
#endif /* CONFIG_COMMANDS & CFG_CMD_IRQ */ #endif

8
cpu/mips/au1x00_eth.c
Unescape View File

@ -63,7 +63,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/au1x00.h> #include <asm/au1x00.h>
#if (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) #if defined(CONFIG_CMD_MII)
#include <miiphy.h> #include <miiphy.h>
#endif #endif
@ -241,7 +241,7 @@ int au1x00_enet_initialize(bd_t *bis){
eth_register(dev); eth_register(dev);
#if (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) #if defined(CONFIG_CMD_MII)
miiphy_register(dev->name, miiphy_register(dev->name,
au1x00_miiphy_read, au1x00_miiphy_write); au1x00_miiphy_read, au1x00_miiphy_write);
#endif #endif
@ -249,7 +249,7 @@ int au1x00_enet_initialize(bd_t *bis){
return 1; return 1;
} }
#if (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) #if defined(CONFIG_CMD_MII)
int au1x00_miiphy_read(char *devname, unsigned char addr, int au1x00_miiphy_read(char *devname, unsigned char addr,
unsigned char reg, unsigned short * value) unsigned char reg, unsigned short * value)
{ {
@ -306,6 +306,6 @@ int au1x00_miiphy_write(char *devname, unsigned char addr,
*mii_control_reg = mii_control; *mii_control_reg = mii_control;
return 0; return 0;
} }
#endif /* CONFIG_COMMANDS & CFG_CMD_MII */ #endif
#endif /* CONFIG_AU1X00 */ #endif /* CONFIG_AU1X00 */

4
cpu/mpc5xx/interrupts.c
Unescape View File

@ -178,7 +178,7 @@ void timer_interrupt_cpu (struct pt_regs *regs)
return; return;
} }
#if (CONFIG_COMMANDS & CFG_CMD_IRQ) || defined(CONFIG_CMD_IRQ) #if defined(CONFIG_CMD_IRQ)
/******************************************************************************* /*******************************************************************************
* *
* irqinfo - print information about IRQs * irqinfo - print information about IRQs
@ -204,4 +204,4 @@ int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
} }
#endif /* CONFIG_COMMANDS & CFG_CMD_IRQ */ #endif

16
cpu/mpc5xx/traps.c
Unescape View File

@ -36,11 +36,11 @@
#include <command.h> #include <command.h>
#include <asm/processor.h> #include <asm/processor.h>
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
int (*debugger_exception_handler)(struct pt_regs *) = 0; int (*debugger_exception_handler)(struct pt_regs *) = 0;
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
extern void do_bedbug_breakpoint(struct pt_regs *); extern void do_bedbug_breakpoint(struct pt_regs *);
#endif #endif
@ -131,7 +131,7 @@ void MachineCheckException(struct pt_regs *regs)
return; return;
} }
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -165,7 +165,7 @@ void MachineCheckException(struct pt_regs *regs)
*/ */
void AlignmentException(struct pt_regs *regs) void AlignmentException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -179,7 +179,7 @@ void AlignmentException(struct pt_regs *regs)
*/ */
void ProgramCheckException(struct pt_regs *regs) void ProgramCheckException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -193,7 +193,7 @@ void ProgramCheckException(struct pt_regs *regs)
*/ */
void SoftEmuException(struct pt_regs *regs) void SoftEmuException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -208,7 +208,7 @@ void SoftEmuException(struct pt_regs *regs)
*/ */
void UnknownException(struct pt_regs *regs) void UnknownException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -224,7 +224,7 @@ void DebugException(struct pt_regs *regs)
{ {
printf("Debugger trap at @ %lx\n", regs->nip ); printf("Debugger trap at @ %lx\n", regs->nip );
show_regs(regs); show_regs(regs);
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
do_bedbug_breakpoint( regs ); do_bedbug_breakpoint( regs );
#endif #endif
} }

2
cpu/mpc5xxx/cpu_init.c
Unescape View File

@ -198,7 +198,7 @@ int cpu_init_r (void)
/* route critical ints to normal ints */ /* route critical ints to normal ints */
*(vu_long *)MPC5XXX_ICTL_EXT |= 0x00000001; *(vu_long *)MPC5XXX_ICTL_EXT |= 0x00000001;
#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(CONFIG_MPC5xxx_FEC) #if defined(CONFIG_CMD_NET) && defined(CONFIG_MPC5xxx_FEC)
/* load FEC microcode */ /* load FEC microcode */
loadtask(0, 2); loadtask(0, 2);
#endif #endif

6
cpu/mpc5xxx/fec.c
Unescape View File

@ -18,10 +18,10 @@ DECLARE_GLOBAL_DATA_PTR;
/* #define DEBUG 0x28 */ /* #define DEBUG 0x28 */
#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(CONFIG_NET_MULTI) && \ #if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
defined(CONFIG_MPC5xxx_FEC) defined(CONFIG_MPC5xxx_FEC)
#if !(defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII)) #if !(defined(CONFIG_MII) || defined(CONFIG_CMD_MII))
#error "CONFIG_MII has to be defined!" #error "CONFIG_MII has to be defined!"
#endif #endif
@ -917,7 +917,7 @@ int mpc5xxx_fec_initialize(bd_t * bis)
sprintf(dev->name, "FEC ETHERNET"); sprintf(dev->name, "FEC ETHERNET");
eth_register(dev); eth_register(dev);
#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
miiphy_register (dev->name, miiphy_register (dev->name,
fec5xxx_miiphy_read, fec5xxx_miiphy_write); fec5xxx_miiphy_read, fec5xxx_miiphy_write);
#endif #endif

2
cpu/mpc5xxx/interrupts.c
Unescape View File

@ -310,7 +310,7 @@ void irq_free_handler(int irq)
/****************************************************************************/ /****************************************************************************/
#if (CONFIG_COMMANDS & CFG_CMD_IRQ) || defined(CONFIG_CMD_IRQ) #if defined(CONFIG_CMD_IRQ)
void do_irqinfo(cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char *argv[]) void do_irqinfo(cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char *argv[])
{ {
int irq, re_enable; int irq, re_enable;

16
cpu/mpc5xxx/traps.c
Unescape View File

@ -37,7 +37,7 @@
#include <command.h> #include <command.h>
#include <asm/processor.h> #include <asm/processor.h>
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
int (*debugger_exception_handler)(struct pt_regs *) = 0; int (*debugger_exception_handler)(struct pt_regs *) = 0;
#endif #endif
@ -123,7 +123,7 @@ MachineCheckException(struct pt_regs *regs)
return; return;
} }
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -158,7 +158,7 @@ MachineCheckException(struct pt_regs *regs)
void void
AlignmentException(struct pt_regs *regs) AlignmentException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -170,7 +170,7 @@ AlignmentException(struct pt_regs *regs)
void void
ProgramCheckException(struct pt_regs *regs) ProgramCheckException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -182,7 +182,7 @@ ProgramCheckException(struct pt_regs *regs)
void void
SoftEmuException(struct pt_regs *regs) SoftEmuException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -195,7 +195,7 @@ SoftEmuException(struct pt_regs *regs)
void void
UnknownException(struct pt_regs *regs) UnknownException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -204,7 +204,7 @@ UnknownException(struct pt_regs *regs)
_exception(0, regs); _exception(0, regs);
} }
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
extern void do_bedbug_breakpoint(struct pt_regs *); extern void do_bedbug_breakpoint(struct pt_regs *);
#endif #endif
@ -214,7 +214,7 @@ DebugException(struct pt_regs *regs)
printf("Debugger trap at @ %lx\n", regs->nip ); printf("Debugger trap at @ %lx\n", regs->nip );
show_regs(regs); show_regs(regs);
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
do_bedbug_breakpoint( regs ); do_bedbug_breakpoint( regs );
#endif #endif
} }

2
cpu/mpc8220/cpu_init.c
Unescape View File

@ -128,7 +128,7 @@ int cpu_init_r (void)
/* route critical ints to normal ints */ /* route critical ints to normal ints */
*(vu_long *) 0xf0000710 |= 0x00000001; *(vu_long *) 0xf0000710 |= 0x00000001;
#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(CONFIG_MPC8220_FEC) #if defined(CONFIG_CMD_NET) && defined(CONFIG_MPC8220_FEC)
/* load FEC microcode */ /* load FEC microcode */
loadtask (0, 2); loadtask (0, 2);
#endif #endif

6
cpu/mpc8220/fec.c
Unescape View File

@ -15,10 +15,10 @@
#include "fec.h" #include "fec.h"
#undef DEBUG #undef DEBUG
#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(CONFIG_NET_MULTI) && \ #if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
defined(CONFIG_MPC8220_FEC) defined(CONFIG_MPC8220_FEC)
#if !(defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII)) #if !(defined(CONFIG_MII) || defined(CONFIG_CMD_MII))
#error "CONFIG_MII has to be defined!" #error "CONFIG_MII has to be defined!"
#endif #endif
@ -847,7 +847,7 @@ int mpc8220_fec_initialize (bd_t * bis)
sprintf (dev->name, "FEC ETHERNET"); sprintf (dev->name, "FEC ETHERNET");
eth_register (dev); eth_register (dev);
#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
miiphy_register (dev->name, miiphy_register (dev->name,
fec8220_miiphy_read, fec8220_miiphy_write); fec8220_miiphy_read, fec8220_miiphy_write);
#endif #endif

16
cpu/mpc8220/traps.c
Unescape View File

@ -37,7 +37,7 @@
#include <command.h> #include <command.h>
#include <asm/processor.h> #include <asm/processor.h>
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
int (*debugger_exception_handler) (struct pt_regs *) = 0; int (*debugger_exception_handler) (struct pt_regs *) = 0;
#endif #endif
@ -118,7 +118,7 @@ void MachineCheckException (struct pt_regs *regs)
regs->nip = fixup; regs->nip = fixup;
return; return;
} }
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler if (debugger_exception_handler
&& (*debugger_exception_handler) (regs)) && (*debugger_exception_handler) (regs))
return; return;
@ -152,7 +152,7 @@ void MachineCheckException (struct pt_regs *regs)
void AlignmentException (struct pt_regs *regs) void AlignmentException (struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler if (debugger_exception_handler
&& (*debugger_exception_handler) (regs)) && (*debugger_exception_handler) (regs))
return; return;
@ -164,7 +164,7 @@ void AlignmentException (struct pt_regs *regs)
void ProgramCheckException (struct pt_regs *regs) void ProgramCheckException (struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler if (debugger_exception_handler
&& (*debugger_exception_handler) (regs)) && (*debugger_exception_handler) (regs))
return; return;
@ -176,7 +176,7 @@ void ProgramCheckException (struct pt_regs *regs)
void SoftEmuException (struct pt_regs *regs) void SoftEmuException (struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler if (debugger_exception_handler
&& (*debugger_exception_handler) (regs)) && (*debugger_exception_handler) (regs))
return; return;
@ -189,7 +189,7 @@ void SoftEmuException (struct pt_regs *regs)
void UnknownException (struct pt_regs *regs) void UnknownException (struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler if (debugger_exception_handler
&& (*debugger_exception_handler) (regs)) && (*debugger_exception_handler) (regs))
return; return;
@ -199,7 +199,7 @@ void UnknownException (struct pt_regs *regs)
_exception (0, regs); _exception (0, regs);
} }
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
extern void do_bedbug_breakpoint (struct pt_regs *); extern void do_bedbug_breakpoint (struct pt_regs *);
#endif #endif
@ -208,7 +208,7 @@ void DebugException (struct pt_regs *regs)
printf ("Debugger trap at @ %lx\n", regs->nip); printf ("Debugger trap at @ %lx\n", regs->nip);
show_regs (regs); show_regs (regs);
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
do_bedbug_breakpoint (regs); do_bedbug_breakpoint (regs);
#endif #endif
} }

4
cpu/mpc824x/traps.c
Unescape View File

@ -175,7 +175,7 @@ UnknownException(struct pt_regs *regs)
_exception(0, regs); _exception(0, regs);
} }
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
extern void do_bedbug_breakpoint(struct pt_regs *); extern void do_bedbug_breakpoint(struct pt_regs *);
#endif #endif
@ -185,7 +185,7 @@ DebugException(struct pt_regs *regs)
printf("Debugger trap at @ %lx\n", regs->nip ); printf("Debugger trap at @ %lx\n", regs->nip );
show_regs(regs); show_regs(regs);
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
do_bedbug_breakpoint( regs ); do_bedbug_breakpoint( regs );
#endif #endif
} }

2
cpu/mpc8260/bedbug_603e.c
Unescape View File

@ -10,7 +10,7 @@
#include <bedbug/regs.h> #include <bedbug/regs.h>
#include <bedbug/ppc.h> #include <bedbug/ppc.h>
#if ((CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG)) \ #if defined(CONFIG_CMD_BEDBUG) \
&& (defined(CONFIG_MPC824X) || defined(CONFIG_MPC8260)) && (defined(CONFIG_MPC824X) || defined(CONFIG_MPC8260))
#define MAX_BREAK_POINTS 1 #define MAX_BREAK_POINTS 1

6
cpu/mpc8260/ether_fcc.c
Unescape View File

@ -47,13 +47,13 @@
#include <config.h> #include <config.h>
#include <net.h> #include <net.h>
#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
#include <miiphy.h> #include <miiphy.h>
#endif #endif
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_ETHER_ON_FCC) && ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && \ #if defined(CONFIG_ETHER_ON_FCC) && defined(CONFIG_CMD_NET) && \
defined(CONFIG_NET_MULTI) defined(CONFIG_NET_MULTI)
static struct ether_fcc_info_s static struct ether_fcc_info_s
@ -393,7 +393,7 @@ int fec_initialize(bd_t *bis)
eth_register(dev); eth_register(dev);
#if (defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII)) \ #if (defined(CONFIG_MII) || defined(CONFIG_CMD_MII)) \
&& defined(CONFIG_BITBANGMII) && defined(CONFIG_BITBANGMII)
miiphy_register(dev->name, miiphy_register(dev->name,
bb_miiphy_read, bb_miiphy_write); bb_miiphy_read, bb_miiphy_write);

2
cpu/mpc8260/ether_scc.c
Unescape View File

@ -36,7 +36,7 @@
#include <command.h> #include <command.h>
#include <config.h> #include <config.h>
#if defined(CONFIG_ETHER_ON_SCC) && ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) #if defined(CONFIG_ETHER_ON_SCC) && defined(CONFIG_CMD_NET)
#if (CONFIG_ETHER_INDEX == 1) #if (CONFIG_ETHER_INDEX == 1)
# define PROFF_ENET PROFF_SCC1 # define PROFF_ENET PROFF_SCC1

4
cpu/mpc8260/interrupts.c
Unescape View File

@ -246,7 +246,7 @@ void timer_interrupt_cpu (struct pt_regs *regs)
/****************************************************************************/ /****************************************************************************/
#if (CONFIG_COMMANDS & CFG_CMD_IRQ) || defined(CONFIG_CMD_IRQ) #if defined(CONFIG_CMD_IRQ)
/* ripped this out of ppc4xx/interrupts.c */ /* ripped this out of ppc4xx/interrupts.c */
@ -276,4 +276,4 @@ do_irqinfo (cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char *argv[])
enable_interrupts (); enable_interrupts ();
} }
#endif /* CONFIG_COMMANDS & CFG_CMD_IRQ */ #endif

2
cpu/mpc8260/kgdb.S
Unescape View File

@ -34,7 +34,7 @@
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
/* /*
* cache flushing routines for kgdb * cache flushing routines for kgdb

16
cpu/mpc8260/traps.c
Unescape View File

@ -37,7 +37,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/m8260_pci.h> #include <asm/m8260_pci.h>
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
int (*debugger_exception_handler)(struct pt_regs *) = 0; int (*debugger_exception_handler)(struct pt_regs *) = 0;
#endif #endif
@ -150,7 +150,7 @@ MachineCheckException(struct pt_regs *regs)
return; return;
} }
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -186,7 +186,7 @@ MachineCheckException(struct pt_regs *regs)
void void
AlignmentException(struct pt_regs *regs) AlignmentException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -198,7 +198,7 @@ AlignmentException(struct pt_regs *regs)
void void
ProgramCheckException(struct pt_regs *regs) ProgramCheckException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -210,7 +210,7 @@ ProgramCheckException(struct pt_regs *regs)
void void
SoftEmuException(struct pt_regs *regs) SoftEmuException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -223,7 +223,7 @@ SoftEmuException(struct pt_regs *regs)
void void
UnknownException(struct pt_regs *regs) UnknownException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -232,7 +232,7 @@ UnknownException(struct pt_regs *regs)
_exception(0, regs); _exception(0, regs);
} }
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
extern void do_bedbug_breakpoint(struct pt_regs *); extern void do_bedbug_breakpoint(struct pt_regs *);
#endif #endif
@ -242,7 +242,7 @@ DebugException(struct pt_regs *regs)
printf("Debugger trap at @ %lx\n", regs->nip ); printf("Debugger trap at @ %lx\n", regs->nip );
show_regs(regs); show_regs(regs);
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
do_bedbug_breakpoint( regs ); do_bedbug_breakpoint( regs );
#endif #endif
} }

4
cpu/mpc83xx/interrupts.c
Unescape View File

@ -81,7 +81,7 @@ void timer_interrupt_cpu (struct pt_regs *regs)
} }
#if (CONFIG_COMMANDS & CFG_CMD_IRQ) || defined(CONFIG_CMD_IRQ) #if defined(CONFIG_CMD_IRQ)
/* ripped this out of ppc4xx/interrupts.c */ /* ripped this out of ppc4xx/interrupts.c */
@ -94,4 +94,4 @@ do_irqinfo(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
{ {
} }
#endif /* CONFIG_COMMANDS & CFG_CMD_IRQ */ #endif

14
cpu/mpc83xx/traps.c
Unescape View File

@ -140,7 +140,7 @@ MachineCheckException(struct pt_regs *regs)
return; return;
} }
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -176,7 +176,7 @@ MachineCheckException(struct pt_regs *regs)
void void
AlignmentException(struct pt_regs *regs) AlignmentException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -188,7 +188,7 @@ AlignmentException(struct pt_regs *regs)
void void
ProgramCheckException(struct pt_regs *regs) ProgramCheckException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -200,7 +200,7 @@ ProgramCheckException(struct pt_regs *regs)
void void
SoftEmuException(struct pt_regs *regs) SoftEmuException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -213,7 +213,7 @@ SoftEmuException(struct pt_regs *regs)
void void
UnknownException(struct pt_regs *regs) UnknownException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -222,7 +222,7 @@ UnknownException(struct pt_regs *regs)
_exception(0, regs); _exception(0, regs);
} }
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
extern void do_bedbug_breakpoint(struct pt_regs *); extern void do_bedbug_breakpoint(struct pt_regs *);
#endif #endif
@ -231,7 +231,7 @@ DebugException(struct pt_regs *regs)
{ {
printf("Debugger trap at @ %lx\n", regs->nip ); printf("Debugger trap at @ %lx\n", regs->nip );
show_regs(regs); show_regs(regs);
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
do_bedbug_breakpoint( regs ); do_bedbug_breakpoint( regs );
#endif #endif
} }

6
cpu/mpc85xx/ether_fcc.c
Unescape View File

@ -48,13 +48,13 @@
#include <config.h> #include <config.h>
#include <net.h> #include <net.h>
#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
#include <miiphy.h> #include <miiphy.h>
#endif #endif
#if defined(CONFIG_CPM2) #if defined(CONFIG_CPM2)
#if defined(CONFIG_ETHER_ON_FCC) && ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && \ #if defined(CONFIG_ETHER_ON_FCC) && defined(CONFIG_CMD_NET) && \
defined(CONFIG_NET_MULTI) defined(CONFIG_NET_MULTI)
static struct ether_fcc_info_s static struct ether_fcc_info_s
@ -458,7 +458,7 @@ int fec_initialize(bd_t *bis)
eth_register(dev); eth_register(dev);
#if (defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII)) \ #if (defined(CONFIG_MII) || defined(CONFIG_CMD_MII)) \
&& defined(CONFIG_BITBANGMII) && defined(CONFIG_BITBANGMII)
miiphy_register(dev->name, miiphy_register(dev->name,
bb_miiphy_read, bb_miiphy_write); bb_miiphy_read, bb_miiphy_write);

4
cpu/mpc85xx/interrupts.c
Unescape View File

@ -144,7 +144,7 @@ void set_timer (ulong t)
timestamp = t; timestamp = t;
} }
#if (CONFIG_COMMANDS & CFG_CMD_IRQ) || defined(CONFIG_CMD_IRQ) #if defined(CONFIG_CMD_IRQ)
/******************************************************************************* /*******************************************************************************
* *
@ -159,4 +159,4 @@ do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return 0; return 0;
} }
#endif /* CONFIG_COMMANDS & CFG_CMD_IRQ */ #endif

14
cpu/mpc85xx/traps.c
Unescape View File

@ -41,7 +41,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
int (*debugger_exception_handler)(struct pt_regs *) = 0; int (*debugger_exception_handler)(struct pt_regs *) = 0;
#endif #endif
@ -74,7 +74,7 @@ static __inline__ unsigned long get_esr(void)
#define ESR_DIZ 0x00400000 #define ESR_DIZ 0x00400000
#define ESR_U0F 0x00008000 #define ESR_U0F 0x00008000
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
extern void do_bedbug_breakpoint(struct pt_regs *); extern void do_bedbug_breakpoint(struct pt_regs *);
#endif #endif
@ -159,7 +159,7 @@ MachineCheckException(struct pt_regs *regs)
return; return;
} }
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -192,7 +192,7 @@ MachineCheckException(struct pt_regs *regs)
void void
AlignmentException(struct pt_regs *regs) AlignmentException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -207,7 +207,7 @@ ProgramCheckException(struct pt_regs *regs)
{ {
long esr_val; long esr_val;
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -244,7 +244,7 @@ PITException(struct pt_regs *regs)
void void
UnknownException(struct pt_regs *regs) UnknownException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -259,7 +259,7 @@ DebugException(struct pt_regs *regs)
{ {
printf("Debugger trap at @ %lx\n", regs->nip ); printf("Debugger trap at @ %lx\n", regs->nip );
show_regs(regs); show_regs(regs);
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
do_bedbug_breakpoint( regs ); do_bedbug_breakpoint( regs );
#endif #endif
} }

2
cpu/mpc8xx/bedbug_860.c
Unescape View File

@ -10,7 +10,7 @@
#include <bedbug/ppc.h> #include <bedbug/ppc.h>
#include <bedbug/type.h> #include <bedbug/type.h>
#if ((CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG)) && defined(CONFIG_8xx) #if defined(CONFIG_CMD_BEDBUG) && defined(CONFIG_8xx)
#define MAX_BREAK_POINTS 2 #define MAX_BREAK_POINTS 2

18
cpu/mpc8xx/fec.c
Unescape View File

@ -31,7 +31,7 @@ DECLARE_GLOBAL_DATA_PTR;
#undef ET_DEBUG #undef ET_DEBUG
#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && \ #if defined(CONFIG_CMD_NET) && \
(defined(FEC_ENET) || defined(CONFIG_ETHER_ON_FEC1) || defined(CONFIG_ETHER_ON_FEC2)) (defined(FEC_ENET) || defined(CONFIG_ETHER_ON_FEC1) || defined(CONFIG_ETHER_ON_FEC2))
/* compatibility test, if only FEC_ENET defined assume ETHER on FEC1 */ /* compatibility test, if only FEC_ENET defined assume ETHER on FEC1 */
@ -49,7 +49,7 @@ DECLARE_GLOBAL_DATA_PTR;
#if defined(WANT_MII) #if defined(WANT_MII)
#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))
#error "CONFIG_MII has to be defined!" #error "CONFIG_MII has to be defined!"
#endif #endif
@ -182,7 +182,7 @@ int fec_initialize(bd_t *bis)
eth_register(dev); eth_register(dev);
#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
miiphy_register(dev->name, miiphy_register(dev->name,
fec8xx_miiphy_read, fec8xx_miiphy_write); fec8xx_miiphy_read, fec8xx_miiphy_write);
#endif #endif
@ -268,7 +268,7 @@ static int fec_recv (struct eth_device *dev)
length -= 4; length -= 4;
#if (CONFIG_COMMANDS & CFG_CMD_CDP) || defined(CONFIG_CMD_CDP) #if defined(CONFIG_CMD_CDP)
if ((rx[0] & 1) != 0 if ((rx[0] & 1) != 0
&& memcmp ((uchar *) rx, NetBcastAddr, 6) != 0 && memcmp ((uchar *) rx, NetBcastAddr, 6) != 0
&& memcmp ((uchar *) rx, NetCDPAddr, 6) != 0) && memcmp ((uchar *) rx, NetCDPAddr, 6) != 0)
@ -608,7 +608,7 @@ static int fec_init (struct eth_device *dev, bd_t * bd)
fecp->fec_addr_high = (ea[4] << 8) | (ea[5]); fecp->fec_addr_high = (ea[4] << 8) | (ea[5]);
#undef ea #undef ea
#if (CONFIG_COMMANDS & CFG_CMD_CDP) || defined(CONFIG_CMD_CDP) #if defined(CONFIG_CMD_CDP)
/* /*
* Turn on multicast address hash table * Turn on multicast address hash table
*/ */
@ -787,7 +787,7 @@ static void fec_halt(struct eth_device* dev)
efis->initialized = 0; efis->initialized = 0;
} }
#if defined(CFG_DISCOVER_PHY) || defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) #if defined(CFG_DISCOVER_PHY) || defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
/* Make MII read/write commands for the FEC. /* Make MII read/write commands for the FEC.
*/ */
@ -852,7 +852,7 @@ mii_send(uint mii_cmd)
#endif #endif
return (mii_reply & 0xffff); /* data read from phy */ return (mii_reply & 0xffff); /* data read from phy */
} }
#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CFG_CMD_MII) */ #endif
#if defined(CFG_DISCOVER_PHY) #if defined(CFG_DISCOVER_PHY)
static int mii_discover_phy(struct eth_device *dev) static int mii_discover_phy(struct eth_device *dev)
@ -926,7 +926,7 @@ static int mii_discover_phy(struct eth_device *dev)
} }
#endif /* CFG_DISCOVER_PHY */ #endif /* CFG_DISCOVER_PHY */
#if (defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII)) && !defined(CONFIG_BITBANGMII) #if (defined(CONFIG_MII) || defined(CONFIG_CMD_MII)) && !defined(CONFIG_BITBANGMII)
/**************************************************************************** /****************************************************************************
* mii_init -- Initialize the MII for MII command without ethernet * mii_init -- Initialize the MII for MII command without ethernet
@ -1020,6 +1020,6 @@ int fec8xx_miiphy_write(char *devname, unsigned char addr,
#endif #endif
return 0; return 0;
} }
#endif /* (CONFIG_COMMANDS & CFG_CMD_MII) && !defined(CONFIG_BITBANGMII)*/ #endif
#endif /* CFG_CMD_NET, FEC_ENET */ #endif /* CFG_CMD_NET, FEC_ENET */

2
cpu/mpc8xx/kgdb.S
Unescape View File

@ -34,7 +34,7 @@
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
/* /*
* cache flushing routines for kgdb * cache flushing routines for kgdb

2
cpu/mpc8xx/scc.c
Unescape View File

@ -38,7 +38,7 @@
#include <net.h> #include <net.h>
#include <command.h> #include <command.h>
#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(SCC_ENET) #if defined(CONFIG_CMD_NET) && defined(SCC_ENET)
/* Ethernet Transmit and Receive Buffers */ /* Ethernet Transmit and Receive Buffers */
#define DBUF_LENGTH 1520 #define DBUF_LENGTH 1520

2
cpu/mpc8xx/serial.c
Unescape View File

@ -666,7 +666,7 @@ void enable_putc(void)
} }
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
void void
kgdb_serial_init(void) kgdb_serial_init(void)

16
cpu/mpc8xx/traps.c
Unescape View File

@ -36,11 +36,11 @@
#include <command.h> #include <command.h>
#include <asm/processor.h> #include <asm/processor.h>
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
int (*debugger_exception_handler)(struct pt_regs *) = 0; int (*debugger_exception_handler)(struct pt_regs *) = 0;
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
extern void do_bedbug_breakpoint(struct pt_regs *); extern void do_bedbug_breakpoint(struct pt_regs *);
#endif #endif
@ -126,7 +126,7 @@ MachineCheckException(struct pt_regs *regs)
return; return;
} }
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -159,7 +159,7 @@ MachineCheckException(struct pt_regs *regs)
void void
AlignmentException(struct pt_regs *regs) AlignmentException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -171,7 +171,7 @@ AlignmentException(struct pt_regs *regs)
void void
ProgramCheckException(struct pt_regs *regs) ProgramCheckException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -183,7 +183,7 @@ ProgramCheckException(struct pt_regs *regs)
void void
SoftEmuException(struct pt_regs *regs) SoftEmuException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -196,7 +196,7 @@ SoftEmuException(struct pt_regs *regs)
void void
UnknownException(struct pt_regs *regs) UnknownException(struct pt_regs *regs)
{ {
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
@ -210,7 +210,7 @@ DebugException(struct pt_regs *regs)
{ {
printf("Debugger trap at @ %lx\n", regs->nip ); printf("Debugger trap at @ %lx\n", regs->nip );
show_regs(regs); show_regs(regs);
#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) || defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
do_bedbug_breakpoint( regs ); do_bedbug_breakpoint( regs );
#endif #endif
} }

Write Preview
Loading…
Cancel
Save