From owner-p4-projects@FreeBSD.ORG Thu Jan 3 07:32:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9655A16A418; Thu, 3 Jan 2008 07:32:37 +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 43C9716A41A for ; Thu, 3 Jan 2008 07:32:37 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 32DCE13C45D for ; Thu, 3 Jan 2008 07:32:37 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m037WbJB039792 for ; Thu, 3 Jan 2008 07:32:37 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m037Wakn039787 for perforce@freebsd.org; Thu, 3 Jan 2008 07:32:36 GMT (envelope-from imp@freebsd.org) Date: Thu, 3 Jan 2008 07:32:36 GMT Message-Id: <200801030732.m037Wakn039787@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 132380 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: Thu, 03 Jan 2008 07:32:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=132380 Change 132380 by imp@imp_paco-paco on 2008/01/03 07:32:02 Move more of the files from the juniper port. Maybe more are needed. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/conf/files.mips#2 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cache.S#3 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/fp.S#3 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/psraccess.S#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/conf/files.mips#2 (text+ko) ==== @@ -1,38 +1,89 @@ +# This file tells config what files go into building a kernel, +# files marked standard are always included. +# +# Copyright (c) 2001, 2004-2005, Juniper Networks, Inc. +# All rights reserved. +# JNPR: files.mips,v 1.11 2007/08/09 12:25:35 katta +# +# The long compile-with and dependency lines are required because of +# limitations in config: backslash-newline doesn't work in strings, and +# dependency lines other than the first are silently ignored. +# +# ---------------------------------------------------------------------- +# Phase 2 +# ---------------------------------------------------------------------- +# This file tells config what files go into building a kernel, +# files marked standard are always included. +# +# Copyright (c) 2001, 2004-2005, Juniper Networks, Inc. +# All rights reserved. +# JNPR: files.mips,v 1.11 2007/08/09 12:25:35 katta # $FreeBSD$ +# +# The long compile-with and dependency lines are required because of +# limitations in config: backslash-newline doesn't work in strings, and +# dependency lines other than the first are silently ignored. +# +# ---------------------------------------------------------------------- +# Phase 2 +# ---------------------------------------------------------------------- -dev/cfe/cfe_api.c optional cfe -dev/cfe/cfe_console.c optional cfe_console -#dev/cfe/cfe_resource.c optional cfe # not yet needed +mips/mips/cache.S standard +#xxx +#mips/mips/cpuconf.c standard +mips/mips/machdep.c standard +mips/mips/mp_machdep.c optional smp +mips/mips/mips_subr.c standard +mips/mips/psraccess.S standard +# Really? +mips/drivers/sio/ns16550.c standard +# +# ---------------------------------------------------------------------- +# Phase 3 +# ---------------------------------------------------------------------- +mips/mips/autoconf.c standard +mips/mips/cpu.c standard +mips/mips/elf_machdep.c standard +mips/mips/exception.S standard +mips/mips/gdb_machdep.c standard +mips/mips/interrupt.c standard +mips/mips/mainbus.c standard +mips/mips/pmap.c standard +mips/mips/trap.c standard +mips/mips/vm_machdep.c standard +# +# ---------------------------------------------------------------------- +# Phase 4 +# ---------------------------------------------------------------------- +# +mips/mips/clock.c standard +#mips/mips/queue.c standard +# ---------------------------------------------------------------------- +# Phase 5 +# ---------------------------------------------------------------------- +mips/mips/fp.S standard +mips/mips/pm_machdep.c standard +mips/mips/swtch.S standard -mips/mips/autoconf.c standard mips/mips/busdma_machdep.c standard -mips/mips/cache.c standard -mips/mips/cache_mipsNN.c standard -mips/mips/copystr.S standard -mips/mips/cpu.c standard +#mips/mips/cache.c standard +#mips/mips/cache_mipsNN.c standard +#mips/mips/copystr.S standard mips/mips/db_disasm.c optional ddb mips/mips/db_interface.c optional ddb mips/mips/db_trace.c optional ddb mips/mips/dump_machdep.c standard -mips/mips/elf_machdep.c standard -mips/mips/exception.S standard mips/mips/in_cksum.c optional inet mips/mips/intr_machdep.c standard mips/mips/locore.S standard no-obj -mips/mips/machdep.c standard mips/mips/mem.c optional mem mips/mips/nexus.c standard -mips/mips/pmap.c standard mips/mips/stack_machdep.c optional ddb | stack mips/mips/support.S standard mips/mips/swtch.S standard mips/mips/sys_machdep.c standard mips/mips/tick.c standard -mips/mips/tlb.c standard -mips/mips/trap.c standard -mips/mips/uio_machdep.c standard mips/mips/uio_machdep.c standard -mips/mips/vm_machdep.c standard geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_mbr.c standard @@ -53,3 +104,8 @@ #XXX: We can't use these versions, as strcmp.c is included conf/files #libkern/mips/strcmp.S standard #libkern/mips/strncmp.S standard + +dev/cfe/cfe_api.c optional cfe +dev/cfe/cfe_console.c optional cfe_console +#dev/cfe/cfe_resource.c optional cfe # not yet needed + ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/cache.S#3 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include -#include "assym.S" +#include "assym.s" /* * Skip the .h file. Noone else need to know! ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/fp.S#3 (text+ko) ==== @@ -43,7 +43,7 @@ #include #include -#include "assym.S" +#include "assym.s" #define SEXP_INF 0xff #define DEXP_INF 0x7ff ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/psraccess.S#3 (text+ko) ==== @@ -41,7 +41,7 @@ #include #include -#include "assym.S" +#include "assym.s" /* * FREEBSD_DEVELOPERS_FIXME