From owner-p4-projects@FreeBSD.ORG Fri Feb 3 06:48:44 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 A656816A423; Fri, 3 Feb 2006 06:48:43 +0000 (GMT) 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 8086B16A420 for ; Fri, 3 Feb 2006 06:48:43 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3350E43D46 for ; Fri, 3 Feb 2006 06:48:43 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k136mhMD064691 for ; Fri, 3 Feb 2006 06:48:43 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k136mgC2064688 for perforce@freebsd.org; Fri, 3 Feb 2006 06:48:42 GMT (envelope-from imp@freebsd.org) Date: Fri, 3 Feb 2006 06:48:42 GMT Message-Id: <200602030648.k136mgC2064688@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 90958 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, 03 Feb 2006 06:48:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=90958 Change 90958 by imp@imp_hammer on 2006/02/03 06:48:12 Diff reduction to -current. Remove left-over debugs from the board bring up. # all that's left is mapping the system devices, which I'm unsure # if I should remove from here or add to current Affected files ... .. //depot/projects/arm/src/sys/arm/arm/locore.S#18 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/locore.S#18 (text+ko) ==== @@ -68,43 +68,6 @@ ASENTRY_NP(_start) -#define R7SYS \ - mov r7, #0 ; \ - add r7, r7, #0xfffff000 - -#define LED1OFF \ - mov r6, #262144 /* 18 */ ; \ - str r6, [r7, #2096] /* SODR */ -#define LED2OFF \ - mov r6, #524288 /* 19 */ ; \ - str r6, [r7, #2096] /* SODR */ -#define LED3OFF \ - mov r6, #1048576 /* 20 */ ; \ - str r6, [r7, #2096] /* SODR */ -#define LED1ON \ - mov r6, #262144 /* 18 */ ; \ - str r6, [r7, #2100] /* CODR */ -#define LED2ON \ - mov r6, #524288 /* 19 */ ; \ - str r6, [r7, #2100] /* CODR */ -#define LED3ON \ - mov r6, #1048576 /* 20 */ ; \ - str r6, [r7, #2100] /* CODR */ - - R7SYS - mov r6, #262144 /* 18 */ - str r6, [r7, #2048] /* PER */ - str r6, [r7, #2064] /* OER */ - str r6, [r7, #2096] /* SODR */ - mov r6, #524288 /* 19 */ - str r6, [r7, #2048] /* PER */ - str r6, [r7, #2064] /* OER */ - str r6, [r7, #2096] /* SODR */ - mov r6, #1048576 /* 20 */ - str r6, [r7, #2048] /* PER */ - str r6, [r7, #2064] /* OER */ - str r6, [r7, #2096] /* SODR */ - /* Check if we are running on RAM, if not move ourself to RAM */ #if 0 cmp pc, #PHYSADDR @@ -158,7 +121,6 @@ mov pc, r7 Lunmapped: - R7SYS #ifdef STARTUP_PAGETABLE_ADDR /* build page table from scratch */ ldr r0, Lstartup_pagetable @@ -206,15 +168,14 @@ subs r2, r2, #4 bgt .L1 ldr pc, .Lvirt_done + virt_done: - LED1ON mov fp, #0 /* trace back starts here */ bl _C_LABEL(initarm) /* Off we go */ /* init arm will return the new stack pointer. */ mov sp, r0 - LED2ON bl _C_LABEL(mi_startup) /* call mi_startup()! */ adr r0, .Lmainreturned @@ -356,14 +317,6 @@ mov pc, r7 #endif -#if 0 -/* XXX - putc to UART1 of ep93xx */ -ENTRY(asm_putc) - ldr r1, =0xf01c0000 - strb r0, [r1] - mov pc, lr -#endif - /* * setjump + longjmp */