diff options
Diffstat (limited to 'arch/powerpc/configs/mpc85xx_defconfig')
-rw-r--r-- | arch/powerpc/configs/mpc85xx_defconfig | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index a1e5a178a4a..f37a2ab4888 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig | |||
@@ -1,5 +1,4 @@ | |||
1 | CONFIG_PPC_85xx=y | 1 | CONFIG_PPC_85xx=y |
2 | CONFIG_PHYS_64BIT=y | ||
3 | CONFIG_EXPERIMENTAL=y | 2 | CONFIG_EXPERIMENTAL=y |
4 | CONFIG_SYSVIPC=y | 3 | CONFIG_SYSVIPC=y |
5 | CONFIG_POSIX_MQUEUE=y | 4 | CONFIG_POSIX_MQUEUE=y |
@@ -93,15 +92,14 @@ CONFIG_SATA_FSL=y | |||
93 | CONFIG_PATA_ALI=y | 92 | CONFIG_PATA_ALI=y |
94 | CONFIG_NETDEVICES=y | 93 | CONFIG_NETDEVICES=y |
95 | CONFIG_DUMMY=y | 94 | CONFIG_DUMMY=y |
95 | CONFIG_FS_ENET=y | ||
96 | CONFIG_UCC_GETH=y | ||
97 | CONFIG_GIANFAR=y | ||
96 | CONFIG_MARVELL_PHY=y | 98 | CONFIG_MARVELL_PHY=y |
97 | CONFIG_DAVICOM_PHY=y | 99 | CONFIG_DAVICOM_PHY=y |
98 | CONFIG_CICADA_PHY=y | 100 | CONFIG_CICADA_PHY=y |
99 | CONFIG_VITESSE_PHY=y | 101 | CONFIG_VITESSE_PHY=y |
100 | CONFIG_FIXED_PHY=y | 102 | CONFIG_FIXED_PHY=y |
101 | CONFIG_NET_ETHERNET=y | ||
102 | CONFIG_FS_ENET=y | ||
103 | CONFIG_GIANFAR=y | ||
104 | CONFIG_UCC_GETH=y | ||
105 | CONFIG_INPUT_FF_MEMLESS=m | 103 | CONFIG_INPUT_FF_MEMLESS=m |
106 | # CONFIG_INPUT_MOUSEDEV is not set | 104 | # CONFIG_INPUT_MOUSEDEV is not set |
107 | # CONFIG_INPUT_KEYBOARD is not set | 105 | # CONFIG_INPUT_KEYBOARD is not set |
@@ -120,6 +118,9 @@ CONFIG_NVRAM=y | |||
120 | CONFIG_I2C=y | 118 | CONFIG_I2C=y |
121 | CONFIG_I2C_CPM=m | 119 | CONFIG_I2C_CPM=m |
122 | CONFIG_I2C_MPC=y | 120 | CONFIG_I2C_MPC=y |
121 | CONFIG_SPI=y | ||
122 | CONFIG_SPI_FSL_SPI=y | ||
123 | CONFIG_SPI_FSL_ESPI=y | ||
123 | CONFIG_GPIO_MPC8XXX=y | 124 | CONFIG_GPIO_MPC8XXX=y |
124 | # CONFIG_HWMON is not set | 125 | # CONFIG_HWMON is not set |
125 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 126 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
@@ -163,6 +164,10 @@ CONFIG_USB_OHCI_HCD=y | |||
163 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 164 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
164 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y | 165 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y |
165 | CONFIG_USB_STORAGE=y | 166 | CONFIG_USB_STORAGE=y |
167 | CONFIG_MMC=y | ||
168 | CONFIG_MMC_SDHCI=y | ||
169 | CONFIG_MMC_SDHCI_PLTFM=y | ||
170 | CONFIG_MMC_SDHCI_OF_ESDHC=y | ||
166 | CONFIG_EDAC=y | 171 | CONFIG_EDAC=y |
167 | CONFIG_EDAC_MM_EDAC=y | 172 | CONFIG_EDAC_MM_EDAC=y |
168 | CONFIG_RTC_CLASS=y | 173 | CONFIG_RTC_CLASS=y |
@@ -182,6 +187,7 @@ CONFIG_VFAT_FS=y | |||
182 | CONFIG_NTFS_FS=y | 187 | CONFIG_NTFS_FS=y |
183 | CONFIG_PROC_KCORE=y | 188 | CONFIG_PROC_KCORE=y |
184 | CONFIG_TMPFS=y | 189 | CONFIG_TMPFS=y |
190 | CONFIG_HUGETLBFS=y | ||
185 | CONFIG_ADFS_FS=m | 191 | CONFIG_ADFS_FS=m |
186 | CONFIG_AFFS_FS=m | 192 | CONFIG_AFFS_FS=m |
187 | CONFIG_HFS_FS=m | 193 | CONFIG_HFS_FS=m |
@@ -213,4 +219,5 @@ CONFIG_CRYPTO_SHA256=y | |||
213 | CONFIG_CRYPTO_SHA512=y | 219 | CONFIG_CRYPTO_SHA512=y |
214 | CONFIG_CRYPTO_AES=y | 220 | CONFIG_CRYPTO_AES=y |
215 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 221 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
222 | CONFIG_CRYPTO_DEV_FSL_CAAM=y | ||
216 | CONFIG_CRYPTO_DEV_TALITOS=y | 223 | CONFIG_CRYPTO_DEV_TALITOS=y |