Add PCI support to TQM8540 and TQM8560 boards

Patch by Stefan Roese, 15 Sep 2005

diff --git a/CHANGELOG b/CHANGELOG
index bd50db2ae7745284622a4e01906071b22733a505..80c2805ab5ffb39df3853be28d5c6dbacdaca325 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Add PCI support to TQM8540 and TQM8560 boards
+  Patch by Stefan Roese, 15 Sep 2005
+
 * Update AMCC Yosemite to get a consistent setup for all AMCC eval
   boards (baudrate, environment...). Flash driver fixed.
   Patch by Stefan Roese, 15 Sep 2005

diff --git a/include/configs/TQM8540.h b/include/configs/TQM8540.h
index f35914a2397f5d4d614841daa26f240393727820..1f54383629ee712706acb86b953e6692dcc545c8 100644 (file)
--- a/include/configs/TQM8540.h
+++ b/include/configs/TQM8540.h
@@ -41,7 +41,7 @@
 #define CONFIG_MPC8540         1       /* MPC8540 specific */
 #define CONFIG_TQM8540         1       /* TQM8540 board specific */
 
-#undef CONFIG_PCI
+#define CONFIG_PCI
 #define CONFIG_TSEC_ENET               /* tsec ethernet support */
 #undef CONFIG_DDR_ECC                  /* only for ECC DDR module */
 #define CONFIG_DDR_DLL                 /* possible DLL fix needed */
@@ -74,6 +74,8 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F      1       /* Call board_pre_init */
 
+#define CFG_INIT_DBCR DBCR_IDM         /* Enable Debug Exceptions */
+
 #undef CFG_DRAM_TEST                   /* memory test, takes time */
 #define CFG_MEMTEST_START      0x00000000      /* memtest region */
 #define CFG_MEMTEST_END                0x10000000

diff --git a/include/configs/TQM8560.h b/include/configs/TQM8560.h
index f48d04e2611f9113a754d4d7ef31e968b1dbe564..f8e3be98dff1909f7d7afd734b097e78e1019a53 100644 (file)
--- a/include/configs/TQM8560.h
+++ b/include/configs/TQM8560.h
@@ -42,7 +42,12 @@
 #define CONFIG_MPC8560         1       /* MPC8560 specific */
 #define CONFIG_TQM8560         1       /* TQM8560 board specific */
 
-#undef CONFIG_PCI
+/*
+ * BIG FAT WARNING: Right now PCI seems to have a problem on the
+ * TQM8560 on the Starter Kit. So, if the board doen't come up
+ * please disable the PCI support for now. sr@denx.de, 15-09-2005
+ */
+#define CONFIG_PCI
 #define CONFIG_TSEC_ENET               /* tsec ethernet support */
 #undef CONFIG_DDR_ECC                  /* only for ECC DDR module */
 #define CONFIG_DDR_DLL                 /* possible DLL fix needed */
@@ -75,6 +80,8 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F      1       /* Call board_pre_init */
 
+#define CFG_INIT_DBCR DBCR_IDM         /* Enable Debug Exceptions */
+
 #undef CFG_DRAM_TEST                   /* memory test, takes time */
 #define CFG_MEMTEST_START      0x00000000      /* memtest region */
 #define CFG_MEMTEST_END                0x10000000
@@ -276,7 +283,7 @@
 #define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
-#undef CONFIG_EEPRO100
+#define CONFIG_EEPRO100
 #undef CONFIG_TULIP
 
 #if !defined(CONFIG_PCI_PNP)
@@ -298,12 +305,27 @@
 #endif
 
 #define CONFIG_MII             1       /* MII PHY management */
+#define CONFIG_MPC85XX_TSEC1   1
+#define CONFIG_MPC85XX_TSEC1_NAME      "TSEC0"
 #define CONFIG_MPC85XX_TSEC2   1
 #define CONFIG_MPC85XX_TSEC2_NAME      "TSEC1"
+#define TSEC1_PHY_ADDR         0
 #define TSEC2_PHY_ADDR         1
+#define TSEC1_PHYIDX           0
 #define TSEC2_PHYIDX           0
 
-#endif  /* CONFIG_TSEC_ENET */
+#define CONFIG_MPC85XX_FEC     1
+#define CONFIG_MPC85XX_FEC_NAME        "FEC"
+#define FEC_PHY_ADDR           2
+#define FEC_PHYIDX             0
+
+#define CONFIG_HAS_ETH1
+#define CONFIG_HAS_ETH2
+
+/* Options are TSEC[0-1], FEC */
+#define CONFIG_ETHPRIME                "TSEC0"
+
+#endif /* CONFIG_TSEC_ENET */
 
 #define CONFIG_ETHER_ON_FCC
 #define CONFIG_ETHER_ON_FCC3
@@ -312,8 +334,6 @@
 #define CFG_CPMFCR_RAMTYPE    0
 #define CFG_FCC_PSMR          (FCC_PSMR_FDE | FCC_PSMR_LPB)
 
-#define CONFIG_ETHPRIME                "TSEC1"
-
 /*
  * Environment
  */