summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-25 15:05:16 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-25 15:05:16 +0000
commit5448a92c7128dfc5ed3b44443683929834b1e372 (patch)
tree4b53225538d3552798c77a685c0435573dd3ab43
parent87f5e12cd0a27c33cc970186de623b4eb667b564 (diff)
Remove preinit.arch, not used, compile NAPI support for R6040, change the profile name to ar525w
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8160 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/rdc-2.6/config/default1
-rw-r--r--target/linux/rdc-2.6/image/preinit.arch2
-rw-r--r--target/linux/rdc-2.6/patches/002-r6040_ethernet.patch6
-rw-r--r--target/linux/rdc-2.6/profiles/AR525W.mk (renamed from target/linux/rdc-2.6/profiles/Ralink.mk)0
4 files changed, 6 insertions, 3 deletions
diff --git a/target/linux/rdc-2.6/config/default b/target/linux/rdc-2.6/config/default
index 9ce729cfa..9ed3f8626 100644
--- a/target/linux/rdc-2.6/config/default
+++ b/target/linux/rdc-2.6/config/default
@@ -220,6 +220,7 @@ CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_PHYSICAL_START=0x100000
# CONFIG_PNPACPI is not set
CONFIG_R6040=m
+CONFIG_R6040_NAPI=y
# CONFIG_RELOCATABLE is not set
# CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_RTC is not set
diff --git a/target/linux/rdc-2.6/image/preinit.arch b/target/linux/rdc-2.6/image/preinit.arch
deleted file mode 100644
index 2e88efda5..000000000
--- a/target/linux/rdc-2.6/image/preinit.arch
+++ /dev/null
@@ -1,2 +0,0 @@
-mount_root ${FAILSAFE:+failsafe}
-exec /bin/busybox init
diff --git a/target/linux/rdc-2.6/patches/002-r6040_ethernet.patch b/target/linux/rdc-2.6/patches/002-r6040_ethernet.patch
index 333ec3689..a403b0ad1 100644
--- a/target/linux/rdc-2.6/patches/002-r6040_ethernet.patch
+++ b/target/linux/rdc-2.6/patches/002-r6040_ethernet.patch
@@ -1,7 +1,7 @@
diff -urN linux-2.6.17/drivers/net/Kconfig linux-2.6.17.new/drivers/net/Kconfig
--- linux-2.6.17/drivers/net/Kconfig 2006-06-18 03:49:35.000000000 +0200
+++ linux-2.6.17.new/drivers/net/Kconfig 2006-09-25 13:14:27.000000000 +0200
-@@ -1358,6 +1358,19 @@
+@@ -1358,6 +1358,23 @@
<file:Documentation/networking/net-modules.txt>. The module will be
called apricot.
@@ -18,6 +18,10 @@ diff -urN linux-2.6.17/drivers/net/Kconfig linux-2.6.17.new/drivers/net/Kconfig
+ <file:Documentation/networking/net-modules.txt>. The module will be
+ called r6040.
+
++
++config R6040_NAPI
++ bool "NAPI support for R6040"
++ default y
config B44
tristate "Broadcom 4400 ethernet support (EXPERIMENTAL)"
depends on NET_PCI && PCI && EXPERIMENTAL
diff --git a/target/linux/rdc-2.6/profiles/Ralink.mk b/target/linux/rdc-2.6/profiles/AR525W.mk
index 847607e8c..847607e8c 100644
--- a/target/linux/rdc-2.6/profiles/Ralink.mk
+++ b/target/linux/rdc-2.6/profiles/AR525W.mk