aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2013-10-21 20:44:50 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-10-30 01:01:56 -0400
commit4d16bd39c094751adb556382b95373ac53edba3c (patch)
tree3fcb20412ad5260e3642cbeb76dcd7ac6ec9a003 /arch/powerpc/configs
parent686245bee9528a2f62fa88b1f776eacd94d858ee (diff)
powerpc: sync ppc64, ppc64e and pseries configs
Run savedefconfig over the ppc64, ppc64e and pseries config Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/configs')
-rw-r--r--arch/powerpc/configs/ppc64_defconfig15
-rw-r--r--arch/powerpc/configs/ppc64e_defconfig10
-rw-r--r--arch/powerpc/configs/pseries_defconfig13
3 files changed, 8 insertions, 30 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 0e8cfd09da2f..56ac8bbeb032 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -2,7 +2,6 @@ CONFIG_PPC64=y
2CONFIG_ALTIVEC=y 2CONFIG_ALTIVEC=y
3CONFIG_VSX=y 3CONFIG_VSX=y
4CONFIG_SMP=y 4CONFIG_SMP=y
5CONFIG_EXPERIMENTAL=y
6CONFIG_SYSVIPC=y 5CONFIG_SYSVIPC=y
7CONFIG_POSIX_MQUEUE=y 6CONFIG_POSIX_MQUEUE=y
8CONFIG_IRQ_DOMAIN_DEBUG=y 7CONFIG_IRQ_DOMAIN_DEBUG=y
@@ -25,7 +24,6 @@ CONFIG_MODULE_UNLOAD=y
25CONFIG_MODVERSIONS=y 24CONFIG_MODVERSIONS=y
26CONFIG_MODULE_SRCVERSION_ALL=y 25CONFIG_MODULE_SRCVERSION_ALL=y
27CONFIG_PARTITION_ADVANCED=y 26CONFIG_PARTITION_ADVANCED=y
28CONFIG_EFI_PARTITION=y
29CONFIG_PPC_SPLPAR=y 27CONFIG_PPC_SPLPAR=y
30CONFIG_SCANLOG=m 28CONFIG_SCANLOG=m
31CONFIG_PPC_SMLPAR=y 29CONFIG_PPC_SMLPAR=y
@@ -50,12 +48,10 @@ CONFIG_CPU_FREQ_PMAC64=y
50CONFIG_HZ_100=y 48CONFIG_HZ_100=y
51CONFIG_BINFMT_MISC=m 49CONFIG_BINFMT_MISC=m
52CONFIG_PPC_TRANSACTIONAL_MEM=y 50CONFIG_PPC_TRANSACTIONAL_MEM=y
53CONFIG_HOTPLUG_CPU=y
54CONFIG_KEXEC=y 51CONFIG_KEXEC=y
55CONFIG_IRQ_ALL_CPUS=y 52CONFIG_IRQ_ALL_CPUS=y
56CONFIG_MEMORY_HOTREMOVE=y 53CONFIG_MEMORY_HOTREMOVE=y
57CONFIG_SCHED_SMT=y 54CONFIG_SCHED_SMT=y
58CONFIG_PPC_DENORMALISATION=y
59CONFIG_PCCARD=y 55CONFIG_PCCARD=y
60CONFIG_ELECTRA_CF=y 56CONFIG_ELECTRA_CF=y
61CONFIG_HOTPLUG_PCI=y 57CONFIG_HOTPLUG_PCI=y
@@ -89,7 +85,6 @@ CONFIG_NF_CONNTRACK_PPTP=m
89CONFIG_NF_CONNTRACK_SIP=m 85CONFIG_NF_CONNTRACK_SIP=m
90CONFIG_NF_CONNTRACK_TFTP=m 86CONFIG_NF_CONNTRACK_TFTP=m
91CONFIG_NF_CT_NETLINK=m 87CONFIG_NF_CT_NETLINK=m
92CONFIG_NETFILTER_TPROXY=m
93CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 88CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
94CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 89CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
95CONFIG_NETFILTER_XT_TARGET_DSCP=m 90CONFIG_NETFILTER_XT_TARGET_DSCP=m
@@ -131,7 +126,6 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
131CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 126CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
132CONFIG_NETFILTER_XT_MATCH_U32=m 127CONFIG_NETFILTER_XT_MATCH_U32=m
133CONFIG_NF_CONNTRACK_IPV4=m 128CONFIG_NF_CONNTRACK_IPV4=m
134CONFIG_IP_NF_QUEUE=m
135CONFIG_IP_NF_IPTABLES=m 129CONFIG_IP_NF_IPTABLES=m
136CONFIG_IP_NF_MATCH_AH=m 130CONFIG_IP_NF_MATCH_AH=m
137CONFIG_IP_NF_MATCH_ECN=m 131CONFIG_IP_NF_MATCH_ECN=m
@@ -216,6 +210,7 @@ CONFIG_DUMMY=m
216CONFIG_NETCONSOLE=y 210CONFIG_NETCONSOLE=y
217CONFIG_NETPOLL_TRAP=y 211CONFIG_NETPOLL_TRAP=y
218CONFIG_TUN=m 212CONFIG_TUN=m
213CONFIG_VHOST_NET=m
219CONFIG_VORTEX=y 214CONFIG_VORTEX=y
220CONFIG_ACENIC=m 215CONFIG_ACENIC=m
221CONFIG_ACENIC_OMIT_TIGON_I=y 216CONFIG_ACENIC_OMIT_TIGON_I=y
@@ -301,7 +296,6 @@ CONFIG_HID_GYRATION=y
301CONFIG_HID_PANTHERLORD=y 296CONFIG_HID_PANTHERLORD=y
302CONFIG_HID_PETALYNX=y 297CONFIG_HID_PETALYNX=y
303CONFIG_HID_SAMSUNG=y 298CONFIG_HID_SAMSUNG=y
304CONFIG_HID_SONY=y
305CONFIG_HID_SUNPLUS=y 299CONFIG_HID_SUNPLUS=y
306CONFIG_USB_HIDDEV=y 300CONFIG_USB_HIDDEV=y
307CONFIG_USB=y 301CONFIG_USB=y
@@ -386,21 +380,19 @@ CONFIG_NLS_UTF8=y
386CONFIG_CRC_T10DIF=y 380CONFIG_CRC_T10DIF=y
387CONFIG_MAGIC_SYSRQ=y 381CONFIG_MAGIC_SYSRQ=y
388CONFIG_DEBUG_KERNEL=y 382CONFIG_DEBUG_KERNEL=y
383CONFIG_DEBUG_STACK_USAGE=y
384CONFIG_DEBUG_STACKOVERFLOW=y
389CONFIG_LOCKUP_DETECTOR=y 385CONFIG_LOCKUP_DETECTOR=y
390CONFIG_DEBUG_MUTEXES=y 386CONFIG_DEBUG_MUTEXES=y
391CONFIG_DEBUG_STACK_USAGE=y
392CONFIG_LATENCYTOP=y 387CONFIG_LATENCYTOP=y
393CONFIG_SCHED_TRACER=y 388CONFIG_SCHED_TRACER=y
394CONFIG_BLK_DEV_IO_TRACE=y 389CONFIG_BLK_DEV_IO_TRACE=y
395CONFIG_DEBUG_STACKOVERFLOW=y
396CONFIG_CODE_PATCHING_SELFTEST=y 390CONFIG_CODE_PATCHING_SELFTEST=y
397CONFIG_FTR_FIXUP_SELFTEST=y 391CONFIG_FTR_FIXUP_SELFTEST=y
398CONFIG_MSI_BITMAP_SELFTEST=y 392CONFIG_MSI_BITMAP_SELFTEST=y
399CONFIG_XMON=y 393CONFIG_XMON=y
400CONFIG_BOOTX_TEXT=y 394CONFIG_BOOTX_TEXT=y
401CONFIG_PPC_EARLY_DEBUG=y 395CONFIG_PPC_EARLY_DEBUG=y
402CONFIG_PPC_EARLY_DEBUG_BOOTX=y
403CONFIG_CRYPTO_NULL=m
404CONFIG_CRYPTO_TEST=m 396CONFIG_CRYPTO_TEST=m
405CONFIG_CRYPTO_PCBC=m 397CONFIG_CRYPTO_PCBC=m
406CONFIG_CRYPTO_HMAC=y 398CONFIG_CRYPTO_HMAC=y
@@ -422,4 +414,3 @@ CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
422CONFIG_VIRTUALIZATION=y 414CONFIG_VIRTUALIZATION=y
423CONFIG_KVM_BOOK3S_64=m 415CONFIG_KVM_BOOK3S_64=m
424CONFIG_KVM_BOOK3S_64_HV=y 416CONFIG_KVM_BOOK3S_64_HV=y
425CONFIG_VHOST_NET=m
diff --git a/arch/powerpc/configs/ppc64e_defconfig b/arch/powerpc/configs/ppc64e_defconfig
index 0a6be6dd6003..f627fda08953 100644
--- a/arch/powerpc/configs/ppc64e_defconfig
+++ b/arch/powerpc/configs/ppc64e_defconfig
@@ -1,7 +1,6 @@
1CONFIG_PPC64=y 1CONFIG_PPC64=y
2CONFIG_PPC_BOOK3E_64=y 2CONFIG_PPC_BOOK3E_64=y
3CONFIG_SMP=y 3CONFIG_SMP=y
4CONFIG_EXPERIMENTAL=y
5CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
6CONFIG_POSIX_MQUEUE=y 5CONFIG_POSIX_MQUEUE=y
7CONFIG_NO_HZ=y 6CONFIG_NO_HZ=y
@@ -61,7 +60,6 @@ CONFIG_NF_CONNTRACK_PPTP=m
61CONFIG_NF_CONNTRACK_SIP=m 60CONFIG_NF_CONNTRACK_SIP=m
62CONFIG_NF_CONNTRACK_TFTP=m 61CONFIG_NF_CONNTRACK_TFTP=m
63CONFIG_NF_CT_NETLINK=m 62CONFIG_NF_CT_NETLINK=m
64CONFIG_NETFILTER_TPROXY=m
65CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 63CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
66CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 64CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
67CONFIG_NETFILTER_XT_TARGET_DSCP=m 65CONFIG_NETFILTER_XT_TARGET_DSCP=m
@@ -103,7 +101,6 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
103CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 101CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
104CONFIG_NETFILTER_XT_MATCH_U32=m 102CONFIG_NETFILTER_XT_MATCH_U32=m
105CONFIG_NF_CONNTRACK_IPV4=m 103CONFIG_NF_CONNTRACK_IPV4=m
106CONFIG_IP_NF_QUEUE=m
107CONFIG_IP_NF_IPTABLES=m 104CONFIG_IP_NF_IPTABLES=m
108CONFIG_IP_NF_MATCH_AH=m 105CONFIG_IP_NF_MATCH_AH=m
109CONFIG_IP_NF_MATCH_ECN=m 106CONFIG_IP_NF_MATCH_ECN=m
@@ -193,7 +190,6 @@ CONFIG_PPP_SYNC_TTY=m
193CONFIG_INPUT_EVDEV=m 190CONFIG_INPUT_EVDEV=m
194CONFIG_INPUT_MISC=y 191CONFIG_INPUT_MISC=y
195# CONFIG_SERIO_SERPORT is not set 192# CONFIG_SERIO_SERPORT is not set
196CONFIG_VT_HW_CONSOLE_BINDING=y
197CONFIG_SERIAL_8250=y 193CONFIG_SERIAL_8250=y
198CONFIG_SERIAL_8250_CONSOLE=y 194CONFIG_SERIAL_8250_CONSOLE=y
199# CONFIG_HW_RANDOM is not set 195# CONFIG_HW_RANDOM is not set
@@ -230,7 +226,6 @@ CONFIG_HID_NTRIG=y
230CONFIG_HID_PANTHERLORD=y 226CONFIG_HID_PANTHERLORD=y
231CONFIG_HID_PETALYNX=y 227CONFIG_HID_PETALYNX=y
232CONFIG_HID_SAMSUNG=y 228CONFIG_HID_SAMSUNG=y
233CONFIG_HID_SONY=y
234CONFIG_HID_SUNPLUS=y 229CONFIG_HID_SUNPLUS=y
235CONFIG_HID_GREENASIA=y 230CONFIG_HID_GREENASIA=y
236CONFIG_HID_SMARTJOYPLUS=y 231CONFIG_HID_SMARTJOYPLUS=y
@@ -302,19 +297,18 @@ CONFIG_NLS_UTF8=y
302CONFIG_CRC_T10DIF=y 297CONFIG_CRC_T10DIF=y
303CONFIG_MAGIC_SYSRQ=y 298CONFIG_MAGIC_SYSRQ=y
304CONFIG_DEBUG_KERNEL=y 299CONFIG_DEBUG_KERNEL=y
300CONFIG_DEBUG_STACK_USAGE=y
301CONFIG_DEBUG_STACKOVERFLOW=y
305CONFIG_DETECT_HUNG_TASK=y 302CONFIG_DETECT_HUNG_TASK=y
306CONFIG_DEBUG_MUTEXES=y 303CONFIG_DEBUG_MUTEXES=y
307CONFIG_DEBUG_STACK_USAGE=y
308CONFIG_LATENCYTOP=y 304CONFIG_LATENCYTOP=y
309CONFIG_IRQSOFF_TRACER=y 305CONFIG_IRQSOFF_TRACER=y
310CONFIG_SCHED_TRACER=y 306CONFIG_SCHED_TRACER=y
311CONFIG_BLK_DEV_IO_TRACE=y 307CONFIG_BLK_DEV_IO_TRACE=y
312CONFIG_DEBUG_STACKOVERFLOW=y
313CONFIG_CODE_PATCHING_SELFTEST=y 308CONFIG_CODE_PATCHING_SELFTEST=y
314CONFIG_FTR_FIXUP_SELFTEST=y 309CONFIG_FTR_FIXUP_SELFTEST=y
315CONFIG_MSI_BITMAP_SELFTEST=y 310CONFIG_MSI_BITMAP_SELFTEST=y
316CONFIG_XMON=y 311CONFIG_XMON=y
317CONFIG_CRYPTO_NULL=m
318CONFIG_CRYPTO_TEST=m 312CONFIG_CRYPTO_TEST=m
319CONFIG_CRYPTO_CCM=m 313CONFIG_CRYPTO_CCM=m
320CONFIG_CRYPTO_GCM=m 314CONFIG_CRYPTO_GCM=m
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 1d4b9763895d..2dec56dd3e93 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -3,7 +3,6 @@ CONFIG_ALTIVEC=y
3CONFIG_VSX=y 3CONFIG_VSX=y
4CONFIG_SMP=y 4CONFIG_SMP=y
5CONFIG_NR_CPUS=2048 5CONFIG_NR_CPUS=2048
6CONFIG_EXPERIMENTAL=y
7CONFIG_SYSVIPC=y 6CONFIG_SYSVIPC=y
8CONFIG_POSIX_MQUEUE=y 7CONFIG_POSIX_MQUEUE=y
9CONFIG_AUDIT=y 8CONFIG_AUDIT=y
@@ -33,7 +32,6 @@ CONFIG_MODULE_UNLOAD=y
33CONFIG_MODVERSIONS=y 32CONFIG_MODVERSIONS=y
34CONFIG_MODULE_SRCVERSION_ALL=y 33CONFIG_MODULE_SRCVERSION_ALL=y
35CONFIG_PARTITION_ADVANCED=y 34CONFIG_PARTITION_ADVANCED=y
36CONFIG_EFI_PARTITION=y
37CONFIG_PPC_SPLPAR=y 35CONFIG_PPC_SPLPAR=y
38CONFIG_SCANLOG=m 36CONFIG_SCANLOG=m
39CONFIG_PPC_SMLPAR=y 37CONFIG_PPC_SMLPAR=y
@@ -44,7 +42,6 @@ CONFIG_IBMEBUS=y
44CONFIG_HZ_100=y 42CONFIG_HZ_100=y
45CONFIG_BINFMT_MISC=m 43CONFIG_BINFMT_MISC=m
46CONFIG_PPC_TRANSACTIONAL_MEM=y 44CONFIG_PPC_TRANSACTIONAL_MEM=y
47CONFIG_HOTPLUG_CPU=y
48CONFIG_KEXEC=y 45CONFIG_KEXEC=y
49CONFIG_IRQ_ALL_CPUS=y 46CONFIG_IRQ_ALL_CPUS=y
50CONFIG_MEMORY_HOTPLUG=y 47CONFIG_MEMORY_HOTPLUG=y
@@ -52,7 +49,6 @@ CONFIG_MEMORY_HOTREMOVE=y
52CONFIG_PPC_64K_PAGES=y 49CONFIG_PPC_64K_PAGES=y
53CONFIG_PPC_SUBPAGE_PROT=y 50CONFIG_PPC_SUBPAGE_PROT=y
54CONFIG_SCHED_SMT=y 51CONFIG_SCHED_SMT=y
55CONFIG_PPC_DENORMALISATION=y
56CONFIG_HOTPLUG_PCI=y 52CONFIG_HOTPLUG_PCI=y
57CONFIG_HOTPLUG_PCI_RPA=m 53CONFIG_HOTPLUG_PCI_RPA=m
58CONFIG_HOTPLUG_PCI_RPA_DLPAR=m 54CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
@@ -113,7 +109,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
113CONFIG_NETFILTER_XT_MATCH_TIME=m 109CONFIG_NETFILTER_XT_MATCH_TIME=m
114CONFIG_NETFILTER_XT_MATCH_U32=m 110CONFIG_NETFILTER_XT_MATCH_U32=m
115CONFIG_NF_CONNTRACK_IPV4=m 111CONFIG_NF_CONNTRACK_IPV4=m
116CONFIG_IP_NF_QUEUE=m
117CONFIG_IP_NF_IPTABLES=m 112CONFIG_IP_NF_IPTABLES=m
118CONFIG_IP_NF_MATCH_AH=m 113CONFIG_IP_NF_MATCH_AH=m
119CONFIG_IP_NF_MATCH_ECN=m 114CONFIG_IP_NF_MATCH_ECN=m
@@ -179,6 +174,7 @@ CONFIG_DUMMY=m
179CONFIG_NETCONSOLE=y 174CONFIG_NETCONSOLE=y
180CONFIG_NETPOLL_TRAP=y 175CONFIG_NETPOLL_TRAP=y
181CONFIG_TUN=m 176CONFIG_TUN=m
177CONFIG_VHOST_NET=m
182CONFIG_VORTEX=y 178CONFIG_VORTEX=y
183CONFIG_ACENIC=m 179CONFIG_ACENIC=m
184CONFIG_ACENIC_OMIT_TIGON_I=y 180CONFIG_ACENIC_OMIT_TIGON_I=y
@@ -237,7 +233,6 @@ CONFIG_HID_GYRATION=y
237CONFIG_HID_PANTHERLORD=y 233CONFIG_HID_PANTHERLORD=y
238CONFIG_HID_PETALYNX=y 234CONFIG_HID_PETALYNX=y
239CONFIG_HID_SAMSUNG=y 235CONFIG_HID_SAMSUNG=y
240CONFIG_HID_SONY=y
241CONFIG_HID_SUNPLUS=y 236CONFIG_HID_SUNPLUS=y
242CONFIG_USB_HIDDEV=y 237CONFIG_USB_HIDDEV=y
243CONFIG_USB=y 238CONFIG_USB=y
@@ -314,18 +309,17 @@ CONFIG_NLS_UTF8=y
314CONFIG_CRC_T10DIF=y 309CONFIG_CRC_T10DIF=y
315CONFIG_MAGIC_SYSRQ=y 310CONFIG_MAGIC_SYSRQ=y
316CONFIG_DEBUG_KERNEL=y 311CONFIG_DEBUG_KERNEL=y
317CONFIG_LOCKUP_DETECTOR=y
318CONFIG_DEBUG_STACK_USAGE=y 312CONFIG_DEBUG_STACK_USAGE=y
313CONFIG_DEBUG_STACKOVERFLOW=y
314CONFIG_LOCKUP_DETECTOR=y
319CONFIG_LATENCYTOP=y 315CONFIG_LATENCYTOP=y
320CONFIG_SCHED_TRACER=y 316CONFIG_SCHED_TRACER=y
321CONFIG_BLK_DEV_IO_TRACE=y 317CONFIG_BLK_DEV_IO_TRACE=y
322CONFIG_DEBUG_STACKOVERFLOW=y
323CONFIG_CODE_PATCHING_SELFTEST=y 318CONFIG_CODE_PATCHING_SELFTEST=y
324CONFIG_FTR_FIXUP_SELFTEST=y 319CONFIG_FTR_FIXUP_SELFTEST=y
325CONFIG_MSI_BITMAP_SELFTEST=y 320CONFIG_MSI_BITMAP_SELFTEST=y
326CONFIG_XMON=y 321CONFIG_XMON=y
327CONFIG_XMON_DEFAULT=y 322CONFIG_XMON_DEFAULT=y
328CONFIG_CRYPTO_NULL=m
329CONFIG_CRYPTO_TEST=m 323CONFIG_CRYPTO_TEST=m
330CONFIG_CRYPTO_PCBC=m 324CONFIG_CRYPTO_PCBC=m
331CONFIG_CRYPTO_HMAC=y 325CONFIG_CRYPTO_HMAC=y
@@ -347,4 +341,3 @@ CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
347CONFIG_VIRTUALIZATION=y 341CONFIG_VIRTUALIZATION=y
348CONFIG_KVM_BOOK3S_64=m 342CONFIG_KVM_BOOK3S_64=m
349CONFIG_KVM_BOOK3S_64_HV=y 343CONFIG_KVM_BOOK3S_64_HV=y
350CONFIG_VHOST_NET=m
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-25 17:11:51 -0500