diff options
| author | wdenk | 2004-01-18 18:21:54 +0000 |
|---|---|---|
| committer | wdenk | 2004-01-18 18:21:54 +0000 |
| commit | b0aef11c9f1f98d018adaa484f1e048fa626801e (patch) | |
| tree | 3334d5d4bf14b749d547f92ad0c10949fdac88d2 | |
| parent | 1c43771ba888bb9260692636d645fb2d73390a4b (diff) | |
Fix typo in Makefile;
fix problem with PARTNUM detection
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | cpu/mpc8xx/cpu.c | 2 | ||||
| -rw-r--r-- | rtc/Makefile | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 72abebe7faf..b136f2157da 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,9 @@ Changes since U-Boot 1.0.1: ====================================================================== +* Fix typo in Makefile; + fix problem with PARTNUM detection + * Patch by Reinhard Meyer, 09 Jan 2004: - add RTC support for MPC5200 based boards (requires RTC_XTAL) diff --git a/cpu/mpc8xx/cpu.c b/cpu/mpc8xx/cpu.c index 35044229015..3fb97b07ca7 100644 --- a/cpu/mpc8xx/cpu.c +++ b/cpu/mpc8xx/cpu.c @@ -513,7 +513,7 @@ unsigned long get_tbclk (void) * * For older chips, it's just MF field of PLPRCR plus one. */ - if ((immr & 0xFFFF) >= MPC8xx_NEW_CLK) { /* MPC866/87x/88x series */ + if ((immr & 0x0FFF) >= MPC8xx_NEW_CLK) { /* MPC866/87x/88x series */ factor = (PLPRCR_val(MFI) + PLPRCR_val(MFN)/(PLPRCR_val(MFD)+1))/ (PLPRCR_val(PDF)+1) / (1<<PLPRCR_val(S)); } else { diff --git a/rtc/Makefile b/rtc/Makefile index f994238aef6..1c543d74f33 100644 --- a/rtc/Makefile +++ b/rtc/Makefile @@ -31,7 +31,7 @@ OBJS = date.o \ ds12887.o ds1302.o ds1306.o ds1307.o ds1337.o \ ds1556.o ds164x.o ds174x.o \ m41t11.o m48t35ax.o mc146818.o mk48t59.o \ - mpc5xxx mpc8xx.o pcf8563.o s3c24x0_rtc.o + mpc5xxx.o mpc8xx.o pcf8563.o s3c24x0_rtc.o all: $(LIB) |