summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@linux-m68k.org>2018-04-02 23:28:52 +1000
committerGreg Ungerer <gerg@linux-m68k.org>2018-05-28 09:45:27 +1000
commit4a2e130cce1f6ad1b70f0fa8ca1852377fc285ae (patch)
tree2a20be3805aea7cc04a0c6d73f11709cb42754b7
parentbe39cbcbd6cc94ed0e6daf3637cc092641254cf3 (diff)
downloadlinux-0-day-4a2e130cce1f6ad1b70f0fa8ca1852377fc285ae.tar.gz
linux-0-day-4a2e130cce1f6ad1b70f0fa8ca1852377fc285ae.tar.xz
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 <gerg@linux-m68k.org> Reviewed-by: Angelo Dureghello <angelo@sysam.it> Tested-by: Angelo Dureghello <angelo@sysam.it>
-rw-r--r--arch/m68k/Kconfig.bus8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/m68k/Kconfig.bus b/arch/m68k/Kconfig.bus
index d5e66ec136db9..aef698fa50e50 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