aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/configs')
-rw-r--r--arch/powerpc/configs/44x/iss476-smp_defconfig6
-rw-r--r--arch/powerpc/configs/85xx/p1023rds_defconfig173
-rw-r--r--arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig5
-rw-r--r--arch/powerpc/configs/corenet32_smp_defconfig187
-rw-r--r--arch/powerpc/configs/corenet64_smp_defconfig (renamed from arch/powerpc/configs/e55xx_smp_defconfig)0
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig12
-rw-r--r--arch/powerpc/configs/mpc85xx_smp_defconfig10
-rw-r--r--arch/powerpc/configs/ppc64_defconfig16
-rw-r--r--arch/powerpc/configs/pseries_defconfig3
9 files changed, 399 insertions, 13 deletions
diff --git a/arch/powerpc/configs/44x/iss476-smp_defconfig b/arch/powerpc/configs/44x/iss476-smp_defconfig
index 92f863ac8443..a6eb6ad05b2d 100644
--- a/arch/powerpc/configs/44x/iss476-smp_defconfig
+++ b/arch/powerpc/configs/44x/iss476-smp_defconfig
@@ -3,8 +3,8 @@ CONFIG_SMP=y
3CONFIG_EXPERIMENTAL=y 3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 5CONFIG_POSIX_MQUEUE=y
6CONFIG_SPARSE_IRQ=y
6CONFIG_LOG_BUF_SHIFT=14 7CONFIG_LOG_BUF_SHIFT=14
7CONFIG_SYSFS_DEPRECATED_V2=y
8CONFIG_BLK_DEV_INITRD=y 8CONFIG_BLK_DEV_INITRD=y
9# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 9# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
10CONFIG_EXPERT=y 10CONFIG_EXPERT=y
@@ -21,10 +21,11 @@ CONFIG_ISS4xx=y
21CONFIG_HZ_100=y 21CONFIG_HZ_100=y
22CONFIG_MATH_EMULATION=y 22CONFIG_MATH_EMULATION=y
23CONFIG_IRQ_ALL_CPUS=y 23CONFIG_IRQ_ALL_CPUS=y
24CONFIG_SPARSE_IRQ=y
25CONFIG_CMDLINE_BOOL=y 24CONFIG_CMDLINE_BOOL=y
26CONFIG_CMDLINE="root=/dev/issblk0" 25CONFIG_CMDLINE="root=/dev/issblk0"
27# CONFIG_PCI is not set 26# CONFIG_PCI is not set
27CONFIG_ADVANCED_OPTIONS=y
28CONFIG_RELOCATABLE=y
28CONFIG_NET=y 29CONFIG_NET=y
29CONFIG_PACKET=y 30CONFIG_PACKET=y
30CONFIG_UNIX=y 31CONFIG_UNIX=y
@@ -67,7 +68,6 @@ CONFIG_EXT3_FS=y
67# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 68# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
68CONFIG_EXT3_FS_POSIX_ACL=y 69CONFIG_EXT3_FS_POSIX_ACL=y
69CONFIG_EXT3_FS_SECURITY=y 70CONFIG_EXT3_FS_SECURITY=y
70CONFIG_INOTIFY=y
71CONFIG_PROC_KCORE=y 71CONFIG_PROC_KCORE=y
72CONFIG_TMPFS=y 72CONFIG_TMPFS=y
73CONFIG_CRAMFS=y 73CONFIG_CRAMFS=y
diff --git a/arch/powerpc/configs/85xx/p1023rds_defconfig b/arch/powerpc/configs/85xx/p1023rds_defconfig
new file mode 100644
index 000000000000..980ff8f61fd4
--- /dev/null
+++ b/arch/powerpc/configs/85xx/p1023rds_defconfig
@@ -0,0 +1,173 @@
1CONFIG_PPC_85xx=y
2CONFIG_SMP=y
3CONFIG_NR_CPUS=2
4CONFIG_EXPERIMENTAL=y
5CONFIG_SYSVIPC=y
6CONFIG_POSIX_MQUEUE=y
7CONFIG_BSD_PROCESS_ACCT=y
8CONFIG_AUDIT=y
9CONFIG_SPARSE_IRQ=y
10CONFIG_IKCONFIG=y
11CONFIG_IKCONFIG_PROC=y
12CONFIG_LOG_BUF_SHIFT=14
13CONFIG_BLK_DEV_INITRD=y
14# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
15CONFIG_KALLSYMS_ALL=y
16CONFIG_KALLSYMS_EXTRA_PASS=y
17CONFIG_EMBEDDED=y
18CONFIG_MODULES=y
19CONFIG_MODULE_UNLOAD=y
20CONFIG_MODULE_FORCE_UNLOAD=y
21CONFIG_MODVERSIONS=y
22# CONFIG_BLK_DEV_BSG is not set
23CONFIG_P1023_RDS=y
24CONFIG_QUICC_ENGINE=y
25CONFIG_QE_GPIO=y
26CONFIG_CPM2=y
27CONFIG_MPC8xxx_GPIO=y
28CONFIG_HIGHMEM=y
29CONFIG_NO_HZ=y
30CONFIG_HIGH_RES_TIMERS=y
31# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
32CONFIG_BINFMT_MISC=m
33CONFIG_MATH_EMULATION=y
34CONFIG_SWIOTLB=y
35CONFIG_PCI=y
36CONFIG_PCIEPORTBUS=y
37# CONFIG_PCIEAER is not set
38# CONFIG_PCIEASPM is not set
39CONFIG_PCI_MSI=y
40CONFIG_NET=y
41CONFIG_PACKET=y
42CONFIG_UNIX=y
43CONFIG_XFRM_USER=y
44CONFIG_NET_KEY=y
45CONFIG_INET=y
46CONFIG_IP_MULTICAST=y
47CONFIG_IP_ADVANCED_ROUTER=y
48CONFIG_IP_MULTIPLE_TABLES=y
49CONFIG_IP_ROUTE_MULTIPATH=y
50CONFIG_IP_ROUTE_VERBOSE=y
51CONFIG_IP_PNP=y
52CONFIG_IP_PNP_DHCP=y
53CONFIG_IP_PNP_BOOTP=y
54CONFIG_IP_PNP_RARP=y
55CONFIG_NET_IPIP=y
56CONFIG_IP_MROUTE=y
57CONFIG_IP_PIMSM_V1=y
58CONFIG_IP_PIMSM_V2=y
59CONFIG_ARPD=y
60CONFIG_INET_ESP=y
61# CONFIG_INET_XFRM_MODE_BEET is not set
62# CONFIG_INET_LRO is not set
63CONFIG_IPV6=y
64CONFIG_IP_SCTP=m
65CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
66CONFIG_PROC_DEVICETREE=y
67CONFIG_BLK_DEV_LOOP=y
68CONFIG_BLK_DEV_RAM=y
69CONFIG_BLK_DEV_RAM_SIZE=131072
70CONFIG_MISC_DEVICES=y
71CONFIG_EEPROM_LEGACY=y
72CONFIG_BLK_DEV_SD=y
73CONFIG_CHR_DEV_ST=y
74CONFIG_BLK_DEV_SR=y
75CONFIG_CHR_DEV_SG=y
76CONFIG_SCSI_MULTI_LUN=y
77CONFIG_SCSI_LOGGING=y
78CONFIG_ATA=y
79CONFIG_SATA_FSL=y
80CONFIG_SATA_SIL24=y
81CONFIG_NETDEVICES=y
82CONFIG_DUMMY=y
83CONFIG_MARVELL_PHY=y
84CONFIG_DAVICOM_PHY=y
85CONFIG_CICADA_PHY=y
86CONFIG_VITESSE_PHY=y
87CONFIG_FIXED_PHY=y
88CONFIG_NET_ETHERNET=y
89CONFIG_FS_ENET=y
90CONFIG_E1000E=y
91CONFIG_FSL_PQ_MDIO=y
92CONFIG_INPUT_FF_MEMLESS=m
93# CONFIG_INPUT_MOUSEDEV is not set
94# CONFIG_INPUT_KEYBOARD is not set
95# CONFIG_INPUT_MOUSE is not set
96CONFIG_SERIO_LIBPS2=y
97CONFIG_SERIAL_8250=y
98CONFIG_SERIAL_8250_CONSOLE=y
99CONFIG_SERIAL_8250_NR_UARTS=2
100CONFIG_SERIAL_8250_RUNTIME_UARTS=2
101CONFIG_SERIAL_8250_EXTENDED=y
102CONFIG_SERIAL_8250_MANY_PORTS=y
103CONFIG_SERIAL_8250_DETECT_IRQ=y
104CONFIG_SERIAL_8250_RSA=y
105CONFIG_SERIAL_QE=m
106CONFIG_HW_RANDOM=y
107CONFIG_NVRAM=y
108CONFIG_I2C=y
109CONFIG_I2C_CPM=m
110CONFIG_I2C_MPC=y
111# CONFIG_HWMON is not set
112CONFIG_VIDEO_OUTPUT_CONTROL=y
113CONFIG_SOUND=y
114CONFIG_SND=y
115CONFIG_SND_MIXER_OSS=y
116CONFIG_SND_PCM_OSS=y
117# CONFIG_SND_SUPPORT_OLD_API is not set
118CONFIG_EDAC=y
119CONFIG_EDAC_MM_EDAC=y
120CONFIG_RTC_CLASS=y
121CONFIG_RTC_DRV_CMOS=y
122CONFIG_DMADEVICES=y
123CONFIG_FSL_DMA=y
124# CONFIG_NET_DMA is not set
125CONFIG_STAGING=y
126# CONFIG_STAGING_EXCLUDE_BUILD is not set
127CONFIG_EXT2_FS=y
128CONFIG_EXT3_FS=y
129# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
130CONFIG_ISO9660_FS=m
131CONFIG_JOLIET=y
132CONFIG_ZISOFS=y
133CONFIG_UDF_FS=m
134CONFIG_MSDOS_FS=m
135CONFIG_VFAT_FS=y
136CONFIG_NTFS_FS=y
137CONFIG_PROC_KCORE=y
138CONFIG_TMPFS=y
139CONFIG_ADFS_FS=m
140CONFIG_AFFS_FS=m
141CONFIG_HFS_FS=m
142CONFIG_HFSPLUS_FS=m
143CONFIG_BEFS_FS=m
144CONFIG_BFS_FS=m
145CONFIG_EFS_FS=m
146CONFIG_CRAMFS=y
147CONFIG_VXFS_FS=m
148CONFIG_HPFS_FS=m
149CONFIG_QNX4FS_FS=m
150CONFIG_SYSV_FS=m
151CONFIG_UFS_FS=m
152CONFIG_NFS_FS=y
153CONFIG_NFS_V3=y
154CONFIG_NFS_V4=y
155CONFIG_ROOT_NFS=y
156CONFIG_NFSD=y
157CONFIG_PARTITION_ADVANCED=y
158CONFIG_MAC_PARTITION=y
159CONFIG_CRC_T10DIF=y
160CONFIG_FRAME_WARN=8092
161CONFIG_DEBUG_FS=y
162CONFIG_DEBUG_KERNEL=y
163CONFIG_DETECT_HUNG_TASK=y
164# CONFIG_DEBUG_BUGVERBOSE is not set
165CONFIG_DEBUG_INFO=y
166# CONFIG_RCU_CPU_STALL_DETECTOR is not set
167CONFIG_SYSCTL_SYSCALL_CHECK=y
168CONFIG_VIRQ_DEBUG=y
169CONFIG_CRYPTO_PCBC=m
170CONFIG_CRYPTO_SHA256=y
171CONFIG_CRYPTO_SHA512=y
172CONFIG_CRYPTO_AES=y
173# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
index 036bfb2d18cd..0db9ba0423ff 100644
--- a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
@@ -89,6 +89,11 @@ CONFIG_I2C_MPC=y
89CONFIG_VIDEO_OUTPUT_CONTROL=y 89CONFIG_VIDEO_OUTPUT_CONTROL=y
90CONFIG_FB=y 90CONFIG_FB=y
91CONFIG_FB_FSL_DIU=y 91CONFIG_FB_FSL_DIU=y
92CONFIG_VGACON_SOFT_SCROLLBACK=y
93CONFIG_FRAMEBUFFER_CONSOLE=y
94CONFIG_FONTS=y
95CONFIG_FONT_8x8=y
96CONFIG_FONT_8x16=y
92CONFIG_SOUND=y 97CONFIG_SOUND=y
93CONFIG_SND=y 98CONFIG_SND=y
94CONFIG_SND_MIXER_OSS=y 99CONFIG_SND_MIXER_OSS=y
diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig
new file mode 100644
index 000000000000..10562a5c65b9
--- /dev/null
+++ b/arch/powerpc/configs/corenet32_smp_defconfig
@@ -0,0 +1,187 @@
1CONFIG_PPC_85xx=y
2CONFIG_SMP=y
3CONFIG_NR_CPUS=8
4CONFIG_EXPERIMENTAL=y
5CONFIG_SYSVIPC=y
6CONFIG_POSIX_MQUEUE=y
7CONFIG_BSD_PROCESS_ACCT=y
8CONFIG_AUDIT=y
9CONFIG_SPARSE_IRQ=y
10CONFIG_RCU_TRACE=y
11CONFIG_IKCONFIG=y
12CONFIG_IKCONFIG_PROC=y
13CONFIG_LOG_BUF_SHIFT=14
14CONFIG_BLK_DEV_INITRD=y
15# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
16CONFIG_KALLSYMS_ALL=y
17CONFIG_KALLSYMS_EXTRA_PASS=y
18CONFIG_EMBEDDED=y
19CONFIG_PERF_EVENTS=y
20CONFIG_SLAB=y
21CONFIG_MODULES=y
22CONFIG_MODULE_UNLOAD=y
23CONFIG_MODULE_FORCE_UNLOAD=y
24CONFIG_MODVERSIONS=y
25# CONFIG_BLK_DEV_BSG is not set
26CONFIG_P2040_RDB=y
27CONFIG_P3041_DS=y
28CONFIG_P4080_DS=y
29CONFIG_P5020_DS=y
30CONFIG_HIGHMEM=y
31CONFIG_NO_HZ=y
32CONFIG_HIGH_RES_TIMERS=y
33# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
34CONFIG_BINFMT_MISC=m
35CONFIG_KEXEC=y
36CONFIG_FORCE_MAX_ZONEORDER=13
37CONFIG_FSL_LBC=y
38CONFIG_PCI=y
39CONFIG_PCIEPORTBUS=y
40# CONFIG_PCIEASPM is not set
41CONFIG_NET=y
42CONFIG_PACKET=y
43CONFIG_UNIX=y
44CONFIG_XFRM_USER=y
45CONFIG_XFRM_SUB_POLICY=y
46CONFIG_XFRM_STATISTICS=y
47CONFIG_NET_KEY=y
48CONFIG_NET_KEY_MIGRATE=y
49CONFIG_INET=y
50CONFIG_IP_MULTICAST=y
51CONFIG_IP_ADVANCED_ROUTER=y
52CONFIG_IP_MULTIPLE_TABLES=y
53CONFIG_IP_ROUTE_MULTIPATH=y
54CONFIG_IP_ROUTE_VERBOSE=y
55CONFIG_IP_PNP=y
56CONFIG_IP_PNP_DHCP=y
57CONFIG_IP_PNP_BOOTP=y
58CONFIG_IP_PNP_RARP=y
59CONFIG_NET_IPIP=y
60CONFIG_IP_MROUTE=y
61CONFIG_IP_PIMSM_V1=y
62CONFIG_IP_PIMSM_V2=y
63CONFIG_ARPD=y
64CONFIG_INET_AH=y
65CONFIG_INET_ESP=y
66CONFIG_INET_IPCOMP=y
67# CONFIG_INET_LRO is not set
68CONFIG_IPV6=y
69CONFIG_IP_SCTP=m
70CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
71CONFIG_MTD=y
72CONFIG_MTD_PARTITIONS=y
73CONFIG_MTD_CMDLINE_PARTS=y
74CONFIG_MTD_CHAR=y
75CONFIG_MTD_BLOCK=y
76CONFIG_MTD_CFI=y
77CONFIG_MTD_CFI_AMDSTD=y
78CONFIG_MTD_PHYSMAP_OF=y
79CONFIG_MTD_M25P80=y
80CONFIG_PROC_DEVICETREE=y
81CONFIG_BLK_DEV_LOOP=y
82CONFIG_BLK_DEV_RAM=y
83CONFIG_BLK_DEV_RAM_SIZE=131072
84CONFIG_MISC_DEVICES=y
85CONFIG_BLK_DEV_SD=y
86CONFIG_CHR_DEV_ST=y
87CONFIG_BLK_DEV_SR=y
88CONFIG_CHR_DEV_SG=y
89CONFIG_SCSI_MULTI_LUN=y
90CONFIG_SCSI_LOGGING=y
91CONFIG_SCSI_SYM53C8XX_2=y
92CONFIG_ATA=y
93CONFIG_SATA_AHCI=y
94CONFIG_SATA_FSL=y
95CONFIG_SATA_SIL24=y
96CONFIG_SATA_SIL=y
97CONFIG_PATA_SIL680=y
98CONFIG_NETDEVICES=y
99CONFIG_VITESSE_PHY=y
100CONFIG_FIXED_PHY=y
101CONFIG_NET_ETHERNET=y
102CONFIG_E1000=y
103CONFIG_E1000E=y
104CONFIG_FSL_PQ_MDIO=y
105# CONFIG_INPUT_MOUSEDEV is not set
106# CONFIG_INPUT_KEYBOARD is not set
107# CONFIG_INPUT_MOUSE is not set
108CONFIG_SERIO_LIBPS2=y
109# CONFIG_LEGACY_PTYS is not set
110CONFIG_PPC_EPAPR_HV_BYTECHAN=y
111CONFIG_SERIAL_8250=y
112CONFIG_SERIAL_8250_CONSOLE=y
113CONFIG_SERIAL_8250_EXTENDED=y
114CONFIG_SERIAL_8250_MANY_PORTS=y
115CONFIG_SERIAL_8250_DETECT_IRQ=y
116CONFIG_SERIAL_8250_RSA=y
117CONFIG_HW_RANDOM=y
118CONFIG_NVRAM=y
119CONFIG_I2C=y
120CONFIG_I2C_MPC=y
121CONFIG_SPI=y
122CONFIG_SPI_GPIO=y
123CONFIG_SPI_FSL_SPI=y
124CONFIG_SPI_FSL_ESPI=y
125# CONFIG_HWMON is not set
126CONFIG_VIDEO_OUTPUT_CONTROL=y
127CONFIG_USB_HID=m
128CONFIG_USB=y
129CONFIG_USB_DEVICEFS=y
130CONFIG_USB_MON=y
131CONFIG_USB_EHCI_HCD=y
132CONFIG_USB_EHCI_FSL=y
133CONFIG_USB_OHCI_HCD=y
134CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
135CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
136CONFIG_USB_STORAGE=y
137CONFIG_MMC=y
138CONFIG_MMC_SDHCI=y
139CONFIG_MMC_SDHCI_OF=y
140CONFIG_MMC_SDHCI_OF_ESDHC=y
141CONFIG_EDAC=y
142CONFIG_EDAC_MM_EDAC=y
143CONFIG_EDAC_MPC85XX=y
144CONFIG_RTC_CLASS=y
145CONFIG_RTC_DRV_DS3232=y
146CONFIG_RTC_DRV_CMOS=y
147CONFIG_UIO=y
148CONFIG_STAGING=y
149# CONFIG_STAGING_EXCLUDE_BUILD is not set
150CONFIG_VIRT_DRIVERS=y
151CONFIG_FSL_HV_MANAGER=y
152CONFIG_EXT2_FS=y
153CONFIG_EXT3_FS=y
154# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
155CONFIG_ISO9660_FS=m
156CONFIG_JOLIET=y
157CONFIG_ZISOFS=y
158CONFIG_UDF_FS=m
159CONFIG_MSDOS_FS=m
160CONFIG_VFAT_FS=y
161CONFIG_NTFS_FS=y
162CONFIG_PROC_KCORE=y
163CONFIG_TMPFS=y
164CONFIG_JFFS2_FS=y
165CONFIG_CRAMFS=y
166CONFIG_NFS_FS=y
167CONFIG_NFS_V3=y
168CONFIG_NFS_V4=y
169CONFIG_ROOT_NFS=y
170CONFIG_NFSD=m
171CONFIG_PARTITION_ADVANCED=y
172CONFIG_MAC_PARTITION=y
173CONFIG_NLS_ISO8859_1=y
174CONFIG_NLS_UTF8=m
175CONFIG_MAGIC_SYSRQ=y
176CONFIG_DEBUG_KERNEL=y
177CONFIG_DEBUG_SHIRQ=y
178CONFIG_DETECT_HUNG_TASK=y
179CONFIG_DEBUG_INFO=y
180CONFIG_SYSCTL_SYSCALL_CHECK=y
181CONFIG_CRYPTO_NULL=y
182CONFIG_CRYPTO_PCBC=m
183CONFIG_CRYPTO_MD4=y
184CONFIG_CRYPTO_SHA256=y
185CONFIG_CRYPTO_SHA512=y
186CONFIG_CRYPTO_AES=y
187# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/e55xx_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig
index d32283555b53..d32283555b53 100644
--- a/arch/powerpc/configs/e55xx_smp_defconfig
+++ b/arch/powerpc/configs/corenet64_smp_defconfig
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index 96b89df7752a..fcd85d2c72dc 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 5CONFIG_POSIX_MQUEUE=y
6CONFIG_BSD_PROCESS_ACCT=y 6CONFIG_BSD_PROCESS_ACCT=y
7CONFIG_AUDIT=y 7CONFIG_AUDIT=y
8CONFIG_SPARSE_IRQ=y
8CONFIG_IKCONFIG=y 9CONFIG_IKCONFIG=y
9CONFIG_IKCONFIG_PROC=y 10CONFIG_IKCONFIG_PROC=y
10CONFIG_LOG_BUF_SHIFT=14 11CONFIG_LOG_BUF_SHIFT=14
@@ -25,7 +26,9 @@ CONFIG_MPC85xx_MDS=y
25CONFIG_MPC8536_DS=y 26CONFIG_MPC8536_DS=y
26CONFIG_MPC85xx_DS=y 27CONFIG_MPC85xx_DS=y
27CONFIG_MPC85xx_RDB=y 28CONFIG_MPC85xx_RDB=y
29CONFIG_P1010_RDB=y
28CONFIG_P1022_DS=y 30CONFIG_P1022_DS=y
31CONFIG_P1023_RDS=y
29CONFIG_SOCRATES=y 32CONFIG_SOCRATES=y
30CONFIG_KSI8560=y 33CONFIG_KSI8560=y
31CONFIG_XES_MPC85xx=y 34CONFIG_XES_MPC85xx=y
@@ -44,7 +47,6 @@ CONFIG_NO_HZ=y
44CONFIG_HIGH_RES_TIMERS=y 47CONFIG_HIGH_RES_TIMERS=y
45CONFIG_BINFMT_MISC=m 48CONFIG_BINFMT_MISC=m
46CONFIG_MATH_EMULATION=y 49CONFIG_MATH_EMULATION=y
47CONFIG_SPARSE_IRQ=y
48CONFIG_FORCE_MAX_ZONEORDER=12 50CONFIG_FORCE_MAX_ZONEORDER=12
49CONFIG_PCI=y 51CONFIG_PCI=y
50CONFIG_PCI_MSI=y 52CONFIG_PCI_MSI=y
@@ -65,8 +67,6 @@ CONFIG_IP_PNP_DHCP=y
65CONFIG_IP_PNP_BOOTP=y 67CONFIG_IP_PNP_BOOTP=y
66CONFIG_IP_PNP_RARP=y 68CONFIG_IP_PNP_RARP=y
67CONFIG_NET_IPIP=y 69CONFIG_NET_IPIP=y
68CONFIG_NET_IPGRE=y
69CONFIG_NET_IPGRE_BROADCAST=y
70CONFIG_IP_MROUTE=y 70CONFIG_IP_MROUTE=y
71CONFIG_IP_PIMSM_V1=y 71CONFIG_IP_PIMSM_V1=y
72CONFIG_IP_PIMSM_V2=y 72CONFIG_IP_PIMSM_V2=y
@@ -128,6 +128,10 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
128CONFIG_FB=y 128CONFIG_FB=y
129CONFIG_FB_FSL_DIU=y 129CONFIG_FB_FSL_DIU=y
130# CONFIG_VGA_CONSOLE is not set 130# CONFIG_VGA_CONSOLE is not set
131CONFIG_FRAMEBUFFER_CONSOLE=y
132CONFIG_FONTS=y
133CONFIG_FONT_8x8=y
134CONFIG_FONT_8x16=y
131CONFIG_SOUND=y 135CONFIG_SOUND=y
132CONFIG_SND=y 136CONFIG_SND=y
133# CONFIG_SND_SUPPORT_OLD_API is not set 137# CONFIG_SND_SUPPORT_OLD_API is not set
@@ -170,7 +174,6 @@ CONFIG_FSL_DMA=y
170CONFIG_EXT2_FS=y 174CONFIG_EXT2_FS=y
171CONFIG_EXT3_FS=y 175CONFIG_EXT3_FS=y
172# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 176# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
173CONFIG_INOTIFY=y
174CONFIG_ISO9660_FS=m 177CONFIG_ISO9660_FS=m
175CONFIG_JOLIET=y 178CONFIG_JOLIET=y
176CONFIG_ZISOFS=y 179CONFIG_ZISOFS=y
@@ -205,7 +208,6 @@ CONFIG_DEBUG_FS=y
205CONFIG_DEBUG_KERNEL=y 208CONFIG_DEBUG_KERNEL=y
206CONFIG_DETECT_HUNG_TASK=y 209CONFIG_DETECT_HUNG_TASK=y
207CONFIG_DEBUG_INFO=y 210CONFIG_DEBUG_INFO=y
208# CONFIG_RCU_CPU_STALL_DETECTOR is not set
209CONFIG_SYSCTL_SYSCALL_CHECK=y 211CONFIG_SYSCTL_SYSCALL_CHECK=y
210CONFIG_VIRQ_DEBUG=y 212CONFIG_VIRQ_DEBUG=y
211CONFIG_CRYPTO_PCBC=m 213CONFIG_CRYPTO_PCBC=m
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
index de65841aa04e..908c941fc24c 100644
--- a/arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/arch/powerpc/configs/mpc85xx_smp_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYSVIPC=y
7CONFIG_POSIX_MQUEUE=y 7CONFIG_POSIX_MQUEUE=y
8CONFIG_BSD_PROCESS_ACCT=y 8CONFIG_BSD_PROCESS_ACCT=y
9CONFIG_AUDIT=y 9CONFIG_AUDIT=y
10CONFIG_SPARSE_IRQ=y
10CONFIG_IKCONFIG=y 11CONFIG_IKCONFIG=y
11CONFIG_IKCONFIG_PROC=y 12CONFIG_IKCONFIG_PROC=y
12CONFIG_LOG_BUF_SHIFT=14 13CONFIG_LOG_BUF_SHIFT=14
@@ -28,6 +29,7 @@ CONFIG_MPC8536_DS=y
28CONFIG_MPC85xx_DS=y 29CONFIG_MPC85xx_DS=y
29CONFIG_MPC85xx_RDB=y 30CONFIG_MPC85xx_RDB=y
30CONFIG_P1022_DS=y 31CONFIG_P1022_DS=y
32CONFIG_P1023_RDS=y
31CONFIG_SOCRATES=y 33CONFIG_SOCRATES=y
32CONFIG_KSI8560=y 34CONFIG_KSI8560=y
33CONFIG_XES_MPC85xx=y 35CONFIG_XES_MPC85xx=y
@@ -46,7 +48,6 @@ CONFIG_NO_HZ=y
46CONFIG_HIGH_RES_TIMERS=y 48CONFIG_HIGH_RES_TIMERS=y
47CONFIG_BINFMT_MISC=m 49CONFIG_BINFMT_MISC=m
48CONFIG_MATH_EMULATION=y 50CONFIG_MATH_EMULATION=y
49CONFIG_SPARSE_IRQ=y
50CONFIG_FORCE_MAX_ZONEORDER=12 51CONFIG_FORCE_MAX_ZONEORDER=12
51CONFIG_PCI=y 52CONFIG_PCI=y
52CONFIG_PCI_MSI=y 53CONFIG_PCI_MSI=y
@@ -67,8 +68,6 @@ CONFIG_IP_PNP_DHCP=y
67CONFIG_IP_PNP_BOOTP=y 68CONFIG_IP_PNP_BOOTP=y
68CONFIG_IP_PNP_RARP=y 69CONFIG_IP_PNP_RARP=y
69CONFIG_NET_IPIP=y 70CONFIG_NET_IPIP=y
70CONFIG_NET_IPGRE=y
71CONFIG_NET_IPGRE_BROADCAST=y
72CONFIG_IP_MROUTE=y 71CONFIG_IP_MROUTE=y
73CONFIG_IP_PIMSM_V1=y 72CONFIG_IP_PIMSM_V1=y
74CONFIG_IP_PIMSM_V2=y 73CONFIG_IP_PIMSM_V2=y
@@ -130,6 +129,10 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
130CONFIG_FB=y 129CONFIG_FB=y
131CONFIG_FB_FSL_DIU=y 130CONFIG_FB_FSL_DIU=y
132# CONFIG_VGA_CONSOLE is not set 131# CONFIG_VGA_CONSOLE is not set
132CONFIG_FRAMEBUFFER_CONSOLE=y
133CONFIG_FONTS=y
134CONFIG_FONT_8x8=y
135CONFIG_FONT_8x16=y
133CONFIG_SOUND=y 136CONFIG_SOUND=y
134CONFIG_SND=y 137CONFIG_SND=y
135# CONFIG_SND_SUPPORT_OLD_API is not set 138# CONFIG_SND_SUPPORT_OLD_API is not set
@@ -172,7 +175,6 @@ CONFIG_FSL_DMA=y
172CONFIG_EXT2_FS=y 175CONFIG_EXT2_FS=y
173CONFIG_EXT3_FS=y 176CONFIG_EXT3_FS=y
174# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 177# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
175CONFIG_INOTIFY=y
176CONFIG_ISO9660_FS=m 178CONFIG_ISO9660_FS=m
177CONFIG_JOLIET=y 179CONFIG_JOLIET=y
178CONFIG_ZISOFS=y 180CONFIG_ZISOFS=y
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 76736017cd34..84a685a505fe 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -176,12 +176,19 @@ CONFIG_CHR_DEV_SG=y
176CONFIG_SCSI_MULTI_LUN=y 176CONFIG_SCSI_MULTI_LUN=y
177CONFIG_SCSI_CONSTANTS=y 177CONFIG_SCSI_CONSTANTS=y
178CONFIG_SCSI_FC_ATTRS=y 178CONFIG_SCSI_FC_ATTRS=y
179CONFIG_SCSI_SAS_ATTRS=m
180CONFIG_SCSI_CXGB3_ISCSI=m
181CONFIG_SCSI_CXGB4_ISCSI=m
182CONFIG_SCSI_BNX2_ISCSI=m
183CONFIG_BE2ISCSI=m
184CONFIG_SCSI_MPT2SAS=m
179CONFIG_SCSI_IBMVSCSI=y 185CONFIG_SCSI_IBMVSCSI=y
180CONFIG_SCSI_IBMVFC=m 186CONFIG_SCSI_IBMVFC=m
181CONFIG_SCSI_SYM53C8XX_2=y 187CONFIG_SCSI_SYM53C8XX_2=y
182CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 188CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
183CONFIG_SCSI_IPR=y 189CONFIG_SCSI_IPR=y
184CONFIG_SCSI_QLA_FC=m 190CONFIG_SCSI_QLA_FC=m
191CONFIG_SCSI_QLA_ISCSI=m
185CONFIG_SCSI_LPFC=m 192CONFIG_SCSI_LPFC=m
186CONFIG_ATA=y 193CONFIG_ATA=y
187CONFIG_SATA_SIL24=y 194CONFIG_SATA_SIL24=y
@@ -235,11 +242,13 @@ CONFIG_ACENIC_OMIT_TIGON_I=y
235CONFIG_E1000=y 242CONFIG_E1000=y
236CONFIG_E1000E=y 243CONFIG_E1000E=y
237CONFIG_TIGON3=y 244CONFIG_TIGON3=y
245CONFIG_BNX2=m
238CONFIG_SPIDER_NET=m 246CONFIG_SPIDER_NET=m
239CONFIG_GELIC_NET=m 247CONFIG_GELIC_NET=m
240CONFIG_GELIC_WIRELESS=y 248CONFIG_GELIC_WIRELESS=y
241CONFIG_CHELSIO_T1=m 249CONFIG_CHELSIO_T1=m
242CONFIG_CHELSIO_T3=m 250CONFIG_CHELSIO_T3=m
251CONFIG_CHELSIO_T4=m
243CONFIG_EHEA=m 252CONFIG_EHEA=m
244CONFIG_IXGBE=m 253CONFIG_IXGBE=m
245CONFIG_IXGB=m 254CONFIG_IXGB=m
@@ -248,6 +257,8 @@ CONFIG_MYRI10GE=m
248CONFIG_NETXEN_NIC=m 257CONFIG_NETXEN_NIC=m
249CONFIG_PASEMI_MAC=y 258CONFIG_PASEMI_MAC=y
250CONFIG_MLX4_EN=m 259CONFIG_MLX4_EN=m
260CONFIG_QLGE=m
261CONFIG_BE2NET=m
251CONFIG_ISERIES_VETH=m 262CONFIG_ISERIES_VETH=m
252CONFIG_PPP=m 263CONFIG_PPP=m
253CONFIG_PPP_ASYNC=m 264CONFIG_PPP_ASYNC=m
@@ -330,6 +341,8 @@ CONFIG_INFINIBAND_USER_MAD=m
330CONFIG_INFINIBAND_USER_ACCESS=m 341CONFIG_INFINIBAND_USER_ACCESS=m
331CONFIG_INFINIBAND_MTHCA=m 342CONFIG_INFINIBAND_MTHCA=m
332CONFIG_INFINIBAND_EHCA=m 343CONFIG_INFINIBAND_EHCA=m
344CONFIG_INFINIBAND_CXGB3=m
345CONFIG_INFINIBAND_CXGB4=m
333CONFIG_MLX4_INFINIBAND=m 346CONFIG_MLX4_INFINIBAND=m
334CONFIG_INFINIBAND_IPOIB=m 347CONFIG_INFINIBAND_IPOIB=m
335CONFIG_INFINIBAND_IPOIB_CM=y 348CONFIG_INFINIBAND_IPOIB_CM=y
@@ -430,11 +443,12 @@ CONFIG_NLS_KOI8_U=m
430CONFIG_CRC_T10DIF=y 443CONFIG_CRC_T10DIF=y
431CONFIG_MAGIC_SYSRQ=y 444CONFIG_MAGIC_SYSRQ=y
432CONFIG_DEBUG_KERNEL=y 445CONFIG_DEBUG_KERNEL=y
446CONFIG_LOCKUP_DETECTOR=y
447CONFIG_DETECT_HUNG_TASK=y
433CONFIG_DEBUG_MUTEXES=y 448CONFIG_DEBUG_MUTEXES=y
434# CONFIG_RCU_CPU_STALL_DETECTOR is not set 449# CONFIG_RCU_CPU_STALL_DETECTOR is not set
435CONFIG_LATENCYTOP=y 450CONFIG_LATENCYTOP=y
436CONFIG_SYSCTL_SYSCALL_CHECK=y 451CONFIG_SYSCTL_SYSCALL_CHECK=y
437CONFIG_IRQSOFF_TRACER=y
438CONFIG_SCHED_TRACER=y 452CONFIG_SCHED_TRACER=y
439CONFIG_BLK_DEV_IO_TRACE=y 453CONFIG_BLK_DEV_IO_TRACE=y
440CONFIG_DEBUG_STACKOVERFLOW=y 454CONFIG_DEBUG_STACKOVERFLOW=y
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 80bc5de7ee1d..96a58b709705 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -149,6 +149,7 @@ CONFIG_SCSI_CXGB3_ISCSI=m
149CONFIG_SCSI_CXGB4_ISCSI=m 149CONFIG_SCSI_CXGB4_ISCSI=m
150CONFIG_SCSI_BNX2_ISCSI=m 150CONFIG_SCSI_BNX2_ISCSI=m
151CONFIG_BE2ISCSI=m 151CONFIG_BE2ISCSI=m
152CONFIG_SCSI_MPT2SAS=m
152CONFIG_SCSI_IBMVSCSI=y 153CONFIG_SCSI_IBMVSCSI=y
153CONFIG_SCSI_IBMVFC=m 154CONFIG_SCSI_IBMVFC=m
154CONFIG_SCSI_SYM53C8XX_2=y 155CONFIG_SCSI_SYM53C8XX_2=y
@@ -320,6 +321,8 @@ CONFIG_NLS_ISO8859_1=y
320CONFIG_CRC_T10DIF=y 321CONFIG_CRC_T10DIF=y
321CONFIG_MAGIC_SYSRQ=y 322CONFIG_MAGIC_SYSRQ=y
322CONFIG_DEBUG_KERNEL=y 323CONFIG_DEBUG_KERNEL=y
324CONFIG_LOCKUP_DETECTOR=y
325CONFIG_DETECT_HUNG_TASK=y
323# CONFIG_RCU_CPU_STALL_DETECTOR is not set 326# CONFIG_RCU_CPU_STALL_DETECTOR is not set
324CONFIG_LATENCYTOP=y 327CONFIG_LATENCYTOP=y
325CONFIG_SYSCTL_SYSCALL_CHECK=y 328CONFIG_SYSCTL_SYSCALL_CHECK=y