aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2012-08-22 14:43:24 -0400
committerKumar Gala <galak@kernel.crashing.org>2012-08-23 11:46:15 -0400
commit823f74733d8f89eaabfb25f93680fb7e05861348 (patch)
tree0abadfc1f515fa83b8fbd8b4ef3ac1a98bb024c2
parent127c6e731106a2071ee4a6c5a34c471cd3e719f0 (diff)
powerpc/fsl: update defconfigs
run make savedefconfig on fsl defconfigs. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--arch/powerpc/configs/85xx/p1023rds_defconfig30
-rw-r--r--arch/powerpc/configs/corenet32_smp_defconfig28
-rw-r--r--arch/powerpc/configs/mpc83xx_defconfig17
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig31
-rw-r--r--arch/powerpc/configs/mpc85xx_smp_defconfig31
5 files changed, 35 insertions, 102 deletions
diff --git a/arch/powerpc/configs/85xx/p1023rds_defconfig b/arch/powerpc/configs/85xx/p1023rds_defconfig
index f4337bacd0e7..a79b0a9316a5 100644
--- a/arch/powerpc/configs/85xx/p1023rds_defconfig
+++ b/arch/powerpc/configs/85xx/p1023rds_defconfig
@@ -6,28 +6,27 @@ CONFIG_SYSVIPC=y
6CONFIG_POSIX_MQUEUE=y 6CONFIG_POSIX_MQUEUE=y
7CONFIG_BSD_PROCESS_ACCT=y 7CONFIG_BSD_PROCESS_ACCT=y
8CONFIG_AUDIT=y 8CONFIG_AUDIT=y
9CONFIG_SPARSE_IRQ=y 9CONFIG_IRQ_DOMAIN_DEBUG=y
10CONFIG_NO_HZ=y
11CONFIG_HIGH_RES_TIMERS=y
10CONFIG_IKCONFIG=y 12CONFIG_IKCONFIG=y
11CONFIG_IKCONFIG_PROC=y 13CONFIG_IKCONFIG_PROC=y
12CONFIG_LOG_BUF_SHIFT=14 14CONFIG_LOG_BUF_SHIFT=14
13CONFIG_BLK_DEV_INITRD=y 15CONFIG_BLK_DEV_INITRD=y
14# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
15CONFIG_KALLSYMS_ALL=y 16CONFIG_KALLSYMS_ALL=y
16CONFIG_KALLSYMS_EXTRA_PASS=y
17CONFIG_EMBEDDED=y 17CONFIG_EMBEDDED=y
18CONFIG_MODULES=y 18CONFIG_MODULES=y
19CONFIG_MODULE_UNLOAD=y 19CONFIG_MODULE_UNLOAD=y
20CONFIG_MODULE_FORCE_UNLOAD=y 20CONFIG_MODULE_FORCE_UNLOAD=y
21CONFIG_MODVERSIONS=y 21CONFIG_MODVERSIONS=y
22# CONFIG_BLK_DEV_BSG is not set 22# CONFIG_BLK_DEV_BSG is not set
23CONFIG_PARTITION_ADVANCED=y
24CONFIG_MAC_PARTITION=y
23CONFIG_P1023_RDS=y 25CONFIG_P1023_RDS=y
24CONFIG_QUICC_ENGINE=y 26CONFIG_QUICC_ENGINE=y
25CONFIG_QE_GPIO=y 27CONFIG_QE_GPIO=y
26CONFIG_CPM2=y 28CONFIG_CPM2=y
27CONFIG_GPIO_MPC8XXX=y
28CONFIG_HIGHMEM=y 29CONFIG_HIGHMEM=y
29CONFIG_NO_HZ=y
30CONFIG_HIGH_RES_TIMERS=y
31# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 30# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
32CONFIG_BINFMT_MISC=m 31CONFIG_BINFMT_MISC=m
33CONFIG_MATH_EMULATION=y 32CONFIG_MATH_EMULATION=y
@@ -67,7 +66,6 @@ CONFIG_PROC_DEVICETREE=y
67CONFIG_BLK_DEV_LOOP=y 66CONFIG_BLK_DEV_LOOP=y
68CONFIG_BLK_DEV_RAM=y 67CONFIG_BLK_DEV_RAM=y
69CONFIG_BLK_DEV_RAM_SIZE=131072 68CONFIG_BLK_DEV_RAM_SIZE=131072
70CONFIG_MISC_DEVICES=y
71CONFIG_EEPROM_LEGACY=y 69CONFIG_EEPROM_LEGACY=y
72CONFIG_BLK_DEV_SD=y 70CONFIG_BLK_DEV_SD=y
73CONFIG_CHR_DEV_ST=y 71CONFIG_CHR_DEV_ST=y
@@ -80,15 +78,14 @@ CONFIG_SATA_FSL=y
80CONFIG_SATA_SIL24=y 78CONFIG_SATA_SIL24=y
81CONFIG_NETDEVICES=y 79CONFIG_NETDEVICES=y
82CONFIG_DUMMY=y 80CONFIG_DUMMY=y
81CONFIG_FS_ENET=y
82CONFIG_FSL_PQ_MDIO=y
83CONFIG_E1000E=y
83CONFIG_MARVELL_PHY=y 84CONFIG_MARVELL_PHY=y
84CONFIG_DAVICOM_PHY=y 85CONFIG_DAVICOM_PHY=y
85CONFIG_CICADA_PHY=y 86CONFIG_CICADA_PHY=y
86CONFIG_VITESSE_PHY=y 87CONFIG_VITESSE_PHY=y
87CONFIG_FIXED_PHY=y 88CONFIG_FIXED_PHY=y
88CONFIG_NET_ETHERNET=y
89CONFIG_FS_ENET=y
90CONFIG_E1000E=y
91CONFIG_FSL_PQ_MDIO=y
92CONFIG_INPUT_FF_MEMLESS=m 89CONFIG_INPUT_FF_MEMLESS=m
93# CONFIG_INPUT_MOUSEDEV is not set 90# CONFIG_INPUT_MOUSEDEV is not set
94# CONFIG_INPUT_KEYBOARD is not set 91# CONFIG_INPUT_KEYBOARD is not set
@@ -98,16 +95,15 @@ CONFIG_SERIAL_8250=y
98CONFIG_SERIAL_8250_CONSOLE=y 95CONFIG_SERIAL_8250_CONSOLE=y
99CONFIG_SERIAL_8250_NR_UARTS=2 96CONFIG_SERIAL_8250_NR_UARTS=2
100CONFIG_SERIAL_8250_RUNTIME_UARTS=2 97CONFIG_SERIAL_8250_RUNTIME_UARTS=2
101CONFIG_SERIAL_8250_EXTENDED=y
102CONFIG_SERIAL_8250_MANY_PORTS=y 98CONFIG_SERIAL_8250_MANY_PORTS=y
103CONFIG_SERIAL_8250_DETECT_IRQ=y 99CONFIG_SERIAL_8250_DETECT_IRQ=y
104CONFIG_SERIAL_8250_RSA=y 100CONFIG_SERIAL_8250_RSA=y
105CONFIG_SERIAL_QE=m 101CONFIG_SERIAL_QE=m
106CONFIG_HW_RANDOM=y
107CONFIG_NVRAM=y 102CONFIG_NVRAM=y
108CONFIG_I2C=y 103CONFIG_I2C=y
109CONFIG_I2C_CPM=m 104CONFIG_I2C_CPM=m
110CONFIG_I2C_MPC=y 105CONFIG_I2C_MPC=y
106CONFIG_GPIO_MPC8XXX=y
111# CONFIG_HWMON is not set 107# CONFIG_HWMON is not set
112CONFIG_VIDEO_OUTPUT_CONTROL=y 108CONFIG_VIDEO_OUTPUT_CONTROL=y
113CONFIG_SOUND=y 109CONFIG_SOUND=y
@@ -123,7 +119,6 @@ CONFIG_DMADEVICES=y
123CONFIG_FSL_DMA=y 119CONFIG_FSL_DMA=y
124# CONFIG_NET_DMA is not set 120# CONFIG_NET_DMA is not set
125CONFIG_STAGING=y 121CONFIG_STAGING=y
126# CONFIG_STAGING_EXCLUDE_BUILD is not set
127CONFIG_EXT2_FS=y 122CONFIG_EXT2_FS=y
128CONFIG_EXT3_FS=y 123CONFIG_EXT3_FS=y
129# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 124# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
@@ -150,22 +145,15 @@ CONFIG_QNX4FS_FS=m
150CONFIG_SYSV_FS=m 145CONFIG_SYSV_FS=m
151CONFIG_UFS_FS=m 146CONFIG_UFS_FS=m
152CONFIG_NFS_FS=y 147CONFIG_NFS_FS=y
153CONFIG_NFS_V3=y
154CONFIG_NFS_V4=y 148CONFIG_NFS_V4=y
155CONFIG_ROOT_NFS=y 149CONFIG_ROOT_NFS=y
156CONFIG_NFSD=y 150CONFIG_NFSD=y
157CONFIG_PARTITION_ADVANCED=y
158CONFIG_MAC_PARTITION=y
159CONFIG_CRC_T10DIF=y 151CONFIG_CRC_T10DIF=y
160CONFIG_FRAME_WARN=8092 152CONFIG_FRAME_WARN=8092
161CONFIG_DEBUG_FS=y 153CONFIG_DEBUG_FS=y
162CONFIG_DEBUG_KERNEL=y
163CONFIG_DETECT_HUNG_TASK=y 154CONFIG_DETECT_HUNG_TASK=y
164# CONFIG_DEBUG_BUGVERBOSE is not set 155# CONFIG_DEBUG_BUGVERBOSE is not set
165CONFIG_DEBUG_INFO=y 156CONFIG_DEBUG_INFO=y
166# CONFIG_RCU_CPU_STALL_DETECTOR is not set
167CONFIG_SYSCTL_SYSCALL_CHECK=y
168CONFIG_IRQ_DOMAIN_DEBUG=y
169CONFIG_CRYPTO_PCBC=m 157CONFIG_CRYPTO_PCBC=m
170CONFIG_CRYPTO_SHA256=y 158CONFIG_CRYPTO_SHA256=y
171CONFIG_CRYPTO_SHA512=y 159CONFIG_CRYPTO_SHA512=y
diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig
index cbb98c1234fd..f085699dab7c 100644
--- a/arch/powerpc/configs/corenet32_smp_defconfig
+++ b/arch/powerpc/configs/corenet32_smp_defconfig
@@ -6,8 +6,8 @@ CONFIG_SYSVIPC=y
6CONFIG_POSIX_MQUEUE=y 6CONFIG_POSIX_MQUEUE=y
7CONFIG_BSD_PROCESS_ACCT=y 7CONFIG_BSD_PROCESS_ACCT=y
8CONFIG_AUDIT=y 8CONFIG_AUDIT=y
9CONFIG_SPARSE_IRQ=y 9CONFIG_NO_HZ=y
10CONFIG_RCU_TRACE=y 10CONFIG_HIGH_RES_TIMERS=y
11CONFIG_IKCONFIG=y 11CONFIG_IKCONFIG=y
12CONFIG_IKCONFIG_PROC=y 12CONFIG_IKCONFIG_PROC=y
13CONFIG_LOG_BUF_SHIFT=14 13CONFIG_LOG_BUF_SHIFT=14
@@ -21,23 +21,22 @@ CONFIG_MODULE_UNLOAD=y
21CONFIG_MODULE_FORCE_UNLOAD=y 21CONFIG_MODULE_FORCE_UNLOAD=y
22CONFIG_MODVERSIONS=y 22CONFIG_MODVERSIONS=y
23# CONFIG_BLK_DEV_BSG is not set 23# CONFIG_BLK_DEV_BSG is not set
24CONFIG_PARTITION_ADVANCED=y
25CONFIG_MAC_PARTITION=y
24CONFIG_P2041_RDB=y 26CONFIG_P2041_RDB=y
25CONFIG_P3041_DS=y 27CONFIG_P3041_DS=y
26CONFIG_P4080_DS=y 28CONFIG_P4080_DS=y
27CONFIG_P5020_DS=y 29CONFIG_P5020_DS=y
28CONFIG_HIGHMEM=y 30CONFIG_HIGHMEM=y
29CONFIG_NO_HZ=y
30CONFIG_HIGH_RES_TIMERS=y
31# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 31# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
32CONFIG_BINFMT_MISC=m 32CONFIG_BINFMT_MISC=m
33CONFIG_KEXEC=y 33CONFIG_KEXEC=y
34CONFIG_IRQ_ALL_CPUS=y 34CONFIG_IRQ_ALL_CPUS=y
35CONFIG_FORCE_MAX_ZONEORDER=13 35CONFIG_FORCE_MAX_ZONEORDER=13
36CONFIG_FSL_LBC=y
37CONFIG_PCI=y 36CONFIG_PCI=y
38CONFIG_PCIEPORTBUS=y 37CONFIG_PCIEPORTBUS=y
39CONFIG_PCI_MSI=y
40# CONFIG_PCIEASPM is not set 38# CONFIG_PCIEASPM is not set
39CONFIG_PCI_MSI=y
41CONFIG_RAPIDIO=y 40CONFIG_RAPIDIO=y
42CONFIG_FSL_RIO=y 41CONFIG_FSL_RIO=y
43CONFIG_NET=y 42CONFIG_NET=y
@@ -77,17 +76,14 @@ CONFIG_MTD_BLOCK=y
77CONFIG_MTD_CFI=y 76CONFIG_MTD_CFI=y
78CONFIG_MTD_CFI_AMDSTD=y 77CONFIG_MTD_CFI_AMDSTD=y
79CONFIG_MTD_PHYSMAP_OF=y 78CONFIG_MTD_PHYSMAP_OF=y
79CONFIG_MTD_M25P80=y
80CONFIG_MTD_NAND=y 80CONFIG_MTD_NAND=y
81CONFIG_MTD_NAND_ECC=y
82CONFIG_MTD_NAND_IDS=y
83CONFIG_MTD_NAND_FSL_IFC=y
84CONFIG_MTD_NAND_FSL_ELBC=y 81CONFIG_MTD_NAND_FSL_ELBC=y
85CONFIG_MTD_M25P80=y 82CONFIG_MTD_NAND_FSL_IFC=y
86CONFIG_PROC_DEVICETREE=y 83CONFIG_PROC_DEVICETREE=y
87CONFIG_BLK_DEV_LOOP=y 84CONFIG_BLK_DEV_LOOP=y
88CONFIG_BLK_DEV_RAM=y 85CONFIG_BLK_DEV_RAM=y
89CONFIG_BLK_DEV_RAM_SIZE=131072 86CONFIG_BLK_DEV_RAM_SIZE=131072
90CONFIG_MISC_DEVICES=y
91CONFIG_BLK_DEV_SD=y 87CONFIG_BLK_DEV_SD=y
92CONFIG_CHR_DEV_ST=y 88CONFIG_CHR_DEV_ST=y
93CONFIG_BLK_DEV_SR=y 89CONFIG_BLK_DEV_SR=y
@@ -115,11 +111,9 @@ CONFIG_SERIO_LIBPS2=y
115CONFIG_PPC_EPAPR_HV_BYTECHAN=y 111CONFIG_PPC_EPAPR_HV_BYTECHAN=y
116CONFIG_SERIAL_8250=y 112CONFIG_SERIAL_8250=y
117CONFIG_SERIAL_8250_CONSOLE=y 113CONFIG_SERIAL_8250_CONSOLE=y
118CONFIG_SERIAL_8250_EXTENDED=y
119CONFIG_SERIAL_8250_MANY_PORTS=y 114CONFIG_SERIAL_8250_MANY_PORTS=y
120CONFIG_SERIAL_8250_DETECT_IRQ=y 115CONFIG_SERIAL_8250_DETECT_IRQ=y
121CONFIG_SERIAL_8250_RSA=y 116CONFIG_SERIAL_8250_RSA=y
122CONFIG_HW_RANDOM=y
123CONFIG_NVRAM=y 117CONFIG_NVRAM=y
124CONFIG_I2C=y 118CONFIG_I2C=y
125CONFIG_I2C_CHARDEV=y 119CONFIG_I2C_CHARDEV=y
@@ -132,7 +126,6 @@ CONFIG_SPI_FSL_ESPI=y
132CONFIG_VIDEO_OUTPUT_CONTROL=y 126CONFIG_VIDEO_OUTPUT_CONTROL=y
133CONFIG_USB_HID=m 127CONFIG_USB_HID=m
134CONFIG_USB=y 128CONFIG_USB=y
135CONFIG_USB_DEVICEFS=y
136CONFIG_USB_MON=y 129CONFIG_USB_MON=y
137CONFIG_USB_EHCI_HCD=y 130CONFIG_USB_EHCI_HCD=y
138CONFIG_USB_EHCI_FSL=y 131CONFIG_USB_EHCI_FSL=y
@@ -142,8 +135,6 @@ CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
142CONFIG_USB_STORAGE=y 135CONFIG_USB_STORAGE=y
143CONFIG_MMC=y 136CONFIG_MMC=y
144CONFIG_MMC_SDHCI=y 137CONFIG_MMC_SDHCI=y
145CONFIG_MMC_SDHCI_OF=y
146CONFIG_MMC_SDHCI_OF_ESDHC=y
147CONFIG_EDAC=y 138CONFIG_EDAC=y
148CONFIG_EDAC_MM_EDAC=y 139CONFIG_EDAC_MM_EDAC=y
149CONFIG_EDAC_MPC85XX=y 140CONFIG_EDAC_MPC85XX=y
@@ -170,19 +161,16 @@ CONFIG_HUGETLBFS=y
170CONFIG_JFFS2_FS=y 161CONFIG_JFFS2_FS=y
171CONFIG_CRAMFS=y 162CONFIG_CRAMFS=y
172CONFIG_NFS_FS=y 163CONFIG_NFS_FS=y
173CONFIG_NFS_V3=y
174CONFIG_NFS_V4=y 164CONFIG_NFS_V4=y
175CONFIG_ROOT_NFS=y 165CONFIG_ROOT_NFS=y
176CONFIG_NFSD=m 166CONFIG_NFSD=m
177CONFIG_PARTITION_ADVANCED=y
178CONFIG_MAC_PARTITION=y
179CONFIG_NLS_ISO8859_1=y 167CONFIG_NLS_ISO8859_1=y
180CONFIG_NLS_UTF8=m 168CONFIG_NLS_UTF8=m
181CONFIG_MAGIC_SYSRQ=y 169CONFIG_MAGIC_SYSRQ=y
182CONFIG_DEBUG_SHIRQ=y 170CONFIG_DEBUG_SHIRQ=y
183CONFIG_DETECT_HUNG_TASK=y 171CONFIG_DETECT_HUNG_TASK=y
184CONFIG_DEBUG_INFO=y 172CONFIG_DEBUG_INFO=y
185CONFIG_SYSCTL_SYSCALL_CHECK=y 173CONFIG_RCU_TRACE=y
186CONFIG_CRYPTO_NULL=y 174CONFIG_CRYPTO_NULL=y
187CONFIG_CRYPTO_PCBC=m 175CONFIG_CRYPTO_PCBC=m
188CONFIG_CRYPTO_MD4=y 176CONFIG_CRYPTO_MD4=y
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
index 5aac9a8bc53b..e116dc9e8a2e 100644
--- a/arch/powerpc/configs/mpc83xx_defconfig
+++ b/arch/powerpc/configs/mpc83xx_defconfig
@@ -2,12 +2,12 @@ CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 5CONFIG_EXPERT=y
7CONFIG_SLAB=y 6CONFIG_SLAB=y
8CONFIG_MODULES=y 7CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 8CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 9# CONFIG_BLK_DEV_BSG is not set
10CONFIG_PARTITION_ADVANCED=y
11# CONFIG_PPC_CHRP is not set 11# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 12# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 13CONFIG_PPC_83xx=y
@@ -25,7 +25,6 @@ CONFIG_ASP834x=y
25CONFIG_QUICC_ENGINE=y 25CONFIG_QUICC_ENGINE=y
26CONFIG_QE_GPIO=y 26CONFIG_QE_GPIO=y
27CONFIG_MATH_EMULATION=y 27CONFIG_MATH_EMULATION=y
28CONFIG_SPARSE_IRQ=y
29CONFIG_PCI=y 28CONFIG_PCI=y
30CONFIG_NET=y 29CONFIG_NET=y
31CONFIG_PACKET=y 30CONFIG_PACKET=y
@@ -44,8 +43,6 @@ CONFIG_INET_ESP=y
44CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 43CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
45# CONFIG_FW_LOADER is not set 44# CONFIG_FW_LOADER is not set
46CONFIG_MTD=y 45CONFIG_MTD=y
47CONFIG_MTD_PARTITIONS=y
48CONFIG_MTD_OF_PARTS=y
49CONFIG_MTD_CHAR=y 46CONFIG_MTD_CHAR=y
50CONFIG_MTD_BLOCK=y 47CONFIG_MTD_BLOCK=y
51CONFIG_MTD_CFI=y 48CONFIG_MTD_CFI=y
@@ -64,15 +61,14 @@ CONFIG_ATA=y
64CONFIG_SATA_FSL=y 61CONFIG_SATA_FSL=y
65CONFIG_SATA_SIL=y 62CONFIG_SATA_SIL=y
66CONFIG_NETDEVICES=y 63CONFIG_NETDEVICES=y
64CONFIG_MII=y
65CONFIG_UCC_GETH=y
66CONFIG_GIANFAR=y
67CONFIG_MARVELL_PHY=y 67CONFIG_MARVELL_PHY=y
68CONFIG_DAVICOM_PHY=y 68CONFIG_DAVICOM_PHY=y
69CONFIG_VITESSE_PHY=y 69CONFIG_VITESSE_PHY=y
70CONFIG_ICPLUS_PHY=y 70CONFIG_ICPLUS_PHY=y
71CONFIG_FIXED_PHY=y 71CONFIG_FIXED_PHY=y
72CONFIG_NET_ETHERNET=y
73CONFIG_MII=y
74CONFIG_GIANFAR=y
75CONFIG_UCC_GETH=y
76CONFIG_INPUT_FF_MEMLESS=m 72CONFIG_INPUT_FF_MEMLESS=m
77# CONFIG_INPUT_MOUSEDEV is not set 73# CONFIG_INPUT_MOUSEDEV is not set
78# CONFIG_INPUT_KEYBOARD is not set 74# CONFIG_INPUT_KEYBOARD is not set
@@ -112,17 +108,12 @@ CONFIG_RTC_DRV_DS1374=y
112CONFIG_EXT2_FS=y 108CONFIG_EXT2_FS=y
113CONFIG_EXT3_FS=y 109CONFIG_EXT3_FS=y
114# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 110# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
115CONFIG_INOTIFY=y
116CONFIG_PROC_KCORE=y 111CONFIG_PROC_KCORE=y
117CONFIG_TMPFS=y 112CONFIG_TMPFS=y
118CONFIG_NFS_FS=y 113CONFIG_NFS_FS=y
119CONFIG_NFS_V3=y
120CONFIG_NFS_V4=y 114CONFIG_NFS_V4=y
121CONFIG_ROOT_NFS=y 115CONFIG_ROOT_NFS=y
122CONFIG_PARTITION_ADVANCED=y
123CONFIG_CRC_T10DIF=y 116CONFIG_CRC_T10DIF=y
124# CONFIG_RCU_CPU_STALL_DETECTOR is not set
125CONFIG_SYSCTL_SYSCALL_CHECK=y
126CONFIG_CRYPTO_ECB=m 117CONFIG_CRYPTO_ECB=m
127CONFIG_CRYPTO_PCBC=m 118CONFIG_CRYPTO_PCBC=m
128CONFIG_CRYPTO_SHA256=y 119CONFIG_CRYPTO_SHA256=y
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index 99a4dd3b30cc..a036a622be5a 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -5,7 +5,9 @@ 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_IRQ_DOMAIN_DEBUG=y
9CONFIG_NO_HZ=y
10CONFIG_HIGH_RES_TIMERS=y
9CONFIG_IKCONFIG=y 11CONFIG_IKCONFIG=y
10CONFIG_IKCONFIG_PROC=y 12CONFIG_IKCONFIG_PROC=y
11CONFIG_LOG_BUF_SHIFT=14 13CONFIG_LOG_BUF_SHIFT=14
@@ -17,6 +19,8 @@ CONFIG_MODULE_UNLOAD=y
17CONFIG_MODULE_FORCE_UNLOAD=y 19CONFIG_MODULE_FORCE_UNLOAD=y
18CONFIG_MODVERSIONS=y 20CONFIG_MODVERSIONS=y
19# CONFIG_BLK_DEV_BSG is not set 21# CONFIG_BLK_DEV_BSG is not set
22CONFIG_PARTITION_ADVANCED=y
23CONFIG_MAC_PARTITION=y
20CONFIG_MPC8540_ADS=y 24CONFIG_MPC8540_ADS=y
21CONFIG_MPC8560_ADS=y 25CONFIG_MPC8560_ADS=y
22CONFIG_MPC85xx_CDS=y 26CONFIG_MPC85xx_CDS=y
@@ -40,8 +44,6 @@ CONFIG_SBC8548=y
40CONFIG_QUICC_ENGINE=y 44CONFIG_QUICC_ENGINE=y
41CONFIG_QE_GPIO=y 45CONFIG_QE_GPIO=y
42CONFIG_HIGHMEM=y 46CONFIG_HIGHMEM=y
43CONFIG_NO_HZ=y
44CONFIG_HIGH_RES_TIMERS=y
45CONFIG_BINFMT_MISC=m 47CONFIG_BINFMT_MISC=m
46CONFIG_MATH_EMULATION=y 48CONFIG_MATH_EMULATION=y
47CONFIG_FORCE_MAX_ZONEORDER=12 49CONFIG_FORCE_MAX_ZONEORDER=12
@@ -78,32 +80,20 @@ CONFIG_MTD=y
78CONFIG_MTD_CMDLINE_PARTS=y 80CONFIG_MTD_CMDLINE_PARTS=y
79CONFIG_MTD_CHAR=y 81CONFIG_MTD_CHAR=y
80CONFIG_MTD_BLOCK=y 82CONFIG_MTD_BLOCK=y
81CONFIG_MTD_CFI=y
82CONFIG_FTL=y 83CONFIG_FTL=y
83CONFIG_MTD_GEN_PROBE=y 84CONFIG_MTD_CFI=y
84CONFIG_MTD_MAP_BANK_WIDTH_1=y
85CONFIG_MTD_MAP_BANK_WIDTH_2=y
86CONFIG_MTD_MAP_BANK_WIDTH_4=y
87CONFIG_MTD_CFI_I1=y
88CONFIG_MTD_CFI_I2=y
89CONFIG_MTD_CFI_INTELEXT=y 85CONFIG_MTD_CFI_INTELEXT=y
90CONFIG_MTD_CFI_AMDSTD=y 86CONFIG_MTD_CFI_AMDSTD=y
91CONFIG_MTD_CFI_UTIL=y
92CONFIG_MTD_PHYSMAP_OF=y 87CONFIG_MTD_PHYSMAP_OF=y
93CONFIG_MTD_PARTITIONS=y 88CONFIG_MTD_M25P80=y
94CONFIG_MTD_OF_PARTS=y
95CONFIG_MTD_NAND=y 89CONFIG_MTD_NAND=y
96CONFIG_MTD_NAND_FSL_ELBC=y 90CONFIG_MTD_NAND_FSL_ELBC=y
97CONFIG_MTD_NAND_FSL_IFC=y 91CONFIG_MTD_NAND_FSL_IFC=y
98CONFIG_MTD_NAND_IDS=y
99CONFIG_MTD_NAND_ECC=y
100CONFIG_MTD_M25P80=y
101CONFIG_PROC_DEVICETREE=y 92CONFIG_PROC_DEVICETREE=y
102CONFIG_BLK_DEV_LOOP=y 93CONFIG_BLK_DEV_LOOP=y
103CONFIG_BLK_DEV_NBD=y 94CONFIG_BLK_DEV_NBD=y
104CONFIG_BLK_DEV_RAM=y 95CONFIG_BLK_DEV_RAM=y
105CONFIG_BLK_DEV_RAM_SIZE=131072 96CONFIG_BLK_DEV_RAM_SIZE=131072
106CONFIG_MISC_DEVICES=y
107CONFIG_EEPROM_LEGACY=y 97CONFIG_EEPROM_LEGACY=y
108CONFIG_BLK_DEV_SD=y 98CONFIG_BLK_DEV_SD=y
109CONFIG_CHR_DEV_ST=y 99CONFIG_CHR_DEV_ST=y
@@ -135,7 +125,6 @@ CONFIG_SERIAL_8250=y
135CONFIG_SERIAL_8250_CONSOLE=y 125CONFIG_SERIAL_8250_CONSOLE=y
136CONFIG_SERIAL_8250_NR_UARTS=2 126CONFIG_SERIAL_8250_NR_UARTS=2
137CONFIG_SERIAL_8250_RUNTIME_UARTS=2 127CONFIG_SERIAL_8250_RUNTIME_UARTS=2
138CONFIG_SERIAL_8250_EXTENDED=y
139CONFIG_SERIAL_8250_MANY_PORTS=y 128CONFIG_SERIAL_8250_MANY_PORTS=y
140CONFIG_SERIAL_8250_DETECT_IRQ=y 129CONFIG_SERIAL_8250_DETECT_IRQ=y
141CONFIG_SERIAL_8250_RSA=y 130CONFIG_SERIAL_8250_RSA=y
@@ -184,7 +173,6 @@ CONFIG_HID_SAMSUNG=y
184CONFIG_HID_SONY=y 173CONFIG_HID_SONY=y
185CONFIG_HID_SUNPLUS=y 174CONFIG_HID_SUNPLUS=y
186CONFIG_USB=y 175CONFIG_USB=y
187CONFIG_USB_DEVICEFS=y
188CONFIG_USB_MON=y 176CONFIG_USB_MON=y
189CONFIG_USB_EHCI_HCD=y 177CONFIG_USB_EHCI_HCD=y
190CONFIG_USB_EHCI_FSL=y 178CONFIG_USB_EHCI_FSL=y
@@ -230,18 +218,13 @@ CONFIG_QNX4FS_FS=m
230CONFIG_SYSV_FS=m 218CONFIG_SYSV_FS=m
231CONFIG_UFS_FS=m 219CONFIG_UFS_FS=m
232CONFIG_NFS_FS=y 220CONFIG_NFS_FS=y
233CONFIG_NFS_V3=y
234CONFIG_NFS_V4=y 221CONFIG_NFS_V4=y
235CONFIG_ROOT_NFS=y 222CONFIG_ROOT_NFS=y
236CONFIG_NFSD=y 223CONFIG_NFSD=y
237CONFIG_PARTITION_ADVANCED=y
238CONFIG_MAC_PARTITION=y
239CONFIG_CRC_T10DIF=y 224CONFIG_CRC_T10DIF=y
240CONFIG_DEBUG_FS=y 225CONFIG_DEBUG_FS=y
241CONFIG_DETECT_HUNG_TASK=y 226CONFIG_DETECT_HUNG_TASK=y
242CONFIG_DEBUG_INFO=y 227CONFIG_DEBUG_INFO=y
243CONFIG_SYSCTL_SYSCALL_CHECK=y
244CONFIG_IRQ_DOMAIN_DEBUG=y
245CONFIG_CRYPTO_PCBC=m 228CONFIG_CRYPTO_PCBC=m
246CONFIG_CRYPTO_SHA256=y 229CONFIG_CRYPTO_SHA256=y
247CONFIG_CRYPTO_SHA512=y 230CONFIG_CRYPTO_SHA512=y
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
index fdfa84dc908f..4ba5255232bc 100644
--- a/arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/arch/powerpc/configs/mpc85xx_smp_defconfig
@@ -7,7 +7,9 @@ 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_IRQ_DOMAIN_DEBUG=y
11CONFIG_NO_HZ=y
12CONFIG_HIGH_RES_TIMERS=y
11CONFIG_IKCONFIG=y 13CONFIG_IKCONFIG=y
12CONFIG_IKCONFIG_PROC=y 14CONFIG_IKCONFIG_PROC=y
13CONFIG_LOG_BUF_SHIFT=14 15CONFIG_LOG_BUF_SHIFT=14
@@ -19,6 +21,8 @@ CONFIG_MODULE_UNLOAD=y
19CONFIG_MODULE_FORCE_UNLOAD=y 21CONFIG_MODULE_FORCE_UNLOAD=y
20CONFIG_MODVERSIONS=y 22CONFIG_MODVERSIONS=y
21# CONFIG_BLK_DEV_BSG is not set 23# CONFIG_BLK_DEV_BSG is not set
24CONFIG_PARTITION_ADVANCED=y
25CONFIG_MAC_PARTITION=y
22CONFIG_MPC8540_ADS=y 26CONFIG_MPC8540_ADS=y
23CONFIG_MPC8560_ADS=y 27CONFIG_MPC8560_ADS=y
24CONFIG_MPC85xx_CDS=y 28CONFIG_MPC85xx_CDS=y
@@ -42,8 +46,6 @@ CONFIG_SBC8548=y
42CONFIG_QUICC_ENGINE=y 46CONFIG_QUICC_ENGINE=y
43CONFIG_QE_GPIO=y 47CONFIG_QE_GPIO=y
44CONFIG_HIGHMEM=y 48CONFIG_HIGHMEM=y
45CONFIG_NO_HZ=y
46CONFIG_HIGH_RES_TIMERS=y
47CONFIG_BINFMT_MISC=m 49CONFIG_BINFMT_MISC=m
48CONFIG_MATH_EMULATION=y 50CONFIG_MATH_EMULATION=y
49CONFIG_IRQ_ALL_CPUS=y 51CONFIG_IRQ_ALL_CPUS=y
@@ -81,32 +83,20 @@ CONFIG_MTD=y
81CONFIG_MTD_CMDLINE_PARTS=y 83CONFIG_MTD_CMDLINE_PARTS=y
82CONFIG_MTD_CHAR=y 84CONFIG_MTD_CHAR=y
83CONFIG_MTD_BLOCK=y 85CONFIG_MTD_BLOCK=y
84CONFIG_MTD_CFI=y
85CONFIG_FTL=y 86CONFIG_FTL=y
86CONFIG_MTD_GEN_PROBE=y 87CONFIG_MTD_CFI=y
87CONFIG_MTD_MAP_BANK_WIDTH_1=y
88CONFIG_MTD_MAP_BANK_WIDTH_2=y
89CONFIG_MTD_MAP_BANK_WIDTH_4=y
90CONFIG_MTD_CFI_I1=y
91CONFIG_MTD_CFI_I2=y
92CONFIG_MTD_CFI_INTELEXT=y 88CONFIG_MTD_CFI_INTELEXT=y
93CONFIG_MTD_CFI_AMDSTD=y 89CONFIG_MTD_CFI_AMDSTD=y
94CONFIG_MTD_CFI_UTIL=y
95CONFIG_MTD_PHYSMAP_OF=y 90CONFIG_MTD_PHYSMAP_OF=y
96CONFIG_MTD_PARTITIONS=y 91CONFIG_MTD_M25P80=y
97CONFIG_MTD_OF_PARTS=y
98CONFIG_MTD_NAND=y 92CONFIG_MTD_NAND=y
99CONFIG_MTD_NAND_FSL_ELBC=y 93CONFIG_MTD_NAND_FSL_ELBC=y
100CONFIG_MTD_NAND_FSL_IFC=y 94CONFIG_MTD_NAND_FSL_IFC=y
101CONFIG_MTD_NAND_IDS=y
102CONFIG_MTD_NAND_ECC=y
103CONFIG_MTD_M25P80=y
104CONFIG_PROC_DEVICETREE=y 95CONFIG_PROC_DEVICETREE=y
105CONFIG_BLK_DEV_LOOP=y 96CONFIG_BLK_DEV_LOOP=y
106CONFIG_BLK_DEV_NBD=y 97CONFIG_BLK_DEV_NBD=y
107CONFIG_BLK_DEV_RAM=y 98CONFIG_BLK_DEV_RAM=y
108CONFIG_BLK_DEV_RAM_SIZE=131072 99CONFIG_BLK_DEV_RAM_SIZE=131072
109CONFIG_MISC_DEVICES=y
110CONFIG_EEPROM_LEGACY=y 100CONFIG_EEPROM_LEGACY=y
111CONFIG_BLK_DEV_SD=y 101CONFIG_BLK_DEV_SD=y
112CONFIG_CHR_DEV_ST=y 102CONFIG_CHR_DEV_ST=y
@@ -137,7 +127,6 @@ CONFIG_SERIAL_8250=y
137CONFIG_SERIAL_8250_CONSOLE=y 127CONFIG_SERIAL_8250_CONSOLE=y
138CONFIG_SERIAL_8250_NR_UARTS=2 128CONFIG_SERIAL_8250_NR_UARTS=2
139CONFIG_SERIAL_8250_RUNTIME_UARTS=2 129CONFIG_SERIAL_8250_RUNTIME_UARTS=2
140CONFIG_SERIAL_8250_EXTENDED=y
141CONFIG_SERIAL_8250_MANY_PORTS=y 130CONFIG_SERIAL_8250_MANY_PORTS=y
142CONFIG_SERIAL_8250_DETECT_IRQ=y 131CONFIG_SERIAL_8250_DETECT_IRQ=y
143CONFIG_SERIAL_8250_RSA=y 132CONFIG_SERIAL_8250_RSA=y
@@ -186,7 +175,6 @@ CONFIG_HID_SAMSUNG=y
186CONFIG_HID_SONY=y 175CONFIG_HID_SONY=y
187CONFIG_HID_SUNPLUS=y 176CONFIG_HID_SUNPLUS=y
188CONFIG_USB=y 177CONFIG_USB=y
189CONFIG_USB_DEVICEFS=y
190CONFIG_USB_MON=y 178CONFIG_USB_MON=y
191CONFIG_USB_EHCI_HCD=y 179CONFIG_USB_EHCI_HCD=y
192CONFIG_USB_EHCI_FSL=y 180CONFIG_USB_EHCI_FSL=y
@@ -232,18 +220,13 @@ CONFIG_QNX4FS_FS=m
232CONFIG_SYSV_FS=m 220CONFIG_SYSV_FS=m
233CONFIG_UFS_FS=m 221CONFIG_UFS_FS=m
234CONFIG_NFS_FS=y 222CONFIG_NFS_FS=y
235CONFIG_NFS_V3=y
236CONFIG_NFS_V4=y 223CONFIG_NFS_V4=y
237CONFIG_ROOT_NFS=y 224CONFIG_ROOT_NFS=y
238CONFIG_NFSD=y 225CONFIG_NFSD=y
239CONFIG_PARTITION_ADVANCED=y
240CONFIG_MAC_PARTITION=y
241CONFIG_CRC_T10DIF=y 226CONFIG_CRC_T10DIF=y
242CONFIG_DEBUG_FS=y 227CONFIG_DEBUG_FS=y
243CONFIG_DETECT_HUNG_TASK=y 228CONFIG_DETECT_HUNG_TASK=y
244CONFIG_DEBUG_INFO=y 229CONFIG_DEBUG_INFO=y
245CONFIG_SYSCTL_SYSCALL_CHECK=y
246CONFIG_IRQ_DOMAIN_DEBUG=y
247CONFIG_CRYPTO_PCBC=m 230CONFIG_CRYPTO_PCBC=m
248CONFIG_CRYPTO_SHA256=y 231CONFIG_CRYPTO_SHA256=y
249CONFIG_CRYPTO_SHA512=y 232CONFIG_CRYPTO_SHA512=y