summaryrefslogtreecommitdiffstats
path: root/cpu
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-10-08 22:33:00 +0000
committerwdenk <wdenk>2003-10-08 22:33:00 +0000
commitfc3e2165efda62670d447617a7d44c5666178ea4 (patch)
treea1ab5ba88bafe1fbb0e539f81016cead9cab81c0 /cpu
parentef1464cc01cf9dcab52396283bf597e609caa450 (diff)
downloadblackbird-obmc-uboot-fc3e2165efda62670d447617a7d44c5666178ea4.tar.gz
blackbird-obmc-uboot-fc3e2165efda62670d447617a7d44c5666178ea4.zip
* Patch by Sangmoon Kim, 23 Sep 2003:
fix pll_pci_to_mem_multiplier table for MPC8245 * Patch by Anders Larsen, 22 Sep 2003: enable timed autoboot on PXA * Patch by David Müller, 22 Sep 2003: - add $(CFLAGS) to "-print-libgcc-filename" so compiler driver returns correct libgcc file path - "latency" reduction of busy-loop waiting to improve "U-Boot" boot time on s3c24x0 systems * Patch by Jon Diekema, 19 Sep 2003: - Add CFG_FAULT_ECHO_LINK_DOWN option to echo the inverted Ethernet link state to the fault LED. - In NetLoop, make the Fault LED reflect the link status. The link status gets updated on entry, and on timeouts.
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc824x/speed.c4
-rw-r--r--cpu/pxa/interrupts.c20
2 files changed, 22 insertions, 2 deletions
diff --git a/cpu/mpc824x/speed.c b/cpu/mpc824x/speed.c
index bd3156d255..a37a087af1 100644
--- a/cpu/mpc824x/speed.c
+++ b/cpu/mpc824x/speed.c
@@ -61,8 +61,8 @@ short pll_pci_to_mem_multiplier[] = {
25, 0, 10, 0, 15, 15, 0, 0,
#elif defined(CONFIG_MPC8245)
30, 30, 10, 10, 20, 10, 10, 10,
- 10, 20, 20, 15, 20, 15, 20, 0,
- 30, 0, 15, 40, 20, 25, 20, 40,
+ 10, 20, 20, 15, 20, 15, 20, 30,
+ 30, 40, 15, 40, 20, 25, 20, 40,
25, 20, 10, 20, 15, 15, 15, 0,
#else
#error Specific type of MPC824x must be defined (i.e. CONFIG_MPC8240)
diff --git a/cpu/pxa/interrupts.c b/cpu/pxa/interrupts.c
index cf529f4221..b161b74681 100644
--- a/cpu/pxa/interrupts.c
+++ b/cpu/pxa/interrupts.c
@@ -202,3 +202,23 @@ void udelay_masked (unsigned long usec)
while (tmo >= get_timer_masked ())
/*NOP*/;
}
+
+/*
+ * This function is derived from PowerPC code (read timebase as long long).
+ * On ARM it just returns the timer value.
+ */
+unsigned long long get_ticks(void)
+{
+ return get_timer(0);
+}
+
+/*
+ * This function is derived from PowerPC code (timebase clock frequency).
+ * On ARM it returns the number of timer ticks per second.
+ */
+ulong get_tbclk (void)
+{
+ ulong tbclk;
+ tbclk = CFG_HZ;
+ return tbclk;
+}
OpenPOWER on IntegriCloud