Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c42f3ad7 authored by Kumar Gala's avatar Kumar Gala
Browse files

[PPC] Remove 85xx from arch/ppc 



85xx exists in arch/powerpc as well as cuImage support to boot from
a u-boot that doesn't support device trees.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 3155f7f2

arch/ppc/Kconfig

+9 −42
Original line number Diff line number Diff line
@@ -104,12 +104,6 @@ config 8xx 
	bool "8xx"

	select PPC_LIB_RHEAP



config E200

	bool "e200"



config E500

	bool "e500"



endchoice



config PPC_FPU
@@ -124,25 +118,14 @@ config PPC_DCR 
	depends on PPC_DCR_NATIVE

	default y



config BOOKE

	bool

	depends on E200 || E500

	default y



config FSL_BOOKE

	bool

	depends on E200 || E500

	default y



config PTE_64BIT

	bool

	depends on 44x || E500

	depends on 44x

	default y if 44x

	default y if E500 && PHYS_64BIT



config PHYS_64BIT

	bool 'Large physical address support' if E500

	depends on 44x || E500

	bool

	depends on 44x

	default y if 44x

	---help---

	  This option enables kernel support for larger than 32-bit physical
@@ -167,21 +150,6 @@ config ALTIVEC 


	  If in doubt, say Y here.



config SPE

	bool "SPE Support"

	depends on E200 || E500

	---help---

	  This option enables kernel support for the Signal Processing

	  Extensions (SPE) to the PowerPC processor. The kernel currently

	  supports saving and restoring SPE registers, and turning on the

	  'spe enable' bit so user processes can execute SPE instructions.



	  This option is only useful if you have a processor that supports

	  SPE (e500, otherwise known as 85xx series), but does not have any

	  effect on a non-spe cpu (it does, however add code to the kernel).



	  If in doubt, say Y here.



config TAU

	bool "Thermal Management Support"

	depends on 6xx && !8260
@@ -228,7 +196,7 @@ config TAU_AVERAGE 


config MATH_EMULATION

	bool "Math emulation"

	depends on 4xx || 8xx || E200 || E500

	depends on 4xx || 8xx

	---help---

	  Some PowerPC chips designed for embedded applications do not have

	  a floating-point unit and therefore do not implement the
@@ -279,7 +247,6 @@ config PPC601_SYNC_FIX 
	  If in doubt, say Y here.



source arch/ppc/platforms/4xx/Kconfig

source arch/ppc/platforms/85xx/Kconfig



config PPC_STD_MMU

	bool
@@ -288,7 +255,7 @@ config PPC_STD_MMU 


config NOT_COHERENT_CACHE

	bool

	depends on 4xx || 8xx || E200

	depends on 4xx || 8xx

	default y



endmenu
@@ -1045,13 +1012,13 @@ config GENERIC_ISA_DMA 


config PPC_I8259

	bool

	default y if 85xx || PPC_PREP

	default y if PPC_PREP

	default n



config PPC_INDIRECT_PCI

	bool

	depends on PCI

	default y if 40x || 44x || 85xx || PPC_PREP

	default y if 40x || 44x || PPC_PREP

	default n



config EISA
@@ -1068,8 +1035,8 @@ config MCA 
	bool



config PCI

	bool "PCI support" if 40x || CPM2 || 85xx || PPC_MPC52xx

	default y if !40x && !CPM2 && !8xx && !85xx

	bool "PCI support" if 40x || CPM2 || PPC_MPC52xx

	default y if !40x && !CPM2 && !8xx

	default PCI_QSPAN if !4xx && !CPM2 && 8xx

	help

	  Find out whether your system includes a PCI bus. PCI is the name of

arch/ppc/Makefile

+0 −8
Original line number Diff line number Diff line
@@ -36,14 +36,8 @@ LINUXINCLUDE += -Iarch/$(ARCH)/include 


CHECKFLAGS	+= -D__powerpc__



ifndef CONFIG_FSL_BOOKE

KBUILD_CFLAGS	+= -mstring

endif



cpu-as-$(CONFIG_4xx)		+= -Wa,-m405

cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec

cpu-as-$(CONFIG_E500)		+= -Wa,-me500

cpu-as-$(CONFIG_E200)		+= -Wa,-me200



KBUILD_AFLAGS += $(cpu-as-y)

KBUILD_CFLAGS += $(cpu-as-y)
@@ -55,7 +49,6 @@ head-y := arch/ppc/kernel/head.o 
head-$(CONFIG_8xx)		:= arch/ppc/kernel/head_8xx.o

head-$(CONFIG_4xx)		:= arch/ppc/kernel/head_4xx.o

head-$(CONFIG_44x)		:= arch/ppc/kernel/head_44x.o

head-$(CONFIG_FSL_BOOKE)	:= arch/ppc/kernel/head_fsl_booke.o



head-$(CONFIG_PPC_FPU)		+= arch/powerpc/kernel/fpu.o
@@ -65,7 +58,6 @@ core-y += arch/ppc/kernel/ arch/powerpc/kernel/ \ 
				   arch/ppc/syslib/ arch/powerpc/sysdev/ \

				   arch/powerpc/lib/

core-$(CONFIG_4xx)		+= arch/ppc/platforms/4xx/

core-$(CONFIG_85xx)		+= arch/ppc/platforms/85xx/

core-$(CONFIG_MATH_EMULATION)	+= arch/powerpc/math-emu/

core-$(CONFIG_XMON)		+= arch/ppc/xmon/

drivers-$(CONFIG_8xx)		+= arch/ppc/8xx_io/

arch/ppc/configs/TQM8540_defconfig

deleted100644 → 0
+0 −973

File deleted.

Preview size limit exceeded, changes collapsed.

arch/ppc/configs/TQM8541_defconfig

deleted100644 → 0
+0 −986

File deleted.

Preview size limit exceeded, changes collapsed.

arch/ppc/configs/TQM8555_defconfig

deleted100644 → 0
+0 −983

File deleted.

Preview size limit exceeded, changes collapsed.