Fix typo in Makefile;

fix problem with PARTNUM detection

diff --git a/CHANGELOG b/CHANGELOG
index 72abebe7faf1431af21d1f607af4a0758a052e3e..b136f2157daae987ffdc6e37f428348e3576734f 100644 (file)
--- 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 3504422901531a947f7ee80144e5124b666b9dc8..3fb97b07ca7df092e61a584f891e09200a5388e4 100644 (file)
--- 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 f994238aef6486d637ee450c764bd3bf1eedcf3e..1c543d74f330e240f685b6c37a3a6f18a1f4ae87 100644 (file)
--- 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)