Use default options for default partitioning schemes, rather than

making the relevant files standard. This avoids duplication and
makes it easier to override/disable unwanted schemes. Since ARM
doesn't have a DEFAULTS configuration file, leave the source
files for the BSD and MBR partitioning schemes in files.arm for
now.
This commit is contained in:
Marcel Moolenaar 2007-06-11 00:38:06 +00:00
parent 752bb3876c
commit 2b39bb4f4f
10 changed files with 21 additions and 20 deletions

View File

@ -15,5 +15,9 @@ device io # I/O device
# UART chips on this platform
device uart_ns8250
# Default partitioning schemes
options GEOM_BSD
options GEOM_MBR
# KSE support went from being default to a kernel option
options KSE

View File

@ -199,10 +199,6 @@ dev/syscons/scterm-sc.c optional sc
dev/syscons/scvgarndr.c optional sc vga
dev/syscons/scvtb.c optional sc
dev/uart/uart_cpu_amd64.c optional uart
geom/geom_bsd.c standard
geom/geom_bsd_enc.c standard
geom/geom_mbr.c standard
geom/geom_mbr_enc.c standard
isa/syscons_isa.c optional sc
isa/vga_isa.c optional vga
kern/link_elf_obj.c standard

View File

@ -231,10 +231,6 @@ dev/syscons/scvesactl.c optional sc vga vesa
dev/syscons/scvgarndr.c optional sc vga
dev/syscons/scvtb.c optional sc
dev/uart/uart_cpu_i386.c optional uart
geom/geom_bsd.c standard
geom/geom_bsd_enc.c standard
geom/geom_mbr.c standard
geom/geom_mbr_enc.c standard
dev/acpica/acpi_if.m standard
i386/acpica/OsdEnvironment.c optional acpi
i386/acpica/acpi_machdep.c optional acpi

View File

@ -137,10 +137,6 @@ dev/snc/if_snc_pccard.c optional snc pccard
dev/speaker/spkr.c optional speaker
dev/syscons/apm/apm_saver.c optional apm_saver apm
dev/uart/uart_cpu_pc98.c optional uart
geom/geom_bsd.c standard
geom/geom_bsd_enc.c standard
geom/geom_pc98.c standard
geom/geom_pc98_enc.c standard
i386/bios/apm.c optional apm
#i386/i386/apic_vector.s optional apic
i386/i386/atomic.c standard \

View File

@ -67,10 +67,6 @@ dev/syscons/scterm-sc.c optional sc
dev/syscons/scvtb.c optional sc
dev/uart/uart_cpu_sparc64.c optional uart
dev/uart/uart_kbd_sun.c optional uart sc
geom/geom_bsd.c standard
geom/geom_bsd_enc.c standard
geom/geom_sunlabel.c standard
geom/geom_sunlabel_enc.c standard
kern/syscalls.c optional ktr
libkern/ffs.c standard
libkern/ffsl.c standard

View File

@ -28,10 +28,6 @@ dev/ofw/openfirm.c standard
dev/ofw/openfirmio.c standard
dev/ofw/openpromio.c standard
dev/uart/uart_cpu_sparc64.c optional uart
geom/geom_bsd.c standard
geom/geom_bsd_enc.c standard
geom/geom_sunlabel.c standard
geom/geom_sunlabel_enc.c standard
kern/syscalls.c optional ktr
libkern/ffs.c standard
libkern/ffsl.c standard

View File

@ -19,5 +19,9 @@ device io # I/O device
# UART chips on this platform
device uart_ns8250
# Default partitioning schemes
options GEOM_BSD
options GEOM_MBR
# KSE support went from being default to a kernel option
options KSE

View File

@ -21,5 +21,9 @@ device io # I/O device
device uart_ns8250
#device uart_i8251
# Default partitioning schemes
options GEOM_BSD
options GEOM_PC98
# KSE support went from being default to a kernel option
options KSE

View File

@ -15,3 +15,8 @@ device uart_z8530
# KSE support went from being default to a kernel option
options KSE
# Default partitioning schemes
options GEOM_BSD
options GEOM_SUNLABEL

View File

@ -8,3 +8,7 @@ machine sun4v
# Pseudo devices.
device mem # Memory and kernel memory devices
device genclock # Generic clock interface
# Default partitioning schemes
options GEOM_BSD
options GEOM_SUNLABEL