Commit 9e096757 authored by Kevin Hao's avatar Kevin Hao Committed by Scott Wood
Browse files

powerpc/85xx: use one kernel option for all the CoreNet_Generic boards 



Currently all these boards use the same machine struct and also select
the same kernel options, so it seems a bit of redundant to keep one
separate kernel option for each board. Also update the defconfigs
according to this change.

Signed-off-by: default avatarKevin Hao <haokexin@gmail.com>
Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
parent befe7c12

arch/powerpc/configs/corenet32_smp_defconfig

+1 −5
Original line number Diff line number Diff line
@@ -23,11 +23,7 @@ CONFIG_MODVERSIONS=y 
# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

CONFIG_MAC_PARTITION=y

CONFIG_P2041_RDB=y

CONFIG_P3041_DS=y

CONFIG_P4080_DS=y

CONFIG_P5020_DS=y

CONFIG_P5040_DS=y

CONFIG_CORENET_GENERIC=y

CONFIG_HIGHMEM=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=m

arch/powerpc/configs/corenet64_smp_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -21,10 +21,7 @@ CONFIG_MODVERSIONS=y 
# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

CONFIG_MAC_PARTITION=y

CONFIG_B4_QDS=y

CONFIG_P5020_DS=y

CONFIG_P5040_DS=y

CONFIG_T4240_QDS=y

CONFIG_CORENET_GENERIC=y

# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set

CONFIG_BINFMT_MISC=m

CONFIG_MATH_EMULATION=y

arch/powerpc/configs/ppc64e_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y 
CONFIG_PARTITION_ADVANCED=y

CONFIG_MAC_PARTITION=y

CONFIG_EFI_PARTITION=y

CONFIG_P5020_DS=y

CONFIG_CORENET_GENERIC=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_GOV_POWERSAVE=y

CONFIG_CPU_FREQ_GOV_USERSPACE=y

arch/powerpc/platforms/85xx/Kconfig

+10 −101
Original line number Diff line number Diff line
@@ -218,88 +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

	select CORENET_GENERIC

	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

	select CORENET_GENERIC

	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

	select CORENET_GENERIC

	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

	select CORENET_GENERIC

	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

	select CORENET_GENERIC

	help

	  This option enables support for the P5040 DS board



config PPC_QEMU_E500

	bool "QEMU generic e500 platform"

	select DEFAULT_UIMAGE
@@ -315,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
@@ -328,33 +254,16 @@ config T4240_QDS 
	select GPIO_MPC8XXX

	select HAS_RAPIDIO

	select PPC_EPAPR_HV_PIC

	select CORENET_GENERIC

	help

	  This option enables support for the T4240 QDS board

	  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



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

	select CORENET_GENERIC

	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.



endif

endif # FSL_SOC_BOOKE



config TQM85xx

	bool
 


config CORENET_GENERIC

	bool