Reorganisation and cleanup of the powerpc configs

6 files changed, 298 insertions, 537 deletions

diff --git a/Makefile.config b/Makefile.config
index 63549f64..148e21fe 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -12,9 +12,9 @@ CONFIGFILES	= \
 	$(CFG)-armv7hl.config $(CFG)-armv7hl-lpae.config \
 	$(CFG)-aarch64.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64p7.config $(CFG)-ppc64-debug.config \
-	$(CFG)-ppc64le.config
+	$(CFG)-ppc64le.config $(CFG)-ppc64le-debug.config
 
-PLATFORMS	= x86 x86_64 powerpc powerpc64 s390x arm arm64
+PLATFORMS	= x86 x86_64 powerpc s390x arm arm64
 TEMPFILES	= $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
 
 configs: $(CONFIGFILES)
@@ -74,18 +74,12 @@ temp-x86_64-generic: temp-x86-64 temp-generic
 temp-x86_64-debug-generic: temp-x86-64 temp-debug-generic
 	perl merge.pl $^  > $@
 
-temp-powerpc-generic: config-powerpc-generic temp-generic
+temp-powerpc64-generic: config-powerpc64-generic temp-generic
 	perl merge.pl $^  > $@
 
-temp-powerpc-debug-generic: config-powerpc-generic temp-debug-generic
+temp-powerpc64-debug-generic: config-powerpc64-generic temp-debug-generic
 	perl merge.pl $^  > $@
 
-temp-powerpc64-generic: config-powerpc64 temp-powerpc-generic
-	perl merge.pl $^ > $@
-
-temp-powerpc64le-generic: config-powerpc64le temp-powerpc64-generic
-	perl merge.pl $^ > $@
-
 temp-s390-generic: config-s390x temp-generic
 	perl merge.pl $^ > $@
 
@@ -107,16 +101,19 @@ $(CFG)-x86_64.config: /dev/null temp-x86_64-generic
 $(CFG)-x86_64-debug.config: /dev/null temp-x86_64-debug-generic
 	perl merge.pl $^ x86_64 > $@
 
-$(CFG)-ppc64.config: /dev/null temp-powerpc64-generic
+$(CFG)-ppc64.config: config-powerpc64 temp-powerpc64-generic
 	perl merge.pl $^ powerpc > $@
 
-$(CFG)-ppc64-debug.config: temp-powerpc64-generic temp-powerpc-debug-generic
+$(CFG)-ppc64-debug.config: config-powerpc64 temp-powerpc64-debug-generic
 	perl merge.pl $^ powerpc > $@
 
 $(CFG)-ppc64p7.config: config-powerpc64p7 temp-powerpc64-generic
 	perl merge.pl $^ powerpc > $@
 
-$(CFG)-ppc64le.config: /dev/null temp-powerpc64le-generic
+$(CFG)-ppc64le.config: config-powerpc64le temp-powerpc64-generic
+	perl merge.pl $^ powerpc > $@
+
+$(CFG)-ppc64le-debug.config: config-powerpc64le temp-powerpc64-debug-generic
 	perl merge.pl $^ powerpc > $@
 
 $(CFG)-s390x.config: config-s390x temp-s390-generic
diff --git a/config-powerpc64 b/config-powerpc64
index 65b7b694..6a59e66a 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -1,191 +1,108 @@
-CONFIG_WINDFARM_PM81=y
-CONFIG_WINDFARM_PM91=y
-CONFIG_WINDFARM_PM121=y
-CONFIG_WINDFARM_PM72=y
-CONFIG_WINDFARM_RM31=y
+# CONFIG_CPU_LITTLE_ENDIAN is not set
 
-CONFIG_PPC_PMAC64=y
 CONFIG_PPC_MAPLE=y
-# CONFIG_PPC_CELL is not set
-# CONFIG_PPC_IBM_CELL_BLADE is not set
-CONFIG_PPC_PSERIES=y
 CONFIG_PPC_PMAC=y
