diff options
author | Hollis Blanchard <hollisb@us.ibm.com> | 2008-01-04 18:26:54 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-01-08 08:43:57 -0500 |
commit | 5834584e4ea0b03c767e315a5879551b240c5652 (patch) | |
tree | 8b9ddf97c1603088371c21df986be32eb03001e8 /arch/powerpc/configs/sequoia_defconfig | |
parent | 7e52b48216da96632a3bcc051faaf57d3a4aacc1 (diff) |
[POWERPC] 4xx: enable built-in networking for Sequoia defconfig
Enable EMAC driver for Sequoia (and while we're in there, disable
Macintosh drivers for Sequoia and Bamboo).
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch/powerpc/configs/sequoia_defconfig')
-rw-r--r-- | arch/powerpc/configs/sequoia_defconfig | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/arch/powerpc/configs/sequoia_defconfig b/arch/powerpc/configs/sequoia_defconfig index 2bb4df82fbda..abbfed6582e1 100644 --- a/arch/powerpc/configs/sequoia_defconfig +++ b/arch/powerpc/configs/sequoia_defconfig | |||
@@ -449,9 +449,7 @@ CONFIG_MISC_DEVICES=y | |||
449 | # CONFIG_FIREWIRE is not set | 449 | # CONFIG_FIREWIRE is not set |
450 | # CONFIG_IEEE1394 is not set | 450 | # CONFIG_IEEE1394 is not set |
451 | # CONFIG_I2O is not set | 451 | # CONFIG_I2O is not set |
452 | CONFIG_MACINTOSH_DRIVERS=y | 452 | # CONFIG_MACINTOSH_DRIVERS is not set |
453 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
454 | # CONFIG_WINDFARM is not set | ||
455 | CONFIG_NETDEVICES=y | 453 | CONFIG_NETDEVICES=y |
456 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | 454 | # CONFIG_NETDEVICES_MULTIQUEUE is not set |
457 | # CONFIG_DUMMY is not set | 455 | # CONFIG_DUMMY is not set |
@@ -462,10 +460,28 @@ CONFIG_NETDEVICES=y | |||
462 | # CONFIG_VETH is not set | 460 | # CONFIG_VETH is not set |
463 | # CONFIG_IP1000 is not set | 461 | # CONFIG_IP1000 is not set |
464 | # CONFIG_ARCNET is not set | 462 | # CONFIG_ARCNET is not set |
465 | # CONFIG_NET_ETHERNET is not set | 463 | # CONFIG_PHYLIB is not set |
464 | CONFIG_NET_ETHERNET=y | ||
465 | # CONFIG_MII is not set | ||
466 | # CONFIG_HAPPYMEAL is not set | ||
467 | # CONFIG_SUNGEM is not set | ||
468 | # CONFIG_CASSINI is not set | ||
469 | # CONFIG_NET_VENDOR_3COM is not set | ||
470 | # CONFIG_NET_TULIP is not set | ||
471 | # CONFIG_HP100 is not set | ||
472 | CONFIG_IBM_NEW_EMAC=y | ||
473 | CONFIG_IBM_NEW_EMAC_RXB=128 | ||
474 | CONFIG_IBM_NEW_EMAC_TXB=64 | ||
475 | CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32 | ||
476 | CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256 | ||
477 | CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0 | ||
478 | # CONFIG_IBM_NEW_EMAC_DEBUG is not set | ||
466 | CONFIG_IBM_NEW_EMAC_ZMII=y | 479 | CONFIG_IBM_NEW_EMAC_ZMII=y |
467 | CONFIG_IBM_NEW_EMAC_RGMII=y | 480 | CONFIG_IBM_NEW_EMAC_RGMII=y |
481 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
468 | CONFIG_IBM_NEW_EMAC_EMAC4=y | 482 | CONFIG_IBM_NEW_EMAC_EMAC4=y |
483 | # CONFIG_NET_PCI is not set | ||
484 | # CONFIG_B44 is not set | ||
469 | CONFIG_NETDEV_1000=y | 485 | CONFIG_NETDEV_1000=y |
470 | # CONFIG_ACENIC is not set | 486 | # CONFIG_ACENIC is not set |
471 | # CONFIG_DL2K is not set | 487 | # CONFIG_DL2K is not set |