Bläddra i källkod

pci: Drop DM_PCI

This option has not effect now. Drop it, using PCI instead where needed.

Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass 2 år sedan
förälder
incheckning
3232bdf0b3

+ 0 - 1
arch/Kconfig

@@ -182,7 +182,6 @@ config X86
 	select SUPPORT_TPL
 	select SUPPORT_TPL
 	select CREATE_ARCH_SYMLINK
 	select CREATE_ARCH_SYMLINK
 	select DM
 	select DM
-	select DM_PCI
 	select HAVE_ARCH_IOMAP
 	select HAVE_ARCH_IOMAP
 	select HAVE_PRIVATE_LIBGCC
 	select HAVE_PRIVATE_LIBGCC
 	select OF_CONTROL
 	select OF_CONTROL

+ 1 - 1
arch/arm/Kconfig

@@ -1681,7 +1681,7 @@ config TARGET_SL28
 	select DM_SPI_FLASH
 	select DM_SPI_FLASH
 	select DM_ETH
 	select DM_ETH
 	select DM_MDIO
 	select DM_MDIO
-	select DM_PCI
+	select PCI
 	select DM_RNG
 	select DM_RNG
 	select DM_RTC
 	select DM_RTC
 	select DM_SCSI
 	select DM_SCSI

+ 1 - 1
arch/arm/mach-imx/mx6/Kconfig

@@ -237,7 +237,7 @@ config TARGET_KOSAGI_NOVENA
 	select DM_ETH
 	select DM_ETH
 	select DM_GPIO
 	select DM_GPIO
 	select DM_MMC
 	select DM_MMC
-	select DM_PCI
+	select PCI
 	select DM_SCSI
 	select DM_SCSI
 	select DM_VIDEO
 	select DM_VIDEO
 	select OF_CONTROL
 	select OF_CONTROL

+ 1 - 1
arch/mips/Kconfig

@@ -17,7 +17,7 @@ config TARGET_MALTA
 	select BOARD_EARLY_INIT_R
 	select BOARD_EARLY_INIT_R
 	select DM
 	select DM
 	select DM_SERIAL
 	select DM_SERIAL
-	select DM_PCI
+	select PCI
 	select DM_ETH
 	select DM_ETH
 	select DYNAMIC_IO_PORT_BASE
 	select DYNAMIC_IO_PORT_BASE
 	select MIPS_CM
 	select MIPS_CM

+ 0 - 1
board/emulation/qemu-riscv/Kconfig

@@ -51,7 +51,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	imply E1000
 	imply E1000
 	imply NVME
 	imply NVME
 	imply PCI
 	imply PCI
-	imply DM_PCI
 	imply PCIE_ECAM_GENERIC
 	imply PCIE_ECAM_GENERIC
 	imply SCSI
 	imply SCSI
 	imply DM_SCSI
 	imply DM_SCSI

+ 0 - 1
board/socionext/developerbox/Kconfig

@@ -7,7 +7,6 @@ choice
 config TARGET_DEVELOPERBOX
 config TARGET_DEVELOPERBOX
 	bool "Socionext DeveloperBox"
 	bool "Socionext DeveloperBox"
 	select PCI
 	select PCI
-	select DM_PCI
 	select PCIE_ECAM_SYNQUACER
 	select PCIE_ECAM_SYNQUACER
 	select SYS_DISABLE_DCACHE_OPS
 	select SYS_DISABLE_DCACHE_OPS
 	select OF_BOARD_SETUP
 	select OF_BOARD_SETUP

+ 0 - 1
common/Kconfig

@@ -551,7 +551,6 @@ config MISC_INIT_R
 config PCI_INIT_R
 config PCI_INIT_R
 	bool "Enumerate PCI buses during init"
 	bool "Enumerate PCI buses during init"
 	depends on PCI
 	depends on PCI