-CONFIG_PPC_POWERNV=y
-CONFIG_OPAL_PRD=m
-CONFIG_MTD_POWERNV_FLASH=m
-CONFIG_SENSORS_IBMPOWERNV=y
-CONFIG_HW_RANDOM_POWERNV=m
-CONFIG_POWERNV_CPUFREQ=m
-CONFIG_IPMI_POWERNV=m
-CONFIG_SCOM_DEBUGFS=y
-# CONFIG_PPC_PASEMI is not set
-# CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
-# CONFIG_PPC_PS3 is not set
-# CONFIG_PPC_CELL_QPACE is not set
-CONFIG_PMAC_RACKMETER=m
-CONFIG_IBMEBUS=y
-CONFIG_RTAS_FLASH=y
-# CONFIG_UDBG_RTAS_CONSOLE is not set
-CONFIG_PPC_SPLPAR=y
-CONFIG_SCANLOG=y
-CONFIG_LPARCFG=y
-CONFIG_SERIAL_ICOM=m
-CONFIG_HVCS=m
-CONFIG_HVC_CONSOLE=y
-# CONFIG_HVC_OLD_HVSI is not set
-CONFIG_HOTPLUG_PCI=y
-CONFIG_IBMVETH=m
-CONFIG_SCSI_IBMVSCSI=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_HOTPLUG_PCI_RPA=m
-CONFIG_HOTPLUG_PCI_RPA_DLPAR=y
-CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_IDE=y
-CONFIG_PMAC_SMU=y
-CONFIG_CPU_FREQ_PMAC64=y
-CONFIG_CPU_FREQ_MAPLE=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPR_DUMP=y
-CONFIG_HVC_RTAS=y
-CONFIG_HVC_OPAL=y
+CONFIG_PPC_PMAC64=y
 
-# iSeries device drivers
 #
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+# CONFIG_BLK_DEV_IDE_SATA is not set
+# CONFIG_BLK_DEV_IDECS is not set
+CONFIG_BLK_DEV_IDECD=m
+# CONFIG_BLK_DEV_IDETAPE is not set
+CONFIG_BLK_DEV_IDEDMA=y
+CONFIG_BLK_DEV_GENERIC=y
+CONFIG_BLK_DEV_DELKIN=m
+CONFIG_IDE_TASK_IOCTL=y
+CONFIG_IDE_PROC_FS=y
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 
-CONFIG_PASEMI_MAC=m
-CONFIG_SERIAL_OF_PLATFORM=m
-
-CONFIG_SERIAL_TXX9=y
-CONFIG_SERIAL_TXX9_NR_UARTS=6
-CONFIG_SERIAL_TXX9_CONSOLE=y
-
-CONFIG_HVC_BEAT=y
-
-CONFIG_PPC_PMI=m
-
-CONFIG_PATA_SCC=m
-
-CONFIG_APM_EMULATION=m
-
-CONFIG_PPC64=y
-CONFIG_NR_CPUS=1024
-# CONFIG_FB_PLATINUM is not set
-# CONFIG_FB_VALKYRIE is not set
-# CONFIG_FB_CT65550 is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-
-
-CONFIG_RTAS_PROC=y
-CONFIG_NUMA=y
-CONFIG_NUMA_BALANCING=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_PPC_64K_PAGES=y
-CONFIG_PPC_SUBPAGE_PROT=y
-CONFIG_SCHED_SMT=y
-
-CONFIG_HZ=100
-CONFIG_HZ_100=y
-# CONFIG_HZ_1000 is not set
-
-CONFIG_MEMORY_HOTREMOVE=y
-
-CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y
-
-CONFIG_CGROUP_HUGETLB=y
-
-# CONFIG_MV643XX_ETH is not set
-CONFIG_IRQSTACKS=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-# CONFIG_INPUT_PCSPKR is not set
-
-CONFIG_EHEA=m
-CONFIG_INFINIBAND_EHCA=m
-
-# CONFIG_HCALL_STATS is not set
-
-CONFIG_XMON_DISASSEMBLY=y
-
-
-# CONFIG_TUNE_CELL is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-
-
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_IDE_GENERIC is not set
+# CONFIG_BLK_DEV_IDEPNP is not set
+# CONFIG_BLK_DEV_IDEPCI is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SL82C105 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_IDE_PMAC is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_OFFBOARD is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+CONFIG_IDE_GD=y
+CONFIG_IDE_GD_ATA=y
+CONFIG_IDE_GD_ATAPI=y
+
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_OF_PLATFORM=m
+
+# Power970 / G5
 CONFIG_EDAC_CPC925=m
-CONFIG_FRAME_WARN=2048
-
-CONFIG_FORCE_MAX_ZONEORDER=9
-
-CONFIG_VSX=y
-
-CONFIG_SCSI_IBMVFC=m
-# CONFIG_SCSI_IBMVFC_TRACE is not set
-CONFIG_IBM_BSR=m
 
