diff --git a/sys/amd64/conf/GENERIC-MMCCAM b/sys/amd64/conf/GENERIC-MMCCAM index 8a5bc7175d68..0aa7a7da1072 100644 --- a/sys/amd64/conf/GENERIC-MMCCAM +++ b/sys/amd64/conf/GENERIC-MMCCAM @@ -1,32 +1,34 @@ # MMCCAM is the kernel config for doing MMC on CAM development # and testing on bhyve # $FreeBSD$ +#NO_UNIVERSE + include MINIMAL ident GENERIC-MMCCAM # Access GPT-formatted and labeled root volume options GEOM_LABEL # UART -- for bhyve console device uart # VirtIO support, needed for bhyve 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_scsi # VirtIO SCSI device device virtio_balloon # VirtIO Memory Balloon device # CAM-specific stuff device pass device scbus device da options MMCCAM # Add CAMDEBUG stuff options CAMDEBUG options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH) diff --git a/sys/arm/conf/GENERIC-MMCCAM b/sys/arm/conf/GENERIC-MMCCAM index 20ca990d1c3e..0e36756d2241 100644 --- a/sys/arm/conf/GENERIC-MMCCAM +++ b/sys/arm/conf/GENERIC-MMCCAM @@ -1,22 +1,24 @@ # # GEMERIC-MMCCAM # # Custom kernel for GENERIC plus MMCCAM as opposed to the prior MMC stack. # # $FreeBSD$ +#NO_UNIVERSE + include GENERIC ident GENERIC-MMCCAM options MMCCAM # Add CAMDEBUG stuff options CAMDEBUG options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH) # pass(4) device device pass nodevice mmc nodevice mmcsd diff --git a/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG b/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG index 803b5fd25416..319f31984dd2 100644 --- a/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG +++ b/sys/arm64/conf/GENERIC-MMCCAM-NODEBUG @@ -1,13 +1,15 @@ # # GENERIC-MMCCAM-NODEBUG # # Custom kernel for arm64 plus MMCCAM as opposed to the prior MMC stack. It is # present to keep it building in tree since it wouldn't work in LINT. This # version without debugging features. # # $FreeBSD$ +#NO_UNIVERSE + include GENERIC-MMCCAM include "../../conf/std.nodebug" ident GENERIC-MMCCAM-NODEBUG