From owner-p4-projects@FreeBSD.ORG Fri Feb 13 23:55:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9C201065673; Fri, 13 Feb 2009 23:55:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 99FAA106564A for ; Fri, 13 Feb 2009 23:55:05 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 874A38FC08 for ; Fri, 13 Feb 2009 23:55:05 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1DNt5c2032223 for ; Fri, 13 Feb 2009 23:55:05 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1DNt5tZ032221 for perforce@freebsd.org; Fri, 13 Feb 2009 23:55:05 GMT (envelope-from andrew@freebsd.org) Date: Fri, 13 Feb 2009 23:55:05 GMT Message-Id: <200902132355.n1DNt5tZ032221@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 157688 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: Fri, 13 Feb 2009 23:55:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=157688 Change 157688 by andrew@andrew_bender on 2009/02/13 23:54:57 Call board_init from s3c24x0_machdep.c Implement board_init on the Neo1973 Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/board_neo.c#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/files.neo1973#2 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/files.s3c2xx0#6 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/files.neo1973#2 (text+ko) ==== @@ -1,2 +1,2 @@ # $FreeBSD: src/sys/arm/at91/files.at91,v 1.7 2007/01/05 02:06:53 ticso Exp $ -arm/s3c2xx0/neo1973_machdep.c standard +arm/s3c2xx0/board_neo.c standard ==== //depot/projects/arm/src/sys/arm/s3c2xx0/files.s3c2xx0#6 (text+ko) ==== @@ -1,6 +1,7 @@ # $FreeBSD$ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard +arm/s3c2xx0/s3c24x0_machdep.c standard arm/s3c2xx0/s3c24x0.c standard arm/s3c2xx0/s3c2xx0_space.c standard arm/s3c2xx0/s3c24x0_clk.c standard ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#2 (text+ko) ==== @@ -93,6 +93,7 @@ #include #include +#include #define KERNEL_PT_SYS 0 /* Page table for mapping proc0 zero page */ #define KERNEL_PT_KERN 1 @@ -136,8 +137,6 @@ static struct trapframe proc0_tf; -extern vm_offset_t s3c2410_uart_vaddr; - #define _A(a) ((a) & ~L1_S_OFFSET) #define _S(s) (((s) + L1_S_SIZE - 1) & ~(L1_S_SIZE-1)) @@ -235,7 +234,7 @@ vm_offset_t lastaddr; int i; - uint32_t memsize = 128 * 1024 * 1024; + uint32_t memsize; i = 0; @@ -375,7 +374,7 @@ /* Disable all peripheral interrupts */ ioreg_write32(S3C24X0_INTCTL_BASE + INTCTL_INTMSK, ~0); - s3c2410_uart_vaddr = S3C24X0_UART_BASE(0); + memsize = board_init(); cninit(); /* Set stack for exception handlers */