From 395698ec391b9aacacd52658f1073ef078af3bf1 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Sat, 19 Mar 2005 17:52:30 +0000 Subject: support for the asus wl-500g deluxe and the buffalo v2 units. dnsmasq update, control file fixes. add back other boardtypes to make wl.o happy on other routers git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@390 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/Makefile | 2 +- package/dnsmasq/dnsmasq.control | 2 +- package/dropbear/dropbear.control | 2 +- package/iptables/control/ip6tables.control | 2 +- package/iptables/control/iptables-extra.control | 2 +- package/iptables/control/iptables.control | 2 +- .../kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c | 2 +- package/linux/kernel-source/drivers/net/diag/diag_led.c | 16 ++++++++++++++++ 8 files changed, 23 insertions(+), 7 deletions(-) (limited to 'package') diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 899bad799f..761b79843b 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.15 +PKG_VERSION:=2.20 PKG_RELEASE:=1 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/package/dnsmasq/dnsmasq.control b/package/dnsmasq/dnsmasq.control index ef6bd0db30..3aba02b51d 100644 --- a/package/dnsmasq/dnsmasq.control +++ b/package/dnsmasq/dnsmasq.control @@ -1,7 +1,7 @@ Package: dnsmasq Priority: essential Section: net -Version: 2.15-1 +Version: 2.20-1 Architecture: mipsel Maintainer: Felix Fietkau Source: buildroot internal diff --git a/package/dropbear/dropbear.control b/package/dropbear/dropbear.control index e30f02ac5c..1a2f5ed970 100644 --- a/package/dropbear/dropbear.control +++ b/package/dropbear/dropbear.control @@ -2,7 +2,7 @@ Package: dropbear Priority: optional Depends: zlib Section: net -Version: 0.44-1 +Version: 0.45-1 Architecture: mipsel Maintainer: Felix Fietkau Source: buildroot internal diff --git a/package/iptables/control/ip6tables.control b/package/iptables/control/ip6tables.control index 4f7da5645a..6739656c7f 100644 --- a/package/iptables/control/ip6tables.control +++ b/package/iptables/control/ip6tables.control @@ -2,7 +2,7 @@ Package: ip6tables Priority: optional Depends: kmod-ipv6 Section: net -Version: 1.2.11-1 +Version: 1.3.0-1 Architecture: mipsel Maintainer: Felix Fietkau Source: buildroot internal diff --git a/package/iptables/control/iptables-extra.control b/package/iptables/control/iptables-extra.control index 2ce6044642..eb3dd7bed1 100644 --- a/package/iptables/control/iptables-extra.control +++ b/package/iptables/control/iptables-extra.control @@ -1,7 +1,7 @@ Package: iptables-extra Priority: optional Section: net -Version: 1.2.11-1 +Version: 1.3.0-1 Architecture: mipsel Maintainer: Felix Fietkau Source: buildroot internal diff --git a/package/iptables/control/iptables.control b/package/iptables/control/iptables.control index 09a99b5b04..6b7ab38a65 100644 --- a/package/iptables/control/iptables.control +++ b/package/iptables/control/iptables.control @@ -1,7 +1,7 @@ Package: iptables Priority: optional Section: net -Version: 1.2.11-1 +Version: 1.3.0-1 Architecture: mipsel Maintainer: Felix Fietkau Source: buildroot internal diff --git a/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c b/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c index b3469134eb..ead31e9aa5 100644 --- a/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c +++ b/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c @@ -275,7 +275,7 @@ sbpci_init(void *sbh) sb_core_reset(sbh, 0); /* In some board, */ - if(nvram_match("boardtype", "bcm94710dev")) + if(nvram_match("boardtype", "bcm94710dev") || nvram_match("boardtype", "bcm94710ap")|| nvram_match("boardtype", "bcm94710r4")|| nvram_match("boardtype", "bcm94710r4")|| nvram_match("boardtype", "bcm95365r")) CT4712_WR = 0; else CT4712_WR = 1; diff --git a/package/linux/kernel-source/drivers/net/diag/diag_led.c b/package/linux/kernel-source/drivers/net/diag/diag_led.c index 41cb17bf4d..6f1ba97324 100644 --- a/package/linux/kernel-source/drivers/net/diag/diag_led.c +++ b/package/linux/kernel-source/drivers/net/diag/diag_led.c @@ -5,6 +5,7 @@ // initial release 2004/03/28 // // 2004/08/26 asus & buffalo support added +// 2005/03/14 asus wl-500g deluxe and buffalo v2 support added #include #include @@ -187,11 +188,26 @@ static int __init diag_init() reset_polarity=0; buf=nvram_get("boardnum")?:""; if (!strcmp(buf,"44")) { + //motorola set_diag=ignore; set_dmz=ignore; reset_gpio=(1<<5); reset_polarity=0; } + if (!strcmp(buf,"00")) { + //buffalo + set_diag=ignore; + set_dmz=ignore; + reset_gpio=(1<<7); + reset_polarity=1; + } + if (!strcmp(buf,"45")) { + //wl-500g deluxe + set_diag=ignore; + set_dmz=ignore; + reset_gpio=(1<<6); + reset_polarity=1; + } } printk(KERN_INFO "using v%d hardware\n",board_type); -- cgit v1.2.3