Cleanup PowerPC configs

Drop a bunch of embedded platform cruft from the 32-bit configs.  Disable Cell
and Maple support on 64-bit.

3 files changed, 67 insertions, 126 deletions

diff --git a/config-powerpc-generic b/config-powerpc-generic
index 05f85f8f3..c297a80ef 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -47,11 +47,10 @@ CONFIG_FB_ATY_BACKLIGHT=y
 CONFIG_FB_RADEON_BACKLIGHT=y
 CONFIG_FB_RIVA_BACKLIGHT=y
 CONFIG_FB_NVIDIA_BACKLIGHT=y
-# FIXME: Do we care about this hardware ?
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-CONFIG_FB_MB862XX_LIME=y
-CONFIG_FB_MB862XX_I2C=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_SND_POWERMAC=m
@@ -187,8 +186,8 @@ CONFIG_EDAC_PASEMI=m
 CONFIG_EDAC_AMD8131=m
 CONFIG_EDAC_AMD8111=m
 
-CONFIG_AXON_RAM=m
-CONFIG_OPROFILE_CELL=y
+# CONFIG_AXON_RAM is not set
+# CONFIG_OPROFILE_CELL is not set
 
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_IDEPCI_PCIBUS_ORDER is not set
@@ -209,9 +208,9 @@ CONFIG_DMADEVICES=y
 
 CONFIG_SND_PPC=y
 
-CONFIG_PPC_82xx=y
-CONFIG_PPC_83xx=y
-CONFIG_PPC_86xx=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
@@ -227,26 +226,26 @@ CONFIG_EXTRA_TARGETS=""
 
 CONFIG_NET_VENDOR_IBM=y
 
-CONFIG_SERIO_XILINX_XPS_PS2=m
+# CONFIG_SERIO_XILINX_XPS_PS2 is not set
 
 # CONFIG_PPC_SMLPAR is not set
 
-CONFIG_MGCOGE=y
-CONFIG_GEF_SBC610=y
-CONFIG_GEF_PPC9A=y
-CONFIG_GEF_SBC310=y
+# CONFIG_MGCOGE is not set
+# CONFIG_GEF_SBC610 is not set
+# CONFIG_GEF_PPC9A is not set
+# CONFIG_GEF_SBC310 is not set
 
-CONFIG_QUICC_ENGINE=y
-CONFIG_QE_GPIO=y
-CONFIG_MPC8xxx_GPIO=y
+# CONFIG_QUICC_ENGINE is not set
+# CONFIG_QE_GPIO is not set
+# CONFIG_MPC8xxx_GPIO is not set
 
 CONFIG_IDE_GD=y
 CONFIG_IDE_GD_ATA=y
 CONFIG_IDE_GD_ATAPI=y
 
-CONFIG_MCU_MPC8349EMITX=m
+# CONFIG_MCU_MPC8349EMITX is not set
 
-CONFIG_GPIO_XILINX=y
+# CONFIG_GPIO_XILINX is not set
 
 CONFIG_PMIC_DA903X=y
 CONFIG_BACKLIGHT_DA903X=m
@@ -267,11 +266,11 @@ CONFIG_TOUCHSCREEN_DA9034=m
 
 CONFIG_SIMPLE_GPIO=y
 
-CONFIG_FSL_PQ_MDIO=m
+# CONFIG_FSL_PQ_MDIO is not set
 
-CONFIG_PS3_VRAM=m
+# CONFIG_PS3_VRAM is not set
 CONFIG_MDIO_GPIO=m
-CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL=m
+# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
@@ -301,20 +300,20 @@ CONFIG_SWIOTLB=y
 
 CONFIG_PPC_DISABLE_WERROR=y
 
-CONFIG_XILINX_LL_TEMAC=m
-CONFIG_XILINX_EMACLITE=m
+# CONFIG_XILINX_LL_TEMAC is not set
+# CONFIG_XILINX_EMACLITE is not set
 
 CONFIG_GPIO_WM831X=m
 # CONFIG_GPIO_LANGWELL is not set
 # CONFIG_GPIO_UCB1400 is not set
