diff options
| author | wdenk <wdenk> | 2004-04-08 22:31:29 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-04-08 22:31:29 +0000 |
| commit | 7e780369e43ebf5c9e337dfad84dd36b2a08a21f (patch) | |
| tree | 0e30d6ce7632bf4b01394224bc1aa85f5610b77e /cpu | |
| parent | 0608e04da9d0df5d00cf48a1d9141e2ea1bc9635 (diff) | |
| download | barebox-7e780369e43ebf5c9e337dfad84dd36b2a08a21f.tar.gz barebox-7e780369e43ebf5c9e337dfad84dd36b2a08a21f.tar.xz | |
* Patch by Mark Jonas: Remove config.tmp files only when
unconfiguring the board
* Adapt RMU board for bigger flash memory
* Test fix for ethernet problems on MPC5200
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc5xxx/fec.c | 14 | ||||
| -rw-r--r-- | cpu/mpc8xx/cpu_init.c | 1 | ||||
| -rw-r--r-- | cpu/mpc8xx/start.S | 4 |
3 files changed, 6 insertions, 13 deletions
diff --git a/cpu/mpc5xxx/fec.c b/cpu/mpc5xxx/fec.c index 6e20faa390..1df394aaf5 100644 --- a/cpu/mpc5xxx/fec.c +++ b/cpu/mpc5xxx/fec.c @@ -286,16 +286,8 @@ static int mpc5xxx_fec_init(struct eth_device *dev, bd_t * bis) fec->eth->r_cntrl = 0x05ee0024; /*0x05ee0004;FIXME */ } - if (fec->xcv_type == SEVENWIRE) { - /* - * Set FEC-Lite transmit control register(X_CNTRL): - */ - /*fec->eth->x_cntrl = 0x00000002; */ /* half-duplex, heartbeat */ - fec->eth->x_cntrl = 0x00000000; /* half-duplex, heartbeat disabled */ - } else { - /*fec->eth->x_cntrl = 0x00000006; */ /* full-duplex, heartbeat */ - fec->eth->x_cntrl = 0x00000004; /* full-duplex, heartbeat disabled */ - + fec->eth->x_cntrl = 0x00000000; /* half-duplex, heartbeat disabled */ + if (fec->xcv_type != SEVENWIRE) { /* * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock * and do not drop the Preamble. @@ -485,7 +477,7 @@ static int mpc5xxx_fec_init(struct eth_device *dev, bd_t * bis) #endif return -1; } - } while ((phyStatus & 0x0020) != 0x0020); + } while (!(phyStatus & 0x0004)); #if (DEBUG & 0x2) printf("PHY auto neg complete! \n"); diff --git a/cpu/mpc8xx/cpu_init.c b/cpu/mpc8xx/cpu_init.c index c7716dd32e..4dabd20d8b 100644 --- a/cpu/mpc8xx/cpu_init.c +++ b/cpu/mpc8xx/cpu_init.c @@ -155,6 +155,7 @@ void cpu_init_f (volatile immap_t * immr) defined(CONFIG_MHPC) || \ defined(CONFIG_PCU_E) || \ defined(CONFIG_R360MPI) || \ + defined(CONFIG_RMU) || \ defined(CONFIG_RPXCLASSIC) || \ defined(CONFIG_RPXLITE) || \ defined(CONFIG_SPD823TS) diff --git a/cpu/mpc8xx/start.S b/cpu/mpc8xx/start.S index 3ebcab46ae..33a3f6c88e 100644 --- a/cpu/mpc8xx/start.S +++ b/cpu/mpc8xx/start.S @@ -27,12 +27,12 @@ * * The processor starts at 0x00000100 and the code is executed * from flash. The code is organized to be at an other address - * in memory, but as long we don't jump around before relocating. + * in memory, but as long we don't jump around before relocating, * board_init lies at a quite high address and when the cpu has * jumped there, everything is ok. * This works because the cpu gives the FLASH (CS0) the whole * address space at startup, and board_init lies as a echo of - * the flash somewhere up there in the memorymap. + * the flash somewhere up there in the memory map. * * board_init will change CS0 to be positioned at the correct * address and (s)dram will be positioned at address 0 |