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

Commit 5753c082 authored by Kumar Gala's avatar Kumar Gala
Browse files

powerpc/85xx: Kconfig cleanup 



Introduce new FSL_SOC_BOOKE Kconfig to handle both 85xx and QorIQ
based chips.

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

arch/powerpc/platforms/85xx/Kconfig

+6 −5
Original line number Original line Diff line number Diff line 
menuconfig MPC85xx

menuconfig FSL_SOC_BOOKE

	bool "Machine Type"

	bool "Freescale Book-E Machine Type"

	depends on PPC_85xx

	depends on PPC_85xx || PPC_BOOK3E

	select FSL_SOC

	select PPC_UDBG_16550

	select PPC_UDBG_16550

	select MPIC

	select MPIC

	select PPC_PCI_CHOICE

	select PPC_PCI_CHOICE
@@ -8,7 +9,7 @@ menuconfig MPC85xx 
	select SERIAL_8250_SHARE_IRQ if SERIAL_8250

	select SERIAL_8250_SHARE_IRQ if SERIAL_8250

	default y

	default y





if MPC85xx

if FSL_SOC_BOOKE





config MPC8540_ADS

config MPC8540_ADS

	bool "Freescale MPC8540 ADS"

	bool "Freescale MPC8540 ADS"
@@ -144,7 +145,7 @@ config SBC8560 
	help

	help

	  This option enables support for the Wind River SBC8560 board

	  This option enables support for the Wind River SBC8560 board





endif # MPC85xx

endif # FSL_SOC_BOOKE





config TQM85xx

config TQM85xx

	bool
 
	bool

arch/powerpc/platforms/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -260,7 +260,7 @@ config QE_GPIO 




config CPM2

config CPM2

	bool "Enable support for the CPM2 (Communications Processor Module)"

	bool "Enable support for the CPM2 (Communications Processor Module)"

	depends on MPC85xx || 8260

	depends on (FSL_SOC_BOOKE && PPC32) || 8260

	select CPM

	select CPM

	select PPC_LIB_RHEAP

	select PPC_LIB_RHEAP

	select PPC_PCI_CHOICE

	select PPC_PCI_CHOICE
@@ -305,7 +305,7 @@ source "arch/powerpc/sysdev/bestcomm/Kconfig" 




config MPC8xxx_GPIO

config MPC8xxx_GPIO

	bool "MPC8xxx GPIO support"

	bool "MPC8xxx GPIO support"

	depends on PPC_MPC831x || PPC_MPC834x || PPC_MPC837x || PPC_85xx || PPC_86xx

	depends on PPC_MPC831x || PPC_MPC834x || PPC_MPC837x || FSL_SOC_BOOKE || PPC_86xx

	select GENERIC_GPIO

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	help

	help

arch/powerpc/platforms/Kconfig.cputype

+8 −9
Original line number Original line Diff line number Diff line
@@ -28,8 +28,6 @@ config PPC_BOOK3S_32 
config PPC_85xx

config PPC_85xx

	bool "Freescale 85xx"

	bool "Freescale 85xx"

	select E500

	select E500

	select FSL_SOC

	select MPC85xx





config PPC_8xx

config PPC_8xx

	bool "Freescale 8xx"

	bool "Freescale 8xx"
@@ -138,6 +136,14 @@ config PPC_FPU 
	bool

	bool

	default y if PPC64

	default y if PPC64





config FSL_EMB_PERFMON

	bool "Freescale Embedded Perfmon"

	depends on E500 || PPC_83xx

	help

	  This is the Performance Monitor support found on the e500 core

	  and some e300 cores (c3 and c4).  Select this only if your

	  core supports the Embedded Performance Monitor APU



config 4xx

config 4xx

	bool

	bool

	depends on 40x || 44x

	depends on 40x || 44x
@@ -153,13 +159,6 @@ config FSL_BOOKE 
	depends on E200 || E500

	depends on E200 || E500

	default y

	default y





config FSL_EMB_PERFMON

	bool "Freescale Embedded Perfmon"

	depends on E500 || PPC_83xx

	help

	  This is the Performance Monitor support found on the e500 core

	  and some e300 cores (c3 and c4).  Select this only if your

	  core supports the Embedded Performance Monitor APU





config PTE_64BIT

config PTE_64BIT

	bool

	bool

arch/powerpc/platforms/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ obj-$(CONFIG_PPC_MPC52xx) += 52xx/ 
obj-$(CONFIG_PPC_8xx)		+= 8xx/

obj-$(CONFIG_PPC_8xx)		+= 8xx/

obj-$(CONFIG_PPC_82xx)		+= 82xx/

obj-$(CONFIG_PPC_82xx)		+= 82xx/

obj-$(CONFIG_PPC_83xx)		+= 83xx/

obj-$(CONFIG_PPC_83xx)		+= 83xx/

obj-$(CONFIG_PPC_85xx)		+= 85xx/

obj-$(CONFIG_FSL_SOC_BOOKE)	+= 85xx/

obj-$(CONFIG_PPC_86xx)		+= 86xx/

obj-$(CONFIG_PPC_86xx)		+= 86xx/

obj-$(CONFIG_PPC_PSERIES)	+= pseries/

obj-$(CONFIG_PPC_PSERIES)	+= pseries/

obj-$(CONFIG_PPC_ISERIES)	+= iseries/

obj-$(CONFIG_PPC_ISERIES)	+= iseries/

arch/powerpc/sysdev/fsl_pci.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -56,7 +56,7 @@ static int __init fsl_pcie_check_link(struct pci_controller *hose) 
	return 0;

	return 0;

}

}





#if defined(CONFIG_PPC_85xx) || defined(CONFIG_PPC_86xx)

#if defined(CONFIG_FSL_SOC_BOOKE) || defined(CONFIG_PPC_86xx)

static int __init setup_one_atmu(struct ccsr_pci __iomem *pci,

static int __init setup_one_atmu(struct ccsr_pci __iomem *pci,

	unsigned int index, const struct resource *res,

	unsigned int index, const struct resource *res,

	resource_size_t offset)

	resource_size_t offset)
@@ -394,7 +394,7 @@ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641D, quirk_fsl_pcie_header); 
DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header);

DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header);

DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P2020E, quirk_fsl_pcie_header);

DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P2020E, quirk_fsl_pcie_header);

DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P2020, quirk_fsl_pcie_header);

DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P2020, quirk_fsl_pcie_header);

#endif /* CONFIG_PPC_85xx || CONFIG_PPC_86xx */

#endif /* CONFIG_FSL_SOC_BOOKE || CONFIG_PPC_86xx */





#if defined(CONFIG_PPC_83xx) || defined(CONFIG_PPC_MPC512x)

#if defined(CONFIG_PPC_83xx) || defined(CONFIG_PPC_MPC512x)

DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8314E, quirk_fsl_pcie_header);

DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8314E, quirk_fsl_pcie_header);