summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.(none)>2005-09-22 09:34:17 +0200
committerWolfgang Denk <wd@pollux.(none)>2005-09-22 09:34:17 +0200
commit1caa70788c5a936197e3ecbbdc7c7c629fd44a7f (patch)
tree090034e3e995fe9e2dfc190f081bd9d9c65f294c
parent7644f16f6bf4335899603a1065bdf2c7c62bb915 (diff)
downloadu-boot-imx-1caa70788c5a936197e3ecbbdc7c7c629fd44a7f.zip
u-boot-imx-1caa70788c5a936197e3ecbbdc7c7c629fd44a7f.tar.gz
u-boot-imx-1caa70788c5a936197e3ecbbdc7c7c629fd44a7f.tar.bz2
Cleanup - update CHANGELOG, undo test settings
-rw-r--r--CHANGELOG3
-rw-r--r--include/configs/TQM8560.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 38a232f..3be741c 100644
--- 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 780b115..e9b21de 100644
--- 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 */