On Tuesday, June 23, 2026, Dag-Erling Smørgrav <[email protected]> wrote:
> The branch main has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id= > 01c8644093c28d09f0d41fb522dc53f1ab696a7e > > commit 01c8644093c28d09f0d41fb522dc53f1ab696a7e > Author: Dag-Erling Smørgrav <[email protected]> > AuthorDate: 2026-06-23 07:51:01 +0000 > Commit: Dag-Erling Smørgrav <[email protected]> > CommitDate: 2026-06-23 07:51:01 +0000 > > x86: Harmonize GENERIC and MINIMAL > > * Reorder MINIMAL so everything is in the same order as in GENERIC. > > * Wherever comments diverged, except for the explanatory comment at > the top, copy the GENERIC version to MINIMAL. > > * Add KDTRACE_FRAME to i386 GENERIC; it was already in MINIMAL, and > adding it to GENERIC seemed like the more correct move. > > With these changes, MINIMAL is a strict subset of GENERIC, apart from > the identifier and the explanatory comment at the top. > > Hi! Wouldn't be easier to remove the redundant lines from the GENERIC and include MINIMAL from them? Or to you would like to keep them self contained without dependencies? > Reviewed by: imp > Differential Revision: https://reviews.freebsd.org/D57729 > --- > sys/amd64/conf/MINIMAL | 26 +++++++++++++------------- > sys/i386/conf/GENERIC | 1 + > sys/i386/conf/MINIMAL | 34 +++++++++++++++++----------------- > 3 files changed, 31 insertions(+), 30 deletions(-) > > diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL > index ba64c39bc6b9..bf371f79ed86 100644 > --- a/sys/amd64/conf/MINIMAL > +++ b/sys/amd64/conf/MINIMAL > @@ -91,6 +91,18 @@ device acpi > options IOMMU > device pci > > +# ATA controllers > +device ahci # AHCI-compatible SATA controllers > + > +# ATA/SCSI peripherals > +device scbus # SCSI bus (required for ATA/SCSI) > +device da # Direct Access (disks) > +device cd # CD > +device pass # Passthrough device (direct > ATA/SCSI access) > + > +# NVM Express (NVMe) support > +device nvme # base NVMe driver > + > # atkbdc0 controls both the keyboard and the PS/2 mouse > device atkbdc # AT keyboard controller > device atkbd # AT keyboard > @@ -138,8 +150,8 @@ device virtio # Generic > VirtIO bus (required) > device virtio_pci # VirtIO PCI device > device vtnet # VirtIO Ethernet device > device virtio_blk # VirtIO Block device > -device virtio_balloon # VirtIO Memory Balloon device > device virtio_scsi # VirtIO SCSI device > +device virtio_balloon # VirtIO Memory Balloon device > > # Linux KVM paravirtualization support > device kvm_clock # KVM paravirtual clock driver > @@ -156,15 +168,3 @@ device xentimer # Xen x86 > PV timer device > options EVDEV_SUPPORT # evdev support in legacy drivers > device evdev # input event device support > device uinput # install /dev/uinput cdev > - > -# NVM Express (NVMe) support > -device nvme # base NVMe driver > - > -# ATA controllers > -device ahci # AHCI-compatible SATA controllers > - > -# CAM > -device scbus # SCSI bus (required for ATA/SCSI) > -device da # Direct Access (disks) > -device cd # CD > -device pass # Passthrough device (direct > ATA/SCSI access) > diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC > index 5f1e81b46129..44926bc2d3d5 100644 > --- a/sys/i386/conf/GENERIC > +++ b/sys/i386/conf/GENERIC > @@ -79,6 +79,7 @@ options AUDIT # Security event > auditing > options CAPABILITY_MODE # Capsicum capability mode > options CAPABILITIES # Capsicum capabilities > options MAC # TrustedBSD MAC Framework > +options KDTRACE_FRAME # Ensure frames are compiled in > options KDTRACE_HOOKS # Kernel DTrace hooks > options DDB_CTF # Kernel ELF linker loads CTF data > options INCLUDE_CONFIG_FILE # Include this file in kernel > diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL > index 55ef357248c5..ec46c91aaad2 100644 > --- a/sys/i386/conf/MINIMAL > +++ b/sys/i386/conf/MINIMAL > @@ -90,9 +90,9 @@ include "std.debug" > options GZIO # gzip (dumps) > options ZSTDIO # zstd (dumps, tarfs, uzip, zfs) > > -# Make an SMP-capable kernel by default > +# To make an SMP kernel, the next two lines are needed > options SMP # Symmetric MultiProcessor Kernel > -device apic > +device apic # I/O APIC > > # CPU frequency control > device cpufreq > @@ -102,6 +102,18 @@ device acpi > device smbios > device pci > > +# ATA controllers > +device ahci # AHCI-compatible SATA controllers > + > +# ATA/SCSI peripherals > +device scbus # SCSI bus (required for ATA/SCSI) > +device da # Direct Access (disks) > +device cd # CD > +device pass # Passthrough device (direct > ATA/SCSI access) > + > +# NVM Express (NVMe) support > +device nvme # base NVMe driver > + > # atkbdc0 controls both the keyboard and the PS/2 mouse > device atkbdc # AT keyboard controller > device atkbd # AT keyboard > @@ -141,15 +153,15 @@ device virtio # Generic > VirtIO bus (required) > device virtio_pci # VirtIO PCI device > device vtnet # VirtIO Ethernet device > device virtio_blk # VirtIO Block device > -device virtio_balloon # VirtIO Memory Balloon device > device virtio_scsi # VirtIO SCSI device > +device virtio_balloon # VirtIO Memory Balloon device > > # Linux KVM paravirtualization support > device kvm_clock # KVM paravirtual clock driver > > # Xen HVM Guest Optimizations > -# NOTE: XENHVM depends on xenpci and xentimer. > -# They must be added or removed together. > +# NOTE: XENHVM and xenpci interdepend. They must be added or removed > +# together. xentimer depends on XENHVM and isn't required. > options XENHVM # Xen HVM kernel infrastructure > device xenpci # Xen HVM Hypervisor services > driver > device xentimer # Xen x86 PV timer device > @@ -158,15 +170,3 @@ device xentimer # Xen x86 > PV timer device > options EVDEV_SUPPORT # evdev support in legacy drivers > device evdev # input event device support > device uinput # install /dev/uinput cdev > - > -# NVM Express (NVMe) support > -device nvme # base NVMe driver > - > -# ATA controllers > -device ahci # AHCI-compatible SATA controllers > - > -# CAM > -device scbus # SCSI bus (required for ATA/SCSI) > -device da # Direct Access (disks) > -device cd # CD > -device pass # Passthrough device (direct > ATA/SCSI access) > >
