Reorganisation and cleanup of the powerpc configs

1 files changed, 98 insertions, 181 deletions

diff --git a/config-powerpc64 b/config-powerpc64
index 65b7b6944..6a59e66a1 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