-	default y if !DM_PCI
 	help
 	help
 	  With this option U-Boot will call pci_init() soon after relocation,
 	  With this option U-Boot will call pci_init() soon after relocation,
 	  which will enumerate PCI buses. This is needed, for instance, in the
 	  which will enumerate PCI buses. This is needed, for instance, in the

+ 1 - 1
drivers/gpio/Kconfig

@@ -358,7 +358,7 @@ config PIC32_GPIO
 
 
 config OCTEON_GPIO
 config OCTEON_GPIO
 	bool "Octeon II/III/TX/TX2 GPIO driver"
 	bool "Octeon II/III/TX/TX2 GPIO driver"
-	depends on DM_GPIO && DM_PCI &&	(ARCH_OCTEON || ARCH_OCTEONTX || ARCH_OCTEONTX2)
+	depends on DM_GPIO && PCI && (ARCH_OCTEON || ARCH_OCTEONTX || ARCH_OCTEONTX2)
 	default y
 	default y
 	help
 	help
 	  Add support for the Marvell Octeon GPIO driver. This is used with
 	  Add support for the Marvell Octeon GPIO driver. This is used with

+ 1 - 1
drivers/i2c/Makefile

@@ -18,7 +18,7 @@ obj-$(CONFIG_SYS_I2C_CADENCE) += i2c-cdns.o
 obj-$(CONFIG_SYS_I2C_CA) += i2c-cortina.o
 obj-$(CONFIG_SYS_I2C_CA) += i2c-cortina.o
 obj-$(CONFIG_SYS_I2C_DAVINCI) += davinci_i2c.o
 obj-$(CONFIG_SYS_I2C_DAVINCI) += davinci_i2c.o
 obj-$(CONFIG_SYS_I2C_DW) += designware_i2c.o
 obj-$(CONFIG_SYS_I2C_DW) += designware_i2c.o
-ifdef CONFIG_DM_PCI
+ifdef CONFIG_PCI
 obj-$(CONFIG_SYS_I2C_DW) += designware_i2c_pci.o
 obj-$(CONFIG_SYS_I2C_DW) += designware_i2c_pci.o
 endif
 endif
 obj-$(CONFIG_SYS_I2C_FSL) += fsl_i2c.o
 obj-$(CONFIG_SYS_I2C_FSL) += fsl_i2c.o

+ 2 - 4
drivers/net/Kconfig

@@ -222,7 +222,6 @@ config DWC_ETH_QOS_TEGRA186
 
 
 config E1000
 config E1000
 	bool "Intel PRO/1000 Gigabit Ethernet support"
 	bool "Intel PRO/1000 Gigabit Ethernet support"
-	depends on (DM_ETH && DM_PCI) || !DM_ETH
 	help
 	help
 	  This driver supports Intel(R) PRO/1000 gigabit ethernet family of
 	  This driver supports Intel(R) PRO/1000 gigabit ethernet family of
 	  adapters.  For more information on how to identify your adapter, go
 	  adapters.  For more information on how to identify your adapter, go
@@ -506,7 +505,7 @@ config OCTEONTX2_CGX_INTF
 
 
 config PCH_GBE
 config PCH_GBE
 	bool "Intel Platform Controller Hub EG20T GMAC driver"
 	bool "Intel Platform Controller Hub EG20T GMAC driver"
-	depends on DM_ETH && DM_PCI
+	depends on DM_ETH
 	select PHYLIB
 	select PHYLIB
 	help
 	help
 	  This MAC is present in Intel Platform Controller Hub EG20T. It
 	  This MAC is present in Intel Platform Controller Hub EG20T. It
@@ -606,7 +605,6 @@ source "drivers/net/ti/Kconfig"
 
 
 config TULIP
 config TULIP
 	bool "DEC Tulip DC2114x Ethernet support"
 	bool "DEC Tulip DC2114x Ethernet support"
-	depends on (DM_ETH && DM_PCI) || !DM_ETH
 	help
 	help
 	  This driver supports DEC DC2114x Fast ethernet chips.
 	  This driver supports DEC DC2114x Fast ethernet chips.
 
 