-CONFIG_CRASH_DUMP=y
-CONFIG_FA_DUMP=y
-CONFIG_RELOCATABLE=y
-
-CONFIG_RCU_FANOUT=64
-
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_AREAS=7
-CONFIG_KVM_BOOK3S_64=m
-CONFIG_KVM_BOOK3S_64_HV=m
-CONFIG_KVM_BOOK3S_64_PR=m
-# CONFIG_KVM_BOOK3S_HV_EXIT_TIMING is not set
-# CONFIG_KVM_EXIT_TIMING is not set
-CONFIG_KVM_XICS=y
-
-#-- bz#607175
-#-- active memory sharing
-CONFIG_PPC_SMLPAR=y
-CONFIG_CMM=y
-CONFIG_HV_PERF_CTRS=y
-#-- DLPAR memory remove
-CONFIG_SPARSEMEM_VMEMMAP=y
-
-# CONFIG_COMPACTION is not set
-
-CONFIG_PSERIES_ENERGY=m
-
-CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_GOV_LADDER is not set
-CONFIG_PSERIES_CPUIDLE=y
-CONFIG_POWERNV_CPUIDLE=y
-
-CONFIG_PPC_ICSWX=y
-CONFIG_IO_EVENT_IRQ=y
+# Maple
+CONFIG_CPU_FREQ_MAPLE=y
+CONFIG_EDAC_AMD8111=m
+CONFIG_EDAC_AMD8131=m
 CONFIG_HW_RANDOM_AMD=m
 
-CONFIG_UIO_PDRV=m
-
-CONFIG_I2C_OPAL=m
-CONFIG_RTC_DRV_OPAL=m
-
-CONFIG_HW_RANDOM_PSERIES=m
-CONFIG_CRYPTO_DEV_NX=y
-CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS_CRYPTO=m
-CONFIG_CRYPTO_DEV_VMX=y
-CONFIG_CRYPTO_DEV_VMX_ENCRYPT=y
-
-CONFIG_CXL=m
-
-# CONFIG_PPC_ICSWX_PID is not set
-# CONFIG_PPC_ICSWX_USE_SIGILL is not set
-# CONFIG_PCIEPORTBUS is not set
-# CONFIG_SND_HDA_INTEL is not set
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_PPC_TRANSACTIONAL_MEM=y
-
-# CONFIG_CARL9170 is not set
+# Apple G5
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_ADB=y
+CONFIG_ADB_PMU=y
+CONFIG_ADB_PMU_LED=y
+CONFIG_ADB_PMU_LED_IDE=y
+CONFIG_I2C_POWERMAC=y
+CONFIG_PMAC_RACKMETER=m
+CONFIG_PMAC_APM_EMU=m
+CONFIG_APM_EMULATION=m
+CONFIG_PMAC_SMU=y
+CONFIG_APPLE_AIRPORT=m
+CONFIG_SND_POWERMAC=m
+CONFIG_SND_POWERMAC_AUTO_DRC=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_PATA_MACIO=y
+CONFIG_WINDFARM=y
+CONFIG_WINDFARM_RM31=y
+CONFIG_WINDFARM_PM72=y
+CONFIG_WINDFARM_PM81=y
+CONFIG_WINDFARM_PM91=y
+CONFIG_WINDFARM_PM112=y
+CONFIG_WINDFARM_PM121=y
+CONFIG_CPU_FREQ_PMAC64=y
+CONFIG_SERIAL_PMACZILOG=m
+# CONFIG_SERIAL_PMACZILOG_TTYS is not set
+CONFIG_AGP_UNINORTH=y
+# CONFIG_PMAC_BACKLIGHT_LEGACY is not set
+
+CONFIG_SND_AOA=m
+CONFIG_SND_AOA_SOUNDBUS=m
+CONFIG_SND_AOA_FABRIC_LAYOUT=m
+CONFIG_SND_AOA_ONYX=m
+CONFIG_SND_AOA_TAS=m
+CONFIG_SND_AOA_TOONIE=m
+CONFIG_SND_AOA_SOUNDBUS_I2S=m
diff --git a/config-powerpc-generic b/config-powerpc64-generic
index 5eb3f039..327b9617 100644
--- a/config-powerpc-generic
+++ b/config-powerpc64-generic
@@ -1,14 +1,154 @@
-# Most PowerPC kernels we build are SMP
-CONFIG_IRQ_ALL_CPUS=y
 CONFIG_PPC=y
-CONFIG_WATCHDOG_RTAS=m
+CONFIG_PPC64=y
+
+CONFIG_PPC_POWERNV=y
+CONFIG_PPC_PSERIES=y
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_QPACE is not set
+# CONFIG_PPC_IBM_CELL_BLADE is not set
+# CONFIG_PPC_MAPLE is not set
+# CONFIG_PPC_PASEMI is not set
+# CONFIG_PPC_PMAC is not set
+# CONFIG_PPC_PMAC64 is not set
+# CONFIG_PPC_PS3 is not set
+
+CONFIG_EXTRA_TARGETS=""
+
+CONFIG_NR_CPUS=1024
+
+CONFIG_NR_IRQS=512
+CONFIG_SPARSE_IRQ=y
+CONFIG_IRQ_ALL_CPUS=y
+CONFIG_IRQSTACKS=y
+
+CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_DEBUGGER=y
+CONFIG_NVRAM=y
 CONFIG_GENERIC_NVRAM=y
