--=-=-=

Chris Gilbert <chris@paradox.demon.co.uk> writes:

[...]

> > > I've glanced over it, and it looks OK to me.  The only obvious thing
> > > missing is to defopt CPU_ARM7TDMI in files.arm.
> >
> > Ok I'll add that, and check it in later this afternoon.
> 
> It's now checked in, John could you check it all works (when anoncvs
> updates).  I had to tweak a few #if defines as ben's been playing
> with the abort code, basically for the few that had changed I just
> added CPU_ARM7TDMI to those that had CPU_ARM7.

With the one line patch attached below to choose the late abort option
(please apply) it compiles and does not break my bootup before the
point it already broke before, what more can I say? :-)


--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment;
  filename=netbsd-20010607-arm-7tdmi-abt.patch

Index: arm/cpufunc.c
===================================================================
RCS file: /pub/NetBSD-CVS/syssrc/sys/arch/arm/arm/cpufunc.c,v
retrieving revision 1.9
diff -u -r1.9 cpufunc.c
--- cpufunc.c	2001/06/03 18:32:33	1.9
+++ cpufunc.c	2001/06/07 18:53:08
@@ -330,7 +330,7 @@
 	(void *)arm7tdmi_cache_flushID,	/* cache_purgeD_rng	*/
 	(void *)cpufunc_nullop,		/* cache_syncI_rng	*/
 
-	arm7_dataabt_fixup,		/* dataabt_fixup	*/
+	late_abort_fixup,		/* dataabt_fixup	*/
 	cpufunc_null_fixup,		/* prefetchabt_fixup	*/
 
 	arm7tdmi_context_switch,		/* context_switch	*/

--=-=-=


-- 

	http://ape.n3.net

--=-=-=--