From 868fbb706e69147e6e8749e775afaaf6e9396b57 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Wed, 25 Jul 2007 15:05:16 +0000
Subject: Remove preinit.arch, not used, compile NAPI support for R6040, change
 the profile name to ar525w

SVN-Revision: 8160
---
 target/linux/rdc-2.6/config/default                   |  1 +
 target/linux/rdc-2.6/image/preinit.arch               |  2 --
 target/linux/rdc-2.6/patches/002-r6040_ethernet.patch |  6 +++++-
 target/linux/rdc-2.6/profiles/AR525W.mk               | 13 +++++++++++++
 target/linux/rdc-2.6/profiles/Ralink.mk               | 13 -------------
 5 files changed, 19 insertions(+), 16 deletions(-)
 delete mode 100644 target/linux/rdc-2.6/image/preinit.arch
 create mode 100644 target/linux/rdc-2.6/profiles/AR525W.mk
 delete mode 100644 target/linux/rdc-2.6/profiles/Ralink.mk

(limited to 'target/linux')

diff --git a/target/linux/rdc-2.6/config/default b/target/linux/rdc-2.6/config/default
index 9ce729cfaa..9ed3f86268 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 2e88efda56..0000000000
--- 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 333ec36892..a403b0ad18 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/AR525W.mk b/target/linux/rdc-2.6/profiles/AR525W.mk
new file mode 100644
index 0000000000..847607e8c5
--- /dev/null
+++ b/target/linux/rdc-2.6/profiles/AR525W.mk
@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/ar525w
+  NAME:=AirLink101 AR525W
+  PACKAGES:=kmod-rt61 kmod-r6040
+endef
+$(eval $(call Profile,ar525w))
+
diff --git a/target/linux/rdc-2.6/profiles/Ralink.mk b/target/linux/rdc-2.6/profiles/Ralink.mk
deleted file mode 100644
index 847607e8c5..0000000000
--- a/target/linux/rdc-2.6/profiles/Ralink.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/ar525w
-  NAME:=AirLink101 AR525W
-  PACKAGES:=kmod-rt61 kmod-r6040
-endef
-$(eval $(call Profile,ar525w))
-
-- 
cgit v1.2.3