+CONFIG_MMIO_NVRAM=y
+CONFIG_PPC_DENORMALISATION=y
+# CONFIG_PPC_EARLY_DEBUG is not set
+CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
+
+CONFIG_FRAME_WARN=2048
+
+CONFIG_FORCE_MAX_ZONEORDER=9
+
+CONFIG_XMON=y
+# CONFIG_XMON_DEFAULT is not set
+CONFIG_XMON_DISASSEMBLY=y
+
+CONFIG_BOOTX_TEXT=y
+
 CONFIG_ALTIVEC=y
+CONFIG_VSX=y
+
+CONFIG_HZ=100
+CONFIG_HZ_100=y
+# CONFIG_HZ_1000 is not set
+
+CONFIG_NUMA=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_PPC_64K_PAGES=y
+CONFIG_PPC_SUBPAGE_PROT=y
+CONFIG_SCHED_SMT=y
+# CONFIG_TUNE_CELL is not set
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y
+
+CONFIG_CGROUP_HUGETLB=y
+
+CONFIG_RCU_FANOUT=64
+CONFIG_RCU_FANOUT_LEAF=16
+
+CONFIG_CRASH=m
+CONFIG_CRASH_DUMP=y
+CONFIG_FA_DUMP=y
+CONFIG_RELOCATABLE=y
+
+CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_GOV_LADDER is not set
+CONFIG_POWERNV_CPUIDLE=y
+CONFIG_PSERIES_CPUIDLE=y
+
+CONFIG_HW_RANDOM_PSERIES=m
+CONFIG_CRYPTO_DEV_NX=y
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS_CRYPTO=m
+CONFIG_CRYPTO_DEV_VMX=y
+CONFIG_CRYPTO_DEV_VMX_ENCRYPT=y
+
+CONFIG_XZ_DEC_POWERPC=y
 
-CONFIG_TAU=y
-# CONFIG_TAU_INT is not set
-CONFIG_TAU_AVERAGE=y
+# HW Virt
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_AREAS=7
+CONFIG_KVM_GUEST=y
+CONFIG_KVM_BOOK3S_64=m
+CONFIG_KVM_BOOK3S_64_HV=m
+CONFIG_KVM_BOOK3S_64_PR=m
+# CONFIG_KVM_BOOK3S_HV_EXIT_TIMING is not set
+# CONFIG_KVM_EXIT_TIMING is not set
+CONFIG_KVM_XICS=y
+# CONFIG_HCALL_STATS is not set
+CONFIG_PPC_SPLPAR=y
+CONFIG_LPARCFG=y
+#-- active memory sharing
+CONFIG_PPC_SMLPAR=y
+CONFIG_CMM=y
+CONFIG_HV_PERF_CTRS=y
+#-- DLPAR memory remove
+CONFIG_SPARSEMEM_VMEMMAP=y
+
+# Power NV
+CONFIG_HVC_CONSOLE=y
+CONFIG_HVCS=m
+CONFIG_HVC_RTAS=y
+CONFIG_HVC_OPAL=y
+CONFIG_I2C_OPAL=m
+CONFIG_RTC_DRV_OPAL=m
+CONFIG_SENSORS_IBMPOWERNV=y
+CONFIG_HW_RANDOM_POWERNV=m
+CONFIG_POWERNV_CPUFREQ=m
+CONFIG_IPMI_POWERNV=m
+CONFIG_RTAS_FLASH=y
+CONFIG_OPAL_PRD=m
+CONFIG_MTD_POWERNV_FLASH=m
+
+# Power 7 and later
+CONFIG_PPC_TRANSACTIONAL_MEM=y
+CONFIG_BLK_DEV_RSXX=m
+CONFIG_CXL=m
+CONFIG_IBMEBUS=y
+CONFIG_EHEA=m
+CONFIG_INFINIBAND_EHCA=m
+CONFIG_PPC_ICSWX=y
+# CONFIG_PPC_ICSWX_PID is not set
+# CONFIG_PPC_ICSWX_USE_SIGILL is not set
+
+# pSeries
+# CONFIG_SCSI_IBMVFC_TRACE is not set
+CONFIG_IBM_BSR=m
+CONFIG_IBMVETH=m
+CONFIG_PSERIES_ENERGY=m
+# CONFIG_HVC_OLD_HVSI is not set
+CONFIG_SCOM_DEBUGFS=y
+CONFIG_SCANLOG=y
+CONFIG_RTAS_PROC=y
+CONFIG_WATCHDOG_RTAS=m
+# CONFIG_UDBG_RTAS_CONSOLE is not set
+CONFIG_IO_EVENT_IRQ=y
 
 # CONFIG_RTC is not set
 # CONFIG_GEN_RTC is not set
