The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ca8fcfcf5ed12459cb83b764fcdab45fa6297d82
commit ca8fcfcf5ed12459cb83b764fcdab45fa6297d82 Author: Mina Galić <[email protected]> AuthorDate: 2024-02-02 19:46:01 +0000 Commit: Warner Losh <[email protected]> CommitDate: 2024-02-02 19:46:05 +0000 amd64: switch GENERIC-MMCCAM to GENERIC arm's and arm64's GENERIC-MMCCAM is based on GENERIC. amd64's is based on MINIMAL. For consistency, switch it to GENERIC. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/798 --- sys/amd64/conf/GENERIC-MMCCAM | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/sys/amd64/conf/GENERIC-MMCCAM b/sys/amd64/conf/GENERIC-MMCCAM index 7cf1ebdf9458..26e19887c800 100644 --- a/sys/amd64/conf/GENERIC-MMCCAM +++ b/sys/amd64/conf/GENERIC-MMCCAM @@ -1,33 +1,23 @@ -# MMCCAM is the kernel config for doing MMC on CAM development -# and testing on bhyve +# +# GENERIC-MMCCAM +# +# Custom kernel for GENERIC plus MMCCAM as opposed to the prior MMC stack. +# #NO_UNIVERSE -include MINIMAL +include GENERIC 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) + +# pass(4) device +device pass + +nodevice mmc +nodevice mmcsd