@@ -791,7 +789,7 @@ config HIGMACV300_ETH
 
 
 config FSL_ENETC
 config FSL_ENETC
 	bool "NXP ENETC Ethernet controller"
 	bool "NXP ENETC Ethernet controller"
-	depends on DM_PCI && DM_ETH && DM_MDIO
+	depends on DM_ETH && DM_MDIO
 	help
 	help
 	  This driver supports the NXP ENETC Ethernet controller found on some
 	  This driver supports the NXP ENETC Ethernet controller found on some
 	  of the NXP SoCs.
 	  of the NXP SoCs.

+ 1 - 1
drivers/net/mscc_eswitch/Kconfig

@@ -39,7 +39,7 @@ config MSCC_SERVAL_SWITCH
 
 
 config MSCC_FELIX_SWITCH
 config MSCC_FELIX_SWITCH
 	bool "Felix switch driver"
 	bool "Felix switch driver"
-	depends on DM_DSA && DM_PCI
+	depends on DM_DSA
 	select FSL_ENETC
 	select FSL_ENETC
 	help
 	help
 	  This driver supports the Ethernet switch integrated in the
 	  This driver supports the Ethernet switch integrated in the

+ 3 - 37
drivers/pci/Kconfig

@@ -2,35 +2,26 @@ menuconfig PCI
 	bool "PCI support"
 	bool "PCI support"
 	depends on DM
 	depends on DM
 	default y if PPC
 	default y if PPC
-	select DM_PCI
 	help
 	help
 	  Enable support for PCI (Peripheral Interconnect Bus), a type of bus
 	  Enable support for PCI (Peripheral Interconnect Bus), a type of bus
 	  used on some devices to allow the CPU to communicate with its
 	  used on some devices to allow the CPU to communicate with its
 	  peripherals.
 	  peripherals.
 
 
-config DM_PCI
-	bool
-	help
-	  Use driver model for PCI. Driver model is the new method for
-	  orgnising devices in U-Boot. For PCI, driver model keeps track of
-	  available PCI devices, allows scanning of PCI buses and provides
-	  device configuration support.
+	  This subsystem requires driver model.
 
 
 if PCI
 if PCI
 
 
 config DM_PCI_COMPAT
 config DM_PCI_COMPAT
 	bool "Enable compatible functions for PCI"
 	bool "Enable compatible functions for PCI"
-	depends on DM_PCI
 	help
 	help
 	  Enable compatibility functions for PCI so that old code can be used
 	  Enable compatibility functions for PCI so that old code can be used
-	  with CONFIG_DM_PCI enabled. This should be used as an interim
+	  with CONFIG_PCI enabled. This should be used as an interim
 	  measure when porting a board to use driver model for PCI. Once the
 	  measure when porting a board to use driver model for PCI. Once the
 	  board is fully supported, this option should be disabled.
 	  board is fully supported, this option should be disabled.
 
 
 config PCI_AARDVARK
 config PCI_AARDVARK
 	bool "Enable Aardvark PCIe driver"
 	bool "Enable Aardvark PCIe driver"
 	default n
 	default n
-	depends on DM_PCI
 	depends on DM_GPIO
 	depends on DM_GPIO
 	depends on ARMADA_3700
 	depends on ARMADA_3700
 	help
 	help
@@ -40,14 +31,12 @@ config PCI_AARDVARK
 
 
 config PCI_PNP
 config PCI_PNP
 	bool "Enable Plug & Play support for PCI"
 	bool "Enable Plug & Play support for PCI"
-	depends on PCI || DM_PCI
 	default y
 	default y
 	help
 	help
 	  Enable PCI memory and I/O space resource allocation and assignment.
 	  Enable PCI memory and I/O space resource allocation and assignment.
 
 
 config PCI_REGION_MULTI_ENTRY
 config PCI_REGION_MULTI_ENTRY
 	bool "Enable Multiple entries of region type MEMORY in ranges for PCI"
 	bool "Enable Multiple entries of region type MEMORY in ranges for PCI"