-CONFIG_EDAC_MPC85XX=m
+# CONFIG_EDAC_MPC85XX is not set
 
 CONFIG_NR_IRQS=512
 CONFIG_SPARSE_IRQ=y
 
-CONFIG_PPC_MPC5200_LPBFIFO=m
-CONFIG_CAN_MSCAN=m
-CONFIG_CAN_MPC5XXX=m
+# CONFIG_PPC_MPC5200_LPBFIFO is not set
+# CONFIG_CAN_MSCAN is not set
+# CONFIG_CAN_MPC5XXX is not set
 CONFIG_PATA_MACIO=m
 CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 # CONFIG_PMIC_ADP5520 is not set
@@ -335,7 +334,7 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 # CONFIG_PPC_MPC512x is not set
 # CONFIG_RTC_DRV_MPC5121 is not set
 
-CONFIG_MPC512X_DMA=m
+# CONFIG_MPC512X_DMA is not set
 
 CONFIG_KVM_GUEST=y
 
@@ -346,12 +345,7 @@ CONFIG_I2C_MPC=m
 
 CONFIG_RFKILL_GPIO=m
 
-CONFIG_CRYPTO_DEV_FSL_CAAM=m
-CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
-CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=255
-CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=2048
-CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
 
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_MCP23S08 is not set
diff --git a/config-powerpc32-generic b/config-powerpc32-generic
index 6cf06acab..e856b9ff0 100644
--- a/config-powerpc32-generic
+++ b/config-powerpc32-generic
@@ -7,17 +7,17 @@ CONFIG_PPC32=y
 CONFIG_CPU_FREQ_PMAC=y
 CONFIG_PPC_CHRP=y
 CONFIG_PPC_PMAC=y
-CONFIG_PPC_MPC52xx=y
+# CONFIG_PPC_MPC52xx is not set
 CONFIG_PPC_PREP=y
 
 # CONFIG_PPC_MPC5200_SIMPLE is not set
-CONFIG_SATA_FSL=m
+# CONFIG_SATA_FSL is not set
 # CONFIG_SATA_NV is not set
 
 # busted in .28git1
 # ERROR: "cacheable_memzero" [drivers/net/gianfar_driver.ko] undefined!
 # CONFIG_GIANFAR is not set
-CONFIG_USB_EHCI_FSL=y
+# CONFIG_USB_EHCI_FSL is not set
 
 CONFIG_PMAC_APM_EMU=y
 CONFIG_PMAC_BACKLIGHT=y
@@ -73,25 +73,20 @@ CONFIG_BRIQ_PANEL=m
 # CONFIG_ATA_PIIX is not set
 # CONFIG_PATA_AMD is not set
 # CONFIG_PATA_ATIIXP is not set
-CONFIG_PATA_MPC52xx=m
+# CONFIG_PATA_MPC52xx is not set
 # CONFIG_PATA_MPIIX is not set
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_OPTI is not set
 # CONFIG_PATA_SERVERWORKS is not set
 
-CONFIG_SERIAL_MPC52xx=y
-CONFIG_SERIAL_MPC52xx_CONSOLE=y
-CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
+# CONFIG_SERIAL_MPC52xx is not set
 # CONFIG_MPC5200_WDT is not set
 CONFIG_8xxx_WDT=m
 CONFIG_GEF_WDT=m
 
-CONFIG_PPC_MPC5200_BUGFIX=y
-CONFIG_NET_VENDOR_FREESCALE=y
-CONFIG_FEC_MPC52xx=m
+# CONFIG_PPC_MPC5200_BUGFIX is not set
+# CONFIG_NET_VENDOR_FREESCALE is not set
 #CHECK: This may later become a tristate.
-CONFIG_FEC_MPC52xx_MDIO=y
-CONFIG_PPC_MPC5200_GPIO=y
 CONFIG_MDIO_GPIO=m
 
 CONFIG_SERIAL_OF_PLATFORM=y
@@ -146,26 +141,28 @@ CONFIG_VIRTUALIZATION=y
 CONFIG_SND_ISA=y
 CONFIG_CRYPTO_DEV_TALITOS=m
 
