X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-powerpc.config;h=7f0cfc36185561d793fbc1abe2fdbb0060676dc2;hb=9b3fcbe069e2b3f442cb26a46e780a41df1aa844;hp=b0bbb35a8525ff844c77af6ef279129d069f9369;hpb=1b111bdaa2ac9bc503c8ff6fd7df288375eadf89;p=packages%2Fkernel.git

diff --git a/kernel-powerpc.config b/kernel-powerpc.config
index b0bbb35a..7f0cfc36 100644
--- a/kernel-powerpc.config
+++ b/kernel-powerpc.config
@@ -5,6 +5,7 @@
 OPROFILE powerpc=m
 OPROFILE_IBS powerpc=n
 KPROBES powerpc=y
+#- file kernel/gcov/Kconfig goes here
 
 #-
 #- *** FILE: arch/powerpc/Kconfig ***
@@ -20,13 +21,15 @@ HIGHMEM ppc=n
 #- file kernel/Kconfig.preempt goes here
 #- file fs/Kconfig.binfmt goes here
 IOMMU_VMERGE ppc64=n
-HOTPLUG_CPU ppc64=y
+SWIOTLB powerpc=n
+HOTPLUG_CPU powerpc=y
 KEXEC powerpc=y
 CRASH_DUMP powerpc=n
 PHYP_DUMP ppc64=n
 IRQ_ALL_CPUS powerpc=y
 NUMA ppc64=y
 #- file mm/Kconfig goes here
+PPC_4K_PAGES ppc=y ppc64=y
 PPC_64K_PAGES ppc64=n
 FORCE_MAX_ZONEORDER ppc=11 ppc64=13
 SCHED_SMT ppc64=n
@@ -35,7 +38,6 @@ CMDLINE_BOOL powerpc=n
 EXTRA_TARGETS powerpc=""
 #- file kernel/power/Kconfig goes here
 SECCOMP powerpc=y
-CC_STACKPROTECTOR powerpc=n
 ISA ppc=n
 #- file drivers/pci/pcie/Kconfig goes here
 #- file drivers/pci/Kconfig goes here
@@ -51,7 +53,6 @@ KERNEL_START ppc=0xc0000000
 #- file arch/powerpc/sysdev/qe_lib/Kconfig goes here
 #- file lib/Kconfig goes here
 #- file arch/powerpc/Kconfig.debug goes here
-#- file kernel/vserver/Kconfig goes here
 #- file security/Kconfig goes here
 #- file crypto/Kconfig goes here
 #- file arch/powerpc/kvm/Kconfig goes here
@@ -60,10 +61,12 @@ KERNEL_START ppc=0xc0000000
 #- *** FILE: arch/powerpc/Kconfig.debug ***
 #-
 #- file lib/Kconfig.debug goes here
+PPC_DISABLE_WERROR powerpc=y
 PRINT_STACK_DEPTH powerpc=64
 DEBUG_STACKOVERFLOW powerpc=n
 DEBUG_STACK_USAGE powerpc=n
-DEBUG_PAGEALLOC powerpc=n
+HCALL_STATS ppc64=n
+PPC_EMULATED_STATS powerpc=n
 CODE_PATCHING_SELFTEST powerpc=n
 FTR_FIXUP_SELFTEST powerpc=n
 MSI_BITMAP_SELFTEST powerpc=n
@@ -77,6 +80,7 @@ PPC_EARLY_DEBUG powerpc=n
 #-
 #- *** FILE: arch/powerpc/kvm/Kconfig ***
 #-
+#- file virt/kvm/Kconfig goes here
 VIRTUALIZATION powerpc=y
 KVM ppc=y
 #- file drivers/virtio/Kconfig goes here
@@ -98,8 +102,6 @@ PPC_MEDIA5200 ppc=y
 PPC_MPC5200_BUGFIX ppc=y
 PPC_MPC5200_GPIO ppc=y
 
-PPC_OF_BOOT_TRAMPOLINE ppc=y
-
 #-
 #- *** FILE: arch/powerpc/platforms/82xx/Kconfig ***
 #-
@@ -137,11 +139,12 @@ PPC_86xx ppc=n
 #- file arch/powerpc/platforms/embedded6xx/Kconfig goes here
 #- file arch/powerpc/platforms/44x/Kconfig goes here
 #- file arch/powerpc/platforms/40x/Kconfig goes here
+#- file arch/powerpc/platforms/amigaone/Kconfig goes here
+PPC_OF_BOOT_TRAMPOLINE powerpc=y
 UDBG_RTAS_CONSOLE ppc=n ppc64=y
 PPC_UDBG_BEAT ppc64=y
 RTAS_PROC powerpc=y
 RTAS_FLASH ppc64=m
-PPC_PMI ppc64=m
 IBMEBUS ppc64=n
 #- file drivers/cpufreq/Kconfig goes here
 CPU_FREQ_PMAC ppc=y
@@ -157,13 +160,16 @@ SIMPLE_GPIO powerpc=y
 #- *** FILE: arch/powerpc/platforms/Kconfig.cputype ***
 #-
 PPC64 ppc=n ppc64=y
-6xx ppc=y
+PPC_BOOK3S_32 ppc=y
 PPC_85xx ppc=n
 PPC_8xx ppc=n
 40x ppc=n
 44x ppc=n
 E200 ppc=n
+PPC_BOOK3S_64 ppc64=y
+PPC_BOOK3E_64 ppc64=n
 POWER4_ONLY ppc64=n
+6xx ppc=y
 TUNE_CELL ppc64=n
 ALTIVEC powerpc=y
 VSX ppc64=y
@@ -176,6 +182,7 @@ NR_CPUS ppc=4 ppc64=32
 #-
 PPC_IBM_CELL_BLADE ppc64=y
 PPC_CELLEB ppc64=y
+PPC_CELL_QPACE ppc64=y
 SPU_FS ppc64=m
 SPU_FS_64K_LS ppc64=y
 CBE_RAS ppc64=y
@@ -183,7 +190,9 @@ PPC_IBM_CELL_RESETBUTTON ppc64=y
 PPC_IBM_CELL_POWERBUTTON ppc64=m
 CBE_THERM ppc64=m
 CBE_CPUFREQ ppc64=m
+CBE_CPUFREQ_PMI_ENABLE ppc64=y
 CBE_CPUFREQ_PMI ppc64=m
+PPC_PMI ppc64=m
 CBE_CPUFREQ_SPU_GOVERNOR ppc64=m
 
 #-
@@ -240,6 +249,7 @@ PS3_VUART ppc64=y
 PS3_DISK ppc64=m
 PS3_ROM ppc64=m
 PS3_FLASH ppc64=m
+PS3_VRAM ppc64=m
 PS3_LPM ppc64=m
 
 #-
@@ -258,3 +268,9 @@ PPC_BESTCOMM ppc=m
 PPC_BESTCOMM_ATA ppc=m
 PPC_BESTCOMM_FEC ppc=m
 PPC_BESTCOMM_GEN_BD ppc=m
+
+#-
+#- *** FILE: drivers/edac/Kconfig ***
+#-
+#- Reporting subsystems
+EDAC_CPC925 ppc64=m