summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.(none)>2005-09-21 09:59:55 +0200
committerWolfgang Denk <wd@pollux.(none)>2005-09-21 09:59:55 +0200
commit29fe1c0fa4275d2612e238f3b1e2d16c52a3d9d6 (patch)
treeb208431aa4012fc48dcded19f0c284df81f278f4
parent053b40fa0c90d885b00c29c9c4490924801809f7 (diff)
downloadu-boot-imx-29fe1c0fa4275d2612e238f3b1e2d16c52a3d9d6.zip
u-boot-imx-29fe1c0fa4275d2612e238f3b1e2d16c52a3d9d6.tar.gz
u-boot-imx-29fe1c0fa4275d2612e238f3b1e2d16c52a3d9d6.tar.bz2
Update configuration for PM854 board
Based on patch by R. Loeffl, 20 Jul 2005
-rw-r--r--CHANGELOG3
-rw-r--r--include/configs/PM854.h7
2 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 80c2805..48fafad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes for U-Boot 1.1.4:
======================================================================
+* Update configuration for PM854 board
+ Based on patch by R. Loeffl, 20 Jul 2005
+
* Add PCI support to TQM8540 and TQM8560 boards
Patch by Stefan Roese, 15 Sep 2005
diff --git a/include/configs/PM854.h b/include/configs/PM854.h
index 89b5f36..af06efc 100644
--- a/include/configs/PM854.h
+++ b/include/configs/PM854.h
@@ -235,8 +235,9 @@
#define CONFIG_NET_MULTI
#define CONFIG_PCI_PNP /* do pci plug-and-play */
-#undef CONFIG_EEPRO100
-#undef CONFIG_TULIP
+#define CONFIG_EEPRO100
+#define CONFIG_E1000
+#undef CONFIG_TULIP
#if !defined(CONFIG_PCI_PNP)
#define PCI_ENET0_IOADDR 0xe0000000
@@ -320,6 +321,7 @@
#define CONFIG_COMMANDS (CONFIG_CMD_DFL \
| CFG_CMD_EEPROM \
| CFG_CMD_DATE \
+ | CFG_CMD_MII \
| CFG_CMD_PCI \
| CFG_CMD_PING \
| CFG_CMD_I2C)
@@ -327,6 +329,7 @@
#define CONFIG_COMMANDS (CONFIG_CMD_DFL \
| CFG_CMD_EEPROM \
| CFG_CMD_DATE \
+ | CFG_CMD_MII \
| CFG_CMD_PING \
| CFG_CMD_I2C)
#endif