diff options
| author | Stefan Roese <sr@denx.de> | 2007-04-18 12:13:51 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-04-18 12:13:51 +0200 |
| commit | afc7e4c2a4729427bec672561ea1b3dbb5e8c0d3 (patch) | |
| tree | 3ebdd6d931b0ce09acf276903d83a801eed2d9f9 | |
| parent | 3747a3f010b2b1442dec3e871c69788b6017aaae (diff) | |
| parent | 8048cdd56f04a756eeea4951f402bf5cc33785db (diff) | |
Merge with git://www.denx.de/git/u-boot.git
| -rw-r--r-- | CHANGELOG | 17 | ||||
| -rw-r--r-- | board/uc101/uc101.c | 2 | ||||
| -rw-r--r-- | cpu/mpc5xxx/fec.c | 4 |
3 files changed, 23 insertions, 0 deletions
@@ -1,3 +1,20 @@ +commit 37403005cfe6bb13964d450f6a48a0b0f2f7017e +Author: Heiko Schocher <hs@pollux.denx.de> +Date: Sat Apr 14 05:26:48 2007 +0200 + + [Fix] Set the LED status register on the UC101 for the LXT971 PHY. + clear the Display after reset. + + Signed-off-by: Heiko Schocher <hs@denx.de> + +commit 6c9ba919375db977aaad9146bf320c7afd07ae7a +Author: Wolfgang Denk <wd@denx.de> +Date: Wed Apr 11 17:25:01 2007 +0200 + + Update CHANGELOG + + Signed-off-by: Wolfgang Denk <wd@denx.de> + commit 51056dd9863e6a1bc363afbbe1775c58cd967418 Author: Wolfgang Denk <wd@denx.de> Date: Wed Apr 11 17:22:55 2007 +0200 diff --git a/board/uc101/uc101.c b/board/uc101/uc101.c index 7a6b3be72e..f726513965 100644 --- a/board/uc101/uc101.c +++ b/board/uc101/uc101.c @@ -221,6 +221,8 @@ long int initdram (int board_type) int checkboard (void) { puts ("Board: MAN UC101\n"); + /* clear the Display */ + *(char *)(CFG_DISP_CWORD) = 0x80; return 0; } diff --git a/cpu/mpc5xxx/fec.c b/cpu/mpc5xxx/fec.c index 13a3870f3d..e59bd85e1b 100644 --- a/cpu/mpc5xxx/fec.c +++ b/cpu/mpc5xxx/fec.c @@ -467,6 +467,10 @@ static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis) miiphy_write(dev->name, phyAddr, 0x0, 0x8000); udelay(1000); +#if defined(CONFIG_UC101) + /* Set the LED configuration Register for the UC101 Board */ + miiphy_write(dev->name, phyAddr, 0x14, 0x4122); +#endif if (fec->xcv_type == MII10) { /* * Force 10Base-T, FDX operation |