summaryrefslogtreecommitdiff
path: root/lib_m68k
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-05-09 13:46:55 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-05-09 13:46:55 +0200
commit1cfefe8cb6e1bb43f6509c0aee254e2908d42f21 (patch)
treeeba45129d65b83452d281514802f3895aa4f283e /lib_m68k
parent67a94685225b289fb3344cf00fefa91fd93f24ae (diff)
parent78b123cd69d485887f33ebd33ba1f9b27f8e6916 (diff)
downloadu-boot-imx-1cfefe8cb6e1bb43f6509c0aee254e2908d42f21.zip
u-boot-imx-1cfefe8cb6e1bb43f6509c0aee254e2908d42f21.tar.gz
u-boot-imx-1cfefe8cb6e1bb43f6509c0aee254e2908d42f21.tar.bz2
Merge with /home/m8/git/u-boot
Diffstat (limited to 'lib_m68k')
-rw-r--r--lib_m68k/board.c9
-rw-r--r--lib_m68k/time.c9
2 files changed, 14 insertions, 4 deletions
diff --git a/lib_m68k/board.c b/lib_m68k/board.c
index 80c41a6..73d2e3f 100644
--- a/lib_m68k/board.c
+++ b/lib_m68k/board.c
@@ -261,6 +261,7 @@ board_init_f (ulong bootflag)
{
bd_t *bd;
ulong len, addr, addr_sp;
+ ulong *paddr;
gd_t *id;
init_fnc_t **init_fnc_ptr;
#ifdef CONFIG_PRAM
@@ -357,8 +358,12 @@ board_init_f (ulong bootflag)
*/
addr_sp -= 16;
addr_sp &= ~0xF;
- *((ulong *) addr_sp)-- = 0;
- *((ulong *) addr_sp)-- = 0;
+
+ paddr = (ulong *)addr_sp;
+ *paddr-- = 0;
+ *paddr-- = 0;
+ addr_sp = (ulong)paddr;
+
debug ("Stack Pointer at: %08lx\n", addr_sp);
/*
diff --git a/lib_m68k/time.c b/lib_m68k/time.c
index 1d6d297..d45e470 100644
--- a/lib_m68k/time.c
+++ b/lib_m68k/time.c
@@ -27,6 +27,11 @@
#include <asm/mcftimer.h>
+#ifdef CONFIG_M5271
+#include <asm/m5271.h>
+#include <asm/immap_5271.h>
+#endif
+
#ifdef CONFIG_M5272
#include <asm/m5272.h>
#include <asm/immap_5272.h>
@@ -43,7 +48,7 @@
static ulong timestamp;
-#ifdef CONFIG_M5282
+#if defined(CONFIG_M5282) || defined(CONFIG_M5271)
static unsigned short lastinc;
#endif
@@ -127,7 +132,7 @@ void set_timer (ulong t)
}
#endif
-#if defined(CONFIG_M5282)
+#if defined(CONFIG_M5282) || defined(CONFIG_M5271)
void udelay(unsigned long usec)
{