@@ -16,59 +156,52 @@ CONFIG_TAU_AVERAGE=y
 CONFIG_RTC_DRV_GENERIC=y
 # CONFIG_CMDLINE_BOOL is not set
 
-CONFIG_ADB=y
-CONFIG_ADB_PMU=y
-CONFIG_WINDFARM=y
-CONFIG_WINDFARM_PM112=y
-CONFIG_I2C_POWERMAC=y
-CONFIG_APPLE_AIRPORT=m
-CONFIG_SERIAL_PMACZILOG=m
-# CONFIG_SERIAL_PMACZILOG_TTYS is not set
-CONFIG_AGP_UNINORTH=y
+CONFIG_HOTPLUG_PCI=y
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
+CONFIG_HOTPLUG_PCI_RPA=m
+CONFIG_HOTPLUG_PCI_RPA_DLPAR=y
+
+CONFIG_SCSI_IBMVFC=m
+CONFIG_SCSI_IBMVSCSI=m
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_IPR_TRACE=y
+CONFIG_SCSI_IPR_DUMP=y
+
+CONFIG_SERIAL_ICOM=m
+
+# Things we might want to review for newer architectures
+# CONFIG_PCIEPORTBUS is not set
+
 CONFIG_FB_OF=y
 # CONFIG_FB_CONTROL is not set
+# CONFIG_FB_CT65550 is not set
 CONFIG_FB_IBM_GXT4500=y
 CONFIG_FB_MATROX=y
 CONFIG_FB_MATROX_G=y
-# CONFIG_FB_VGA16 is not set
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_RIVA_BACKLIGHT=y
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_MB862XX_PCI_GDC is not set
 # CONFIG_FB_MB862XX_LIME is not set
 # CONFIG_FB_MB862XX_I2C is not set
+# CONFIG_FB_PLATINUM is not set
+# CONFIG_FB_VALKYRIE is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
 
-
-CONFIG_SND_POWERMAC=m
-CONFIG_SND_POWERMAC_AUTO_DRC=y
-CONFIG_SND_AOA=m
-CONFIG_SND_AOA_SOUNDBUS=m
-CONFIG_SND_AOA_FABRIC_LAYOUT=m
-CONFIG_SND_AOA_ONYX=m
-CONFIG_SND_AOA_TAS=m
-CONFIG_SND_AOA_TOONIE=m
-CONFIG_SND_AOA_SOUNDBUS_I2S=m
 # CONFIG_SND_SOC is not set
+# CONFIG_INPUT_PCSPKR is not set
+# CONFIG_SND_HDA_INTEL is not set
 
-CONFIG_XMON=y
-# CONFIG_XMON_DEFAULT is not set
-CONFIG_XMON_DISASSEMBLY=y
-
-CONFIG_BOOTX_TEXT=y
-CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_CAPI_EICON=y
 
-CONFIG_NVRAM=y
-
 # CONFIG_SCSI_AHA1542 is not set
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_SCSI_IPS is not set
 # CONFIG_NI65 is not set
 # CONFIG_LANCE is not set
 # CONFIG_3C515 is not set
-
-CONFIG_MEMORY_HOTPLUG=y
+# CONFIG_BLK_DEV_PLATFORM is not set
 
 # Stuff which wants bus_to_virt() or virt_to_bus()
 # CONFIG_BLK_CPQ_DA is not set
@@ -78,106 +211,30 @@ CONFIG_MEMORY_HOTPLUG=y
 # CONFIG_ATM_AMBASSADOR is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 
-
-# CONFIG_PPC_EARLY_DEBUG is not set
-
-# CONFIG_PMAC_BACKLIGHT_LEGACY is not set
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_GPIO=m
 
-CONFIG_PPC_EFIKA=y
-CONFIG_PPC_MEDIA5200=y
-
-# CONFIG_PPC_LITE5200 is not set
-CONFIG_PPC_BESTCOMM=y
-CONFIG_PMAC_RACKMETER=m
+CONFIG_USB_EHCI_HCD_PPC_OF=y
 CONFIG_USB_OHCI_HCD_PCI=y
 CONFIG_USB_OHCI_HCD_PPC_OF=y
 CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
 CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
 
