* Patch by Jon Loeliger, 2005-Feb-10

  Add config option CONFIG_HAS_FEC calling out 8540 FEC features.

diff --git a/CHANGELOG b/CHANGELOG
index 985f5f04509dd1f73760a9caaae5f99d81720290..39166f8c7ec52e3fae06cf4634aa0c3e422c2316 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 ======================================================================
 Changes for U-Boot 1.1.3:
 ======================================================================
+* Patch by Jon Loeliger, 2005-Feb-10
+  Add config option CONFIG_HAS_FEC calling out 8540 FEC features.
+
 * Patch by Jon Loeliger, Kumar Gala, 2005-02-08
   For MPC85xxCDS:
     Adds Relaxed Timing TRLX bit to FLASH ORx regs to allow

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 1c11c6f4bd2d9a29feea01592782d36e6164a033..533b58796650516ddef9cc1ba69176ffff83666f 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -41,6 +41,10 @@
 #define CONFIG_MPC8540         1       /* MPC8540 specific */
 #define CONFIG_MPC8540ADS      1       /* MPC8540ADS board specific */
 
+#ifndef CONFIG_HAS_FEC
+#define CONFIG_HAS_FEC         1       /* 8540 has FEC */
+#endif
+
 #define CONFIG_PCI
 #define CONFIG_TSEC_ENET               /* tsec ethernet support */
 #define CONFIG_ENV_OVERWRITE
@@ -344,9 +348,12 @@
 #define TSEC1_PHYIDX           0
 #define TSEC2_PHYIDX           0
 
+
+#if CONFIG_HAS_FEC
 #define CONFIG_MPC85XX_FEC     1
 #define FEC_PHY_ADDR           3
 #define FEC_PHYIDX             0
+#endif
 
 #define CONFIG_ETHPRIME                "MOTO ENET0"