diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2011-12-08 01:55:57 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2012-01-04 16:33:58 -0500 |
commit | 389a6c527ece502da7aa3dde4c03e49fcecc45f8 (patch) | |
tree | 7c6b07fa6960c6d65ac5f6ee002da071a0ee6b43 /arch/powerpc/configs | |
parent | 220669495bf8b68130a8218607147c7b74c28d2b (diff) |
powerpc/fsl: Update defconfigs to enable some standard FSL HW features
corenet64_smp_defconfig:
- enabled rapidio
corenet32_smp_defconfig:
- enabled hugetlbfs, rapidio
mpc85xx_smp_defconfig:
- enabled P1010RDB, hugetlbfs, SPI, SDHC, Crypto/CAAM
mpc85xx_smp_defconfig:
- enabled hugetlbfs, SPI, SDHC, Crypto/CAAM
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/configs')
-rw-r--r-- | arch/powerpc/configs/corenet32_smp_defconfig | 9 | ||||
-rw-r--r-- | arch/powerpc/configs/corenet64_smp_defconfig | 3 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc85xx_defconfig | 16 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc85xx_smp_defconfig | 17 |
4 files changed, 30 insertions, 15 deletions
diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig index 8ff630267b51..c39877946351 100644 --- a/arch/powerpc/configs/corenet32_smp_defconfig +++ b/arch/powerpc/configs/corenet32_smp_defconfig | |||
@@ -37,6 +37,8 @@ CONFIG_FSL_LBC=y | |||
37 | CONFIG_PCI=y | 37 | CONFIG_PCI=y |
38 | CONFIG_PCIEPORTBUS=y | 38 | CONFIG_PCIEPORTBUS=y |
39 | # CONFIG_PCIEASPM is not set | 39 | # CONFIG_PCIEASPM is not set |
40 | CONFIG_RAPIDIO=y | ||
41 | CONFIG_FSL_RIO=y | ||
40 | CONFIG_NET=y | 42 | CONFIG_NET=y |
41 | CONFIG_PACKET=y | 43 | CONFIG_PACKET=y |
42 | CONFIG_UNIX=y | 44 | CONFIG_UNIX=y |
@@ -94,12 +96,11 @@ CONFIG_SATA_SIL24=y | |||
94 | CONFIG_SATA_SIL=y | 96 | CONFIG_SATA_SIL=y |
95 | CONFIG_PATA_SIL680=y | 97 | CONFIG_PATA_SIL680=y |
96 | CONFIG_NETDEVICES=y | 98 | CONFIG_NETDEVICES=y |
97 | CONFIG_VITESSE_PHY=y | 99 | CONFIG_FSL_PQ_MDIO=y |
98 | CONFIG_FIXED_PHY=y | ||
99 | CONFIG_NET_ETHERNET=y | ||
100 | CONFIG_E1000=y | 100 | CONFIG_E1000=y |
101 | CONFIG_E1000E=y | 101 | CONFIG_E1000E=y |
102 | CONFIG_FSL_PQ_MDIO=y | 102 | CONFIG_VITESSE_PHY=y |
103 | CONFIG_FIXED_PHY=y | ||
103 | # CONFIG_INPUT_MOUSEDEV is not set | 104 | # CONFIG_INPUT_MOUSEDEV is not set |
104 | # CONFIG_INPUT_KEYBOARD is not set | 105 | # CONFIG_INPUT_KEYBOARD is not set |
105 | # CONFIG_INPUT_MOUSE is not set | 106 | # CONFIG_INPUT_MOUSE is not set |
diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig index 53741f402078..7ed8d4cf2719 100644 --- a/arch/powerpc/configs/corenet64_smp_defconfig +++ b/arch/powerpc/configs/corenet64_smp_defconfig | |||
@@ -23,6 +23,8 @@ CONFIG_P5020_DS=y | |||
23 | CONFIG_NO_HZ=y | 23 | CONFIG_NO_HZ=y |
24 | CONFIG_HIGH_RES_TIMERS=y | 24 | CONFIG_HIGH_RES_TIMERS=y |
25 | CONFIG_BINFMT_MISC=m | 25 | CONFIG_BINFMT_MISC=m |
26 | CONFIG_RAPIDIO=y | ||
27 | CONFIG_FSL_RIO=y | ||
26 | CONFIG_NET=y | 28 | CONFIG_NET=y |
27 | CONFIG_PACKET=y | 29 | CONFIG_PACKET=y |
28 | CONFIG_UNIX=y | 30 | CONFIG_UNIX=y |
@@ -57,7 +59,6 @@ CONFIG_MISC_DEVICES=y | |||
57 | CONFIG_EEPROM_LEGACY=y | 59 | CONFIG_EEPROM_LEGACY=y |
58 | CONFIG_NETDEVICES=y | 60 | CONFIG_NETDEVICES=y |
59 | CONFIG_DUMMY=y | 61 | CONFIG_DUMMY=y |
60 | CONFIG_NET_ETHERNET=y | ||
61 | CONFIG_INPUT_FF_MEMLESS=m | 62 | CONFIG_INPUT_FF_MEMLESS=m |
62 | # CONFIG_INPUT_MOUSEDEV is not set | 63 | # CONFIG_INPUT_MOUSEDEV is not set |
63 | # CONFIG_INPUT_KEYBOARD is not set | 64 | # CONFIG_INPUT_KEYBOARD is not set |
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index 542eaa113974..f37a2ab48881 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 |
@@ -214,4 +219,5 @@ CONFIG_CRYPTO_SHA256=y | |||
214 | CONFIG_CRYPTO_SHA512=y | 219 | CONFIG_CRYPTO_SHA512=y |
215 | CONFIG_CRYPTO_AES=y | 220 | CONFIG_CRYPTO_AES=y |
216 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 221 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
222 | CONFIG_CRYPTO_DEV_FSL_CAAM=y | ||
217 | CONFIG_CRYPTO_DEV_TALITOS=y | 223 | CONFIG_CRYPTO_DEV_TALITOS=y |
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index c0a957429f9c..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 |
@@ -215,4 +221,5 @@ CONFIG_CRYPTO_SHA256=y | |||
215 | CONFIG_CRYPTO_SHA512=y | 221 | CONFIG_CRYPTO_SHA512=y |
216 | CONFIG_CRYPTO_AES=y | 222 | CONFIG_CRYPTO_AES=y |
217 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 223 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
224 | CONFIG_CRYPTO_DEV_FSL_CAAM=y | ||
218 | CONFIG_CRYPTO_DEV_TALITOS=y | 225 | CONFIG_CRYPTO_DEV_TALITOS=y |