From owner-p4-projects@FreeBSD.ORG Tue Jul 18 09:49:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1127616A4DF; Tue, 18 Jul 2006 09:49:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E1B2616A4DA for ; Tue, 18 Jul 2006 09:49:53 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8EE8043D49 for ; Tue, 18 Jul 2006 09:49:53 +0000 (GMT) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6I9nrAe033758 for ; Tue, 18 Jul 2006 09:49:53 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6I9nrcs033755 for perforce@freebsd.org; Tue, 18 Jul 2006 09:49:53 GMT (envelope-from kevlo@freebsd.org) Date: Tue, 18 Jul 2006 09:49:53 GMT Message-Id: <200607180949.k6I9nrcs033755@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 101841 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jul 2006 09:49:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=101841 Change 101841 by kevlo@kevlo_monet on 2006/07/18 09:48:56 Initial stuff to get a IXP425 kernel building. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/cpufunc.c#8 edit .. //depot/projects/arm/src/sys/arm/arm/locore.S#21 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_machdep.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.avila#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_intr.h#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_mem.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_sipvar.h#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_space.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_timer.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425var.h#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/std.avila#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/std.ixp425#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 add .. //depot/projects/arm/src/sys/conf/options.arm#14 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/cpufunc.c#8 (text+ko) ==== @@ -938,7 +938,6 @@ #ifdef CPU_XSCALE_IXP425 if (cputype == CPU_ID_IXP425_533 || cputype == CPU_ID_IXP425_400 || cputype == CPU_ID_IXP425_266) { - ixp425_icu_init(); cpufuncs = xscale_cpufuncs; #if defined(PERFCTRS) ==== //depot/projects/arm/src/sys/arm/arm/locore.S#21 (text+ko) ==== @@ -113,6 +113,9 @@ CPU_CONTROL_WBUF_ENABLE) bic r2, r2, #(CPU_CONTROL_IC_ENABLE) bic r2, r2, #(CPU_CONTROL_BPRD_ENABLE) +#ifdef CPU_XSCALE_IXP425 + orr r2, r2, #(CPU_CONTROL_BEND_ENABLE) +#endif mcr p15, 0, r2, c1, c0, 0 nop @@ -150,6 +153,9 @@ /* Enable MMU */ mrc p15, 0, r0, c1, c0, 0 orr r0, r0, #CPU_CONTROL_MMU_ENABLE +#ifdef CPU_XSCALE_IXP425 + orr r0, r0, #CPU_CONTROL_BEND_ENABLE +#endif mcr p15, 0, r0, c1, c0, 0 nop nop ==== //depot/projects/arm/src/sys/conf/options.arm#14 (text+ko) ==== @@ -8,6 +8,7 @@ CPU_SA1110 opt_global.h CPU_ARM9 opt_global.h CPU_XSCALE_80321 opt_global.h +CPU_XSCALE_IXP425 opt_global.h KERNPHYSADDR opt_global.h KERNVIRTADDR opt_global.h PHYSADDR opt_global.h