-	depends on PCI || DM_PCI
 	default n
 	default n
 	help
 	help
 	  Enable PCI memory regions to be of multiple entry. Multiple entry
 	  Enable PCI memory regions to be of multiple entry. Multiple entry
@@ -57,7 +46,6 @@ config PCI_REGION_MULTI_ENTRY
 
 
 config PCI_MAP_SYSTEM_MEMORY
 config PCI_MAP_SYSTEM_MEMORY
 	bool "Map local system memory from a virtual base address"
 	bool "Map local system memory from a virtual base address"
-	depends on PCI || DM_PCI
 	depends on MIPS
 	depends on MIPS
 	default n
 	default n
 	help
 	help
@@ -70,7 +58,6 @@ config PCI_MAP_SYSTEM_MEMORY
 
 
 config PCI_SRIOV
 config PCI_SRIOV
 	bool "Enable Single Root I/O Virtualization support for PCI"
 	bool "Enable Single Root I/O Virtualization support for PCI"
-	depends on PCI || DM_PCI
 	default n
 	default n
 	help
 	help
 	  Say Y here if you want to enable PCI Single Root I/O Virtualization
 	  Say Y here if you want to enable PCI Single Root I/O Virtualization
@@ -80,7 +67,6 @@ config PCI_SRIOV
 
 
 config PCI_ARID
 config PCI_ARID
         bool "Enable Alternate Routing-ID support for PCI"
         bool "Enable Alternate Routing-ID support for PCI"
-        depends on PCI || DM_PCI
         default n
         default n
         help
         help
           Say Y here if you want to enable Alternate Routing-ID capability
           Say Y here if you want to enable Alternate Routing-ID capability
@@ -90,7 +76,6 @@ config PCI_ARID
 config PCIE_ECAM_GENERIC
 config PCIE_ECAM_GENERIC
 	bool "Generic ECAM-based PCI host controller support"
 	bool "Generic ECAM-based PCI host controller support"
 	default n
 	default n
-	depends on DM_PCI
 	help
 	help
 	  Say Y here if you want to enable support for generic ECAM-based
 	  Say Y here if you want to enable support for generic ECAM-based
 	  PCIe host controllers, such as the one emulated by QEMU.
 	  PCIe host controllers, such as the one emulated by QEMU.
@@ -98,7 +83,6 @@ config PCIE_ECAM_GENERIC
 config PCIE_ECAM_SYNQUACER
 config PCIE_ECAM_SYNQUACER
 	bool "SynQuacer ECAM-based PCI host controller support"
 	bool "SynQuacer ECAM-based PCI host controller support"
 	default n
 	default n
-	depends on DM_PCI
 	select PCI_INIT_R
 	select PCI_INIT_R
 	select PCI_REGION_MULTI_ENTRY
 	select PCI_REGION_MULTI_ENTRY
 	help
 	help
@@ -109,14 +93,12 @@ config PCIE_ECAM_SYNQUACER
 
 
 config PCI_PHYTIUM
 config PCI_PHYTIUM
 	bool "Phytium PCIe support"
 	bool "Phytium PCIe support"
-	depends on DM_PCI
 	help
 	help
 	  Say Y here if you want to enable PCIe controller support on
 	  Say Y here if you want to enable PCIe controller support on
 	  Phytium SoCs.
 	  Phytium SoCs.
 
 
 config PCIE_DW_MVEBU
 config PCIE_DW_MVEBU
 	bool "Enable Armada-8K PCIe driver (DesignWare core)"
 	bool "Enable Armada-8K PCIe driver (DesignWare core)"
-	depends on DM_PCI
 	depends on ARMADA_8K
 	depends on ARMADA_8K
 	help
 	help
 	  Say Y here if you want to enable PCIe controller support on
 	  Say Y here if you want to enable PCIe controller support on
