* Patch by Stefan Roese, 30 Jun 2005:
Fix PHY addresses for PPChameleon and CATcenter boards
Change MAINTAINER for most esd boards
diff --git a/CHANGELOG b/CHANGELOG
index 371b2ff..ba4adf9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@
Changes for U-Boot 1.1.3:
======================================================================
+* Patch by Stefan Roese, 30 Jun 2005:
+ Fix PHY addresses for PPChameleon and CATcenter boards
+ Change MAINTAINER for most esd boards
+
* Fix baudrate calculation problem on MPC5200 systems
* Add EEPROM and RTC support for HMI1001 board
diff --git a/MAINTAINERS b/MAINTAINERS
index 5b560ea..a207df7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -230,7 +230,7 @@
sbc8240 MPC8240
sbc405 PPC405GP
-Stefan Roese <stefan.roese@esd-electronics.com>
+Matthias Fuchs <matthias.fuchs@esd-electronics.com>
ADCIOP IOP480 (PPC401)
APC405 PPC405GP
@@ -496,7 +496,7 @@
# Board CPU #
#########################################################################
-Stefan Roese <stefan.roese@esd-electronics.com>
+Matthias Fuchs <matthias.fuchs@esd-electronics.com>
TASREG MCF5249
diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
index 6f38633..8135927 100644
--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@@ -110,8 +110,8 @@
#define CONFIG_MII 1 /* MII PHY management */
#ifndef CONFIG_EXT_PHY
-#define CONFIG_PHY_ADDR 0 /* EMAC0 PHY address */
-#define CONFIG_PHY1_ADDR 1 /* EMAC1 PHY address */
+#define CONFIG_PHY_ADDR 1 /* EMAC0 PHY address */
+#define CONFIG_PHY1_ADDR 2 /* EMAC1 PHY address */
#else
#define CONFIG_PHY_ADDR 2 /* PHY address */
#endif
diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index 011abf1..d7025eb 100644
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -106,8 +106,8 @@
#define CONFIG_MII 1 /* MII PHY management */
#ifndef CONFIG_EXT_PHY
-#define CONFIG_PHY_ADDR 0 /* EMAC0 PHY address */
-#define CONFIG_PHY1_ADDR 1 /* EMAC1 PHY address */
+#define CONFIG_PHY_ADDR 1 /* EMAC0 PHY address */
+#define CONFIG_PHY1_ADDR 2 /* EMAC1 PHY address */
#else
#define CONFIG_PHY_ADDR 2 /* PHY address */
#endif