From owner-p4-projects@FreeBSD.ORG Thu Jun 14 21:37:09 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A7721065677; Thu, 14 Jun 2012 21:37:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C17A8106566B for ; Thu, 14 Jun 2012 21:37:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [69.147.83.45]) by mx1.freebsd.org (Postfix) with ESMTP id A30BC8FC24 for ; Thu, 14 Jun 2012 21:37:08 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q5ELb8bS039758 for ; Thu, 14 Jun 2012 21:37:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5ELb8ZR039755 for perforce@freebsd.org; Thu, 14 Jun 2012 21:37:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 14 Jun 2012 21:37:08 GMT Message-Id: <201206142137.q5ELb8ZR039755@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212863 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jun 2012 21:37:10 -0000 http://p4web.freebsd.org/@@212863?ac=10 Change 212863 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/06/14 21:36:03 Factor out common, non-DE4-specific portions of the BERI DE4 MDROOT and SDROOT kernel configuration files into a new BERI_TEPLATE configuratio file incuded by both, and also appropriatate to use with future tPad configurations. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_MDROOT#4 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_SDROOT#5 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_TEMPLATE#1 add Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_MDROOT#4 (text+ko) ==== @@ -6,46 +6,12 @@ # $FreeBSD$ # +include "BERI_TEMPLATE" + ident BERI_DE4_MDROOT -machine mips mips64eb - -cpu CPU_BERI - -options HZ=200 - -makeoptions ARCH_FLAGS="-march=mips64 -mabi=64" - -makeoptions KERNLOADADDR=0xffffffff80100000 - -include "../beri/std.beri" - hints "BERI_DE4.hints" #Default places to look for devices. -makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols - -makeoptions MODULES_OVERRIDE="" - -options DDB -options KDB -options ALT_BREAK_TO_DEBUGGER - -options SCHED_ULE - -options FFS #Berkeley Fast Filesystem - -options INET -options INET6 -options NFSCL -options NFS_ROOT - -# Debugging for use in -current -#options DEADLKRES #Enable the deadlock resolver -options INVARIANTS #Enable calls of extra sanity checking -options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detect deadlocks and cycles -#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed - # # This kernel configuration uses an embedded 8MB memory root file system. # Adjust the following path based on local requirements. @@ -62,11 +28,4 @@ device terasic_mtl device isf -device geom_map - -device md -device ether -device loop -device random device sc -device snp ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_SDROOT#5 (text+ko) ==== @@ -6,45 +6,12 @@ # $FreeBSD$ # +include "BERI_TEMPLATE" + ident BERI_DE4_SDROOT -machine mips mips64eb - -cpu CPU_BERI - -options HZ=200 -makeoptions ARCH_FLAGS="-march=mips64 -mabi=64" - -makeoptions KERNLOADADDR=0xffffffff80100000 - -include "../beri/std.beri" - hints "BERI_DE4.hints" #Default places to look for devices. -makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols - -makeoptions MODULES_OVERRIDE="" - -options DDB -options KDB -options ALT_BREAK_TO_DEBUGGER - -options SCHED_ULE - -options FFS #Berkeley Fast Filesystem - -options INET -options INET6 -options NFSCL -options NFS_ROOT - -# Debugging for use in -current -#options DEADLKRES #Enable the deadlock resolver -options INVARIANTS #Enable calls of extra sanity checking -options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detect deadlocks and cycles -#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed - options ROOTDEVNAME=\"ufs:altera_sdcard0\" device altera_avgen @@ -54,11 +21,4 @@ device terasic_mtl device isf -device geom_map - -device md -device ether -device loop -device random device sc -device snp