-CONFIG_SERIAL_UARTLITE=m
-CONFIG_SERIAL_UARTLITE_CONSOLE=y
-
-CONFIG_SENSORS_AMS=m
-CONFIG_SENSORS_AMS_PMU=y
-CONFIG_SENSORS_AMS_I2C=y
-
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IDECS is not set
-CONFIG_BLK_DEV_IDECD=m
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_IDE_TASK_IOCTL=y
-#
-# IDE chipset support/bugfixes
-#
-# CONFIG_IDE_GENERIC is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDEPCI is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_BLK_DEV_IDE_PMAC is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_DELKIN=m
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_TC86C001 is not set
-CONFIG_BLK_DEV_IDEDMA=y
-CONFIG_BLK_DEV_GENERIC=y
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-CONFIG_MTD_PHYSMAP_OF=m
-CONFIG_IDE_PROC_FS=y
-CONFIG_MACINTOSH_DRIVERS=y
-
-CONFIG_PPC_PASEMI_MDIO=m
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+# CONFIG_EDAC_CPC925 is not set
+
 CONFIG_SPU_FS_64K_LS=y
-CONFIG_PPC_PASEMI_CPUFREQ=y
-CONFIG_PMAC_APM_EMU=m
-CONFIG_HW_RANDOM_PASEMI=m
 
 CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_PASEMI=m
-CONFIG_EDAC_AMD8131=m
-CONFIG_EDAC_AMD8111=m
 CONFIG_EDAC_LEGACY_SYSFS=y
 
 # CONFIG_AXON_RAM is not set
-# CONFIG_OPROFILE_CELL is not set
 
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_IDEPCI_PCIBUS_ORDER is not set
-CONFIG_PATA_PLATFORM=m
-CONFIG_PATA_OF_PLATFORM=m
-CONFIG_USB_EHCI_HCD_PPC_OF=y
 
 # CONFIG_MPC5121_ADS is not set
 CONFIG_MTD_OF_PARTS=y
@@ -191,10 +248,6 @@ CONFIG_DMADEVICES=y
 
 CONFIG_SND_PPC=y
 
-# CONFIG_PPC_82xx is not set
-# CONFIG_PPC_83xx is not set
-# CONFIG_PPC_86xx is not set
-CONFIG_EXTRA_TARGETS=""
 # CONFIG_CODE_PATCHING_SELFTEST is not set
 # CONFIG_FTR_FIXUP_SELFTEST is not set
 
@@ -222,21 +275,10 @@ CONFIG_MLX4_EN_VXLAN=y
 # CONFIG_GEF_PPC9A is not set
 # CONFIG_GEF_SBC310 is not set
 
-# CONFIG_QUICC_ENGINE is not set
-# CONFIG_QE_GPIO is not set
-
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GD_ATAPI=y
-
 # CONFIG_MCU_MPC8349EMITX is not set
 
 # CONFIG_GPIO_XILINX is not set
 
-CONFIG_PMIC_DA903X=y
-CONFIG_BACKLIGHT_DA903X=m
-CONFIG_LEDS_DA903X=m
-
 CONFIG_MSI_BITMAP_SELFTEST=y
 
 CONFIG_RELOCATABLE=y
@@ -244,11 +286,10 @@ CONFIG_RELOCATABLE=y
 # CONFIG_HVC_UDBG is not set
 CONFIG_PRINT_STACK_DEPTH=64
 
-CONFIG_BATTERY_DA9030=m
+# CONFIG_PMIC_DA903X is not set
 # CONFIG_TWL4030_CORE is not set
 
 CONFIG_BLK_DEV_IT8172=m
-CONFIG_TOUCHSCREEN_DA9034=m
 
 CONFIG_SIMPLE_GPIO=y
 
@@ -256,6 +297,7 @@ CONFIG_SIMPLE_GPIO=y
 
 # CONFIG_PS3_VRAM is not set
 CONFIG_MDIO_GPIO=m
+CONFIG_SERIAL_OF_PLATFORM=m
 # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_PCA953X=m
@@ -266,15 +308,12 @@ CONFIG_GPIO_PCF857X=m
 
 # CONFIG_AMIGAONE is not set
 
-CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
-
 CONFIG_DTL=y
 
 CONFIG_MMC_SDHCI_OF=m
 
 # CONFIG_CONSISTENT_SIZE_BOOL is not set
 
-
 CONFIG_PPC_EMULATED_STATS=y
 
 CONFIG_SWIOTLB=y
@@ -291,14 +330,9 @@ CONFIG_GPIO_WM831X=m
 # CONFIG_GPIO_UCB1400 is not set
 # CONFIG_EDAC_MPC85XX is not set
 
-CONFIG_NR_IRQS=512
-CONFIG_SPARSE_IRQ=y
-
 # CONFIG_PPC_MPC5200_LPBFIFO is not set
 # CONFIG_CAN_MSCAN is not set
 # CONFIG_CAN_MPC5XXX is not set
-CONFIG_PATA_MACIO=y
-CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_TPS65910 is not set
@@ -313,13 +347,6 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 # CONFIG_GPIO_SCH is not set
 # CONFIG_GPIO_74XX_MMIO is not set
 
