From owner-p4-projects@FreeBSD.ORG Fri Jul 14 14:01:48 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 6700D16A4DF; Fri, 14 Jul 2006 14:01:48 +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 45AD516A4DD for ; Fri, 14 Jul 2006 14:01:48 +0000 (UTC) (envelope-from bms@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E75FA43D45 for ; Fri, 14 Jul 2006 14:01:47 +0000 (GMT) (envelope-from bms@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 k6EE1lrr091542 for ; Fri, 14 Jul 2006 14:01:47 GMT (envelope-from bms@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6EE1lG9091539 for perforce@freebsd.org; Fri, 14 Jul 2006 14:01:47 GMT (envelope-from bms@freebsd.org) Date: Fri, 14 Jul 2006 14:01:47 GMT Message-Id: <200607141401.k6EE1lG9091539@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@freebsd.org using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 101552 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, 14 Jul 2006 14:01:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=101552 Change 101552 by bms@bms_montagne on 2006/07/14 14:01:31 The R4KC *is* a MIPS32 processor; so comment out ARCH_FLAGS Also reference the hardwired device hints we added as we currently have no loader and are in bringup. Affected files ... .. //depot/projects/mips2/src/sys/mips/conf/MALTA#5 edit .. //depot/projects/mips2/src/sys/mips/mips/locore.S#10 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/conf/MALTA#5 (text+ko) ==== @@ -21,7 +21,7 @@ cpu CPU_MIPS4KC ident MALTA -makeoptions ARCH_FLAGS=-march=r4kc +#makeoptions ARCH_FLAGS=-march=mips32 makeoptions MIPS_LITTLE_ENDIAN=defined # Don't build any modules yet. @@ -32,7 +32,7 @@ options PHYSADDR=0xc0000000 include "../mips4k/malta/std.malta" -#hints "GENERIC.hints" #Default places to look for devices. +hints "MALTA.hints" #Default places to look for devices. makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols @@ -58,3 +58,4 @@ device mem device md device uart +device uart_ns8250 ==== //depot/projects/mips2/src/sys/mips/mips/locore.S#10 (text+ko) ==== @@ -48,31 +48,14 @@ * Soft reset * Boot exception vectors (firmware-provided) */ -/* - * XXXMIPS: I get absolute expression required `li' with this below. - * Probably because cpuregs.h from NetBSD defines MIPS_SR_SOFT_RESET as - * another macro which is not defined. - */ -#if 0 li t0, (MIPS_SR_BEV | MIPS_SR_SOFT_RESET) -#endif - li t0, MIPS_SR_BEV /* * t1: Bits to set explicitly: - * Kernel mode is 64-bit * Enable FPU */ -/* - * XXXMIPS: look at this. I think "Kernel mode is 64-bit" == MIPS_SR_KX, so - * it's probably worth to remove it soon. - */ -#if 0 - li t1, MIPS_SR_KX | MIPS_SR_COP_1_BIT -#endif li t1, MIPS_SR_COP_1_BIT - /* * Read coprocessor 0 status register, clear bits not * preserved (namely, clearing interrupt bits), and set @@ -97,18 +80,14 @@ /* * Set up the GP. - * XXMIPS: I did 'dla' -> 'la' conversion here. */ la gp, _gp /* * Set up our temporary stack. - * XXMIPS: I did 'dla' -> 'la' conversion here. */ la sp, topstack - - /* Call the platform-specific startup code. */ jal platform_start nop