* Patch by Mathias Küster, 23 Nov 2004:

  add udelay support for the mcf5282 cpu

* Patch by Tolunay Orkun, 16 November 2004:
  fix incorrect onboard Xilinx CPLD base address

diff --git a/CHANGELOG b/CHANGELOG
index 239c82a300687be3860777af6d357dbd40e67011..73fb943b7c93879d98659e0e79b6780917b6c9e6 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,12 @@
 Changes for U-Boot 1.1.3:
 ======================================================================
 
+* Patch by Mathias Küster, 23 Nov 2004:
+  add udelay support for the mcf5282 cpu
+
+* Patch by Tolunay Orkun, 16 November 2004:
+  fix incorrect onboard Xilinx CPLD base address
+  
 * Patch by Jerry Van Baren, 08 Nov 2004:
   - Add low-boot option for MPC8260ADS board (if lowboot is selected,
     the jumper for the HRCW source should select flash. If lowboot is

diff --git a/board/csb472/init.S b/board/csb472/init.S
index ca0241bd8a27ed4849e26bcf5099ca6fce33c93e..aec42a14b97664e5ebba5af821b4a8ade2562df0 100644 (file)
--- a/board/csb472/init.S
+++ b/board/csb472/init.S
@@ -129,7 +129,7 @@ ext_bus_cntlr_init:
         *******************************************************************/
        /*WDCR_EBC(pb3ap, 0x07869200)*/
        WDCR_EBC(pb3ap, 0x04055200)
-       WDCR_EBC(pb3cr, 0xff01c000)
+       WDCR_EBC(pb3cr, 0xf081c000)
        /********************************************************************
         * Memory Bank 1,2,4-7 (Unused) initialization
         *******************************************************************/

diff --git a/lib_m68k/time.c b/lib_m68k/time.c
index fb997b5b49c06e66c79e1de6befedd87986fce30..e2c1b060b48c281278bac58f1f6962bf82d9d7c1 100644 (file)
--- a/lib_m68k/time.c
+++ b/lib_m68k/time.c
@@ -131,6 +131,28 @@ void set_timer (ulong t)
 
 void udelay(unsigned long usec)
 {
+       volatile unsigned short *timerp;
+       uint tmp;
+
+       timerp = (volatile unsigned short *) (CFG_MBAR + MCFTIMER_BASE3);
+       
+       while (usec > 0) {
+               if (usec > 65000)
+                       tmp = 65000;
+               else
+                       tmp = usec;
+               usec = usec - tmp;
+
+               /* Set up TIMER 3 as timebase clock */
+               timerp[MCFTIMER_PCSR] = MCFTIMER_PCSR_OVW;
+               timerp[MCFTIMER_PMR] = 0;
+               /* set period to 1 us */
+               timerp[MCFTIMER_PCSR] =
+                       (5 << 8) | MCFTIMER_PCSR_EN | MCFTIMER_PCSR_OVW;
+
+                timerp[MCFTIMER_PMR] = tmp;
+               while (timerp[MCFTIMER_PCNTR] > 0);
+       }
 }
 
 void timer_init (void)