-CONFIG_FSL_EMB_PERFMON=y
-CONFIG_MPC8272_ADS=y
-CONFIG_PQ2FADS=y
-CONFIG_EP8248E=y
-CONFIG_MPC830x_RDB=y
-CONFIG_MPC831x_RDB=y
-CONFIG_MPC832x_MDS=y
-CONFIG_MPC832x_RDB=y
-CONFIG_MPC834x_MDS=y
-CONFIG_MPC834x_ITX=y
-CONFIG_MPC836x_MDS=y
-CONFIG_MPC836x_RDK=y
-CONFIG_MPC837x_MDS=y
-CONFIG_MPC837x_RDB=y
-CONFIG_SBC834x=y
-CONFIG_ASP834x=y
-CONFIG_KMETER1=y
-CONFIG_MPC8641_HPCN=y
-CONFIG_SBC8641D=y
-CONFIG_MPC8610_HPCD=y
+# CONFIG_FSL_EMB_PERFMON is not set
+# CONFIG_MPC8272_ADS is not set
+# CONFIG_PQ2FADS is not set
+# CONFIG_EP8248E is not set
+# CONFIG_MPC830x_RDB is not set
+# CONFIG_MPC831x_RDB is not set
+# CONFIG_MPC832x_MDS is not set
+# CONFIG_MPC832x_RDB is not set
+# CONFIG_MPC834x_MDS is not set
+# CONFIG_MPC834x_ITX is not set
+# CONFIG_MPC836x_MDS is not set
+# CONFIG_MPC836x_RDK is not set
+# CONFIG_MPC837x_MDS is not set
+# CONFIG_MPC837x_RDB is not set
+# CONFIG_SBC834x is not set
+# CONFIG_ASP834x is not set
+# CONFIG_KMETER1 is not set
+# CONFIG_MPC8641_HPCN is not set
+# CONFIG_SBC8641D is not set
+# CONFIG_MPC8610_HPCD is not set
+# CONFIG_FSL_LBC is not set
+# CONFIG_MTD_NAND_FSL_UPM is not set
 
 # CONFIG_USB_MUSB_HDRC is not set
 
@@ -174,8 +171,6 @@ CONFIG_MPC8610_HPCD=y
 # drivers/mtd/maps/sbc8240.c:172: warning: passing argument 1 of 'simple_map_init' from incompatible pointer type
 # drivers/mtd/maps/sbc8240.c:177: error: 'struct mtd_info' has no member named 'module'
 
-CONFIG_MTD_NAND_FSL_UPM=m
-
 CONFIG_RCU_FANOUT=32
 
 CONFIG_PERF_COUNTERS=y
diff --git a/config-powerpc64 b/config-powerpc64
index 7142d8007..6f84e16bf 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -2,42 +2,21 @@ CONFIG_WINDFARM_PM81=y
 CONFIG_WINDFARM_PM91=y
 CONFIG_WINDFARM_PM121=y
 CONFIG_PPC_PMAC64=y
-CONFIG_PPC_MAPLE=y
-CONFIG_PPC_CELL=y
-CONFIG_PPC_IBM_CELL_BLADE=y
+# CONFIG_PPC_MAPLE is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_IBM_CELL_BLADE is not set
 CONFIG_PPC_ISERIES=y
 CONFIG_PPC_PSERIES=y
 CONFIG_PPC_PMAC=y
-CONFIG_PPC_PASEMI=y
+# CONFIG_PPC_PASEMI is not set
 # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
