[POWERPC] 8xx: generic 8xx code arch/powerpc port
Including support for non-coherent cache, some mm-related things + relevant field in Kconfig and Makefiles. Also included rheap.o compilation if 8xx is defined. Non-coherent mapping were refined and renamed according to Cristoph Hellwig. Orphaned functions were cleaned up. [Also removed arch/ppc/kernel/dma-mapping.c, because otherwise compiling with ARCH=ppc for a non DMA-cache-coherent platform ends up with two copies of __dma_alloc_coherent etc. -- paulus.] Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
dbbb06b7f6
commit
5902ebce22
|
@ -173,6 +173,11 @@ config PPC_86xx
|
||||||
help
|
help
|
||||||
The Freescale E600 SoCs have 74xx cores.
|
The Freescale E600 SoCs have 74xx cores.
|
||||||
|
|
||||||
|
config PPC_8xx
|
||||||
|
bool "Freescale 8xx"
|
||||||
|
select FSL_SOC
|
||||||
|
select 8xx
|
||||||
|
|
||||||
config 40x
|
config 40x
|
||||||
bool "AMCC 40x"
|
bool "AMCC 40x"
|
||||||
select PPC_DCR_NATIVE
|
select PPC_DCR_NATIVE
|
||||||
|
@ -181,8 +186,6 @@ config 44x
|
||||||
bool "AMCC 44x"
|
bool "AMCC 44x"
|
||||||
select PPC_DCR_NATIVE
|
select PPC_DCR_NATIVE
|
||||||
|
|
||||||
config 8xx
|
|
||||||
bool "Freescale 8xx"
|
|
||||||
|
|
||||||
config E200
|
config E200
|
||||||
bool "Freescale e200"
|
bool "Freescale e200"
|
||||||
|
@ -210,6 +213,10 @@ config POWER4
|
||||||
config 6xx
|
config 6xx
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
# this is temp to handle compat with arch=ppc
|
||||||
|
config 8xx
|
||||||
|
bool
|
||||||
|
|
||||||
# this is temp to handle compat with arch=ppc
|
# this is temp to handle compat with arch=ppc
|
||||||
config 83xx
|
config 83xx
|
||||||
bool
|
bool
|
||||||
|
|
|
@ -16,6 +16,7 @@ obj-$(CONFIG_PPC64) += checksum_64.o copypage_64.o copyuser_64.o \
|
||||||
strcase.o
|
strcase.o
|
||||||
obj-$(CONFIG_QUICC_ENGINE) += rheap.o
|
obj-$(CONFIG_QUICC_ENGINE) += rheap.o
|
||||||
obj-$(CONFIG_XMON) += sstep.o
|
obj-$(CONFIG_XMON) += sstep.o
|
||||||
|
obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o
|
||||||
|
|
||||||
ifeq ($(CONFIG_PPC64),y)
|
ifeq ($(CONFIG_PPC64),y)
|
||||||
obj-$(CONFIG_SMP) += locks.o
|
obj-$(CONFIG_SMP) += locks.o
|
||||||
|
@ -24,5 +25,6 @@ endif
|
||||||
|
|
||||||
# Temporary hack until we have migrated to asm-powerpc
|
# Temporary hack until we have migrated to asm-powerpc
|
||||||
ifeq ($(CONFIG_PPC_MERGE),y)
|
ifeq ($(CONFIG_PPC_MERGE),y)
|
||||||
|
obj-$(CONFIG_8xx) += rheap.o
|
||||||
obj-$(CONFIG_CPM2) += rheap.o
|
obj-$(CONFIG_CPM2) += rheap.o
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -22,37 +22,13 @@
|
||||||
* published by the Free Software Foundation.
|
* published by the Free Software Foundation.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/module.h>
|
|
||||||
#include <linux/signal.h>
|
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/ptrace.h>
|
|
||||||
#include <linux/mman.h>
|
|
||||||
#include <linux/mm.h>
|
|
||||||
#include <linux/swap.h>
|
|
||||||
#include <linux/stddef.h>
|
|
||||||
#include <linux/vmalloc.h>
|
|
||||||
#include <linux/init.h>
|
|
||||||
#include <linux/delay.h>
|
|
||||||
#include <linux/bootmem.h>
|
|
||||||
#include <linux/highmem.h>
|
#include <linux/highmem.h>
|
||||||
#include <linux/dma-mapping.h>
|
#include <linux/dma-mapping.h>
|
||||||
#include <linux/hardirq.h>
|
|
||||||
|
|
||||||
#include <asm/pgalloc.h>
|
|
||||||
#include <asm/prom.h>
|
|
||||||
#include <asm/io.h>
|
|
||||||
#include <asm/mmu_context.h>
|
|
||||||
#include <asm/pgtable.h>
|
|
||||||
#include <asm/mmu.h>
|
|
||||||
#include <asm/uaccess.h>
|
|
||||||
#include <asm/smp.h>
|
|
||||||
#include <asm/machdep.h>
|
|
||||||
|
|
||||||
int map_page(unsigned long va, phys_addr_t pa, int flags);
|
|
||||||
|
|
||||||
#include <asm/tlbflush.h>
|
#include <asm/tlbflush.h>
|
||||||
|
|
|
@ -12,7 +12,6 @@ obj-y := entry.o traps.o time.o misc.o \
|
||||||
setup.o \
|
setup.o \
|
||||||
ppc_htab.o
|
ppc_htab.o
|
||||||
obj-$(CONFIG_MODULES) += ppc_ksyms.o
|
obj-$(CONFIG_MODULES) += ppc_ksyms.o
|
||||||
obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o
|
|
||||||
obj-$(CONFIG_PCI) += pci.o
|
obj-$(CONFIG_PCI) += pci.o
|
||||||
obj-$(CONFIG_RAPIDIO) += rio.o
|
obj-$(CONFIG_RAPIDIO) += rio.o
|
||||||
obj-$(CONFIG_KGDB) += ppc-stub.o
|
obj-$(CONFIG_KGDB) += ppc-stub.o
|
||||||
|
|
Loading…
Reference in a new issue