Skip to content

Commit b1acf1b

Browse files
committed
powerpc: Update g5_defconfig
This updates the g5 defconfig to include nouveau instead of nvidiafb (which works much better nowadays, in fact the latter crashes on modern distros), and to set CONFIG_VT_HW_CONSOLE_BINDING without which takeover from the firmware offb by nouveau doesn't work properly (and leads to unexplained black screens for some users). The rest is churn of going through defconfig / savedefconfig Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
1 parent 38df850 commit b1acf1b

File tree

1 file changed

+30
-73
lines changed

1 file changed

+30
-73
lines changed

arch/powerpc/configs/g5_defconfig

Lines changed: 30 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
CONFIG_PPC64=y
2-
CONFIG_ALTIVEC=y
3-
CONFIG_SMP=y
4-
CONFIG_NR_CPUS=4
51
CONFIG_EXPERIMENTAL=y
62
CONFIG_SYSVIPC=y
73
CONFIG_POSIX_MQUEUE=y
4+
CONFIG_NO_HZ=y
5+
CONFIG_HIGH_RES_TIMERS=y
86
CONFIG_IKCONFIG=y
97
CONFIG_IKCONFIG_PROC=y
108
CONFIG_BLK_DEV_INITRD=y
@@ -15,16 +13,15 @@ CONFIG_MODULES=y
1513
CONFIG_MODULE_UNLOAD=y
1614
CONFIG_MODVERSIONS=y
1715
CONFIG_MODULE_SRCVERSION_ALL=y
18-
# CONFIG_PPC_PSERIES is not set
16+
CONFIG_PARTITION_ADVANCED=y
17+
CONFIG_MAC_PARTITION=y
18+
CONFIG_SMP=y
19+
CONFIG_NR_CPUS=4
20+
CONFIG_KEXEC=y
21+
# CONFIG_RELOCATABLE is not set
1922
CONFIG_CPU_FREQ=y
2023
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
2124
CONFIG_CPU_FREQ_GOV_USERSPACE=y
22-
CONFIG_CPU_FREQ_PMAC64=y
23-
CONFIG_NO_HZ=y
24-
CONFIG_HIGH_RES_TIMERS=y
25-
CONFIG_KEXEC=y
26-
CONFIG_IRQ_ALL_CPUS=y
27-
# CONFIG_MIGRATION is not set
2825
CONFIG_PCI_MSI=y
2926
CONFIG_NET=y
3027
CONFIG_PACKET=y
@@ -52,16 +49,13 @@ CONFIG_NF_CT_NETLINK=m
5249
CONFIG_NF_CONNTRACK_IPV4=m
5350
CONFIG_IP_NF_QUEUE=m
5451
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
55-
CONFIG_PROC_DEVICETREE=y
5652
CONFIG_BLK_DEV_LOOP=y
5753
CONFIG_BLK_DEV_NBD=m
5854
CONFIG_BLK_DEV_RAM=y
5955
CONFIG_BLK_DEV_RAM_SIZE=65536
6056
CONFIG_CDROM_PKTCDVD=m
6157
CONFIG_IDE=y
6258
CONFIG_BLK_DEV_IDECD=y
63-
CONFIG_BLK_DEV_IDE_PMAC=y
64-
CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
6559
CONFIG_BLK_DEV_SD=y
6660
CONFIG_CHR_DEV_ST=y
6761
CONFIG_BLK_DEV_SR=y
@@ -85,33 +79,24 @@ CONFIG_DM_CRYPT=m
8579
CONFIG_DM_SNAPSHOT=m
8680
CONFIG_DM_MIRROR=m
8781
CONFIG_DM_ZERO=m
88-
CONFIG_IEEE1394=y
89-
CONFIG_IEEE1394_OHCI1394=y
90-
CONFIG_IEEE1394_SBP2=m
91-
CONFIG_IEEE1394_ETH1394=m
92-
CONFIG_IEEE1394_RAWIO=y
93-
CONFIG_IEEE1394_VIDEO1394=m
94-
CONFIG_IEEE1394_DV1394=m
95-
CONFIG_ADB_PMU=y
96-
CONFIG_PMAC_SMU=y
82+
CONFIG_MACINTOSH_DRIVERS=y
9783
CONFIG_MAC_EMUMOUSEBTN=y
98-
CONFIG_THERM_PM72=y
99-
CONFIG_WINDFARM=y
100-
CONFIG_WINDFARM_PM81=y
101-
CONFIG_WINDFARM_PM91=y
102-
CONFIG_WINDFARM_PM112=y
103-
CONFIG_WINDFARM_PM121=y
10484
CONFIG_NETDEVICES=y
105-
CONFIG_DUMMY=m
10685
CONFIG_BONDING=m
107-
CONFIG_TUN=m
108-
CONFIG_NET_ETHERNET=y
86+
CONFIG_DUMMY=m
10987
CONFIG_MII=y
110-
CONFIG_SUNGEM=y
88+
CONFIG_TUN=m
11189
CONFIG_ACENIC=m
11290
CONFIG_ACENIC_OMIT_TIGON_I=y
113-
CONFIG_E1000=y
11491
CONFIG_TIGON3=y
92+
CONFIG_E1000=y
93+
CONFIG_SUNGEM=y
94+
CONFIG_PPP=m
95+
CONFIG_PPP_BSDCOMP=m
96+
CONFIG_PPP_DEFLATE=m
97+
CONFIG_PPPOE=m
98+
CONFIG_PPP_ASYNC=m
99+
CONFIG_PPP_SYNC_TTY=m
115100
CONFIG_USB_CATC=m
116101
CONFIG_USB_KAWETH=m
117102
CONFIG_USB_PEGASUS=m
@@ -121,66 +106,45 @@ CONFIG_USB_USBNET=m
121106
# CONFIG_USB_NET_NET1080 is not set
122107
# CONFIG_USB_NET_CDC_SUBSET is not set
123108
# CONFIG_USB_NET_ZAURUS is not set
124-
CONFIG_PPP=m
125-
CONFIG_PPP_ASYNC=m
126-
CONFIG_PPP_SYNC_TTY=m
127-
CONFIG_PPP_DEFLATE=m
128-
CONFIG_PPP_BSDCOMP=m
129-
CONFIG_PPPOE=m
130109
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
131110
CONFIG_INPUT_JOYDEV=m
132111
CONFIG_INPUT_EVDEV=y
133-
# CONFIG_KEYBOARD_ATKBD is not set
134112
# CONFIG_MOUSE_PS2 is not set
135-
# CONFIG_SERIO_I8042 is not set
136113
# CONFIG_SERIO_SERPORT is not set
114+
CONFIG_VT_HW_CONSOLE_BINDING=y
137115
# CONFIG_HW_RANDOM is not set
138116
CONFIG_GEN_RTC=y
139117
CONFIG_RAW_DRIVER=y
140118
CONFIG_I2C_CHARDEV=y
141119
# CONFIG_HWMON is not set
142-
CONFIG_AGP=m
143-
CONFIG_AGP_UNINORTH=m
120+
CONFIG_AGP=y
121+
CONFIG_DRM=y
122+
CONFIG_DRM_NOUVEAU=y
144123
CONFIG_VIDEO_OUTPUT_CONTROL=m
145-
CONFIG_FB=y
146124
CONFIG_FIRMWARE_EDID=y
147125
CONFIG_FB_TILEBLITTING=y
148-
CONFIG_FB_OF=y
149-
CONFIG_FB_NVIDIA=y
150-
CONFIG_FB_NVIDIA_I2C=y
151126
CONFIG_FB_RADEON=y
152-
# CONFIG_VGA_CONSOLE is not set
153-
CONFIG_FRAMEBUFFER_CONSOLE=y
154127
CONFIG_LOGO=y
155128
CONFIG_SOUND=m
156129
CONFIG_SND=m
157130
CONFIG_SND_SEQUENCER=m
158131
CONFIG_SND_MIXER_OSS=m
159132
CONFIG_SND_PCM_OSS=m
160133
CONFIG_SND_SEQUENCER_OSS=y
161-
CONFIG_SND_POWERMAC=m
162-
CONFIG_SND_AOA=m
163-
CONFIG_SND_AOA_FABRIC_LAYOUT=m
164-
CONFIG_SND_AOA_ONYX=m
165-
CONFIG_SND_AOA_TAS=m
166-
CONFIG_SND_AOA_TOONIE=m
167134
CONFIG_SND_USB_AUDIO=m
168-
CONFIG_HID_PID=y
169-
CONFIG_USB_HIDDEV=y
170135
CONFIG_HID_GYRATION=y
171136
CONFIG_LOGITECH_FF=y
172137
CONFIG_HID_PANTHERLORD=y
173138
CONFIG_HID_PETALYNX=y
174139
CONFIG_HID_SAMSUNG=y
175140
CONFIG_HID_SONY=y
176141
CONFIG_HID_SUNPLUS=y
142+
CONFIG_HID_PID=y
143+
CONFIG_USB_HIDDEV=y
177144
CONFIG_USB=y
178-
CONFIG_USB_DEVICEFS=y
179145
CONFIG_USB_MON=y
180146
CONFIG_USB_EHCI_HCD=y
181-
# CONFIG_USB_EHCI_HCD_PPC_OF is not set
182147
CONFIG_USB_OHCI_HCD=y
183-
CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
184148
CONFIG_USB_ACM=m
185149
CONFIG_USB_PRINTER=y
186150
CONFIG_USB_STORAGE=y
@@ -244,8 +208,6 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
244208
CONFIG_REISERFS_FS_SECURITY=y
245209
CONFIG_XFS_FS=m
246210
CONFIG_XFS_POSIX_ACL=y
247-
CONFIG_INOTIFY=y
248-
CONFIG_AUTOFS_FS=m
249211
CONFIG_ISO9660_FS=y
250212
CONFIG_JOLIET=y
251213
CONFIG_ZISOFS=y
@@ -259,44 +221,36 @@ CONFIG_HFS_FS=m
259221
CONFIG_HFSPLUS_FS=m
260222
CONFIG_CRAMFS=y
261223
CONFIG_NFS_FS=y
262-
CONFIG_NFS_V3=y
263224
CONFIG_NFS_V3_ACL=y
264225
CONFIG_NFS_V4=y
265226
CONFIG_NFSD=y
266227
CONFIG_NFSD_V3_ACL=y
267228
CONFIG_NFSD_V4=y
268229
CONFIG_CIFS=m
269-
CONFIG_PARTITION_ADVANCED=y
270230
CONFIG_NLS_CODEPAGE_437=y
271231
CONFIG_NLS_CODEPAGE_1250=y
272232
CONFIG_NLS_CODEPAGE_1251=y
273233
CONFIG_NLS_ASCII=y
274234
CONFIG_NLS_ISO8859_1=y
275235
CONFIG_NLS_ISO8859_15=y
276236
CONFIG_NLS_UTF8=y
277-
CONFIG_CRC_T10DIF=y
278-
CONFIG_LIBCRC32C=m
279237
CONFIG_MAGIC_SYSRQ=y
238+
# CONFIG_UNUSED_SYMBOLS is not set
280239
CONFIG_DEBUG_FS=y
281240
CONFIG_DEBUG_KERNEL=y
282241
CONFIG_DEBUG_MUTEXES=y
283-
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
284242
CONFIG_LATENCYTOP=y
285-
CONFIG_SYSCTL_SYSCALL_CHECK=y
286-
CONFIG_BOOTX_TEXT=y
243+
CONFIG_STRICT_DEVMEM=y
287244
CONFIG_CRYPTO_NULL=m
288245
CONFIG_CRYPTO_TEST=m
289-
CONFIG_CRYPTO_ECB=m
290246
CONFIG_CRYPTO_PCBC=m
291247
CONFIG_CRYPTO_HMAC=y
292-
CONFIG_CRYPTO_MD4=m
293248
CONFIG_CRYPTO_MICHAEL_MIC=m
294249
CONFIG_CRYPTO_SHA256=m
295250
CONFIG_CRYPTO_SHA512=m
296251
CONFIG_CRYPTO_WP512=m
297252
CONFIG_CRYPTO_AES=m
298253
CONFIG_CRYPTO_ANUBIS=m
299-
CONFIG_CRYPTO_ARC4=m
300254
CONFIG_CRYPTO_BLOWFISH=m
301255
CONFIG_CRYPTO_CAST5=m
302256
CONFIG_CRYPTO_CAST6=m
@@ -306,3 +260,6 @@ CONFIG_CRYPTO_TEA=m
306260
CONFIG_CRYPTO_TWOFISH=m
307261
# CONFIG_CRYPTO_ANSI_CPRNG is not set
308262
# CONFIG_CRYPTO_HW is not set
263+
# CONFIG_VIRTUALIZATION is not set
264+
CONFIG_CRC_T10DIF=y
265+
CONFIG_LIBCRC32C=m

0 commit comments

Comments
 (0)