aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/c2k_defconfig
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2015-01-20 01:36:53 -0500
committerMichael Ellerman <mpe@ellerman.id.au>2015-01-20 02:06:58 -0500
commita85cade6762bf566698e625ec1a4461245e40768 (patch)
treee6dc30c400417d313c2546aa0bc93ca1905608b5 /arch/powerpc/configs/c2k_defconfig
parent9a4fc4eaf111ca960c9f524b850598e9dbc9697f (diff)
powerpc: Update all configs using savedefconfig
It looks like it's ~4 years since we updated some of these, so do a bulk update. Verified that the before and after generated configs are exactly the same. Which begs the question why update them? The answer is that it can be confusing when the stored defconfig drifts too far from the generated result. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/configs/c2k_defconfig')
-rw-r--r--arch/powerpc/configs/c2k_defconfig82
1 files changed, 20 insertions, 62 deletions
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig
index 8a08d6dcb0b4..91862292cd55 100644
--- a/arch/powerpc/configs/c2k_defconfig
+++ b/arch/powerpc/configs/c2k_defconfig
@@ -1,17 +1,23 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 2CONFIG_POSIX_MQUEUE=y
4CONFIG_BSD_PROCESS_ACCT=y
5CONFIG_AUDIT=y 3CONFIG_AUDIT=y
4CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7CONFIG_KALLSYMS_EXTRA_PASS=y
8CONFIG_PROFILING=y 6CONFIG_PROFILING=y
9CONFIG_OPROFILE=m 7CONFIG_OPROFILE=m
10CONFIG_KPROBES=y 8CONFIG_KPROBES=y
11CONFIG_MODULES=y 9CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 10CONFIG_MODULE_UNLOAD=y
13CONFIG_MODVERSIONS=y 11CONFIG_MODVERSIONS=y
14# CONFIG_BLK_DEV_BSG is not set 12CONFIG_PARTITION_ADVANCED=y
13CONFIG_OSF_PARTITION=y
14CONFIG_MAC_PARTITION=y
15CONFIG_BSD_DISKLABEL=y
16CONFIG_MINIX_SUBPARTITION=y
17CONFIG_SOLARIS_X86_PARTITION=y
18CONFIG_UNIXWARE_DISKLABEL=y
19CONFIG_SGI_PARTITION=y
20CONFIG_SUN_PARTITION=y
15# CONFIG_PPC_CHRP is not set 21# CONFIG_PPC_CHRP is not set
16# CONFIG_PPC_PMAC is not set 22# CONFIG_PPC_PMAC is not set
17CONFIG_EMBEDDED6xx=y 23CONFIG_EMBEDDED6xx=y
@@ -24,7 +30,6 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=m
24CONFIG_HIGHMEM=y 30CONFIG_HIGHMEM=y
25CONFIG_PREEMPT_VOLUNTARY=y 31CONFIG_PREEMPT_VOLUNTARY=y
26CONFIG_BINFMT_MISC=y 32CONFIG_BINFMT_MISC=y
27CONFIG_SPARSE_IRQ=y
28CONFIG_PM=y 33CONFIG_PM=y
29CONFIG_PCI_MSI=y 34CONFIG_PCI_MSI=y
30CONFIG_HOTPLUG_PCI=y 35CONFIG_HOTPLUG_PCI=y
@@ -43,8 +48,6 @@ CONFIG_IP_ROUTE_VERBOSE=y
43CONFIG_IP_PNP=y 48CONFIG_IP_PNP=y
44CONFIG_IP_PNP_DHCP=y 49CONFIG_IP_PNP_DHCP=y
45CONFIG_NET_IPIP=m 50CONFIG_NET_IPIP=m
46CONFIG_NET_IPGRE=m
47CONFIG_NET_IPGRE_BROADCAST=y
48CONFIG_IP_MROUTE=y 51CONFIG_IP_MROUTE=y
49CONFIG_IP_PIMSM_V1=y 52CONFIG_IP_PIMSM_V1=y
50CONFIG_IP_PIMSM_V2=y 53CONFIG_IP_PIMSM_V2=y
@@ -52,22 +55,17 @@ CONFIG_SYN_COOKIES=y
52CONFIG_INET_AH=m 55CONFIG_INET_AH=m
53CONFIG_INET_ESP=m 56CONFIG_INET_ESP=m
54CONFIG_INET_IPCOMP=m 57CONFIG_INET_IPCOMP=m
55CONFIG_IPV6_PRIVACY=y
56CONFIG_INET6_AH=m 58CONFIG_INET6_AH=m
57CONFIG_INET6_ESP=m 59CONFIG_INET6_ESP=m
58CONFIG_INET6_IPCOMP=m 60CONFIG_INET6_IPCOMP=m
59CONFIG_IPV6_TUNNEL=m 61CONFIG_IPV6_TUNNEL=m
60CONFIG_NETFILTER=y 62CONFIG_NETFILTER=y
61# CONFIG_NETFILTER_XT_MATCH_SCTP is not set 63# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
62CONFIG_IP_NF_QUEUE=m
63CONFIG_IP_NF_IPTABLES=m 64CONFIG_IP_NF_IPTABLES=m
64CONFIG_IP_NF_MATCH_ADDRTYPE=m
65CONFIG_IP_NF_MATCH_ECN=m 65CONFIG_IP_NF_MATCH_ECN=m
66CONFIG_IP_NF_MATCH_TTL=m 66CONFIG_IP_NF_MATCH_TTL=m
67CONFIG_IP_NF_FILTER=m 67CONFIG_IP_NF_FILTER=m
68CONFIG_IP_NF_TARGET_REJECT=m 68CONFIG_IP_NF_TARGET_REJECT=m
69CONFIG_IP_NF_TARGET_LOG=m
70CONFIG_IP_NF_TARGET_ULOG=m
71CONFIG_IP_NF_MANGLE=m 69CONFIG_IP_NF_MANGLE=m
72CONFIG_IP_NF_TARGET_ECN=m 70CONFIG_IP_NF_TARGET_ECN=m
73CONFIG_IP_NF_RAW=m 71CONFIG_IP_NF_RAW=m
@@ -81,7 +79,6 @@ CONFIG_IP6_NF_MATCH_OPTS=m
81CONFIG_IP6_NF_MATCH_HL=m 79CONFIG_IP6_NF_MATCH_HL=m
82CONFIG_IP6_NF_MATCH_IPV6HEADER=m 80CONFIG_IP6_NF_MATCH_IPV6HEADER=m
83CONFIG_IP6_NF_MATCH_RT=m 81CONFIG_IP6_NF_MATCH_RT=m
84CONFIG_IP6_NF_TARGET_LOG=m
85CONFIG_IP6_NF_FILTER=m 82CONFIG_IP6_NF_FILTER=m
86CONFIG_IP6_NF_MANGLE=m 83CONFIG_IP6_NF_MANGLE=m
87CONFIG_IP6_NF_RAW=m 84CONFIG_IP6_NF_RAW=m
@@ -133,8 +130,6 @@ CONFIG_NET_CLS_RSVP=m
133CONFIG_NET_CLS_RSVP6=m 130CONFIG_NET_CLS_RSVP6=m
134CONFIG_NET_CLS_IND=y 131CONFIG_NET_CLS_IND=y
135CONFIG_BT=m 132CONFIG_BT=m
136CONFIG_BT_L2CAP=y
137CONFIG_BT_SCO=y
138CONFIG_BT_RFCOMM=m 133CONFIG_BT_RFCOMM=m
139CONFIG_BT_RFCOMM_TTY=y 134CONFIG_BT_RFCOMM_TTY=y
140CONFIG_BT_BNEP=m 135CONFIG_BT_BNEP=m
@@ -149,9 +144,6 @@ CONFIG_BT_HCIBFUSB=m
149CONFIG_BT_HCIVHCI=m 144CONFIG_BT_HCIVHCI=m
150CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 145CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
151CONFIG_MTD=y 146CONFIG_MTD=y
152CONFIG_MTD_CONCAT=m
153CONFIG_MTD_OF_PARTS=y
154CONFIG_MTD_CHAR=m
155CONFIG_MTD_BLOCK=y 147CONFIG_MTD_BLOCK=y
156CONFIG_MTD_CFI=y 148CONFIG_MTD_CFI=y
157CONFIG_MTD_CFI_AMDSTD=y 149CONFIG_MTD_CFI_AMDSTD=y
@@ -162,7 +154,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
162CONFIG_BLK_DEV_NBD=m 154CONFIG_BLK_DEV_NBD=m
163CONFIG_BLK_DEV_RAM=y 155CONFIG_BLK_DEV_RAM=y
164CONFIG_BLK_DEV_RAM_SIZE=16384 156CONFIG_BLK_DEV_RAM_SIZE=16384
165# CONFIG_MISC_DEVICES is not set
166CONFIG_SCSI=m 157CONFIG_SCSI=m
167CONFIG_BLK_DEV_SD=m 158CONFIG_BLK_DEV_SD=m
168CONFIG_CHR_DEV_ST=m 159CONFIG_CHR_DEV_ST=m
@@ -182,7 +173,6 @@ CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
182CONFIG_AIC7XXX_RESET_DELAY_MS=15000 173CONFIG_AIC7XXX_RESET_DELAY_MS=15000
183# CONFIG_AIC7XXX_DEBUG_ENABLE is not set 174# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
184# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set 175# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
185CONFIG_SCSI_AIC7XXX_OLD=m
186CONFIG_SCSI_AIC79XX=m 176CONFIG_SCSI_AIC79XX=m
187CONFIG_AIC79XX_CMDS_PER_DEVICE=4 177CONFIG_AIC79XX_CMDS_PER_DEVICE=4
188CONFIG_AIC79XX_RESET_DELAY_MS=15000 178CONFIG_AIC79XX_RESET_DELAY_MS=15000
@@ -199,18 +189,14 @@ CONFIG_SCSI_IPS=m
199CONFIG_SCSI_INITIO=m 189CONFIG_SCSI_INITIO=m
200CONFIG_SCSI_SYM53C8XX_2=m 190CONFIG_SCSI_SYM53C8XX_2=m
201CONFIG_SCSI_QLOGIC_1280=m 191CONFIG_SCSI_QLOGIC_1280=m
202CONFIG_SCSI_LPFC=m
203CONFIG_NETDEVICES=y 192CONFIG_NETDEVICES=y
204CONFIG_DUMMY=m
205CONFIG_BONDING=m 193CONFIG_BONDING=m
194CONFIG_DUMMY=m
195CONFIG_NETCONSOLE=m
206CONFIG_TUN=m 196CONFIG_TUN=m
207CONFIG_VITESSE_PHY=y
208CONFIG_NET_ETHERNET=y
209CONFIG_MII=y
210CONFIG_MV643XX_ETH=y
211# CONFIG_NETDEV_10000 is not set
212# CONFIG_ATM_DRIVERS is not set 197# CONFIG_ATM_DRIVERS is not set
213CONFIG_NETCONSOLE=m 198CONFIG_MV643XX_ETH=y
199CONFIG_VITESSE_PHY=y
214# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 200# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
215CONFIG_INPUT_EVDEV=y 201CONFIG_INPUT_EVDEV=y
216# CONFIG_INPUT_KEYBOARD is not set 202# CONFIG_INPUT_KEYBOARD is not set
@@ -218,10 +204,10 @@ CONFIG_INPUT_EVDEV=y
218CONFIG_INPUT_MISC=y 204CONFIG_INPUT_MISC=y
219CONFIG_INPUT_UINPUT=m 205CONFIG_INPUT_UINPUT=m
220# CONFIG_SERIO is not set 206# CONFIG_SERIO is not set
207# CONFIG_LEGACY_PTYS is not set
221CONFIG_SERIAL_NONSTANDARD=y 208CONFIG_SERIAL_NONSTANDARD=y
222CONFIG_SERIAL_MPSC=y 209CONFIG_SERIAL_MPSC=y
223CONFIG_SERIAL_MPSC_CONSOLE=y 210CONFIG_SERIAL_MPSC_CONSOLE=y
224# CONFIG_LEGACY_PTYS is not set
225CONFIG_NVRAM=m 211CONFIG_NVRAM=m
226CONFIG_GEN_RTC=m 212CONFIG_GEN_RTC=m
227CONFIG_RAW_DRIVER=y 213CONFIG_RAW_DRIVER=y
@@ -236,7 +222,7 @@ CONFIG_SENSORS_ADM1026=m
236CONFIG_SENSORS_ADM1031=m 222CONFIG_SENSORS_ADM1031=m
237CONFIG_SENSORS_DS1621=m 223CONFIG_SENSORS_DS1621=m
238CONFIG_SENSORS_GL518SM=m 224CONFIG_SENSORS_GL518SM=m
239CONFIG_SENSORS_IT87=m 225CONFIG_SENSORS_MAX1619=m
240CONFIG_SENSORS_LM75=m 226CONFIG_SENSORS_LM75=m
241CONFIG_SENSORS_LM77=m 227CONFIG_SENSORS_LM77=m
242CONFIG_SENSORS_LM78=m 228CONFIG_SENSORS_LM78=m
@@ -245,23 +231,17 @@ CONFIG_SENSORS_LM83=m
245CONFIG_SENSORS_LM85=m 231CONFIG_SENSORS_LM85=m
246CONFIG_SENSORS_LM87=m 232CONFIG_SENSORS_LM87=m
247CONFIG_SENSORS_LM90=m 233CONFIG_SENSORS_LM90=m
248CONFIG_SENSORS_MAX1619=m
249CONFIG_SENSORS_PCF8591=m 234CONFIG_SENSORS_PCF8591=m
250CONFIG_SENSORS_SMSC47M1=m
251CONFIG_SENSORS_SMSC47B397=m
252CONFIG_SENSORS_VIA686A=m 235CONFIG_SENSORS_VIA686A=m
253CONFIG_SENSORS_W83781D=m 236CONFIG_SENSORS_W83781D=m
254CONFIG_SENSORS_W83L785TS=m 237CONFIG_SENSORS_W83L785TS=m
255CONFIG_SENSORS_W83627HF=m
256CONFIG_WATCHDOG=y 238CONFIG_WATCHDOG=y
257CONFIG_SOFT_WATCHDOG=m 239CONFIG_SOFT_WATCHDOG=m
258CONFIG_PCIPCWATCHDOG=m 240CONFIG_PCIPCWATCHDOG=m
259CONFIG_WDTPCI=m 241CONFIG_WDTPCI=m
260CONFIG_USBPCWATCHDOG=m 242CONFIG_USBPCWATCHDOG=m
261# CONFIG_VGA_CONSOLE is not set 243# CONFIG_VGA_CONSOLE is not set
262# CONFIG_HID_SUPPORT is not set
263CONFIG_USB=m 244CONFIG_USB=m
264# CONFIG_USB_DEVICE_CLASS is not set
265CONFIG_USB_MON=m 245CONFIG_USB_MON=m
266CONFIG_USB_EHCI_HCD=m 246CONFIG_USB_EHCI_HCD=m
267CONFIG_USB_EHCI_ROOT_HUB_TT=y 247CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -350,24 +330,12 @@ CONFIG_JFFS2_FS=y
350CONFIG_CRAMFS=m 330CONFIG_CRAMFS=m
351CONFIG_VXFS_FS=m 331CONFIG_VXFS_FS=m
352CONFIG_NFS_FS=y 332CONFIG_NFS_FS=y
353CONFIG_NFS_V3=y
354CONFIG_NFS_V3_ACL=y 333CONFIG_NFS_V3_ACL=y
355CONFIG_NFS_V4=y 334CONFIG_NFS_V4=y
356CONFIG_ROOT_NFS=y 335CONFIG_ROOT_NFS=y
357CONFIG_RPCSEC_GSS_SPKM3=m
358CONFIG_CIFS=m 336CONFIG_CIFS=m
359CONFIG_CIFS_XATTR=y 337CONFIG_CIFS_XATTR=y
360CONFIG_CIFS_POSIX=y 338CONFIG_CIFS_POSIX=y
361CONFIG_PARTITION_ADVANCED=y
362CONFIG_OSF_PARTITION=y
363CONFIG_MAC_PARTITION=y
364CONFIG_BSD_DISKLABEL=y
365CONFIG_MINIX_SUBPARTITION=y
366CONFIG_SOLARIS_X86_PARTITION=y
367CONFIG_UNIXWARE_DISKLABEL=y
368CONFIG_SGI_PARTITION=y
369CONFIG_SUN_PARTITION=y
370CONFIG_EFI_PARTITION=y
371CONFIG_NLS=y 339CONFIG_NLS=y
372CONFIG_NLS_DEFAULT="utf8" 340CONFIG_NLS_DEFAULT="utf8"
373CONFIG_NLS_CODEPAGE_437=y 341CONFIG_NLS_CODEPAGE_437=y
@@ -409,21 +377,16 @@ CONFIG_NLS_KOI8_R=m
409CONFIG_NLS_KOI8_U=m 377CONFIG_NLS_KOI8_U=m
410CONFIG_CRC_CCITT=m 378CONFIG_CRC_CCITT=m
411CONFIG_CRC_T10DIF=m 379CONFIG_CRC_T10DIF=m
380CONFIG_DEBUG_INFO=y
412CONFIG_MAGIC_SYSRQ=y 381CONFIG_MAGIC_SYSRQ=y
413CONFIG_DEBUG_KERNEL=y 382CONFIG_DEBUG_KERNEL=y
414CONFIG_DETECT_HUNG_TASK=y 383CONFIG_DEBUG_STACK_USAGE=y
415CONFIG_DEBUG_SPINLOCK=y
416CONFIG_DEBUG_SPINLOCK_SLEEP=y
417CONFIG_DEBUG_HIGHMEM=y 384CONFIG_DEBUG_HIGHMEM=y
418CONFIG_DEBUG_INFO=y
419# CONFIG_RCU_CPU_STALL_DETECTOR is not set
420CONFIG_SYSCTL_SYSCALL_CHECK=y
421CONFIG_DEBUG_STACKOVERFLOW=y 385CONFIG_DEBUG_STACKOVERFLOW=y
422CONFIG_DEBUG_STACK_USAGE=y 386CONFIG_DETECT_HUNG_TASK=y
387CONFIG_DEBUG_SPINLOCK=y
423CONFIG_BOOTX_TEXT=y 388CONFIG_BOOTX_TEXT=y
424CONFIG_PPC_EARLY_DEBUG=y 389CONFIG_PPC_EARLY_DEBUG=y
425CONFIG_PPC_EARLY_DEBUG_BOOTX=y
426CONFIG_KEYS=y
427CONFIG_KEYS_DEBUG_PROC_KEYS=y 390CONFIG_KEYS_DEBUG_PROC_KEYS=y
428CONFIG_SECURITY=y 391CONFIG_SECURITY=y
429CONFIG_SECURITY_NETWORK=y 392CONFIG_SECURITY_NETWORK=y
@@ -431,16 +394,11 @@ CONFIG_SECURITY_SELINUX=y
431CONFIG_SECURITY_SELINUX_BOOTPARAM=y 394CONFIG_SECURITY_SELINUX_BOOTPARAM=y
432CONFIG_SECURITY_SELINUX_DISABLE=y 395CONFIG_SECURITY_SELINUX_DISABLE=y
433CONFIG_CRYPTO_NULL=m 396CONFIG_CRYPTO_NULL=m
434CONFIG_CRYPTO_ECB=m
435CONFIG_CRYPTO_HMAC=y 397CONFIG_CRYPTO_HMAC=y
436CONFIG_CRYPTO_MD4=m
437CONFIG_CRYPTO_MICHAEL_MIC=m 398CONFIG_CRYPTO_MICHAEL_MIC=m
438CONFIG_CRYPTO_SHA1=y 399CONFIG_CRYPTO_SHA1=y
439CONFIG_CRYPTO_SHA256=m
440CONFIG_CRYPTO_SHA512=m 400CONFIG_CRYPTO_SHA512=m
441CONFIG_CRYPTO_WP512=m 401CONFIG_CRYPTO_WP512=m
442CONFIG_CRYPTO_AES=m
443CONFIG_CRYPTO_ARC4=m
444CONFIG_CRYPTO_BLOWFISH=m 402CONFIG_CRYPTO_BLOWFISH=m
445CONFIG_CRYPTO_CAST6=m 403CONFIG_CRYPTO_CAST6=m
446CONFIG_CRYPTO_KHAZAD=m 404CONFIG_CRYPTO_KHAZAD=m
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-18 01:07:00 -0500