PERFORCE change 151338 for review

Mon Oct 13 20:29:33 UTC 2008

http://perforce.freebsd.org/chv.cgi?CH=151338

Change 151338 by imp at imp_paco-paco on 2008/10/13 20:28:59

	IFC @151337

Affected files ...

.. //depot/projects/mips2/src/sys/arm/arm/elf_trampoline.c#7 integrate
.. //depot/projects/mips2/src/sys/arm/include/intr.h#7 integrate
.. //depot/projects/mips2/src/sys/arm/include/resource.h#2 integrate
.. //depot/projects/mips2/src/sys/arm/mv/bus_space.c#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/common.c#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/discovery/db78xxx.c#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/discovery/discovery.c#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/discovery/files.db78xxx#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/discovery/std.db78xxx#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/files.mv#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/gpio.c#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/ic.c#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/kirkwood/kirkwood.c#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/mv_machdep.c#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/mvreg.h#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/mvvar.h#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/obio.c#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/orion/db88f5xxx.c#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/orion/files.db88f5xxx#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/orion/orion.c#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/orion/std.db88f5xxx#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/rtc.c#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/std.mv#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/timer.c#1 branch
.. //depot/projects/mips2/src/sys/arm/mv/twsi.c#1 branch
.. //depot/projects/mips2/src/sys/conf/Makefile.arm#9 integrate
.. //depot/projects/mips2/src/sys/conf/options.arm#7 integrate
.. //depot/projects/mips2/src/sys/dev/uart/uart_bus_mbus.c#1 branch
.. //depot/projects/mips2/src/sys/dev/uart/uart_cpu_mv.c#1 branch

Differences ...

==== //depot/projects/mips2/src/sys/arm/arm/elf_trampoline.c#7 (text+ko) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.21 2008/08/04 14:37:32 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.22 2008/10/13 20:07:13 raj Exp $");
 #include <machine/asm.h>
 #include <sys/param.h>
 #include <sys/elf32.h>
@@ -73,6 +73,8 @@
 #endif
 #ifdef CPU_XSCALE_81342
 #define cpu_l2cache_wbinv_all	xscalec3_l2cache_purge
+#elif defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY)
+#define cpu_l2cache_wbinv_all	feroceon_l2cache_wbinv_all
 #else
 #define cpu_l2cache_wbinv_all()	
 #endif

==== //depot/projects/mips2/src/sys/arm/include/intr.h#7 (text+ko) ====

@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/arm/include/intr.h,v 1.10 2008/09/11 12:36:13 raj Exp $
+ * $FreeBSD: src/sys/arm/include/intr.h,v 1.11 2008/10/13 20:07:13 raj Exp $
  *
  */
 
@@ -44,7 +44,9 @@
 #elif defined(CPU_XSCALE_PXA2X0)
 #include <arm/xscale/pxa/pxareg.h>
 #define	NIRQ		IRQ_GPIO_MAX
-#elif defined(CPU_ARM9)
+#elif defined(SOC_MV_DISCOVERY)
+#define NIRQ		96
+#elif defined(CPU_ARM9) || defined(SOC_MV_KIRKWOOD)
 #define NIRQ		64
 #else
 #define NIRQ		32

==== //depot/projects/mips2/src/sys/arm/include/resource.h#2 (text+ko) ====

@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/arm/include/resource.h,v 1.2 2005/01/05 21:58:48 imp Exp $
+ * $FreeBSD: src/sys/arm/include/resource.h,v 1.3 2008/10/13 20:07:13 raj Exp $
  */
 
 #ifndef _MACHINE_RESOURCE_H_
@@ -41,5 +41,6 @@
 #define	SYS_RES_DRQ	2	/* isa dma lines */
 #define	SYS_RES_MEMORY	3	/* i/o memory */
 #define	SYS_RES_IOPORT	4	/* i/o ports */
+#define	SYS_RES_GPIO	5	/* general purpose i/o */
 
 #endif /* !_MACHINE_RESOURCE_H_ */

==== //depot/projects/mips2/src/sys/conf/Makefile.arm#9 (text+ko) ====

@@ -1,7 +1,7 @@
 # Makefile.arm -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.arm,v 1.39 2008/08/04 14:38:38 cognet Exp $
+# $FreeBSD: src/sys/conf/Makefile.arm,v 1.40 2008/10/13 20:07:13 raj Exp $
 #
 # Makefile for FreeBSD
 #
@@ -75,7 +75,8 @@
 	$S/$M/$M/cpufunc_asm_arm8.S $S/$M/$M/cpufunc_asm_arm9.S \
 	$S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \
 	$S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \
-	$S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S
+	$S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S \
+	$S/$M/$M/cpufunc_asm_feroceon.S
 KERNEL_EXTRA=trampoline
 KERNEL_EXTRA_INSTALL=kernel.gz.tramp
 trampoline: ${KERNEL_KO}.tramp

==== //depot/projects/mips2/src/sys/conf/options.arm#7 (text+ko) ====

@@ -1,4 +1,4 @@
-#$FreeBSD: src/sys/conf/options.arm,v 1.20 2008/06/06 05:08:09 benno Exp $
+#$FreeBSD: src/sys/conf/options.arm,v 1.21 2008/10/13 20:07:13 raj Exp $
 ARM9_CACHE_WRITE_THROUGH	opt_global.h
 ARM_CACHE_LOCK_ENABLE	opt_global.h
 ARMFPE			opt_global.h
@@ -20,7 +20,11 @@
 KERNVIRTADDR		opt_global.h
 LOADERRAMADDR		opt_global.h
 PHYSADDR		opt_global.h
+PHYSMEM_SIZE		opt_global.h
 SKYEYE_WORKAROUNDS	opt_global.h
+SOC_MV_DISCOVERY	opt_global.h
+SOC_MV_KIRKWOOD		opt_global.h
+SOC_MV_ORION		opt_global.h
 STARTUP_PAGETABLE_ADDR	opt_global.h
 XSCALE_CACHE_READ_WRITE_ALLOCATE	opt_global.h
 XSACLE_DISABLE_CCNT	opt_timer.h
