From e0ac62d798ce60ec5d43125d4786e58b0d881836 Mon Sep 17 00:00:00 2001
From: wdenk
Date: Sun, 17 Aug 2003 18:55:18 +0000
Subject: * 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).
---
 cpu/mpc5xxx/pci_mpc5200.c | 3 ---
 cpu/mpc5xxx/start.S       | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'cpu/mpc5xxx')

diff --git a/cpu/mpc5xxx/pci_mpc5200.c b/cpu/mpc5xxx/pci_mpc5200.c
index 106e843788d..a890a6d0a73 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 37448acba39..216c1c88f39 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)
-- 
cgit v1.2.3