diff options
Diffstat (limited to 'arch/powerpc/configs/mpc85xx_smp_defconfig')
-rw-r--r-- | arch/powerpc/configs/mpc85xx_smp_defconfig | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index dd1e41386c4c..abdcd317cda7 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig | |||
@@ -1,5 +1,4 @@ | |||
1 | CONFIG_PPC_85xx=y | 1 | CONFIG_PPC_85xx=y |
2 | CONFIG_PHYS_64BIT=y | ||
3 | CONFIG_SMP=y | 2 | CONFIG_SMP=y |
4 | CONFIG_NR_CPUS=8 | 3 | CONFIG_NR_CPUS=8 |
5 | CONFIG_EXPERIMENTAL=y | 4 | CONFIG_EXPERIMENTAL=y |
@@ -26,6 +25,7 @@ CONFIG_MPC85xx_MDS=y | |||
26 | CONFIG_MPC8536_DS=y | 25 | CONFIG_MPC8536_DS=y |
27 | CONFIG_MPC85xx_DS=y | 26 | CONFIG_MPC85xx_DS=y |
28 | CONFIG_MPC85xx_RDB=y | 27 | CONFIG_MPC85xx_RDB=y |
28 | CONFIG_P1010_RDB=y | ||
29 | CONFIG_P1022_DS=y | 29 | CONFIG_P1022_DS=y |
30 | CONFIG_P1023_RDS=y | 30 | CONFIG_P1023_RDS=y |
31 | CONFIG_SOCRATES=y | 31 | CONFIG_SOCRATES=y |
@@ -94,15 +94,14 @@ CONFIG_SATA_FSL=y | |||
94 | CONFIG_PATA_ALI=y | 94 | CONFIG_PATA_ALI=y |
95 | CONFIG_NETDEVICES=y | 95 | CONFIG_NETDEVICES=y |
96 | CONFIG_DUMMY=y | 96 | CONFIG_DUMMY=y |
97 | CONFIG_FS_ENET=y | ||
98 | CONFIG_UCC_GETH=y | ||
99 | CONFIG_GIANFAR=y | ||
97 | CONFIG_MARVELL_PHY=y | 100 | CONFIG_MARVELL_PHY=y |
98 | CONFIG_DAVICOM_PHY=y | 101 | CONFIG_DAVICOM_PHY=y |
99 | CONFIG_CICADA_PHY=y | 102 | CONFIG_CICADA_PHY=y |
100 | CONFIG_VITESSE_PHY=y | 103 | CONFIG_VITESSE_PHY=y |
101 | CONFIG_FIXED_PHY=y | 104 | CONFIG_FIXED_PHY=y |
102 | CONFIG_NET_ETHERNET=y | ||
103 | CONFIG_FS_ENET=y | ||
104 | CONFIG_GIANFAR=y | ||
105 | CONFIG_UCC_GETH=y | ||
106 | CONFIG_INPUT_FF_MEMLESS=m | 105 | CONFIG_INPUT_FF_MEMLESS=m |
107 | # CONFIG_INPUT_MOUSEDEV is not set | 106 | # CONFIG_INPUT_MOUSEDEV is not set |
108 | # CONFIG_INPUT_KEYBOARD is not set | 107 | # CONFIG_INPUT_KEYBOARD is not set |
@@ -121,6 +120,9 @@ CONFIG_NVRAM=y | |||
121 | CONFIG_I2C=y | 120 | CONFIG_I2C=y |
122 | CONFIG_I2C_CPM=m | 121 | CONFIG_I2C_CPM=m |
123 | CONFIG_I2C_MPC=y | 122 | CONFIG_I2C_MPC=y |
123 | CONFIG_SPI=y | ||
124 | CONFIG_SPI_FSL_SPI=y | ||
125 | CONFIG_SPI_FSL_ESPI=y | ||
124 | CONFIG_GPIO_MPC8XXX=y | 126 | CONFIG_GPIO_MPC8XXX=y |
125 | # CONFIG_HWMON is not set | 127 | # CONFIG_HWMON is not set |
126 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 128 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
@@ -164,6 +166,10 @@ CONFIG_USB_OHCI_HCD=y | |||
164 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 166 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
165 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y | 167 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y |
166 | CONFIG_USB_STORAGE=y | 168 | CONFIG_USB_STORAGE=y |
169 | CONFIG_MMC=y | ||
170 | CONFIG_MMC_SDHCI=y | ||
171 | CONFIG_MMC_SDHCI_PLTFM=y | ||
172 | CONFIG_MMC_SDHCI_OF_ESDHC=y | ||
167 | CONFIG_EDAC=y | 173 | CONFIG_EDAC=y |
168 | CONFIG_EDAC_MM_EDAC=y | 174 | CONFIG_EDAC_MM_EDAC=y |
169 | CONFIG_RTC_CLASS=y | 175 | CONFIG_RTC_CLASS=y |
@@ -183,6 +189,7 @@ CONFIG_VFAT_FS=y | |||
183 | CONFIG_NTFS_FS=y | 189 | CONFIG_NTFS_FS=y |
184 | CONFIG_PROC_KCORE=y | 190 | CONFIG_PROC_KCORE=y |
185 | CONFIG_TMPFS=y | 191 | CONFIG_TMPFS=y |
192 | CONFIG_HUGETLBFS=y | ||
186 | CONFIG_ADFS_FS=m | 193 | CONFIG_ADFS_FS=m |
187 | CONFIG_AFFS_FS=m | 194 | CONFIG_AFFS_FS=m |
188 | CONFIG_HFS_FS=m | 195 | CONFIG_HFS_FS=m |
@@ -214,4 +221,5 @@ CONFIG_CRYPTO_SHA256=y | |||
214 | CONFIG_CRYPTO_SHA512=y | 221 | CONFIG_CRYPTO_SHA512=y |
215 | CONFIG_CRYPTO_AES=y | 222 | CONFIG_CRYPTO_AES=y |
216 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 223 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
224 | CONFIG_CRYPTO_DEV_FSL_CAAM=y | ||
217 | CONFIG_CRYPTO_DEV_TALITOS=y | 225 | CONFIG_CRYPTO_DEV_TALITOS=y |