Remove old COMPAT_FREEBSD options from the ARM kernel configs. We replaced

the ABI in 10.0, and have removed support for the old ABI in 11. As such
any of these options to provide compatibility prior to 10 are unneeded.

Sponsored by:	ABT Systems Ltd
This commit is contained in:
Andrew Turner 2016-03-16 15:31:09 +00:00
parent f8eecb9709
commit 8ef1f44afe
9 changed files with 7 additions and 22 deletions

View File

@ -57,11 +57,6 @@ options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
options COMPAT_FREEBSD9 # Compatible with FreeBSD9
options COMPAT_FREEBSD10 # Compatible with FreeBSD10
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
options STACK # stack(9) support

View File

@ -46,11 +46,6 @@ options DDB # Enable the kernel debugger
#options DIAGNOSTIC
#options COMPAT_FREEBSD5
#options COMPAT_FREEBSD6
#options COMPAT_FREEBSD7n
options SCHED_ULE # ULE scheduler
#options SCHED_4BSD # 4BSD scheduler
options GEOM_PART_BSD # BSD partition scheme

View File

@ -30,9 +30,6 @@ options SOC_IMX51
options SCHED_4BSD # 4BSD scheduler
#options MD_ROOT # MD is a potential root device
#options NFSD # Network Filesystem Server
#options COMPAT_FREEBSD5 # Compatible with FreeBSD5
#options COMPAT_FREEBSD6 # Compatible with FreeBSD6
#options COMPAT_FREEBSD7 # Compatible with FreeBSD7
options PLATFORM
options INCLUDE_CONFIG_FILE # Include this file in kernel

View File

@ -53,9 +53,6 @@ options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
#options GEOM_PART_GPT # GUID Partition Tables.
#options GEOM_LABEL # Provides labelization
#options COMPAT_FREEBSD5 # Compatible with FreeBSD5
#options COMPAT_FREEBSD6 # Compatible with FreeBSD6
#options COMPAT_FREEBSD7 # Compatible with FreeBSD7
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
#options STACK # stack(9) support

View File

@ -27,9 +27,6 @@ options SOC_IMX53
options SCHED_4BSD # 4BSD scheduler
#options NFSD # Network Filesystem Server
#options COMPAT_FREEBSD5 # Compatible with FreeBSD5
#options COMPAT_FREEBSD6 # Compatible with FreeBSD6
#options COMPAT_FREEBSD7 # Compatible with FreeBSD7
options PLATFORM
options INCLUDE_CONFIG_FILE # Include this file in kernel

View File

@ -58,6 +58,10 @@ nooptions SMP
nooptions MAXCPU
nooptions COMPAT_FREEBSD4
nooptions COMPAT_FREEBSD5
nooptions COMPAT_FREEBSD6
nooptions COMPAT_FREEBSD7
nooptions COMPAT_FREEBSD9
nooption PPC_PROBE_CHIPSET
nodevice fdc

View File

@ -64,9 +64,6 @@ options GEOM_PART_BSD # BSD partition scheme
options GEOM_PART_MBR # MBR partition scheme
#options GEOM_PART_GPT # GUID Partition Tables.
#options GEOM_LABEL # Provides labelization
#options COMPAT_FREEBSD5 # Compatible with FreeBSD5
#options COMPAT_FREEBSD6 # Compatible with FreeBSD6
#options COMPAT_FREEBSD7 # Compatible with FreeBSD7
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
#options STACK # stack(9) support

View File

@ -2,4 +2,5 @@
#
# $FreeBSD$
options COMPAT_FREEBSD10 # Compatible with FreeBSD10

View File

@ -39,6 +39,8 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8)
options VFP # Enable floating point hardware support
options COMPAT_FREEBSD10 # Compatible with FreeBSD10
# DTrace support
options KDTRACE_HOOKS # Kernel DTrace hooks
options DDB_CTF # all architectures - kernel ELF linker loads CTF data