aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2009-04-21 16:40:51 -0400
committerKumar Gala <galak@kernel.crashing.org>2009-04-21 17:08:56 -0400
commit8db3dca86e0a1b74b87ffb612f1e57c481a122b9 (patch)
tree9192b43720911bcc6f2bc0055830c569980cc230 /arch/powerpc
parent778544e59857bed3f8c152e3c8755b12f7f3971f (diff)
powerpc/85xx: Enabled a bunch of FSL specific drivers/options
* Add new 85xx boards * Added QE/FSL gpio * Enabled PHY drivers that exist on various boards * Enabled FS_ENET & UCC ethernet drivers (CPM2 & QE) * FSL HW Crypto Engine * CPM I2C * QE Serial Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig43
1 files changed, 27 insertions, 16 deletions
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index 6a3ea1aa2960..c162724fed4f 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc2 3# Linux kernel version: 2.6.30-rc2
4# Tue Apr 21 15:38:23 2009 4# Tue Apr 21 15:40:23 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -189,9 +189,9 @@ CONFIG_MPC85xx_CDS=y
189CONFIG_MPC85xx_MDS=y 189CONFIG_MPC85xx_MDS=y
190CONFIG_MPC8536_DS=y 190CONFIG_MPC8536_DS=y
191CONFIG_MPC85xx_DS=y 191CONFIG_MPC85xx_DS=y
192# CONFIG_SOCRATES is not set 192CONFIG_SOCRATES=y
193CONFIG_KSI8560=y 193CONFIG_KSI8560=y
194# CONFIG_STX_GP3 is not set 194CONFIG_STX_GP3=y
195CONFIG_TQM8540=y 195CONFIG_TQM8540=y
196CONFIG_TQM8541=y 196CONFIG_TQM8541=y
197CONFIG_TQM8548=y 197CONFIG_TQM8548=y
@@ -212,11 +212,11 @@ CONFIG_PPC_I8259=y
212# CONFIG_GENERIC_IOMAP is not set 212# CONFIG_GENERIC_IOMAP is not set
213# CONFIG_CPU_FREQ is not set 213# CONFIG_CPU_FREQ is not set
214CONFIG_QUICC_ENGINE=y 214CONFIG_QUICC_ENGINE=y
215# CONFIG_QE_GPIO is not set 215CONFIG_QE_GPIO=y
216CONFIG_CPM2=y 216CONFIG_CPM2=y
217CONFIG_FSL_ULI1575=y 217CONFIG_FSL_ULI1575=y
218CONFIG_CPM=y 218CONFIG_CPM=y
219# CONFIG_MPC8xxx_GPIO is not set 219CONFIG_MPC8xxx_GPIO=y
220# CONFIG_SIMPLE_GPIO is not set 220# CONFIG_SIMPLE_GPIO is not set
221 221
222# 222#
@@ -661,11 +661,11 @@ CONFIG_PHYLIB=y
661# 661#
662# MII PHY device drivers 662# MII PHY device drivers
663# 663#
664# CONFIG_MARVELL_PHY is not set 664CONFIG_MARVELL_PHY=y
665# CONFIG_DAVICOM_PHY is not set 665CONFIG_DAVICOM_PHY=y
666# CONFIG_QSEMI_PHY is not set 666# CONFIG_QSEMI_PHY is not set
667# CONFIG_LXT_PHY is not set 667# CONFIG_LXT_PHY is not set
668# CONFIG_CICADA_PHY is not set 668CONFIG_CICADA_PHY=y
669CONFIG_VITESSE_PHY=y 669CONFIG_VITESSE_PHY=y
670# CONFIG_SMSC_PHY is not set 670# CONFIG_SMSC_PHY is not set
671# CONFIG_BROADCOM_PHY is not set 671# CONFIG_BROADCOM_PHY is not set
@@ -674,7 +674,7 @@ CONFIG_VITESSE_PHY=y
674# CONFIG_NATIONAL_PHY is not set 674# CONFIG_NATIONAL_PHY is not set
675# CONFIG_STE10XP is not set 675# CONFIG_STE10XP is not set
676# CONFIG_LSI_ET1011C_PHY is not set 676# CONFIG_LSI_ET1011C_PHY is not set
677# CONFIG_FIXED_PHY is not set 677CONFIG_FIXED_PHY=y
678# CONFIG_MDIO_BITBANG is not set 678# CONFIG_MDIO_BITBANG is not set
679CONFIG_NET_ETHERNET=y 679CONFIG_NET_ETHERNET=y
680CONFIG_MII=y 680CONFIG_MII=y
@@ -696,7 +696,10 @@ CONFIG_MII=y
696# CONFIG_NET_PCI is not set 696# CONFIG_NET_PCI is not set
697# CONFIG_B44 is not set 697# CONFIG_B44 is not set
698# CONFIG_ATL2 is not set 698# CONFIG_ATL2 is not set
699# CONFIG_FS_ENET is not set 699CONFIG_FS_ENET=y
700CONFIG_FS_ENET_HAS_SCC=y
701CONFIG_FS_ENET_HAS_FCC=y
702# CONFIG_FS_ENET_MDIO_FCC is not set
700CONFIG_NETDEV_1000=y 703CONFIG_NETDEV_1000=y
701# CONFIG_ACENIC is not set 704# CONFIG_ACENIC is not set
702# CONFIG_DL2K is not set 705# CONFIG_DL2K is not set
@@ -717,7 +720,9 @@ CONFIG_NETDEV_1000=y
717# CONFIG_BNX2 is not set 720# CONFIG_BNX2 is not set
718CONFIG_FSL_PQ_MDIO=y 721CONFIG_FSL_PQ_MDIO=y
719CONFIG_GIANFAR=y 722CONFIG_GIANFAR=y
720# CONFIG_UCC_GETH is not set 723CONFIG_UCC_GETH=y
724# CONFIG_UGETH_MAGIC_PACKET is not set
725# CONFIG_UGETH_TX_ON_DEMAND is not set
721# CONFIG_QLA3XXX is not set 726# CONFIG_QLA3XXX is not set
722# CONFIG_ATL1 is not set 727# CONFIG_ATL1 is not set
723# CONFIG_ATL1E is not set 728# CONFIG_ATL1E is not set
@@ -846,14 +851,15 @@ CONFIG_SERIAL_CORE_CONSOLE=y
846# CONFIG_SERIAL_CPM is not set 851# CONFIG_SERIAL_CPM is not set
847# CONFIG_SERIAL_JSM is not set 852# CONFIG_SERIAL_JSM is not set
848# CONFIG_SERIAL_OF_PLATFORM is not set 853# CONFIG_SERIAL_OF_PLATFORM is not set
849# CONFIG_SERIAL_QE is not set 854CONFIG_SERIAL_QE=m
850CONFIG_UNIX98_PTYS=y 855CONFIG_UNIX98_PTYS=y
851# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 856# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
852CONFIG_LEGACY_PTYS=y 857CONFIG_LEGACY_PTYS=y
853CONFIG_LEGACY_PTY_COUNT=256 858CONFIG_LEGACY_PTY_COUNT=256
854# CONFIG_HVC_UDBG is not set 859# CONFIG_HVC_UDBG is not set
855# CONFIG_IPMI_HANDLER is not set 860# CONFIG_IPMI_HANDLER is not set
856# CONFIG_HW_RANDOM is not set 861CONFIG_HW_RANDOM=y
862# CONFIG_HW_RANDOM_TIMERIOMEM is not set
857CONFIG_NVRAM=y 863CONFIG_NVRAM=y
858# CONFIG_R3964 is not set 864# CONFIG_R3964 is not set
859# CONFIG_APPLICOM is not set 865# CONFIG_APPLICOM is not set
@@ -890,7 +896,7 @@ CONFIG_I2C_HELPER_AUTO=y
890# 896#
891# I2C system bus drivers (mostly embedded / system-on-chip) 897# I2C system bus drivers (mostly embedded / system-on-chip)
892# 898#
893# CONFIG_I2C_CPM is not set 899CONFIG_I2C_CPM=m
894# CONFIG_I2C_GPIO is not set 900# CONFIG_I2C_GPIO is not set
895CONFIG_I2C_MPC=y 901CONFIG_I2C_MPC=y
896# CONFIG_I2C_OCORES is not set 902# CONFIG_I2C_OCORES is not set
@@ -1253,6 +1259,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
1253CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y 1259CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
1254CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1260CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1255# CONFIG_USB_UHCI_HCD is not set 1261# CONFIG_USB_UHCI_HCD is not set
1262# CONFIG_USB_FHCI_HCD is not set
1256# CONFIG_USB_SL811_HCD is not set 1263# CONFIG_USB_SL811_HCD is not set
1257# CONFIG_USB_R8A66597_HCD is not set 1264# CONFIG_USB_R8A66597_HCD is not set
1258# CONFIG_USB_WHCI_HCD is not set 1265# CONFIG_USB_WHCI_HCD is not set
@@ -1597,6 +1604,9 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1597# CONFIG_NLS_KOI8_U is not set 1604# CONFIG_NLS_KOI8_U is not set
1598CONFIG_NLS_UTF8=m 1605CONFIG_NLS_UTF8=m
1599# CONFIG_DLM is not set 1606# CONFIG_DLM is not set
1607CONFIG_UCC_SLOW=y
1608CONFIG_UCC_FAST=y
1609CONFIG_UCC=y
1600# CONFIG_BINARY_PRINTF is not set 1610# CONFIG_BINARY_PRINTF is not set
1601 1611
1602# 1612#
@@ -1719,6 +1729,7 @@ CONFIG_CRYPTO=y
1719# CONFIG_CRYPTO_FIPS is not set 1729# CONFIG_CRYPTO_FIPS is not set
1720CONFIG_CRYPTO_ALGAPI=y 1730CONFIG_CRYPTO_ALGAPI=y
1721CONFIG_CRYPTO_ALGAPI2=y 1731CONFIG_CRYPTO_ALGAPI2=y
1732CONFIG_CRYPTO_AEAD=y
1722CONFIG_CRYPTO_AEAD2=y 1733CONFIG_CRYPTO_AEAD2=y
1723CONFIG_CRYPTO_BLKCIPHER=y 1734CONFIG_CRYPTO_BLKCIPHER=y
1724CONFIG_CRYPTO_BLKCIPHER2=y 1735CONFIG_CRYPTO_BLKCIPHER2=y
@@ -1732,7 +1743,7 @@ CONFIG_CRYPTO_MANAGER2=y
1732# CONFIG_CRYPTO_NULL is not set 1743# CONFIG_CRYPTO_NULL is not set
1733CONFIG_CRYPTO_WORKQUEUE=y 1744CONFIG_CRYPTO_WORKQUEUE=y
1734# CONFIG_CRYPTO_CRYPTD is not set 1745# CONFIG_CRYPTO_CRYPTD is not set
1735# CONFIG_CRYPTO_AUTHENC is not set 1746CONFIG_CRYPTO_AUTHENC=y
1736# CONFIG_CRYPTO_TEST is not set 1747# CONFIG_CRYPTO_TEST is not set
1737 1748
1738# 1749#
@@ -1808,7 +1819,7 @@ CONFIG_CRYPTO_DES=y
1808# CONFIG_CRYPTO_ANSI_CPRNG is not set 1819# CONFIG_CRYPTO_ANSI_CPRNG is not set
1809CONFIG_CRYPTO_HW=y 1820CONFIG_CRYPTO_HW=y
1810# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1821# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1811# CONFIG_CRYPTO_DEV_TALITOS is not set 1822CONFIG_CRYPTO_DEV_TALITOS=y
1812CONFIG_PPC_CLOCK=y 1823CONFIG_PPC_CLOCK=y
1813CONFIG_PPC_LIB_RHEAP=y 1824CONFIG_PPC_LIB_RHEAP=y
1814# CONFIG_VIRTUALIZATION is not set 1825# CONFIG_VIRTUALIZATION is not set