Browse Source

Fix typo in Makefile;
fix problem with PARTNUM detection

wdenk 21 years ago
parent
commit
b0aef11c9f
3 changed files with 5 additions and 2 deletions
  1. 3 0
      CHANGELOG
  2. 1 1
      cpu/mpc8xx/cpu.c
  3. 1 1
      rtc/Makefile

+ 3 - 0
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)
 

+ 1 - 1
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 {

+ 1 - 1
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)