-# CONFIG_PPC_MPC512x is not set
-# CONFIG_RTC_DRV_MPC5121 is not set
-
-# CONFIG_MPC512X_DMA is not set
-
-CONFIG_KVM_GUEST=y
-
 CONFIG_I2C_MPC=m
 
 # CONFIG_IMA is not set
@@ -336,15 +363,12 @@ CONFIG_I2C_MPC=m
 # CONFIG_NET_VENDOR_PASEMI is not set
 # CONFIG_NET_VENDOR_TOSHIBA is not set
 
-# CONFIG_CPU_IDLE is not set
 # CONFIG_OF_UNITTEST is not set
 # CONFIG_OF_OVERLAY is not set
 # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
 # CONFIG_INPUT_GP2A is not set
 # CONFIG_INPUT_GPIO_TILT_POLLED is not set
 
-CONFIG_RCU_FANOUT_LEAF=16
-
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 # CONFIG_MPIC_MSGR is not set
 # CONFIG_FA_DUMP is not set
@@ -354,21 +378,14 @@ CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_SPAPR_TCE_IOMMU is not set
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 
-CONFIG_PPC_DENORMALISATION=y
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
 
-
-# CONFIG_CPU_LITTLE_ENDIAN is not set
+# CONFIG_WINDFARM is not set
 
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_FB_SSD1307=m
 CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_BACKLIGHT_PWM=m
-CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=n
-
-CONFIG_XZ_DEC_POWERPC=y
-
-CONFIG_CRASH=m
diff --git a/config-powerpc64le b/config-powerpc64le
index ee43fdb3..48c8c0d8 100644
--- a/config-powerpc64le
+++ b/config-powerpc64le
@@ -1 +1,3 @@
 CONFIG_CPU_LITTLE_ENDIAN=y
+
+CONFIG_POWER7_CPU=y
diff --git a/config-powerpc64p7 b/config-powerpc64p7
index 23337c8c..5e85fbd1 100644
--- a/config-powerpc64p7
+++ b/config-powerpc64p7
@@ -1,179 +1,3 @@
-CONFIG_POWER7_CPU=y
-# CONFIG_PPC_PMAC64 is not set
-# CONFIG_PPC_MAPLE is not set
-# CONFIG_PPC_CELL is not set
-# CONFIG_PPC_IBM_CELL_BLADE is not set
-CONFIG_PPC_PSERIES=y
-# CONFIG_PPC_PMAC is not set
-CONFIG_PPC_POWERNV=y
-CONFIG_OPAL_PRD=m
-CONFIG_MTD_POWERNV_FLASH=m
-CONFIG_HW_RANDOM_POWERNV=m
-CONFIG_SENSORS_IBMPOWERNV=y
-CONFIG_POWERNV_CPUFREQ=m
-CONFIG_IPMI_POWERNV=m
-CONFIG_SCOM_DEBUGFS=y
-# CONFIG_PPC_PASEMI is not set
-# CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
-# CONFIG_PPC_PS3 is not set
-# CONFIG_PPC_CELL_QPACE is not set
-CONFIG_IBMEBUS=y
-CONFIG_RTAS_FLASH=y
-# CONFIG_UDBG_RTAS_CONSOLE is not set
-CONFIG_PPC_SPLPAR=y
-CONFIG_SCANLOG=y
-CONFIG_LPARCFG=y
-CONFIG_SERIAL_ICOM=m
-CONFIG_HVCS=m
-CONFIG_HVC_CONSOLE=y
-# CONFIG_HVC_OLD_HVSI is not set
-CONFIG_HOTPLUG_PCI=y
-CONFIG_IBMVETH=m
-CONFIG_SCSI_IBMVSCSI=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_HOTPLUG_PCI_RPA=m
-CONFIG_HOTPLUG_PCI_RPA_DLPAR=y
-CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_IDE=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPR_DUMP=y
-CONFIG_HVC_RTAS=y
-CONFIG_HVC_OPAL=y
-
-# iSeries device drivers
-#
-
-CONFIG_SERIAL_OF_PLATFORM=m
-
-CONFIG_SERIAL_TXX9=y
-CONFIG_SERIAL_TXX9_NR_UARTS=6
-CONFIG_SERIAL_TXX9_CONSOLE=y
-
-CONFIG_HVC_BEAT=y
-
-CONFIG_PPC_PMI=m
-
-CONFIG_PATA_SCC=m
-
-CONFIG_APM_EMULATION=m
-
-CONFIG_PPC64=y
-CONFIG_NR_CPUS=1024
-# CONFIG_FB_PLATINUM is not set
-# CONFIG_FB_VALKYRIE is not set
-# CONFIG_FB_CT65550 is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-
-
-CONFIG_RTAS_PROC=y
-CONFIG_NUMA=y
-CONFIG_NUMA_BALANCING=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_PPC_64K_PAGES=y
-CONFIG_PPC_SUBPAGE_PROT=y
-CONFIG_SCHED_SMT=y
-
-CONFIG_HZ=100
-CONFIG_HZ_100=y
-# CONFIG_HZ_1000 is not set
-
-CONFIG_MEMORY_HOTREMOVE=y
-
-CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y
-
-CONFIG_CGROUP_HUGETLB=y
-
-# CONFIG_MV643XX_ETH is not set
-CONFIG_IRQSTACKS=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-# CONFIG_INPUT_PCSPKR is not set
-
-CONFIG_EHEA=m
-CONFIG_INFINIBAND_EHCA=m
-
-# CONFIG_HCALL_STATS is not set
-
-CONFIG_XMON_DISASSEMBLY=y
-
+# CONFIG_CPU_LITTLE_ENDIAN is not set
 
