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

diff --combined drivers/ata/Kconfig
index a1bd12ebe9f776877dc0b155673667f4fa32a169,db051605f5ceb11a8c80f592659d32e0e22fa8a3..803064aaf110a11c8da5e529084839e4f9b7b05b
--- 1/drivers/ata/Kconfig
--- 2/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

diff --combined include/mmc.h
index ad9716c05745d8fc1fc9f8137cc325de77187fbc,6a0ea0af21735c9fbfc880808ea7ebfc6fe4d70b..cb8bf6a971c0222234a35dc3651f06a845681e18
--- 1/include/mmc.h
--- 2/include/mmc.h
+++ b/include/mmc.h
@@@ -321,7 -321,7 +321,7 @@@ struct mmc_data 
  /* forward decl. */
  struct mmc;
  
 -#ifdef CONFIG_DM_MMC_OPS
 +#if CONFIG_IS_ENABLED(DM_MMC_OPS)
  struct dm_mmc_ops {
        /**
         * send_cmd() - Send a command to the MMC device
@@@ -385,7 -385,7 +385,7 @@@ struct mmc_ops 
  
  struct mmc_config {
        const char *name;
 -#ifndef CONFIG_DM_MMC_OPS
 +#if !CONFIG_IS_ENABLED(DM_MMC_OPS)
        const struct mmc_ops *ops;
  #endif
        uint host_caps;
@@@ -409,7 -409,7 +409,7 @@@ struct sd_ssr 
   * TODO struct mmc should be in mmc_private but it's hard to fix right now
   */
  struct mmc {
 -#ifndef CONFIG_BLK
 +#if !CONFIG_IS_ENABLED(BLK)
        struct list_head link;
  #endif
        const struct mmc_config *cfg;   /* provided configuration */
@@@ -444,14 -444,14 +444,14 @@@
        u64 capacity_gp[4];
        u64 enh_user_start;
        u64 enh_user_size;
 -#ifndef CONFIG_BLK
 +#if !CONFIG_IS_ENABLED(BLK)
        struct blk_desc block_dev;
  #endif
        char op_cond_pending;   /* 1 if we are waiting on an op_cond command */
        char init_in_progress;  /* 1 if we have done mmc_start_init() */
        char preinit;           /* start init as early as possible */
        int ddr_mode;
 -#ifdef CONFIG_DM_MMC
 +#if CONFIG_IS_ENABLED(DM_MMC)
        struct udevice *dev;    /* Device for this MMC controller */
  #endif
  };
@@@ -519,7 -519,7 +519,7 @@@ int mmc_switch_part(struct mmc *mmc, un
  int mmc_hwpart_config(struct mmc *mmc, const struct mmc_hwpart_conf *conf,
                      enum mmc_hwpart_conf_mode mode);
  
 -#ifndef CONFIG_DM_MMC_OPS
 +#if !CONFIG_IS_ENABLED(DM_MMC_OPS)
  int mmc_getcd(struct mmc *mmc);
  int board_mmc_getcd(struct mmc *mmc);
  int mmc_getwp(struct mmc *mmc);
@@@ -585,18 -585,6 +585,6 @@@ int cpu_mmc_init(bd_t *bis)
  int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr);
  int mmc_get_env_dev(void);
  
- struct pci_device_id;
- 
- /**
-  * pci_mmc_init() - set up PCI MMC devices
-  *
-  * This finds all the matching PCI IDs and sets them up as MMC devices.
-  *
-  * @name:             Name to use for devices
-  * @mmc_supported:    PCI IDs to search for, terminated by {0, 0}
-  */
- int pci_mmc_init(const char *name, struct pci_device_id *mmc_supported);
- 
  /* Set block count limit because of 16 bit register limit on some hardware*/
  #ifndef CONFIG_SYS_MMC_MAX_BLK_COUNT
  #define CONFIG_SYS_MMC_MAX_BLK_COUNT 65535