Cleanup - update CHANGELOG, undo test settings

diff --git a/CHANGELOG b/CHANGELOG
index 38a232f23e00d79018487b21607029b226e538a3..3be741c4a1cff01cdca03a425eef7dcbb16bda78 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,9 @@ Changes for U-Boot 1.1.4:
   Add support for eeprom write-enable (CFG_EEPROM_WREN).
   Patch by Stefan Roese, 22 Sep 2005
 
+* Fix autonegotiation in tsec ethernet driver
+  Patch by Stefan Roese, 21 Sep 2005
+
 * Update configuration for INKA4x0 board
 
 * Update configuration for PM854 board

diff --git a/include/configs/TQM8560.h b/include/configs/TQM8560.h
index 780b11552310da14c0aaa9a41cb64db54cffdaef..e9b21de6063419217a37fbc056d754d0f4204de2 100644 (file)
--- a/include/configs/TQM8560.h
+++ b/include/configs/TQM8560.h
@@ -48,7 +48,6 @@
  * please disable the PCI support for now. sr@denx.de, 15-09-2005
  */
 #define CONFIG_PCI
-#undef CONFIG_PCI /* test-only !!!!!!!!!!!!!!!! */
 #define CONFIG_TSEC_ENET               /* tsec ethernet support */
 #undef CONFIG_DDR_ECC                  /* only for ECC DDR module */
 #define CONFIG_DDR_DLL                 /* possible DLL fix needed */