move natsemi module into the kernel

SVN-Revision: 2997

4 files changed, 6 insertions, 36 deletions

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index bb5afd3..8848740 100644
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -515,8 +515,7 @@ config BR2_PACKAGE_KMOD_NET_HERMES_PLX
 config BR2_PACKAGE_KMOD_NET_NATSEMI
 	prompt "kmod-net-natsemi.................. National Semiconductor DP8381x series PCI Ethernet kernel support"
 	tristate
-	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_ARUBA
-	default y if BR2_LINUX_2_6_ARUBA
+	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
 	default m
 	help
 	  This driver is for the National Semiconductor DP83810 series, 
diff --git a/openwrt/target/linux/aruba-2.6/config b/openwrt/target/linux/aruba-2.6/config
index 75aab78..e662d99 100644
--- a/openwrt/target/linux/aruba-2.6/config
+++ b/openwrt/target/linux/aruba-2.6/config
@@ -757,7 +757,7 @@ CONFIG_NET_PCI=y
 # CONFIG_EEPRO100 is not set
 # CONFIG_E100 is not set
 # CONFIG_FEALNX is not set
-CONFIG_NATSEMI=m
+CONFIG_NATSEMI=y
 # CONFIG_NE2K_PCI is not set
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
diff --git a/openwrt/target/linux/image/aruba/Makefile b/openwrt/target/linux/image/aruba/Makefile
index aba1115..59bf597 100644
--- a/openwrt/target/linux/image/aruba/Makefile
+++ b/openwrt/target/linux/image/aruba/Makefile
@@ -15,31 +15,18 @@ ifeq ($(IB),)
 $(KDIR)/vmlinux.lzma: $(KDIR)/vmlinux
 	cat $^ | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $@ || (rm -f $@ && false)
 
-$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).ari: $(KDIR)/vmlinux.lzma
-install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).ari
-endif
-
-ifeq ($(FS),jffs2-8MB)
-TRXALIGN:=-a 0x20000
-endif
-ifeq ($(FS),jffs2-4MB)
-TRXALIGN:=-a 0x10000
+$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari: $(KDIR)/vmlinux.lzma
+install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari
 endif
 
 ifeq ($(KERNEL),2.6)
 FSNAME:=$(patsubst jffs2-%,jffs2,$(FS))
 
 ifeq ($(FS),jffs2-4MB)
-$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).ari: $(KDIR)/loader.elf
+$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari: $(KDIR)/loader.elf
 	./addVersion -n ArubaOS $(KDIR)/loader.elf $@ version
 
-$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).ari $(KDIR)/root.$(FS)
-	@dd if=$< of=$@.tmp bs=655360 conv=sync
-	@cat $(KDIR)/root.$(FS) >> $@.tmp
-	@dd if=$@.tmp of=$@ bs=3604480 conv=sync
-	@rm -f $@.tmp
-
-install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin
+install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari
 endif
 endif
 
diff --git a/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/init.d/S40network b/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/init.d/S40network
deleted file mode 100755
index df7c6b3..0000000
--- a/openwrt/target/linux/package/base-files/files/aruba-2.6/etc/init.d/S40network
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-. /etc/functions.sh
-[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
-case "$1" in
-  start|restart)
-    ifup lan
-    ifup wan
-    ifup wifi
-    wifi up
-
-    for route in $(nvram get static_route); do {
-      eval "set $(echo $route | sed 's/:/ /g')"
-      $DEBUG route add -net $1 netmask $2 gw $3 metric $4 dev $5
-    } done
-    ;;
-esac