Commit 634286f1 authored by Ralf Baechle's avatar Ralf Baechle

MIPS: IP27: Switch from DMA_IP27 to DMA_COHERENT

The special IP27 DMA code selected by DMA_IP27 has been removed a while
ago turning DMA_IP27 into almost a nop.  Also fixup the broken logic of
its last users memcpy.S and memcpy-inatomic.s.
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 732f0462
...@@ -351,7 +351,7 @@ config SGI_IP27 ...@@ -351,7 +351,7 @@ config SGI_IP27
select ARC64 select ARC64
select BOOT_ELF64 select BOOT_ELF64
select DEFAULT_SGI_PARTITION select DEFAULT_SGI_PARTITION
select DMA_IP27 select DMA_COHERENT
select SYS_HAS_EARLY_PRINTK select SYS_HAS_EARLY_PRINTK
select HW_HAS_PCI select HW_HAS_PCI
select NR_CPUS_DEFAULT_64 select NR_CPUS_DEFAULT_64
...@@ -761,9 +761,6 @@ config CFE ...@@ -761,9 +761,6 @@ config CFE
config DMA_COHERENT config DMA_COHERENT
bool bool
config DMA_IP27
bool
config DMA_NONCOHERENT config DMA_NONCOHERENT
bool bool
select DMA_NEED_PCI_MAP_STATE select DMA_NEED_PCI_MAP_STATE
......
...@@ -53,7 +53,7 @@ CONFIG_GENERIC_TIME=y ...@@ -53,7 +53,7 @@ CONFIG_GENERIC_TIME=y
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
CONFIG_ARC=y CONFIG_ARC=y
CONFIG_DMA_IP27=y CONFIG_DMA_COHERENT=y
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_SYS_HAS_EARLY_PRINTK=y CONFIG_SYS_HAS_EARLY_PRINTK=y
# CONFIG_NO_IOPORT is not set # CONFIG_NO_IOPORT is not set
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
* end of memory on some systems. It's also a seriously bad idea on non * end of memory on some systems. It's also a seriously bad idea on non
* dma-coherent systems. * dma-coherent systems.
*/ */
#if !defined(CONFIG_DMA_COHERENT) || !defined(CONFIG_DMA_IP27) #ifdef CONFIG_DMA_NONCOHERENT
#undef CONFIG_CPU_HAS_PREFETCH #undef CONFIG_CPU_HAS_PREFETCH
#endif #endif
#ifdef CONFIG_MIPS_MALTA #ifdef CONFIG_MIPS_MALTA
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
* end of memory on some systems. It's also a seriously bad idea on non * end of memory on some systems. It's also a seriously bad idea on non
* dma-coherent systems. * dma-coherent systems.
*/ */
#if !defined(CONFIG_DMA_COHERENT) || !defined(CONFIG_DMA_IP27) #ifdef CONFIG_DMA_NONCOHERENT
#undef CONFIG_CPU_HAS_PREFETCH #undef CONFIG_CPU_HAS_PREFETCH
#endif #endif
#ifdef CONFIG_MIPS_MALTA #ifdef CONFIG_MIPS_MALTA
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment