* 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 371b2ff8ccc36531b4b6ea3dcc4e04d5b3d72ef6..ba4adf9866fd9b686f308024e65f623fb4df6a10 100644 (file)
--- 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 5b560ea5a5495c5548229d571208d079f27d726b..a207df7b26db1cb90886c2c96cef86139aba1ba8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -230,7 +230,7 @@ Daniel Poirot <dan.poirot@windriver.com>
        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 @@ Yasushi Shoji <yashi@atmark-techno.com>
 #      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 6f38633d63cc0be9d5c9e863ae95a74815de0ac3..81359272934ddca79c004c35e0dcb79b07b7edb4 100644 (file)
--- 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 011abf10ca204df52c2f8f388b7ac61e2a111759..d7025eba676602d4b611cebc0a5d55b217bde29e 100644 (file)
--- 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