From: Tom Rini <trini@konsulko.com>
Date: Tue, 1 Aug 2017 19:38:32 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Tag: v2017.09-rc2~135
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=07d778382200a05a8b86cc135f79ec48e386f25a;p=u-boot

Merge git://git.denx.de/u-boot-x86
---

07d778382200a05a8b86cc135f79ec48e386f25a
diff --cc drivers/ata/Kconfig
index a1bd12ebe9,db051605f5..803064aaf1
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@@ -20,8 -20,32 +20,14 @@@ config SAT
  
  	  See also CMD_SATA which provides command-line support.
  
 -config SCSI
 -	bool "Support SCSI controllers"
 -	help
 -	  This enables support for SCSI (Small Computer System Interface),
 -	  a parallel interface widely used with storage peripherals such as
 -	  hard drives and optical drives. The SCSI standards define physical
 -	  interfaces as well as protocols for controlling devices and
 -	  tranferring data.
 -
 -config DM_SCSI
 -	bool "Support SCSI controllers with driver model"
 -	depends on BLK
 -	help
 -	  This option enables the SCSI (Small Computer System Interface) uclass
 -	  which supports SCSI and SATA HDDs. For every device configuration
 -	  (IDs/LUNs) a block device is created with RAW read/write and
 -	  filesystem support.
 -
  menu "SATA/SCSI device support"
  
+ config AHCI_PCI
+ 	bool "Support for PCI-based AHCI controller"
+ 	depends on DM_SCSI
+ 	help
+ 	  Enables support for the PCI-based AHCI controller.
+ 
  config SATA_CEVA
  	bool "Ceva Sata controller"
  	depends on AHCI