Patchwork powerpc/85xx: enable E1000 NIC to mpc85xx_defconfig

login
register
mail settings
Submitter Zang Roy-R61911
Date March 14, 2013, 3:40 p.m.
Message ID <1363275622-1412-1-git-send-email-tie-fei.zang@freescale.com>
Download mbox | patch
Permalink /patch/227452/
State Accepted
Commit 714b720eff5ee7cf6a9f835007f9dfd5d4c68ae3
Delegated to: Kumar Gala
Headers show

Comments

Zang Roy-R61911 - March 14, 2013, 3:40 p.m.
E1000 NIC is a common used Ethernet card. Enable it as default
for mpc85xx platform.

other change is due to make savedefconfig

Reported-by: Fu Jiwei <b36666@freescale.com>
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
---
tested on P1010rdb board
 arch/powerpc/configs/mpc85xx_defconfig |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Kumar Gala - March 15, 2013, 4:16 p.m.
On Mar 14, 2013, at 10:40 AM, Roy Zang wrote:

> E1000 NIC is a common used Ethernet card. Enable it as default
> for mpc85xx platform.
> 
> other change is due to make savedefconfig
> 
> Reported-by: Fu Jiwei <b36666@freescale.com>
> Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
> ---
> tested on P1010rdb board
> arch/powerpc/configs/mpc85xx_defconfig |    8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)

applied to next

- k

Patch

diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index cf815e8..e12146f 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -1,13 +1,12 @@ 
 CONFIG_PPC_85xx=y
 CONFIG_PHYS_64BIT=y
-CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
-CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_AUDIT=y
 CONFIG_IRQ_DOMAIN_DEBUG=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
@@ -113,6 +112,9 @@  CONFIG_DUMMY=y
 CONFIG_FS_ENET=y
 CONFIG_UCC_GETH=y
 CONFIG_GIANFAR=y
+CONFIG_E1000=y
+CONFIG_E1000E=y
+CONFIG_IGB=y
 CONFIG_MARVELL_PHY=y
 CONFIG_DAVICOM_PHY=y
 CONFIG_CICADA_PHY=y
@@ -132,7 +134,6 @@  CONFIG_SERIAL_8250_DETECT_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_QE=m
 CONFIG_NVRAM=y
-CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_CPM=m
 CONFIG_I2C_MPC=y
@@ -230,7 +231,6 @@  CONFIG_DEBUG_INFO=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_DEV_FSL_CAAM=y
 CONFIG_CRYPTO_DEV_TALITOS=y