From c813c0daaebd5c4ceeee6faea3580d9c2e50336d Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Thu, 27 Oct 2011 15:15:12 -0400
Subject: Cleanup PowerPC configs

Drop a bunch of embedded platform cruft from the 32-bit configs.  Disable Cell
and Maple support on 64-bit.
---
 config-powerpc64 | 64 +++++++-------------------------------------------------
 1 file changed, 8 insertions(+), 56 deletions(-)

(limited to 'config-powerpc64')

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
-- 
cgit