summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-02-07 01:27:10 +0000
committerwdenk <wdenk>2004-02-07 01:27:10 +0000
commitf4863a7aec41f1f78fe93eade700b15b287a5ef7 (patch)
tree12822de96f90354447a6b7a7f36bbc06f46cc57e /cpu
parentba56f625767d058b0e05a22729de13be5e0f6334 (diff)
downloadu-boot-imx-f4863a7aec41f1f78fe93eade700b15b287a5ef7.zip
u-boot-imx-f4863a7aec41f1f78fe93eade700b15b287a5ef7.tar.gz
u-boot-imx-f4863a7aec41f1f78fe93eade700b15b287a5ef7.tar.bz2
* Patch by liang a lei, 9 Jan 2004:
Fix Intel 28F128J3 ID in include/flash.h * Patch by Masami Komiya, 09 Jan 2004: add support for TB0229 board (NEC VR4131 MIPS processor) * Patch by Leon Kukovec, 12 Dec 2003: changed extern __inline__ into static __inline__ in include/linux/byteorder/swab.h
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mips/cpu.c2
-rw-r--r--cpu/mips/start.S4
2 files changed, 5 insertions, 1 deletions
diff --git a/cpu/mips/cpu.c b/cpu/mips/cpu.c
index e73d138..f48675e 100644
--- a/cpu/mips/cpu.c
+++ b/cpu/mips/cpu.c
@@ -30,7 +30,7 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
#if defined(CONFIG_INCA_IP)
*INCA_IP_WDT_RST_REQ = 0x3f;
-#elif defined(CONFIG_PURPLE)
+#elif defined(CONFIG_PURPLE) || defined(CONFIG_TB0229)
void (*f)(void) = (void *) 0xbfc00000;
f();
diff --git a/cpu/mips/start.S b/cpu/mips/start.S
index 59c6acf..45a90a8 100644
--- a/cpu/mips/start.S
+++ b/cpu/mips/start.S
@@ -214,7 +214,11 @@ reset:
mtc0 zero, CP0_WATCHHI
/* STATUS register */
+#ifdef CONFIG_TB0229
+ li k0, ST0_CU0
+#else
mfc0 k0, CP0_STATUS
+#endif
li k1, ~ST0_IE
and k0, k1
mtc0 k0, CP0_STATUS