projects
/
openwrt
/
staging
/
chunkeey.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1f59f20
)
move natsemi module into the kernel
author
Mike Baker
<mbm@openwrt.org>
Mon, 16 Jan 2006 19:16:51 +0000
(19:16 +0000)
committer
Mike Baker
<mbm@openwrt.org>
Mon, 16 Jan 2006 19:16:51 +0000
(19:16 +0000)
SVN-Revision: 2997
openwrt/target/linux/Config.in
patch
|
blob
|
history
openwrt/target/linux/aruba-2.6/config
patch
|
blob
|
history
openwrt/target/linux/image/aruba/Makefile
patch
|
blob
|
history
openwrt/target/linux/package/base-files/files/aruba-2.6/etc/init.d/S40network
[deleted file]
patch
|
blob
|
history
diff --git
a/openwrt/target/linux/Config.in
b/openwrt/target/linux/Config.in
index bb5afd30ca76fae6ad4b05c3dc3ab994c14e016a..8848740fa7297292f1837253ca7af49a06103842 100644
(file)
--- 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
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,
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 75aab7858a2e3a6e8eb04b4dae58dc02b907741d..e662d99feefe7d45d5d6276d4a487ce6b852a07d 100644
(file)
--- 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_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
# 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 aba11156d7a56601787adef8d94295cad1f89689..59bf59777b81dabf0db8dcc4b3d2e2e0419ae248 100644
(file)
--- 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)
$(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)
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
./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
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
(executable)
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