@@ -135,7 +117,6 @@ config PCIE_DW_SIFIVE
 
 
 config PCIE_FSL
 config PCIE_FSL
 	bool "FSL PowerPC PCIe support"
 	bool "FSL PowerPC PCIe support"
-	depends on DM_PCI
 	help
 	help
 	  Say Y here if you want to enable PCIe controller support on FSL
 	  Say Y here if you want to enable PCIe controller support on FSL
 	  PowerPC MPC85xx, MPC86xx, B series, P series and T series SoCs.
 	  PowerPC MPC85xx, MPC86xx, B series, P series and T series SoCs.
@@ -143,14 +124,12 @@ config PCIE_FSL
 
 
 config PCI_MPC85XX
 config PCI_MPC85XX
 	bool "MPC85XX PowerPC PCI support"
 	bool "MPC85XX PowerPC PCI support"
-	depends on DM_PCI
 	help
 	help
 	  Say Y here if you want to enable PCI controller support on FSL
 	  Say Y here if you want to enable PCI controller support on FSL
 	  PowerPC MPC85xx SoC.
 	  PowerPC MPC85xx SoC.
 
 
 config PCI_RCAR_GEN2
 config PCI_RCAR_GEN2
 	bool "Renesas RCar Gen2 PCIe driver"
 	bool "Renesas RCar Gen2 PCIe driver"
-	depends on DM_PCI
 	depends on RCAR_32
 	depends on RCAR_32
 	help
 	help
 	  Say Y here if you want to enable PCIe controller support on
 	  Say Y here if you want to enable PCIe controller support on
@@ -159,7 +138,6 @@ config PCI_RCAR_GEN2
 
 
 config PCI_RCAR_GEN3
 config PCI_RCAR_GEN3
 	bool "Renesas RCar Gen3 PCIe driver"
 	bool "Renesas RCar Gen3 PCIe driver"
-	depends on DM_PCI
 	depends on RCAR_GEN3
 	depends on RCAR_GEN3
 	help
 	help
 	  Say Y here if you want to enable PCIe controller support on
 	  Say Y here if you want to enable PCIe controller support on
@@ -167,7 +145,7 @@ config PCI_RCAR_GEN3
 
 
 config PCI_SANDBOX
 config PCI_SANDBOX
 	bool "Sandbox PCI support"
 	bool "Sandbox PCI support"
-	depends on SANDBOX && DM_PCI
+	depends on SANDBOX
 	help
 	help
 	  Support PCI on sandbox, as an emulated bus. This permits testing of
 	  Support PCI on sandbox, as an emulated bus. This permits testing of
 	  PCI feature such as bus scanning, device configuration and device
 	  PCI feature such as bus scanning, device configuration and device
@@ -202,7 +180,6 @@ config PCIE_OCTEON
 
 
 config PCI_XILINX
 config PCI_XILINX
 	bool "Xilinx AXI Bridge for PCI Express"
 	bool "Xilinx AXI Bridge for PCI Express"
-	depends on DM_PCI
 	help
 	help
 	  Enable support for the Xilinx AXI bridge for PCI express, an IP block
 	  Enable support for the Xilinx AXI bridge for PCI express, an IP block
 	  which can be used on some generations of Xilinx FPGAs.
 	  which can be used on some generations of Xilinx FPGAs.
@@ -213,7 +190,6 @@ config PCIE_LAYERSCAPE
 
 
 config PCIE_LAYERSCAPE_RC
 config PCIE_LAYERSCAPE_RC
 	bool "Layerscape PCIe Root Complex mode support"
 	bool "Layerscape PCIe Root Complex mode support"
-	depends on DM_PCI
 	select PCIE_LAYERSCAPE
 	select PCIE_LAYERSCAPE
 	help
 	help
 	  Enable Layerscape PCIe Root Complex mode driver support. The Layerscape
 	  Enable Layerscape PCIe Root Complex mode driver support. The Layerscape