-CONFIG_PPC_PS3=y
-CONFIG_PPC_CELLEB=y
-CONFIG_PPC_CELL_QPACE=y
-CONFIG_PS3_HTAB_SIZE=20
-# CONFIG_PS3_DYNAMIC_DMA is not set
-CONFIG_PS3_ADVANCED=y
-CONFIG_PS3_HTAB_SIZE=20
-# CONFIG_PS3_DYNAMIC_DMA is not set
-CONFIG_PS3_VUART=y
-CONFIG_PS3_PS3AV=y
-CONFIG_PS3_STORAGE=m
-CONFIG_PS3_DISK=m
-CONFIG_PS3_ROM=m
-CONFIG_PS3_FLASH=m
-CONFIG_PS3_LPM=y
-CONFIG_SND_PS3=m
-CONFIG_SND_PS3_DEFAULT_START_DELAY=1000
-CONFIG_GELIC_NET=m
-CONFIG_GELIC_WIRELESS=y
-CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE=y
-CONFIG_CBE_THERM=m
-CONFIG_CBE_CPUFREQ=m
-CONFIG_CBE_CPUFREQ_PMI=m
-CONFIG_CBE_CPUFREQ_PMI_ENABLE=y
+# CONFIG_PPC_PS3 is not set
+# CONFIG_PPC_CELLEB is not set
+# CONFIG_PPC_CELL_QPACE is not set
 CONFIG_PMAC_RACKMETER=m
 CONFIG_IBMEBUS=y
-CONFIG_SPU_FS=m
 CONFIG_RTAS_FLASH=y
+# CONFIG_UDBG_RTAS_CONSOLE is not set
 CONFIG_PPC_SPLPAR=y
 CONFIG_SCANLOG=y
 CONFIG_LPARCFG=y
@@ -60,10 +39,8 @@ CONFIG_CPU_FREQ_PMAC64=y
 CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPR_TRACE=y
 CONFIG_SCSI_IPR_DUMP=y
-CONFIG_SPIDER_NET=m
 CONFIG_HVC_RTAS=y
 CONFIG_HVC_ISERIES=y
-CONFIG_CBE_RAS=y
 
 # iSeries device drivers
 #
@@ -75,19 +52,13 @@ CONFIG_VIOTAPE=m
 CONFIG_PASEMI_MAC=m
 CONFIG_SERIAL_OF_PLATFORM=m
 
-CONFIG_PPC_PASEMI_IOMMU=y
 CONFIG_SERIAL_TXX9=y
 CONFIG_SERIAL_TXX9_NR_UARTS=6
 CONFIG_SERIAL_TXX9_CONSOLE=y
 
 CONFIG_HVC_BEAT=y
 
-CONFIG_FB_PS3=y
-CONFIG_FB_PS3_DEFAULT_SIZE_M=18
-
 CONFIG_PPC_PMI=m
-CONFIG_PS3_SYS_MANAGER=y
-# CONFIG_BLK_DEV_CELLEB is not set
 
 CONFIG_PATA_SCC=m
 
@@ -132,19 +103,9 @@ CONFIG_SECCOMP=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_BLK_DEV_PLATFORM is not set
-CONFIG_IBM_NEW_EMAC=m
-CONFIG_IBM_NEW_EMAC_RXB=128
-CONFIG_IBM_NEW_EMAC_TXB=64
-CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-# CONFIG_IBM_NEW_EMAC_DEBUG is not set
 
 # CONFIG_VIRQ_DEBUG is not set
-CONFIG_ELECTRA_CF=m
 
-CONFIG_MTD_NAND_PASEMI=m
-CONFIG_EDAC_CELL=m
 CONFIG_EDAC_CPC925=m
 CONFIG_FRAME_WARN=2048
 
@@ -158,14 +119,6 @@ CONFIG_SCSI_IBMVFC=m
 # CONFIG_SCSI_IBMVFC_TRACE is not set
 CONFIG_IBM_BSR=m
 
-CONFIG_SERIO_XILINX_XPS_PS2=m
-
-CONFIG_PPC_IBM_CELL_RESETBUTTON=y
-CONFIG_PPC_IBM_CELL_POWERBUTTON=m
-CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m
-
-CONFIG_RTC_DRV_PS3=y
-
 CONFIG_CRASH_DUMP=y
 CONFIG_RELOCATABLE=y
 
@@ -194,4 +147,3 @@ CONFIG_IO_EVENT_IRQ=y
 CONFIG_HW_RANDOM_AMD=m
 
 CONFIG_BPF_JIT=y
-CONFIG_CPU_FREQ_MAPLE=y