From 7d0e430fef6009c4dba11f80637a4ead4a129cb9 Mon Sep 17 00:00:00 2001 From: jmallett Date: Tue, 4 Jan 2011 19:09:05 +0000 Subject: [PATCH] Remove OCTEON1-32. Since moving to the Cavium SDK, we've lost our support for running an o32 kernel safely, and would have to add interrupt disabling and reenabling to a bunch of macros in the Simple Executive sources to support it. The only reason one would run an o32 kernel on Octeon would be to run o32 world, which is better worked towards by adding o32 binary compatibility to n64 kernels along with, eventually, supporting multilib systems so o32 binaries can run alongside n32 and n64 ones. Discussed with: imp --- sys/mips/conf/OCTEON1-32 | 91 ---------------------------------------- 1 file changed, 91 deletions(-) delete mode 100644 sys/mips/conf/OCTEON1-32 diff --git a/sys/mips/conf/OCTEON1-32 b/sys/mips/conf/OCTEON1-32 deleted file mode 100644 index dce780d1470c..000000000000 --- a/sys/mips/conf/OCTEON1-32 +++ /dev/null @@ -1,91 +0,0 @@ -# OCTEON1 -- Configuration kernel for all Octeon1 SoCs from Cavium Networks -# -# For more information on this file, please read the handbook section on -# Kernel Configuration Files: -# -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# -# $FreeBSD$ - -ident OCTEON1-32 - -# Don't build any modules yet. -makeoptions MODULES_OVERRIDE="" -makeoptions ARCH_FLAGS="-march=octeon" -makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1.32 - -makeoptions KERNLOADADDR=0x81000000 -include "../cavium/std.octeon1" -machine mips mipseb - -hints "OCTEON1.hints" #Default places to look for devices. - -makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols - -options ISA_MIPS32 - -options DDB -options KDB - -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options NFSCLIENT #Network Filesystem Client -#options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options PSEUDOFS #Pseudo-filesystem framework -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -#options ROOTDEVNAME=\"ufs:ad0s1a\" # Original -options NO_SWAPPING - - -options FFS #Berkeley Fast Filesystem -options SOFTUPDATES #Enable FFS soft updates support -options UFS_ACL #Support for access control lists -options UFS_DIRHASH #Improve performance on big directories - - -# 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 SMP - -# Board-specific support that cannot be auto-detected at runtime. -#options OCTEON_VENDOR_LANNER # Support for Lanner boards. -#options OCTEON_BOARD_CAPK_0100ND # Support for CAPK-0100nd. - -device loop -device ether -device md -device uart -nodevice uart_ns8250 -device miibus -device octe -#options VERBOSE_SYSINIT - -device bpf -device random - -# -# Use the following for Compact Flash file-system -device cf -options ROOTDEVNAME=\"ufs:cf0s2a\" # Unmask if compact flash is needed as RFS - -# -# Use the following for RFS in mem-device -#options MD_ROOT -#options ROOTDEVNAME=\"ufs:md0\" - -#options MD_ROOT_SIZE=21264