@@ -235,7 +211,6 @@ config PCI_IOMMU_EXTRA_MAPPINGS
 
 
 config PCIE_LAYERSCAPE_EP
 config PCIE_LAYERSCAPE_EP
 	bool "Layerscape PCIe Endpoint mode support"
 	bool "Layerscape PCIe Endpoint mode support"
-	depends on DM_PCI
 	select PCIE_LAYERSCAPE
 	select PCIE_LAYERSCAPE
 	select PCI_ENDPOINT
 	select PCI_ENDPOINT
 	help
 	help
@@ -246,7 +221,6 @@ config PCIE_LAYERSCAPE_EP
 
 
 config PCIE_LAYERSCAPE_GEN4
 config PCIE_LAYERSCAPE_GEN4
 	bool "Layerscape Gen4 PCIe support"
 	bool "Layerscape Gen4 PCIe support"
-	depends on DM_PCI
 	help
 	help
 	  Support PCIe Gen4 on NXP Layerscape SoCs, which may have one or
 	  Support PCIe Gen4 on NXP Layerscape SoCs, which may have one or
 	  several PCIe controllers. The PCIe controller can work in RC or
 	  several PCIe controllers. The PCIe controller can work in RC or
@@ -279,14 +253,12 @@ config FSL_PCIE_EP_COMPAT
 
 
 config PCIE_INTEL_FPGA
 config PCIE_INTEL_FPGA
 	bool "Intel FPGA PCIe support"
 	bool "Intel FPGA PCIe support"
-	depends on DM_PCI
 	help
 	help
 	  Say Y here if you want to enable PCIe controller support on Intel
 	  Say Y here if you want to enable PCIe controller support on Intel
 	  FPGA, example Stratix 10.
 	  FPGA, example Stratix 10.
 
 
 config PCIE_IPROC
 config PCIE_IPROC
 	bool "Iproc PCIe support"
 	bool "Iproc PCIe support"
-	depends on DM_PCI
 	help
 	help
 	  Broadcom iProc PCIe controller driver.
 	  Broadcom iProc PCIe controller driver.
 	  Say Y here if you want to enable Broadcom iProc PCIe controller,
 	  Say Y here if you want to enable Broadcom iProc PCIe controller,
@@ -294,7 +266,6 @@ config PCIE_IPROC
 config PCI_MVEBU
 config PCI_MVEBU
 	bool "Enable Armada XP/38x PCIe driver"
 	bool "Enable Armada XP/38x PCIe driver"
 	depends on ARCH_MVEBU
 	depends on ARCH_MVEBU
-	select DM_PCI
 	select MISC
 	select MISC
 	help
 	help
 	  Say Y here if you want to enable PCIe controller support on
 	  Say Y here if you want to enable PCIe controller support on
@@ -302,7 +273,6 @@ config PCI_MVEBU
 
 
 config PCIE_DW_COMMON
 config PCIE_DW_COMMON
 	bool
 	bool
-	select DM_PCI
 
 
 config PCI_KEYSTONE
 config PCI_KEYSTONE
 	bool "TI Keystone PCIe controller"
 	bool "TI Keystone PCIe controller"
@@ -312,7 +282,6 @@ config PCI_KEYSTONE
 
 
 config PCIE_MEDIATEK
 config PCIE_MEDIATEK
 	bool "MediaTek PCIe Gen2 controller"
 	bool "MediaTek PCIe Gen2 controller"
-	depends on DM_PCI
 	depends on ARCH_MEDIATEK
 	depends on ARCH_MEDIATEK
 	help
 	help
 	  Say Y here if you want to enable Gen2 PCIe controller,
 	  Say Y here if you want to enable Gen2 PCIe controller,
