From 4a2e130cce1f6ad1b70f0fa8ca1852377fc285ae Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Mon, 2 Apr 2018 23:28:52 +1000 Subject: m68k: allow ColdFire PCI bus on MMU and non-MMU configuration Up to now we have only had support for the PCI bus when running the ColdFire CPU family with the MMU enabled. The only reason for this was the incomplete state of the IO remapping and access functions when running with the MMU disabled. Recent fixes and improvements to the ColdFire IO access code means we can now support the PCI bus when running non-MMU enabled as well. So modify the configuration support to allow it to be selected no matter what choice of MMU mode is used. Signed-off-by: Greg Ungerer Reviewed-by: Angelo Dureghello Tested-by: Angelo Dureghello --- arch/m68k/Kconfig.bus | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'arch/m68k') diff --git a/arch/m68k/Kconfig.bus b/arch/m68k/Kconfig.bus index d5e66ec136db..aef698fa50e5 100644 --- a/arch/m68k/Kconfig.bus +++ b/arch/m68k/Kconfig.bus @@ -59,6 +59,10 @@ config ATARI_ROM_ISA config GENERIC_ISA_DMA def_bool ISA +source "drivers/zorro/Kconfig" + +endif + config PCI bool "PCI support" depends on M54xx @@ -66,10 +70,8 @@ config PCI Enable the PCI bus. Support for the PCI bus hardware built into the ColdFire 547x and 548x processors. +if PCI source "drivers/pci/Kconfig" - -source "drivers/zorro/Kconfig" - endif if !MMU -- cgit v1.2.3-55-g7522