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