aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-01-04 09:00:43 -0500
committerJosh Boyer <jwboyer@linux.vnet.ibm.com>2008-01-04 13:52:52 -0500
commit7e52b48216da96632a3bcc051faaf57d3a4aacc1 (patch)
treebe1c1cb92474cbbb36610ddc4543c037df4538e2
parent1fe1b95d86aea936582de3bdd1ac8dd62601893e (diff)
[POWERPC] 4xx: Add EMAC support to Kilauea defconfig
Somehow the EMAC support was dropped (or never really added) to the Kilauea defconfig file. This patch finally adds EMAC support. Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
-rw-r--r--arch/powerpc/configs/kilauea_defconfig23
1 files changed, 21 insertions, 2 deletions
diff --git a/arch/powerpc/configs/kilauea_defconfig b/arch/powerpc/configs/kilauea_defconfig
index c86e7565adc6..8dca3d451c0e 100644
--- a/arch/powerpc/configs/kilauea_defconfig
+++ b/arch/powerpc/configs/kilauea_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.24-rc6 3# Linux kernel version: 2.6.24-rc6
4# Mon Dec 24 11:18:12 2007 4# Thu Jan 3 14:21:31 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -453,9 +453,28 @@ CONFIG_NETDEVICES=y
453# CONFIG_VETH is not set 453# CONFIG_VETH is not set
454# CONFIG_IP1000 is not set 454# CONFIG_IP1000 is not set
455# CONFIG_ARCNET is not set 455# CONFIG_ARCNET is not set
456# CONFIG_NET_ETHERNET is not set 456# CONFIG_PHYLIB is not set
457CONFIG_NET_ETHERNET=y
458# CONFIG_MII is not set
459# CONFIG_HAPPYMEAL is not set
460# CONFIG_SUNGEM is not set
461# CONFIG_CASSINI is not set
462# CONFIG_NET_VENDOR_3COM is not set
463# CONFIG_NET_TULIP is not set
464# CONFIG_HP100 is not set
465CONFIG_IBM_NEW_EMAC=y
466CONFIG_IBM_NEW_EMAC_RXB=256
467CONFIG_IBM_NEW_EMAC_TXB=256
468CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
469CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
470CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
471# CONFIG_IBM_NEW_EMAC_DEBUG is not set
472# CONFIG_IBM_NEW_EMAC_ZMII is not set
457CONFIG_IBM_NEW_EMAC_RGMII=y 473CONFIG_IBM_NEW_EMAC_RGMII=y
474# CONFIG_IBM_NEW_EMAC_TAH is not set
458CONFIG_IBM_NEW_EMAC_EMAC4=y 475CONFIG_IBM_NEW_EMAC_EMAC4=y
476# CONFIG_NET_PCI is not set
477# CONFIG_B44 is not set
459# CONFIG_NETDEV_1000 is not set 478# CONFIG_NETDEV_1000 is not set
460# CONFIG_NETDEV_10000 is not set 479# CONFIG_NETDEV_10000 is not set
461# CONFIG_TR is not set 480# CONFIG_TR is not set