The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=a508f5d92a93cda11b0c68084dbb181f97e7f5f7
commit a508f5d92a93cda11b0c68084dbb181f97e7f5f7
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2024-04-09 22:02:58 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2024-04-09 22:02:58 +0000
NOTES: Tidy entries for SATA controllers
- Add typical comments after device entries (copied from amd64
GENERIC)
- Add an entry for 'device ada'. Normally this is pulled in via
'device sd', but is documented in ada(4) and can be used to include
ATA/SATA disk support in a kernel without SCSI disk support.
Reviewed by: imp
Sponsored by: Chelsio Communications
Differential Revision: https://reviews.freebsd.org/D44689
---
sys/conf/NOTES | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index b15f2fdd22f5..cf447004cb92 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1685,9 +1685,10 @@ device mrsas # LSI/Avago MegaRAID
SAS/SATA, 6Gb/s and 12Gb/s
# These drivers are part of cam(4) subsystem. They supersede less featured
# ata(4) subsystem drivers, supporting same hardware.
-device ahci
-device mvs
-device siis
+device ahci # AHCI-compatible SATA controllers
+device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
+device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA
+device ada # ATA/SATA direct access devices (aka disks)
#
# The 'ATA' driver supports all legacy ATA/ATAPI controllers, including
@@ -1697,7 +1698,7 @@ device siis
# the 'atacore' driver then selecting the drivers on a per vendor basis.
# For example to build a system which only supports a VIA chipset,
# omit 'ata' and include the 'atacore', 'atapci' and 'atavia' drivers.
-device ata
+device ata # Legacy ATA/SATA controllers
# Modular ATA
#device atacore # Core ATA functionality