-# CONFIG_TUNE_CELL is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-
-
-CONFIG_EDAC_CPC925=m
-CONFIG_FRAME_WARN=2048
-
-CONFIG_FORCE_MAX_ZONEORDER=9
-
-CONFIG_VSX=y
-
-CONFIG_SCSI_IBMVFC=m
-# CONFIG_SCSI_IBMVFC_TRACE is not set
-CONFIG_IBM_BSR=m
-
-CONFIG_CRASH_DUMP=y
-CONFIG_FA_DUMP=y
-CONFIG_RELOCATABLE=y
-
-CONFIG_RCU_FANOUT=64
-
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_AREAS=7
-CONFIG_KVM_BOOK3S_64=m
-CONFIG_KVM_BOOK3S_64_HV=m
-CONFIG_KVM_BOOK3S_64_PR=m
-# CONFIG_KVM_BOOK3S_HV_EXIT_TIMING is not set
-# CONFIG_KVM_EXIT_TIMING is not set
-CONFIG_KVM_XICS=y
-
-#-- bz#607175
-#-- active memory sharing
-CONFIG_PPC_SMLPAR=y
-CONFIG_CMM=y
-CONFIG_HV_PERF_CTRS=y
-#-- DLPAR memory remove
-CONFIG_SPARSEMEM_VMEMMAP=y
-
-# CONFIG_COMPACTION is not set
-
-CONFIG_PSERIES_ENERGY=m
-
-CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_GOV_LADDER is not set
-CONFIG_PSERIES_CPUIDLE=y
-CONFIG_POWERNV_CPUIDLE=y
-
-CONFIG_PPC_ICSWX=y
-CONFIG_IO_EVENT_IRQ=y
-CONFIG_HW_RANDOM_AMD=m
-
-CONFIG_UIO_PDRV=m
-
-CONFIG_I2C_OPAL=m
-CONFIG_RTC_DRV_OPAL=m
-
-CONFIG_HW_RANDOM_PSERIES=m
-CONFIG_CRYPTO_DEV_NX=y
-CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS_CRYPTO=m
-CONFIG_CRYPTO_DEV_VMX=y
-CONFIG_CRYPTO_DEV_VMX_ENCRYPT=y
-
-CONFIG_CXL=m
-
-# CONFIG_PPC_ICSWX_PID is not set
-# CONFIG_PPC_ICSWX_USE_SIGILL is not set
-# CONFIG_PCIEPORTBUS is not set
-# CONFIG_SND_HDA_INTEL is not set
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_PPC_TRANSACTIONAL_MEM=y
+CONFIG_POWER7_CPU=y
diff --git a/kernel.spec b/kernel.spec
index 8d90969a..2d327758 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -237,6 +237,7 @@ Summary: The Linux kernel
 %ifnarch %{power64}
 %define with_bootwrapper 0
 %define with_sparse 0
+%define with_perf 0
 %endif
 
 # Per-arch tweaks
@@ -265,7 +266,7 @@ Summary: The Linux kernel
 %define all_arch_configs kernel-%{version}-ppc64*.config
 %endif
 %ifarch ppc64le
-%define all_arch_configs kernel-%{version}-ppc64le.config
+%define all_arch_configs kernel-%{version}-ppc64le*.config
 %endif
 %endif
 
@@ -431,7 +432,7 @@ Source32: config-x86-32-generic
 
 Source40: config-x86_64-generic
 
-Source50: config-powerpc-generic
+Source50: config-powerpc64-generic
 Source53: config-powerpc64
 Source54: config-powerpc64p7
 Source55: config-powerpc64le
@@ -2147,6 +2148,9 @@ fi
 #
 # 
 %changelog
+* Fri Jun 26 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Reorganisation and cleanup of the powerpc configs
+
 * Thu Jun 25 2015 Josh Boyer <jwboyer@fedoraproject.org>
 - Linux v4.1-5596-gaefbef10e3ae