diff options
author | Rod Whitby <rod@whitby.id.au> | 2008-02-01 18:04:05 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-02-04 08:15:26 -0500 |
commit | b7edc84a9619eb2c8bfb5265d4079da9c70ad270 (patch) | |
tree | cacd9ffa7a99d6d75ce42f0b6edcd84c90fdf9e2 /arch/arm/configs | |
parent | 1208ebf25b654a48f075c191de1d6410af7062b0 (diff) |
[ARM] 4806/1: ixp4xx: Ethernet support for the nslu2 and nas100d boards
Enables the new ixp4xx qmgr and npe drivers in ixp4xx_defconfig.
Sets up the corresponding platform data for the nslu2 and nas100d
boards, and reads the ethernet MAC address from the internal flash.
Tested on both little-endian and big-endian kernels.
Tested-by: Tom King <tom@websb.net>
Signed-off-by: Rod Whitby <rod@whitby.id.au>
Signed-off-by: Michael Westerhof <mwester@dls.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/ixp4xx_defconfig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig index 77fe3b005141..efa0485d2f7e 100644 --- a/arch/arm/configs/ixp4xx_defconfig +++ b/arch/arm/configs/ixp4xx_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-rc8 | 3 | # Linux kernel version: 2.6.24 |
4 | # Wed Jan 23 17:26:16 2008 | 4 | # Sun Jan 27 07:33:38 2008 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
@@ -174,6 +174,8 @@ CONFIG_MACH_GTWX5715=y | |||
174 | # | 174 | # |
175 | CONFIG_DMABOUNCE=y | 175 | CONFIG_DMABOUNCE=y |
176 | # CONFIG_IXP4XX_INDIRECT_PCI is not set | 176 | # CONFIG_IXP4XX_INDIRECT_PCI is not set |
177 | CONFIG_IXP4XX_QMGR=y | ||
178 | CONFIG_IXP4XX_NPE=y | ||
177 | 179 | ||
178 | # | 180 | # |
179 | # Boot options | 181 | # Boot options |
@@ -832,6 +834,7 @@ CONFIG_DUMMY=y | |||
832 | # CONFIG_PHYLIB is not set | 834 | # CONFIG_PHYLIB is not set |
833 | CONFIG_NET_ETHERNET=y | 835 | CONFIG_NET_ETHERNET=y |
834 | CONFIG_MII=y | 836 | CONFIG_MII=y |
837 | CONFIG_IXP4XX_ETH=y | ||
835 | # CONFIG_AX88796 is not set | 838 | # CONFIG_AX88796 is not set |
836 | # CONFIG_HAPPYMEAL is not set | 839 | # CONFIG_HAPPYMEAL is not set |
837 | # CONFIG_SUNGEM is not set | 840 | # CONFIG_SUNGEM is not set |
@@ -925,6 +928,7 @@ CONFIG_HDLC_X25=m | |||
925 | # CONFIG_PC300TOO is not set | 928 | # CONFIG_PC300TOO is not set |
926 | # CONFIG_FARSYNC is not set | 929 | # CONFIG_FARSYNC is not set |
927 | # CONFIG_DSCC4 is not set | 930 | # CONFIG_DSCC4 is not set |
931 | # CONFIG_IXP4XX_HSS is not set | ||
928 | CONFIG_DLCI=m | 932 | CONFIG_DLCI=m |
929 | CONFIG_DLCI_MAX=8 | 933 | CONFIG_DLCI_MAX=8 |
930 | CONFIG_WAN_ROUTER_DRIVERS=m | 934 | CONFIG_WAN_ROUTER_DRIVERS=m |