aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/cell_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/cell_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/cell_defconfig')
-rw-r--r--arch/powerpc/configs/cell_defconfig30
1 files changed, 7 insertions, 23 deletions
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index 7a7b3c879f96..9788b3c2d563 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
@@ -3,9 +3,10 @@ CONFIG_TUNE_CELL=y
3CONFIG_ALTIVEC=y 3CONFIG_ALTIVEC=y
4CONFIG_SMP=y 4CONFIG_SMP=y
5CONFIG_NR_CPUS=4 5CONFIG_NR_CPUS=4
6CONFIG_EXPERIMENTAL=y
7CONFIG_SYSVIPC=y 6CONFIG_SYSVIPC=y
8CONFIG_FHANDLE=y 7CONFIG_FHANDLE=y
8CONFIG_NO_HZ=y
9CONFIG_HIGH_RES_TIMERS=y
9CONFIG_IKCONFIG=y 10CONFIG_IKCONFIG=y
10CONFIG_IKCONFIG_PROC=y 11CONFIG_IKCONFIG_PROC=y
11CONFIG_LOG_BUF_SHIFT=15 12CONFIG_LOG_BUF_SHIFT=15
@@ -17,7 +18,7 @@ CONFIG_PROFILING=y
17CONFIG_OPROFILE=m 18CONFIG_OPROFILE=m
18CONFIG_MODULES=y 19CONFIG_MODULES=y
19CONFIG_MODULE_UNLOAD=y 20CONFIG_MODULE_UNLOAD=y
20# CONFIG_BLK_DEV_BSG is not set 21CONFIG_PARTITION_ADVANCED=y
21# CONFIG_PPC_POWERNV is not set 22# CONFIG_PPC_POWERNV is not set
22# CONFIG_PPC_PSERIES is not set 23# CONFIG_PPC_PSERIES is not set
23# CONFIG_PPC_PMAC is not set 24# CONFIG_PPC_PMAC is not set
@@ -34,8 +35,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
34CONFIG_CPU_FREQ_GOV_USERSPACE=y 35CONFIG_CPU_FREQ_GOV_USERSPACE=y
35CONFIG_CPU_FREQ_GOV_ONDEMAND=y 36CONFIG_CPU_FREQ_GOV_ONDEMAND=y
36CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y 37CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
37CONFIG_NO_HZ=y
38CONFIG_HIGH_RES_TIMERS=y
39CONFIG_BINFMT_MISC=m 38CONFIG_BINFMT_MISC=m
40CONFIG_IRQ_ALL_CPUS=y 39CONFIG_IRQ_ALL_CPUS=y
41CONFIG_NUMA=y 40CONFIG_NUMA=y
@@ -63,7 +62,6 @@ CONFIG_INET6_IPCOMP=m
63# CONFIG_IPV6_SIT is not set 62# CONFIG_IPV6_SIT is not set
64CONFIG_IPV6_TUNNEL=m 63CONFIG_IPV6_TUNNEL=m
65CONFIG_NETFILTER=y 64CONFIG_NETFILTER=y
66CONFIG_NETFILTER_NETLINK_QUEUE=m
67CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 65CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
68CONFIG_NETFILTER_XT_TARGET_DSCP=m 66CONFIG_NETFILTER_XT_TARGET_DSCP=m
69CONFIG_NETFILTER_XT_TARGET_MARK=m 67CONFIG_NETFILTER_XT_TARGET_MARK=m
@@ -94,16 +92,12 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
94CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 92CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
95CONFIG_NETFILTER_XT_MATCH_TIME=m 93CONFIG_NETFILTER_XT_MATCH_TIME=m
96CONFIG_NETFILTER_XT_MATCH_U32=m 94CONFIG_NETFILTER_XT_MATCH_U32=m
97CONFIG_IP_NF_QUEUE=m
98CONFIG_IP_NF_IPTABLES=m 95CONFIG_IP_NF_IPTABLES=m
99CONFIG_IP_NF_MATCH_ADDRTYPE=m
100CONFIG_IP_NF_MATCH_AH=m 96CONFIG_IP_NF_MATCH_AH=m
101CONFIG_IP_NF_MATCH_ECN=m 97CONFIG_IP_NF_MATCH_ECN=m
102CONFIG_IP_NF_MATCH_TTL=m 98CONFIG_IP_NF_MATCH_TTL=m
103CONFIG_IP_NF_FILTER=m 99CONFIG_IP_NF_FILTER=m
104CONFIG_IP_NF_TARGET_REJECT=m 100CONFIG_IP_NF_TARGET_REJECT=m
105CONFIG_IP_NF_TARGET_LOG=m
106CONFIG_IP_NF_TARGET_ULOG=m
107CONFIG_IP_NF_MANGLE=m 101CONFIG_IP_NF_MANGLE=m
108CONFIG_IP_NF_TARGET_ECN=m 102CONFIG_IP_NF_TARGET_ECN=m
109CONFIG_IP_NF_TARGET_TTL=m 103CONFIG_IP_NF_TARGET_TTL=m
@@ -112,7 +106,6 @@ CONFIG_IP_NF_ARPTABLES=m
112CONFIG_IP_NF_ARPFILTER=m 106CONFIG_IP_NF_ARPFILTER=m
113CONFIG_IP_NF_ARP_MANGLE=m 107CONFIG_IP_NF_ARP_MANGLE=m
114CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 108CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
115CONFIG_PROC_DEVICETREE=y
116CONFIG_BLK_DEV_LOOP=y 109CONFIG_BLK_DEV_LOOP=y
117CONFIG_BLK_DEV_RAM=y 110CONFIG_BLK_DEV_RAM=y
118CONFIG_BLK_DEV_RAM_SIZE=131072 111CONFIG_BLK_DEV_RAM_SIZE=131072
@@ -144,26 +137,24 @@ CONFIG_NETDEVICES=y
144CONFIG_BONDING=m 137CONFIG_BONDING=m
145CONFIG_MACVLAN=m 138CONFIG_MACVLAN=m
146CONFIG_TUN=y 139CONFIG_TUN=y
147CONFIG_NET_ETHERNET=y 140CONFIG_TIGON3=y
148CONFIG_MII=y
149CONFIG_E1000=m 141CONFIG_E1000=m
150CONFIG_SKGE=m 142CONFIG_SKGE=m
151CONFIG_SKY2=m 143CONFIG_SKY2=m
152CONFIG_TIGON3=y
153CONFIG_SPIDER_NET=y
154CONFIG_GELIC_NET=m 144CONFIG_GELIC_NET=m
155CONFIG_GELIC_WIRELESS=y 145CONFIG_GELIC_WIRELESS=y
146CONFIG_SPIDER_NET=y
156# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 147# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
157# CONFIG_INPUT_KEYBOARD is not set 148# CONFIG_INPUT_KEYBOARD is not set
158# CONFIG_INPUT_MOUSE is not set 149# CONFIG_INPUT_MOUSE is not set
159# CONFIG_SERIO_I8042 is not set 150# CONFIG_SERIO_I8042 is not set
151# CONFIG_LEGACY_PTYS is not set
160CONFIG_SERIAL_NONSTANDARD=y 152CONFIG_SERIAL_NONSTANDARD=y
161CONFIG_SERIAL_8250=y 153CONFIG_SERIAL_8250=y
162CONFIG_SERIAL_8250_CONSOLE=y 154CONFIG_SERIAL_8250_CONSOLE=y
163CONFIG_SERIAL_TXX9_NR_UARTS=2 155CONFIG_SERIAL_TXX9_NR_UARTS=2
164CONFIG_SERIAL_TXX9_CONSOLE=y 156CONFIG_SERIAL_TXX9_CONSOLE=y
165CONFIG_SERIAL_OF_PLATFORM=y 157CONFIG_SERIAL_OF_PLATFORM=y
166# CONFIG_LEGACY_PTYS is not set
167CONFIG_HVC_RTAS=y 158CONFIG_HVC_RTAS=y
168CONFIG_HVC_BEAT=y 159CONFIG_HVC_BEAT=y
169CONFIG_IPMI_HANDLER=m 160CONFIG_IPMI_HANDLER=m
@@ -174,9 +165,7 @@ CONFIG_IPMI_POWEROFF=m
174# CONFIG_HW_RANDOM is not set 165# CONFIG_HW_RANDOM is not set
175CONFIG_GEN_RTC=y 166CONFIG_GEN_RTC=y
176CONFIG_I2C=y 167CONFIG_I2C=y
177# CONFIG_HWMON is not set
178CONFIG_WATCHDOG=y 168CONFIG_WATCHDOG=y
179CONFIG_VIDEO_OUTPUT_CONTROL=m
180# CONFIG_VGA_CONSOLE is not set 169# CONFIG_VGA_CONSOLE is not set
181CONFIG_HID=m 170CONFIG_HID=m
182# CONFIG_USB_HID is not set 171# CONFIG_USB_HID is not set
@@ -199,7 +188,6 @@ CONFIG_EDAC_CELL=y
199CONFIG_UIO=m 188CONFIG_UIO=m
200CONFIG_EXT2_FS=y 189CONFIG_EXT2_FS=y
201CONFIG_EXT3_FS=y 190CONFIG_EXT3_FS=y
202CONFIG_INOTIFY=y
203CONFIG_AUTOFS4_FS=m 191CONFIG_AUTOFS4_FS=m
204CONFIG_ISO9660_FS=m 192CONFIG_ISO9660_FS=m
205CONFIG_JOLIET=y 193CONFIG_JOLIET=y
@@ -210,11 +198,8 @@ CONFIG_PROC_KCORE=y
210CONFIG_TMPFS=y 198CONFIG_TMPFS=y
211CONFIG_HUGETLBFS=y 199CONFIG_HUGETLBFS=y
212CONFIG_NFS_FS=y 200CONFIG_NFS_FS=y
213CONFIG_NFS_V3=y
214CONFIG_NFS_V3_ACL=y 201CONFIG_NFS_V3_ACL=y
215CONFIG_ROOT_NFS=y 202CONFIG_ROOT_NFS=y
216CONFIG_PARTITION_ADVANCED=y
217CONFIG_EFI_PARTITION=y
218CONFIG_NLS_ISO8859_1=m 203CONFIG_NLS_ISO8859_1=m
219CONFIG_NLS_ISO8859_2=m 204CONFIG_NLS_ISO8859_2=m
220CONFIG_NLS_ISO8859_3=m 205CONFIG_NLS_ISO8859_3=m
@@ -227,11 +212,10 @@ CONFIG_NLS_ISO8859_13=m
227CONFIG_NLS_ISO8859_14=m 212CONFIG_NLS_ISO8859_14=m
228CONFIG_NLS_ISO8859_15=m 213CONFIG_NLS_ISO8859_15=m
229# CONFIG_ENABLE_MUST_CHECK is not set 214# CONFIG_ENABLE_MUST_CHECK is not set
230CONFIG_MAGIC_SYSRQ=y
231CONFIG_DEBUG_FS=y 215CONFIG_DEBUG_FS=y
216CONFIG_MAGIC_SYSRQ=y
232CONFIG_DEBUG_KERNEL=y 217CONFIG_DEBUG_KERNEL=y
233CONFIG_DEBUG_MUTEXES=y 218CONFIG_DEBUG_MUTEXES=y
234CONFIG_DEBUG_SPINLOCK_SLEEP=y
235CONFIG_XMON=y 219CONFIG_XMON=y
236CONFIG_XMON_DEFAULT=y 220CONFIG_XMON_DEFAULT=y
237CONFIG_CRYPTO_ECB=m 221CONFIG_CRYPTO_ECB=m
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-18 01:36:12 -0500