From: Jon Loeliger <jdl@freescale.com>
Date: Mon, 25 Jul 2005 17:14:54 +0000 (-0500)
Subject: * Patch by Jon Loeliger, 2005-Feb-10
X-Git-Tag: LABEL_2006_03_12_0025~242^2~10
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=288693abe1f7c23e69479fd85c2c0d8d7fdbf8f2;p=u-boot

* 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 985f5f0450..39166f8c7e 100644
--- 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 1c11c6f4bd..533b587966 100644
--- 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"