diff options
| author | wdenk <wdenk> | 2003-08-17 18:55:18 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-08-17 18:55:18 +0000 |
| commit | e0ac62d798ce60ec5d43125d4786e58b0d881836 (patch) | |
| tree | 3f32c8f29ff9089ef61099b11d81d51039bf2162 /cpu | |
| parent | ae3af05ec986a8ac66dadb5eafe13db2d4a02c5c (diff) | |
| download | u-boot-imx-e0ac62d798ce60ec5d43125d4786e58b0d881836.zip u-boot-imx-e0ac62d798ce60ec5d43125d4786e58b0d881836.tar.gz u-boot-imx-e0ac62d798ce60ec5d43125d4786e58b0d881836.tar.bz2 | |
* Make Ethernet autonegotiation on INCA-IP work for all clock rates;
allow selection of clock frequency as "make" target
* Implement memory autosizing code for IceCube boards
* Configure network port on INCA-IP for autonegotiation
* Fix overflow problem in network timeout code
* Patch by Richard Woodruff, 8 Aug 2003:
Allow crc32 to be used at address 0x000 (crc32_no_comp, too).
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc5xxx/pci_mpc5200.c | 3 | ||||
| -rw-r--r-- | cpu/mpc5xxx/start.S | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/cpu/mpc5xxx/pci_mpc5200.c b/cpu/mpc5xxx/pci_mpc5200.c index 106e843..a890a6d 100644 --- a/cpu/mpc5xxx/pci_mpc5200.c +++ b/cpu/mpc5xxx/pci_mpc5200.c @@ -51,9 +51,6 @@ static int mpc5200_read_config_dword(struct pci_controller *hose, *value = in_le32((volatile u32 *)CONFIG_PCI_IO_PHYS); eieio(); *(volatile u32 *)MPC5XXX_PCI_CAR = 0; - /* skip MPC5200 */ - if (offset == 0 && *value == 0x58031057) - *value = 0xffffffff; return 0; } diff --git a/cpu/mpc5xxx/start.S b/cpu/mpc5xxx/start.S index 37448ac..216c1c8 100644 --- a/cpu/mpc5xxx/start.S +++ b/cpu/mpc5xxx/start.S @@ -103,7 +103,7 @@ boot_cold: boot_warm: mfmsr r5 /* save msr contents */ -#if defined(CFG_DEFAULT_MBAR) +#if defined(CFG_DEFAULT_MBAR) && !defined(CFG_RAMBOOT) lis r3, CFG_MBAR@h ori r3, r3, CFG_MBAR@l #if defined(CONFIG_MPC5200) |