@@ -329,7 +298,6 @@ config PCIE_DW_MESON
 config PCIE_ROCKCHIP
 config PCIE_ROCKCHIP
 	bool "Enable Rockchip PCIe driver"
 	bool "Enable Rockchip PCIe driver"
 	depends on ARCH_ROCKCHIP
 	depends on ARCH_ROCKCHIP
-	select DM_PCI
 	select PHY_ROCKCHIP_PCIE
 	select PHY_ROCKCHIP_PCIE
 	default y if ROCKCHIP_RK3399
 	default y if ROCKCHIP_RK3399
 	help
 	help
@@ -347,7 +315,6 @@ config PCIE_DW_ROCKCHIP
 
 
 config PCI_BRCMSTB
 config PCI_BRCMSTB
 	bool "Broadcom STB PCIe controller"
 	bool "Broadcom STB PCIe controller"
-	depends on DM_PCI
 	depends on ARCH_BCM283X
 	depends on ARCH_BCM283X
 	help
 	help
 	  Say Y here if you want to enable support for PCIe controller
 	  Say Y here if you want to enable support for PCIe controller
@@ -357,7 +324,6 @@ config PCI_BRCMSTB
 
 
 config PCIE_UNIPHIER
 config PCIE_UNIPHIER
 	bool "Socionext UniPhier PCIe driver"
 	bool "Socionext UniPhier PCIe driver"
-	depends on DM_PCI
 	depends on ARCH_UNIPHIER
 	depends on ARCH_UNIPHIER
 	select PHY_UNIPHIER_PCIE
 	select PHY_UNIPHIER_PCIE
 	help
 	help

+ 1 - 1
drivers/spi/Kconfig

@@ -271,7 +271,7 @@ config NXP_FSPI
 
 
 config OCTEON_SPI
 config OCTEON_SPI
 	bool "Octeon SPI driver"
 	bool "Octeon SPI driver"
-	depends on DM_PCI && (ARCH_OCTEON || ARCH_OCTEONTX || ARCH_OCTEONTX2)
+	depends on ARCH_OCTEON || ARCH_OCTEONTX || ARCH_OCTEONTX2
 	help
 	help
 	  Enable the Octeon SPI driver. This driver can be used to
 	  Enable the Octeon SPI driver. This driver can be used to
 	  access the SPI NOR flash on Octeon II/III and OcteonTX/TX2
 	  access the SPI NOR flash on Octeon II/III and OcteonTX/TX2

+ 1 - 1
drivers/virtio/Kconfig

@@ -31,7 +31,7 @@ config VIRTIO_MMIO
 
 
 config VIRTIO_PCI
 config VIRTIO_PCI
 	bool "PCI driver for virtio devices"
 	bool "PCI driver for virtio devices"
-	depends on DM_PCI
+	depends on PCI
 	select VIRTIO
 	select VIRTIO
 	help
 	help
 	  This driver provides support for virtio based paravirtual device
 	  This driver provides support for virtio based paravirtual device

+ 1 - 1
test/dm/Makefile

@@ -65,7 +65,7 @@ obj-y += of_extra.o
 obj-$(CONFIG_OSD) += osd.o
 obj-$(CONFIG_OSD) += osd.o
 obj-$(CONFIG_DM_VIDEO) += panel.o
 obj-$(CONFIG_DM_VIDEO) += panel.o
 obj-$(CONFIG_EFI_PARTITION) += part.o
 obj-$(CONFIG_EFI_PARTITION) += part.o
-obj-$(CONFIG_DM_PCI) += pci.o
+obj-$(CONFIG_PCI) += pci.o
 obj-$(CONFIG_P2SB) += p2sb.o
 obj-$(CONFIG_P2SB) += p2sb.o
 obj-$(CONFIG_PCI_ENDPOINT) += pci_ep.o
 obj-$(CONFIG_PCI_ENDPOINT) += pci_ep.o
 obj-$(CONFIG_PCH) += pch.o
 obj-$(CONFIG_PCH) += pch.o