[OpenWrt-Devel] [patch] mmv-over-gpio and b43 compatibility patch (next try)
Hello,
this patch aims at making the mmv-over-gpio driver and the b43
wireless driver compatible. They both use gpgio lines, however,
the mmc driver does this for the real work whereas the b43 driver
uses the connected LEDs only as blinkenlights eye-candy.
This patch disabled the LED subsystem on the brcm47xx platform if
the gpio mmc driver is selected. This way the mmc gpgio driver
has exclusive access to the lines.
This required passing some defines on to the mac80211 package
which contains the b43 driver. These have no effect on other
platforms. If somebody knows a way to patch the config.mk only
for the brcm47xx case, I'd be glad to know.
Bye,
Joerg
Signed-Off-by: Joerg Dorchain
Index: target/linux/brcm47xx/patches-2.6.32/215-b43-mmc-gpio-conflict.patch
===
--- target/linux/brcm47xx/patches-2.6.32/215-b43-mmc-gpio-conflict.patch
(revision 0)
+++ target/linux/brcm47xx/patches-2.6.32/215-b43-mmc-gpio-conflict.patch
(revision 0)
@@ -0,0 +1,15 @@
+--- a/drivers/led/Kconfig 2010-04-01 10:03:32.349152840 +0200
b/drivers/led/Kconfig 2010-04-01 10:10:48.449153105 +0200
+@@ -1,3 +1,4 @@
++if (GPIOMMC = n)
+ menuconfig NEW_LEDS
+ bool "LED Support"
+ help
+@@ -6,6 +7,7 @@
+
+ This is not related to standard keyboard LEDs which are controlled
+ via the input system.
++endif # GPIOMMC
+
+ if NEW_LEDS
+
Index: package/mac80211/patches/016-no_led.patch
===
--- package/mac80211/patches/016-no_led.patch (revision 0)
+++ package/mac80211/patches/016-no_led.patch (revision 0)
@@ -0,0 +1,108 @@
+--- a/config.mk2010-03-13 13:03:49.071860543 +0100
b/config.mk2010-03-13 13:05:01.271918224 +0100
+@@ -116,7 +116,7 @@
+ CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstrel
+ CONFIG_MAC80211_RC_PID=y
+ CONFIG_MAC80211_RC_MINSTREL=y
+-CONFIG_MAC80211_LEDS=y
++#CONFIG_MAC80211_LEDS=y
+
+ # enable mesh networking too
+ CONFIG_MAC80211_MESH=y
+@@ -199,7 +199,7 @@
+ ifneq ($(CONFIG_PCMCIA),)
+ # CONFIG_B43_PCMCIA=y
+ endif
+-CONFIG_B43_LEDS=y
++# CONFIG_B43_LEDS=y
+ CONFIG_B43_PHY_LP=y
+ CONFIG_B43_NPHY=y
+ # CONFIG_B43_DEBUG=y
+@@ -207,7 +207,7 @@
+ CONFIG_B43LEGACY=m
+ CONFIG_B43LEGACY_HWRNG=y
+ CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+-CONFIG_B43LEGACY_LEDS=y
++# CONFIG_B43LEGACY_LEDS=y
+ # CONFIG_B43LEGACY_DEBUG=y
+ CONFIG_B43LEGACY_DMA=y
+ CONFIG_B43LEGACY_PIO=y
+@@ -332,13 +332,13 @@
+
+ CONFIG_P54_USB=m
+ CONFIG_RTL8187=m
+-CONFIG_RTL8187_LEDS=y
++# CONFIG_RTL8187_LEDS=y
+
+ CONFIG_AT76C50X_USB=m
+
+ ifndef CONFIG_COMPAT_KERNEL_28
+ CONFIG_AR9170_USB=m
+-CONFIG_AR9170_LEDS=y
++#CONFIG_AR9170_LEDS=y
+ endif
+
+ # RT2500USB does not require firmware
+@@ -411,7 +411,7 @@
+ CONFIG_RT2X00_LIB_HT=y
+ CONFIG_RT2X00_LIB_FIRMWARE=y
+ CONFIG_RT2X00_LIB_CRYPTO=y
+-CONFIG_RT2X00_LIB_LEDS=y
++#CONFIG_RT2X00_LIB_LEDS=y
+ # CONFIG_RT2X00_DEBUG=y
+ # CONFIG_RT2X00_LIB_DEBUGFS
+ endif
+@@ -422,7 +422,7 @@
+
+ # p54
+ CONFIG_P54_COMMON=m
+-CONFIG_P54_LEDS=y
++#CONFIG_P54_LEDS=y
+
+ # Atheros
+ CONFIG_ATH_COMMON=m
+
+--- a/drivers/net/wireless/b43/main.c 2010-03-26 19:25:51.0 +0100
b/drivers/net/wireless/b43/main.c 2010-04-01 09:23:06.149155292 +0200
+@@ -2528,10 +2528,17 @@
+ & ~B43_MACCTL_GPOUTSMSK);
+
+ b43_write16(dev, B43_MMIO_GPIO_MASK, b43_read16(dev, B43_MMIO_GPIO_MASK)
++#ifndef CONFIG_GPIOMMC
+ | 0x000F);
+-
++#else
++ | 0x0001);
++#endif
+ mask = 0x001F;
++#ifndef CONFIG_GPIOMMC
+ set = 0x000F;
++#else
++ set = 0x0001;
++#endif
+ if (dev->dev->bus->chip_id == 0x4301) {
+ mask |= 0x0060;
+ set |= 0x0060;
+@@ -2559,10 +2566,11 @@
+ gpiodev = bus->chipco.dev ? : pcidev;
+ if (!gpiodev)
+ return 0;
++#ifndef CONFIG_GPIOMMC
+ ssb_write32(gpiodev, B43_GPIO_CONTROL,
+ (ssb_read32(gpiodev, B43_GPIO_CONTROL)
+& mask) | set);
+-
++#endif
+ return 0;
+ }
+
+@@ -2578,7 +2586,9 @@
+ gpiodev = bus->chipco.dev ? : pcidev;
+ if (!gpiodev)
+ return;
++#ifndef CONFIG_GPIOMMC
+ ssb_write32(gpiodev, B43_GPIO_CONTROL, 0);
++#endif
+ }
+
+ /* http://bcm-specs.sipsolutions.net/EnableMac */
Index: package/mac80211/Makefile
===
--- package/mac80211/Makefile (revision 20646)
+++ package/mac80211/Makefile (working copy)
@@ -628,6 +628,7 @@
$(if $(CONFIG_PACKAGE_kmod-rt2x00-soc),-DCONFIG_RT2X00_LIB_SOC) \
$(if $(CONFIG_PCI_SUPPORT),-DCONFIG_RT2800PCI_PCI) \
$(if $(CONFIG_TARGET_ramips),-DCONFIG_RT2800PCI_SOC) \
+ $(if $(CONFIG_GPIOMMC),-DCONFIG_GPIOMMC) \
MAKE_OPTS:= \
CROSS_COMPILE="$(KERNEL_CROSS)" \
@@ -637,7 +638,7 @@
CONFIG_MAC80211=$(if $(CONFIG_PACKAGE_kmod-mac80211),m) \
CONFIG
[OpenWrt-Devel] patch for pptp package
Hi,
I am proposing the below patch for pptp package. Because this ifname
correction is done in the ppp.sh script for all the ppp based
protocols.
Thanks,
Murat Sezgin
www.ubicom.com
diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index e38c242..6008a48 100644
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -31,11 +31,6 @@ setup_interface_pptp() {
config_get netmask "$config" netmask
[ -z "$netmask" -o -z "$device" ] || ifconfig $device netmask $netmask
- # make sure the network state references the correct ifname
- scan_ppp "$config"
- config_get ifname "$config" ifname
- uci_set_state network "$config" ifname "$ifname"
-
config_get mtu "$config" mtu
mtu=${mtu:-1452}
start_pppd "$config" \
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [patch] set mac address for bridge also on sub-devices
If a mac address is set for the lan bridge, e.g.
network.lan.macaddr=00:1a:70:a0:38:80
then it is only set on the bridge itself and not the sub-devices
br-lanLink encap:Ethernet HWaddr 00:1A:70:A0:38:80
lan1 Link encap:Ethernet HWaddr 00:00:00:00:51:81
lan2 Link encap:Ethernet HWaddr 00:00:00:00:51:81
lan3 Link encap:Ethernet HWaddr 00:00:00:00:51:81
lan4 Link encap:Ethernet HWaddr 00:00:00:00:51:81
The attached patch (really simple) also sets the mac address on the
sub-devices.
It is tested and used for some weeks on LinkSys WRT350Nv2 by some forum
members.
It is also a prerequisite for the next WRT350Nv2 patch.
Kind regards
Matthias "Maddes" Bücher
--
http://www.maddes.net/
Home: Earth / Germany / Ruhr-Area
Index: package/base-files/files/lib/network/config.sh
===
--- package/base-files/files/lib/network/config.sh (revision 20654)
+++ package/base-files/files/lib/network/config.sh (working copy)
@@ -115,6 +115,8 @@
config_get iftype "$config" type
case "$iftype" in
bridge)
+ local macaddr
+ config_get macaddr "$config" macaddr
[ -x /usr/sbin/brctl ] && {
ifconfig "br-$config" 2>/dev/null >/dev/null && {
local newdevs devices
@@ -139,7 +141,7 @@
# result in another setup_interface() call, so we simply stop processing
# the current event at this point.
}
-ifconfig "$iface" up 2>/dev/null >/dev/null
+ifconfig "$iface" ${macaddr:+hw ether "${macaddr}"} up 2>/dev/null >/dev/null
return 1
}
;;
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] patch for pptp package
Selam Murat,
Nasilsin?
ppp.sh generic bir dosya olarak kabul edilip, application specific olan
script lerde bu gibi variable lar overwrite ediliyor olabilir.
Yani bu tarz bisey dusunerek yapmis olabilirler.
Hadi kolay gelsin,
Bayram
On 2 April 2010 22:02, Murat Sezgin wrote:
> Hi,
>
> I am proposing the below patch for pptp package. Because this ifname
> correction is done in the ppp.sh script for all the ppp based
> protocols.
>
> Thanks,
> Murat Sezgin
> www.ubicom.com
>
>
> diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
> index e38c242..6008a48 100644
> --- a/package/pptp/files/pptp.sh
> +++ b/package/pptp/files/pptp.sh
> @@ -31,11 +31,6 @@ setup_interface_pptp() {
>config_get netmask "$config" netmask
>[ -z "$netmask" -o -z "$device" ] || ifconfig $device netmask
> $netmask
>
> - # make sure the network state references the correct ifname
> - scan_ppp "$config"
> - config_get ifname "$config" ifname
> - uci_set_state network "$config" ifname "$ifname"
> -
>config_get mtu "$config" mtu
>mtu=${mtu:-1452}
>start_pppd "$config" \
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
>
--
Bayram
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] patch for pptp package
I am sorry for Turkish reply :)
Here is the English version:
As a guess, ppp.sh may be the generic setting location and applications may
override these type of settings.
Regards,
Bayram
On 3 April 2010 00:25, Bayram Kurumahmut wrote:
> Selam Murat,
>
> Nasilsin?
>
> ppp.sh generic bir dosya olarak kabul edilip, application specific olan
> script lerde bu gibi variable lar overwrite ediliyor olabilir.
>
> Yani bu tarz bisey dusunerek yapmis olabilirler.
>
> Hadi kolay gelsin,
> Bayram
>
>
> On 2 April 2010 22:02, Murat Sezgin wrote:
>
>> Hi,
>>
>> I am proposing the below patch for pptp package. Because this ifname
>> correction is done in the ppp.sh script for all the ppp based
>> protocols.
>>
>> Thanks,
>> Murat Sezgin
>> www.ubicom.com
>>
>>
>> diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
>> index e38c242..6008a48 100644
>> --- a/package/pptp/files/pptp.sh
>> +++ b/package/pptp/files/pptp.sh
>> @@ -31,11 +31,6 @@ setup_interface_pptp() {
>>config_get netmask "$config" netmask
>>[ -z "$netmask" -o -z "$device" ] || ifconfig $device netmask
>> $netmask
>>
>> - # make sure the network state references the correct ifname
>> - scan_ppp "$config"
>> - config_get ifname "$config" ifname
>> - uci_set_state network "$config" ifname "$ifname"
>> -
>>config_get mtu "$config" mtu
>>mtu=${mtu:-1452}
>>start_pppd "$config" \
>> ___
>> openwrt-devel mailing list
>> openwrt-devel@lists.openwrt.org
>> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
>>
>
>
>
> --
> Bayram
>
--
Bayram
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Backfire 10.03-rc3
*** Release Candidate 3 *** The OpenWrt Team is pleased to announce the third and last release candidate (RC3) of the next stable release, codenamed Backfire. Testing of this build will help refine the code in preparation of the final release. Binaries can be downloaded at http://downloads.openwrt.org/backfire/10.03-rc3/ OpenWrt Trunk has now been branched and named "backfire" within the repository. The Backfire branch source code can be checked out at svn://svn.openwrt.org/openwrt/branches/backfire/ Changes since Backfire RC2: * support for Infineon Danube/TwinPass (ifxmips) * support for Intel Tolapai SoC (ep80579) * experimental ImageBuilder files back again * new /etc/openwrt_release machine-readable file with detailed release informations Known Issues: * Encounters of spurious log messages every second on some brcm-2.4 & brcm47xx installs * Kernel modules missing on ixp4xx * There have been reports that sysupgrade can fail on brcm-2.4 and brcm47xx under certain conditions More detailed information available at https://dev.openwrt.org/milestone/Backfire%2010.03-rc3 Special thanks to marcant.net [1] for offering buildbot assistance 1. http://marcant.net/ Yours truly, -- The release management team Andy Boyett & Nicolas Thill ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] busybox 1.16.0 update patch
Hi Peter,
I just updated busybox to v1.16.1 in r20661 [1], using your 1.16.0 patch
as a base, thanks !
1. https://dev.openwrt.org/changeset/20661
Cheers,
--
-{Nico}
Peter Wagner wrote:
> Hi,
>
> this is my busybox update patch...
>
> please apply
>
> greets
>
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
