diff options
Diffstat (limited to 'cpu/mpc8220')
| -rw-r--r-- | cpu/mpc8220/fec.c | 12 | ||||
| -rw-r--r-- | cpu/mpc8220/i2c.c | 2 | ||||
| -rw-r--r-- | cpu/mpc8220/i2cCore.c | 9 | ||||
| -rw-r--r-- | cpu/mpc8220/traps.c | 17 |
4 files changed, 0 insertions, 40 deletions
diff --git a/cpu/mpc8220/fec.c b/cpu/mpc8220/fec.c index 1201e794df..2ba87cd003 100644 --- a/cpu/mpc8220/fec.c +++ b/cpu/mpc8220/fec.c @@ -348,14 +348,12 @@ static int mpc8220_fec_init (struct eth_device *dev, bd_t * bis) */ fec->eth->xmit_fsm = 0x03000000; -#if 1 /*#if defined(CONFIG_MPC5200)*/ /* * Turn off COMM bus prefetch in the MGT5200 BestComm. It doesn't * work w/ the current receive task. */ dma->PtdCntrl |= 0x00000001; -#endif /* * Set priority of different initiators @@ -777,16 +775,6 @@ static int mpc8220_fec_recv (struct eth_device *dev) frame = (NBUF *) pRbd->dataPointer; frame_length = pRbd->dataLength - 4; -#if (0) - { - int i; - - printf ("recv data hdr:"); - for (i = 0; i < 14; i++) - printf ("%x ", *(frame->head + i)); - printf ("\n"); - } -#endif /* * Fill the buffer and pass it to upper layers */ diff --git a/cpu/mpc8220/i2c.c b/cpu/mpc8220/i2c.c index d67936dc31..2c6a55d891 100644 --- a/cpu/mpc8220/i2c.c +++ b/cpu/mpc8220/i2c.c @@ -105,7 +105,6 @@ static int wait_for_bb (void) status = mpc_reg_in (®s->sr); while (timeout-- && (status & I2C_BB)) { -#if 1 volatile int temp; mpc_reg_out (®s->cr, I2C_STA, I2C_STA); @@ -113,7 +112,6 @@ static int wait_for_bb (void) mpc_reg_out (®s->cr, 0, I2C_STA); mpc_reg_out (®s->cr, 0, 0); mpc_reg_out (®s->cr, I2C_EN, 0); -#endif udelay (1000); status = mpc_reg_in (®s->sr); } diff --git a/cpu/mpc8220/i2cCore.c b/cpu/mpc8220/i2cCore.c index accf43c102..4e690bc823 100644 --- a/cpu/mpc8220/i2cCore.c +++ b/cpu/mpc8220/i2cCore.c @@ -191,9 +191,7 @@ STATUS i2c_start (PSI2C pi2c, PI2CSET pi2cSet) #else UINT8 ByteOffset = pi2cSet->str_adr; #endif -#if 1 UINT8 tmp = 0; -#endif UINT8 Addr = pi2cSet->slv_adr; pi2c->cr |= I2C_CTL_STA; /* Generate start signal */ @@ -207,13 +205,6 @@ STATUS i2c_start (PSI2C pi2c, PI2CSET pi2cSet) return ERROR; } #ifdef TWOBYTES -# if 0 - /* Issue the offset to start */ - if (i2c_write2byte (pi2c, &ByteOffset) != OK) { - i2c_stop (pi2c); /* Disable I2c */ - return ERROR; - } -#endif tmp = (ByteOffset >> 8) & 0xff; if (i2c_writebyte (pi2c, &tmp) != OK) { i2c_stop (pi2c); /* Disable I2c */ diff --git a/cpu/mpc8220/traps.c b/cpu/mpc8220/traps.c index cdee2be78b..f6bd1bbcf2 100644 --- a/cpu/mpc8220/traps.c +++ b/cpu/mpc8220/traps.c @@ -218,22 +218,5 @@ void DebugException (struct pt_regs *regs) */ int addr_probe (uint * addr) { -#if 0 - int retval; - - __asm__ __volatile__ ("1: lwz %0,0(%1)\n" - " eieio\n" - " li %0,0\n" - "2:\n" - ".section .fixup,\"ax\"\n" - "3: li %0,-1\n" - " b 2b\n" - ".section __ex_table,\"a\"\n" - " .align 2\n" - " .long 1b,3b\n" - ".text":"=r" (retval):"r" (addr)); - - return (retval); -#endif return 0; } |