Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / platforms / 85xx / Kconfig

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index de2eb9320993defb0af098ac9ffcc4ae93a96860..4d4634958cfb09107a37829dc19ee65b427a6bab 100644 (file)
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -218,83 +218,16 @@ config GE_IMP3A
          This board is a 3U CompactPCI Single Board Computer with a Freescale
          P2020 processor.
 
-config P2041_RDB
-       bool "Freescale P2041 RDB"
-       select DEFAULT_UIMAGE
-       select PPC_E500MC
-       select PHYS_64BIT
-       select SWIOTLB
-       select ARCH_REQUIRE_GPIOLIB
-       select GPIO_MPC8XXX
-       select HAS_RAPIDIO
-       select PPC_EPAPR_HV_PIC
-       help
-         This option enables support for the P2041 RDB board
-
-config P3041_DS
-       bool "Freescale P3041 DS"
-       select DEFAULT_UIMAGE
-       select PPC_E500MC
-       select PHYS_64BIT
-       select SWIOTLB
-       select ARCH_REQUIRE_GPIOLIB
-       select GPIO_MPC8XXX
-       select HAS_RAPIDIO
-       select PPC_EPAPR_HV_PIC
-       help
-         This option enables support for the P3041 DS board
-
-config P4080_DS
-       bool "Freescale P4080 DS"
-       select DEFAULT_UIMAGE
-       select PPC_E500MC
-       select PHYS_64BIT
-       select SWIOTLB
-       select ARCH_REQUIRE_GPIOLIB
-       select GPIO_MPC8XXX
-       select HAS_RAPIDIO
-       select PPC_EPAPR_HV_PIC
-       help
-         This option enables support for the P4080 DS board
-
 config SGY_CTS1000
        tristate "Servergy CTS-1000 support"
        select GPIOLIB
        select OF_GPIO
-       depends on P4080_DS
+       depends on CORENET_GENERIC
        help
          Enable this to support functionality in Servergy's CTS-1000 systems.
 
 endif # PPC32
 
-config P5020_DS
-       bool "Freescale P5020 DS"
-       select DEFAULT_UIMAGE
-       select E500
-       select PPC_E500MC
-       select PHYS_64BIT
-       select SWIOTLB
-       select ARCH_REQUIRE_GPIOLIB
-       select GPIO_MPC8XXX
-       select HAS_RAPIDIO
-       select PPC_EPAPR_HV_PIC
-       help
-         This option enables support for the P5020 DS board
-
-config P5040_DS
-       bool "Freescale P5040 DS"
-       select DEFAULT_UIMAGE
-       select E500
-       select PPC_E500MC
-       select PHYS_64BIT
-       select SWIOTLB
-       select ARCH_REQUIRE_GPIOLIB
-       select GPIO_MPC8XXX
-       select HAS_RAPIDIO
-       select PPC_EPAPR_HV_PIC
-       help
-         This option enables support for the P5040 DS board
-
 config PPC_QEMU_E500
        bool "QEMU generic e500 platform"
        select DEFAULT_UIMAGE
@@ -310,10 +243,8 @@ config PPC_QEMU_E500
          unset based on the emulated CPU (or actual host CPU in the case
          of KVM).
 
-if PPC64
-
-config T4240_QDS
-       bool "Freescale T4240 QDS"
+config CORENET_GENERIC
+       bool "Freescale CoreNet Generic"
        select DEFAULT_UIMAGE
        select E500
        select PPC_E500MC
@@ -324,26 +255,14 @@ config T4240_QDS
        select HAS_RAPIDIO
        select PPC_EPAPR_HV_PIC
        help
-         This option enables support for the T4240 QDS board
-
-config B4_QDS
-       bool "Freescale B4 QDS"
-       select DEFAULT_UIMAGE
-       select E500
-       select PPC_E500MC
-       select PHYS_64BIT
-       select SWIOTLB
-       select GPIOLIB
-       select ARCH_REQUIRE_GPIOLIB
-       select HAS_RAPIDIO
-       select PPC_EPAPR_HV_PIC
-       help
-         This option enables support for the B4 QDS board
-         The B4 application development system B4 QDS is a complete
-         debugging environment intended for engineers developing
-         applications for the B4.
+         This option enables support for the FSL CoreNet based boards.
+         For 32bit kernel, the following boards are supported:
+           P2041 RDB, P3041 DS and P4080 DS
+         For 64bit kernel, the following boards are supported:
+           T4240 QDS and B4 QDS
+         The following boards are supported for both 32bit and 64bit kernel:
+           P5020 DS and P5040 DS
 
-endif
 endif # FSL_SOC_BOOKE
 
 config TQM85xx