Re: [OpenWrt-Devel] Migrating packages from oldpackages to packages
On Sun, 4 Mar 2018, Hauke Mehrtens wrote: On 03/04/2018 11:39 AM, Peter Denison wrote: When migrating a package from the unmaintained 'oldpackages' feed to the main 'packages' feed: 1) Should I try to preserve history? If so, how do I do that on just one directory (my git-fu is not that good)? No this is not needed, you can add this in one commit. Just mention in the commit message where you have copied it from. 2) Is it acceptable / preferable to do two commits, one to move the package as is, and a second to bring it up to date and fix its building, or should it just be a single commit? You can do this in one commit. OK. I have adjusted the commit(s). 3) Do I need to do anything other than a pull request on github to offer to maintain a package? (Presumably also a pull request to delete it from oldpackages) No not really, you should probably update the package to a more recent version I assume that version in oldpackage is outdated. Yes, it was. I have updated to the most recent version, which fortunately reduces the dependencies. I've raised PR#5715 on github for the adoption of gkrellmd. Many thanks for your advice. Will you delete it from oldpackages when it goes in to packages, or would you also like a PR for that? Peter -- Peter Denison ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Migrating packages from oldpackages to packages
When migrating a package from the unmaintained 'oldpackages' feed to the main 'packages' feed: 1) Should I try to preserve history? If so, how do I do that on just one directory (my git-fu is not that good)? 2) Is it acceptable / preferable to do two commits, one to move the package as is, and a second to bring it up to date and fix its building, or should it just be a single commit? 3) Do I need to do anything other than a pull request on github to offer to maintain a package? (Presumably also a pull request to delete it from oldpackages) Many thanks, -- Peter Denison ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] please send nvram dump of some brcm47xx based devices
Two dumps for WRTSL54GS devices. Once is about 6 months newer than the other. boardnum=42 boot_ver=v3.5 filter_rule10= wl0_wds_timeout=1 wl0_channel=6 MS_scan_max_num=10 ddns_username_buf= filter_dport_grp10= wl_wme_no_ack=off lan_hwnames= aol_block_traffic=0 pa0b2=0xfe70 pa0b1=0xfa24 audio_PCM=1 pa0b0=0x170c port_priority_4=0 port_priority_3=0 port_priority_2=0 wl_radio=1 ppp_static=0 port_priority_1=0 logon_drive=Z: nas_login=admin:admin:admin guest:guest:guest qos_appname8= qos_appname7= qos_appname6= qos_appname5= wan_mtu=1500 wl0_key=1 qos_appname4= qos_appname3= mac_clone_enable=0 qos_appname2= wl0_wpa_gtk_rekey=3600 qos_appname1= ntp_mode=auto wl_wep=disabled wl0_rts=2347 photo_JPG=1 qos_enable=no ftp_all=1 sdram_ncdl=0x10207 wl_auth=0 port_flow_control_4=1 port_flow_control_3=1 lan_ifname=br0 port_flow_control_2=1 ping_times= audio_AC3=1 port_flow_control_1=1 photo_GIF=1 wl_wds= boot_time=20 wl0_country=Worldwide ppp_ac= pppoe_passwd= firmware_version=v2.06.0 wl0_phytypes=g wl0_maxassoc=128 wl_radius_key= wl_wep_bit=64 wl_crypto=tkip pa0maxpwr=0x48 MS_scan_folder_value= pppoe_service= all_partitions_share=1 sel_qosport8=0 sel_qosport7=0 sel_qosport6=0 sel_qosport5=0 ntp_server= sel_qosport4=0 ubsa_enable=disabled sel_qosport3=0 wl_rate=0 sel_qosport2=0 filter_mac_grp10= sel_qosport1=0 audio_AAC=1 gid_range=42000-43000 enable_game=0 pa0itssit=62 static_route_name= ddns_cache= ftp_share_folder=/ wl_key4= wl_key3= nas_messag= wl_key2= wl_key1= pppoe_static=0 os_server= dhcp_wins=wan shared_info=All_Partitions:1:admin:rw wl_passphrase= port_rate_limit_4=0 port_rate_limit_3=0 port_rate_limit_2=0 ftp_enable=0 port_rate_limit_1=0 wl0gpio3=0 wl0gpio2=0 lan_dhcp=0 wl_wpa_gtk_rekey=3600 d11g_rateset=default wl0_macmode=disabled wl0_plcphdr=long error_pop_up_machine_names= root_passwd=admin ag0=255 block_activex=0 MS_scan_folder5= MS_scan_folder4= MS_scan_folder3= MS_scan_folder2= MS_scan_folder1= workgroup=Linksys wl_lazywds=1 http_lanport=80 os_date=Sep 14 2006 et1mdcport=1 dmz_enable=0 guest_uid=35000 wl_gmode=6 ping_ip= get_mac_index=3 wl0_wme_no_ack=off audio_WMA=1 l2tp_server_ip= ident_pass=0 wcn_flash_enable=0 wan_gateway=0.0.0.0 MServer=0 lan_route= ses_enable=1 filter_ip_grp9= filter_ip_grp8= wl_net_reauth=36000 pppoe_ac= filter_ip_grp7= pdc_enable=disabled filter_ip_grp6= filter_ip_grp5= filter_ip_grp4= filter_ip_grp3= filter_ip_grp2= ddns_hostname= filter_ip_grp1= d11g_dtim=1 wan_lease=86400 restore_defaults=0 ppp_get_ac= uid_range=35000-4 ses_event=2 wl_maxassoc=128 wl0_akm= d11g_mode=6 ppp_idletime=5 il0macaddr=00:16:b6:06:94:f4 filter_dport_grp9= group_users=admin:1:admin guest:1:guest filter_dport_grp8= filter_dport_grp7= filter_dport_grp6= filter_dport_grp5= filter_dport_grp4= filter_dport_grp2= filter_dport_grp1= filter_dport_grp3= ses_sw_btn_status=DEFAULTS wl0_wme_ap_bk=15 1023 7 0 0 off upnp_enable=1 wl_key=1 wl0_corerev=9 wl0_wme_ap_be=15 63 3 0 0 off wl0_radius_key= pppoe_demand=0 wl_ap_isolate=0 lan_wins= wl_rts=2347 wl0_maclist= ddns_passwd_buf= ezc_version=2 wl0_wep_gen= wl0_hwaddr=00:16:B6:06:94:F4 wl_wme_sta_bk=15 1023 7 0 0 off wl_channel=6 wl0_radio=1 ppp_mtu=1500 wan_hostname= wl_wme_sta_be=15 1023 3 0 0 off wan_ifname=eth1 audio_M4A=1 private_shares=All_Partitions:*:comment:/foreign_shares os_version=3.91.38.0 audio_M3U=1 wl_ifname= wan_wins= wl0_passphrase= wl_frameburst=on wl_wme_ap_vo=3 7 1 3264 1504 off wl_wme_ap_vi=7 15 1 6016 3008 off smb_admin_user=admin ddns_hostname_2= security_mode_last= old_lan_netmask=255.255.255.0 dmz_ipaddr=0 sdram_config=0x0062 filter_port_grp9= filter_port_grp8= filter_port_grp7= filter_port_grp6= filter_port_grp5= wl_unit=0 filter_port_grp4= filter_id=1 foreign_disk_info= filter_port_grp10= filter_port_grp3= filter_port_grp2= aa0=3 backup_job10=::: filter_port_grp1= ppp_mru=1500 wl_country=Worldwide blank_disk_info= wl0_auth=0 wl0_mac_deny= ppp_static_ip= d11g_frag=2346 forward_port= wl_active_mac= ntp_enable=1 cifs_msdfs_enable=enabled wl0_net_reauth=36000 qos_level2_file_extensions= ses_client_join=0 hb_server_domain= filter_tod_buf10= d11g_bcn=100 wl_dtim=1 nobody_gid=42001 storage_shares_limit=15 wl_wds_timeout=1 lan_hwaddr=00:16:B6:06:94:F2 wl0_antdiv=-1 security_mode2=disabled wl0_phytype=g wl0_rate=0 wl0_closed=0 skip_amd_check=0 wl_mode=ap primary_pool_name= block_wan=1 remote_mgt_https=0 http_passwd=admin domain_WRTSL54GS_sid=S-1-4-0-0-0-0-0-5-15-a752fdbe-747300c8-cbd29eb-0-0-0-0-0-0-0-0-0-0-0 ppp_keepalive=0 pptp_pass=1 wl_auth_mode=none filter_mac_grp9= filter_mac_grp8= filter_client0= wl0_key4= filter_mac_grp7= wl0_key3= filter_mac_grp6= wl0_key2= pppoe_static_ip= filter_mac_grp5= wl0_key1= filter_mac_grp4= wan_netmask=0.0.0.0 wl0id=0x4320 filter_mac_grp3= wan_hwname= wl_macmode=disabled filter_mac_grp2= wl_plcphdr=long filter_mac_grp1= qos_devname2= qos_devname1= port_trigger= domain_memberships= http_username= lan_netmask=255.255.255.0 wl0_wep_last= wl_active_add_mac=0 storage_groups_limit=15 wl0_gmode=6 sromrev=2 vi
Re: [OpenWrt-Devel] cross ksymoops
On Fri, 17 Oct 2008, Brian J. Murrell wrote: > Code: 9082 03e8 304200ff <9482> 03e8 3042 8c82 > 03e8 > /usr/bin/mipsel-linux-uclibc-objdump: Can't disassemble for architecture > UNKNOWN! > [...] > > Notice the "/usr/bin/mipsel-linux-uclibc-objdump: Can't disassemble for > architecture UNKNOWN!" above. It was a small problem in my ksymoops > cross-build, but to remedy it (the build error is fixed of course) I > have done: > > $ ls -l /usr/bin/mipsel-linux-uclibc-objdump > lrwxrwxrwx 1 root root 86 2008-10-17 07:27 > /usr/bin/mipsel-linux-uclibc-objdump -> > /usr/src/openwrt/staging_dir/toolchain-mipsel_gcc4.1.2/bin/mipsel-linux-uclibc-objdump > $ ls -lL /usr/bin/mipsel-linux-uclibc-objdump > -rwxr-xr-x 2 brian brian 381228 2008-10-16 19:14 > /usr/bin/mipsel-linux-uclibc-objdump > > So that shouldn't be the problem. Maybe my cross-build was not > successful. Try -a r4000 instead. That's what my objdump claims to support as a -m switch (of course we're guessing about how ksymoops calls objdump, but it's an educated guess) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] cross ksymoops
On Fri, 17 Oct 2008, Brian J. Murrell wrote: > I have patched the openwrt buildroot to build a cross-ksymoops. It > seems I have an array of target and architectures I can choose from. > ksymoops tells me they are: Well done! > $ staging_dir/toolchain-mipsel_gcc4.1.2/bin/mipsel-linux-uclibc-ksymoops -a > '?' > ksymoops 2.4.11 on i686 2.6.27-6-generic. Options used > ... > > Architectures supported by your libbfd >mips >mips:3000 >mips:3900 >mips:4000 >mips:4010 >mips:4100 >mips:4111 >mips:4120 [...] > Error (Oops_bfd_perror): scan_arch for specified architecture File in wrong > format > Sorry, looks like your binutils cannot handle the specified architecture I'd run it with -a mips:4000 looking at that list, assuming I've remembered your processor correctly (Broadcom bcm47xx series?) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] 2.6.25.7 and b43 driver oops
On Thu, 16 Oct 2008, Brian J. Murrell wrote: > OK. Figured out how to use ksymoops with the openwrt kernel build to > get a useful stack trace: > > $ ksymoops -v build_dir/linux-brcm47xx/linux-2.6.25.7/vmlinux -m > build_dir/linux-brcm47xx/linux-2.6.25.7/System.map > ksymoops 2.4.11 on i686 2.6.27-6-generic. Options used > -v build_dir/linux-brcm47xx/linux-2.6.25.7/vmlinux (specified) > -k /proc/ksyms (default) > -l /proc/modules (default) > -o /lib/modules/2.6.27-6-generic/ (default) > -m build_dir/linux-brcm47xx/linux-2.6.25.7/System.map (specified) [...snip...] > Code; 80116358 > 8: ff 00 incl (%eax) > Code; 8011635a > a: 42inc%edx > Code; 8011635b<= > b: 30 00 xor%al,(%eax) <= > Code; 8011635d > d: 00 82 94 08 00 e0 add%al,-0x176c(%edx) > Code; 80116363 > > I didn't mention before but this is running on an asus wl500gp FWIW. > This is not an instruction decode for the MIPS architecture. You need to use the -a switch to ksymoops, which probably means you need to compile a cross-tools version that is linked against a libbfd that understands the MIPS architecture. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] 2.6 kernel and b43 driver
On Fri, 27 Jun 2008, Steve Brown wrote: > Stefan Monnier wrote: >> I'm trying to use my WL-700gE's wifi card with the b43 driver but bumped >> into the problem reported at https://dev.openwrt.org/ticket/3510. >> >> This is with revision 11579 of the svn trunk. >> >> Is there something I can do to try and help resolve this problem? >> >> >> Stefan >> > Glad it's not just me. I have the same problem w/ the current svn. > > I tracked my bus error down to reading from B43_MMIO_RADIO_DATA_HIGH in > b43/main.c:b43_phy_versioning. > > I tried an older version (svn 10154) and it works, the driver loads, the > firmware loads, and the radio returns scan results. > > I have a wl500gp v1 with a 4318 rev 2 radio. I'm also available for > assignment. > > Steve Rather than saying "current svn", it would really help if you can state the exact revision you're using. To summarise the reports at #3510 and here, b43 seems to work on r10154, but not on r11363, r11372 or r11579. Unfortunately, I don't have a huge amount of time right now (not enough to do a full bisect between 10154 and 11363). A side note is that r11510 on my WRTSL54GS does not bus error, but equally does not scan the radio correctly. The crucial revisions to investigate around are r11358 r10742 r10755 r10951 r11462 r11347. If anyone can do some narrowing down, it would really help. Also, if you are going to help track this down, compiling the kernel with CONFIG_KALLSYMS will help, as we'll get Oops logs that contain more information about where the failure is happening. Good luck! Peter ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [rfc] Support for other libc implementations (like eglibc)
On Fri, 27 Jun 2008, Luigi 'Comio' Mantellini wrote: > Hi Guys, > > I just looked the eglibc website (www.eglibc.org) and I'm asking to > myself if Openwrt can be extended in order to support different libc > implementations. > I for one would very much like to see this, as I have already had to turn down OpenWRT for one project as the application required glibc (or rather had been tried on uClibc, without success). Good luck - it's worth doing. -- Peter Denison ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Patch-set for Freescale Coldifre 547x/548x cpus.
On Fri, 20 Jun 2008, Luigi 'Comio' Mantellini wrote:
Finally I ported OpenWRT on coldfire/m68k with gcc4.3. I created a set
of patches (~3MBytes) to add:
- gcc4.3.1 support (need to compile coldfire code);
- m68k fixes for gcc4.3 and uClibc;
- kernel patch from Freescale for 547x/548x cpu and linux kernel
2.6.23;
- coldfire MCF54x5yFE board target (with x in {7,8}, y in {A, B, C, D,
E, F}).
I just tested the compilation and I don't have tested the file directly
image on the targets. (I DON'T KNOW IF THE OBJECT CODE IS CORRECT!).
Anyway, I think that these patches should be a good start point in order
to create a complete and powerful building environment for these "new"
CPUs from Freescale...
ÿÿIf anyone is interested contact me and I will happily send these
patches. of course, I can post the patches on this forum... but the
files are very huge...
Great stuff - I might just get a ColdFire board if I can find one cheap
enough...
The best thing to do is to put up the patches somewhere publicly
accessible, and then post the link to the list. I think it would be good
to allow anyone to comment on them, although it's a "big ask" to go
through 3MB of patches!
--
Peter___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] hybrid-wl compilation
On Thu, 12 Jun 2008, Felipe Maya wrote: > Hi, it was my results of the compilation of > http://www.broadcom.com/support/802.11/linux_sta.php on openwrt ... > mipsel-linux-uclibc-ld: > /opt/openwrt-2.6.25/build_dir/linux-brcm47xx/compat-wireless-2008-06-10/hybrid-wl/lib/wlc_hybrid.o_shipped: > > Relocations in generic ELF (EM: 3) > /opt/openwrt-2.6.25/build_dir/linux-brcm47xx/compat-wireless-2008-06-10/hybrid-wl/lib/wlc_hybrid.o_shipped: > > could not read symbols: File in wrong format An interesting academic exercise. So you found that a binary blob provided by the manufacturer didn't work under a different environment. This is why we work with source and not with binary blobs. Sorry to sound so negative, but I wouldn't waste your time doing this, as even if you find an instance where it works, there will be many other instances where it doesn't. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] another compile fix for brcm47xx with kernel 2.6.25
On Thu, 5 Jun 2008, Hauke Mehrtens wrote: > Here is an other fix. > > The svn version doesn't compile with hostapd, because net/if.h and > linux/if.h are both included in the hostapd package with the new version > of mac80211. > > With this patch hostapd includes an special linux/wireless.h like it is > done in mainline. > > For me the hole svn version compiles with brcm47xx now. > > -- > Hauke Applied in r11407. Thanks ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] b43+bcm5354
On Mon, 2 Jun 2008, Felipe Maya wrote: > ohci_hcd: 2006 August 04 USB 1.1 'Open' Host Controller (OHCI) Driver > ohci_hcd ssb0:2: SSB OHCI Controller > ohci_hcd ssb0:2: new USB bus registered, assigned bus number 1 > ohci_hcd ssb0:2: irq 5, io mem 0x18003000 > ohci_hcd ssb0:2: init err ( ) > ohci_hcd ssb0:2: can't start > ohci_hcd ssb0:2: startup error -79 > ohci_hcd ssb0:2: USB bus 1 deregistered > ohci_hcd: probe of ssb0:2 failed with error -79 This is not a good start... > USB Universal Host Controller Interface driver v3.0 > ehci_hcd ssb0:1: SSB EHCI Controller > ehci_hcd ssb0:1: new USB bus registered, assigned bus number 1 > ehci_hcd ssb0:1: irq 5, io mem 0x18003800 > ehci_hcd ssb0:1: USB 0.0 started, EHCI 1.00, driver 10 Dec 2004 ... > Unhandled kernel unaligned access[#1]: > Cpu 0 > $ 0 : 1000b800 08124243 80202e08 > $ 4 : 80260590 80202d88 0021 801ffe3c > $ 8 : 8027 8027 80277fa0 0001acc0 > $12 : 0105 00200200 0001acd0 > $16 : c0170d58 80260590 c0170d74 802ba4a4 > $20 : c011fc10 c00ff000 c01723ac 80202d88 > $24 : 0018 000186a0 > $28 : 81b16000 81b17d40 016f 80151ff4 > Hi: ffc3 > Lo: 7c578400 > epc : c015aad4 Not tainted > ra: 80151ff4 Status: 1000b803KERNEL EXL IE > Cause : 0010 > BadVA : 08124257 > PrId : 00029029 > Modules linked in: b43 mac80211 cfg80211 option usbserial evdev ehci_hcd > uhci_hcd ohci_hcd input_core nf_nat_tftp nf_conntrack_tftp nf_nat_irc > nf_conntrack_irc nf_nat_ftp nf_conntrack_ftp ipt_REDIRECT ipt_NETMAP tunnel4 > ppp_async ppp_generic slhc crc_ccitt usbcore michael_mic arc4 aes deflate ecb > cbc blkcipher crypto_hash cryptomgr crypto_algapi switch_robo switch_core > diag > Process insmod (pid: 698, threadinfo=81b16000, task=81d061e8) > Stack : 0001 0001 0001 386d4427 138ce1ff 81a31a94 > 81a31afc >81b17d80 802b9378 800c4090 800c4080 802ba468 80202e08 81209ca0 >c0170d58 80260590 c0170d74 802ba4a4 c011fc10 c00ff000 c01723ac c0146920 >016f 80151ff4 80260590 81ecb05e 81c4b190 81ecb000 802ba4c0 802ba400 >80132fbc 80132f60 802ba448 801f42bc 8029f600 81ecb000 802ba4c0 802ba400 >... > Call > Trace:[<800c4090>][<800c4080>][][<80151ff4>][<80132fbc>][<80132f60>][<801f42bc>][<80133454>][<80131c1c>][<8010016c>][<801332dc>][<80131d88>][][<801321a8>][<8006b2c8>][][<8004b1b0>][<8000c7b0>][<8004>] > > Code: afa30034 8fa40068 8c82000c <8c420014> 104001b2 2403ffed 94430026 > 24024321 10620005 > > > Something Idea? Yes, it would really help decoding this is you would paste a copy of /proc/modules at the time of the exception and/or compile the kernel with CONFIG_KSYMSALL and/or decode the exception with ksymoops. With just a bunch of numbers (and not your built modules/kernel/System.map) it's rather hard. The failing instruction is a lw $2, 0x14($2), and $2 is 08124243, which is indeed unaligned, and looks bogus. Beyond that it's difficult to say. Note that the b43 in openwrt will not work with updated compat-wireless. I'm working on a commit to use the b43 code that comes with compat-wireless, but I have limited testing time now. Maybe I'll post something for people to try. -- Peter Denison ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] brcm47xx 2.6 still does not compile
On Tue, 20 May 2008, Steve Brown wrote: > My BCM5354 (Asus WL520gu) hangs on on boot after the "Entry at > 0x80001000". Nothing after. > > The same image boots fine on a BCM4704 (Asus WL500GP) and a BCM5352 > (Buffalo WHR-HP-G54). I managed to get some output from the cfe putchar > function at the start of setup_arch. So it's hanging prior to that. I'm > sure how to debug this. Probably just wait for somebody better at it > than me. > > Where did you get the V2? I haven't found anybody in the US that stocks > them yet. The FCC pix shows what looks like a jtag header. That would > sure be handy for times like this. I suggest you look in arch/mips/bcm47xx/prom.c, at the code that initialises the cfe (can't remember which function, and I'm not at home right now, but I think it's the first in the file). Try unconditionally setting the CFE entry point, as per the "workaround" and see if you then get output. I had to mess with this for a while. You can also take out the "*(unsigned char *)0xb864 = 1" that I inadvertently left in there from my debugging! If you get output, then add in a printk that prints fw_arg0, fw_arg1, fw_arg2 and fw_arg3 and let us all know. -- Peter Denison ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] brcm47xx 2.6 still does not compile
On Mon, 19 May 2008, Steve Brown wrote: > Dirk Nehring wrote: >> [...] >> make[5]: Leaving directory >> `/home/technik/dnehring/openwrt/build_dir/linux-brcm47xx/linux-2.6.25.1' >> make[5]: Entering directory >> `/home/technik/dnehring/openwrt/build_dir/linux-brcm47xx/linux-2.6.25.1' >> CHK include/linux/version.h >> CHK include/linux/utsrelease.h >> CALLscripts/checksyscalls.sh >> CHK include/linux/compile.h >> CC drivers/ssb/driver_pcicore.o >> drivers/ssb/driver_pcicore.c: In function 'ssb_pcicore_fixup_pcibridge': >> drivers/ssb/driver_pcicore.c:314: error: implicit declaration of function >> 'pcibios_enable_device' >> make[7]: *** [drivers/ssb/driver_pcicore.o] Error 1 >> make[6]: *** [drivers/ssb] Error 2 >> make[5]: *** [drivers] Error 2 >> make[5]: Leaving directory >> `/home/technik/dnehring/openwrt/build_dir/linux-brcm47xx/linux-2.6.25.1' >> make[4]: *** >> [/home/technik/dnehring/openwrt/build_dir/linux-brcm47xx/linux-2.6.25.1/.image] >> Error 2 >> make[4]: Leaving directory >> `/home/technik/dnehring/openwrt/target/linux/brcm47xx' >> >> And, iproute2 must be updated (works with iproute2-2.6.25.tar.bz2). Yes. I have a patch waiting to go in, but I'm waiting for confirmation (or time to test it) that it works under older kernels as well. >> > I added the following to config-2.6.25. > > CONFIG_PCI=y > CONFIG_SYS_HAS_EARLY_PRINTK=y > CONFIG_EARLY_PRINTK=y > # CONFIG_MEMSTICK is not set > # CONFIG_SGI_IP28 is not set > # CONFIG_THERMAL is not set > > The config_pci is to get the declaration for pcibios_enable_device to be > included. A better solution would be to add the missing ifdef around > that code. Not really. The platform has PCI, so that config setting should be set. Possibly there are some config dependencies that should go in so that you don't get a compilation failure. > I was pretty surprised at having to add the commented lines. If they > aren't there, you get questions from the 'make oldconfig' during the > kernel build. Sorry. If I understood exactly where to set things to get the right resultant .config, it would work more often. > The early printk stuff was to try to figure why it would boot on a > Buffalo whr-hp-54g, but not an Asus wl520gu. I still don't know why. CONFIG_BCM47XX sets CONFIG_SYS_HAS_EARLY_PRINTK, so you shouldn't need to set that. I can't work out where CONFIG_EARLY_PRINTK is set in my config, maybe by hand? That should probably go in. -- Peter Denison ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [EMAIL PROTECTED]: [PATCH] refactoring base-files for using "ip" instead of "ifconfig/route..."]
On Sat, 17 May 2008, Bastian Bittorf wrote: > here are some patches to let the user decide > wether to use "ifconfig/route..." or the nice > command "ip", which is much more cleaner IMHO. > > This is not complete yet, but let me first know, if > the used fallback-method or "elegant" or if I have > to rewrite the code. I would far rather see 'ip' tried first, and then fall back to ifconfig (which is almost guaranteed to be present) than the other way round. -- Peter Denison ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] brcm47xx: Remove obsolete patch for aec62xx
On Fri, 9 May 2008, Aleksandar Radovanovic wrote: > Remove target/linux/brcm47xx/patches-2.6.25/410-aec62xx_pci_enable.patch > It's been included in the mainline since 2.6.24 > > Signed-off-by: Aleksandar Radovanovic <[EMAIL PROTECTED]> > > Index: target/linux/brcm47xx/patches-2.6.25/410-aec62xx_pci_enable.patch > === > --- target/linux/brcm47xx/patches-2.6.25/410-aec62xx_pci_enable.patch > (revision 11096) > +++ target/linux/brcm47xx/patches-2.6.25/410-aec62xx_pci_enable.patch > (working copy) > @@ -1,32 +0,0 @@ > -diff -Naur a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c > a/drivers/ide/pci/aec62xx.c 2007-10-12 18:43:44.0 +0200 > -+++ b/drivers/ide/pci/aec62xx.c 2007-11-14 14:12:51.0 +0100 This isn't the only patch that needs to be fixed for 2.6.25 on brcm47xx. I am working on bringing the platform up to 2.6.25.1, and I'm nearly there. Won't be long now! -- Peter Denison - WRTSL54GS ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] OpenWRT for Linux/m68k?
On Thu, 1 May 2008, Geert Uytterhoeven wrote:
> Given my positive experiences with OpenWRT on adm5120 (RouterBoard 150) and
[...]
> and use an appropriate .config, and the resulting kernel with built-in
> ramdisk booted fine under ARAnyM!
Excellent!
> Perhaps this can become a valid alternative to Debian?
:)
> I still have a few questions, though:
> 1. target/linux/atari/patches/* is just all patch files from my quilt patch
> series for 2.6.25, with each patch file name prefixed by a number to
> ensure the correct order.
> Can the OpenWRT build system handle plain quilt series, too? I
> have to admit I didn't try.
Yes, I think so. I'm a little hazy on that bit, but looking at
include/quilt.mk, there is a snippet like:
if [ -s "$(1)/series" ]; then \
$(call filter_series,$(1)/series) | xargs -n1 \
$(PATCH) $(PKG_BUILD_DIR) "$(1)"; \
else \
$(PATCH) $(PKG_BUILD_DIR) "$(1)"; \
fi; \
where filter series is: sed -e s,\\\#.*,, $(1) | grep -E \[a-zA-Z0-9\]
and PATCH is a script that takes care of uncompressing and applying the
patches with patch -p1 -E -d {dir}
Look in include/quilt.mk, rules.mk and scripts/patch-kernel.sh for details
> Can the OpenWRT build system handle getting the quilt series from
> http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6.25/?
Not yet, I don't think - it pretty much assumes the patches are local.
--
Peter Denison - hacking on a WRTSL54GS (or 3)
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] trouble compiling latest trunk
On Wed, 30 Apr 2008, Mark Kelly wrote: > I doubt this is related to the problem I was seeing, but 2.6.25 is > having kernel compile issues on IXP4XX with the latest updates > > net/ipv4/netfilter/ipt_time.c: In function 'checkentry': > net/ipv4/netfilter/ipt_time.c:97: error: 'NF_IP_PRE_ROUTING' undeclared > (first use in this function) > net/ipv4/netfilter/ipt_time.c:97: error: (Each undeclared identifier is > reported only once > net/ipv4/netfilter/ipt_time.c:97: error: for each function it appears > in.) > net/ipv4/netfilter/ipt_time.c:97: error: 'NF_IP_LOCAL_IN' undeclared > (first use in this function) > net/ipv4/netfilter/ipt_time.c:97: error: 'NF_IP_FORWARD' undeclared > (first use in this function) > net/ipv4/netfilter/ipt_time.c:97: error: 'NF_IP_LOCAL_OUT' undeclared > (first use in this function) > make[8]: *** [net/ipv4/netfilter/ipt_time.o] Error 1 It's a problem with the patches not keeping up with 2.6.25. I have a commit poised to go in that will fix this for almost all of the netfilter modules on 2.6.25 (not IMQ, which is more complex). Just hold on a little while... and then of course fix the breakage in all the packages! -- Peter Denison ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Infrastructure question
On Sun, 27 Apr 2008, Robert P. J. Day wrote: > On Sun, 27 Apr 2008, Sergey Lapin wrote: > >> Hi, all! >> Is there make targets to accomplish the following things: >> >> * build just one package w/o other stuff, just to >> check it builds and packages well; >> * build kernel, for the same reasons? >> >> Thanks a lot, > > i've occasionally wondered whether there was a make target to do > precisely one task as well. it would be handy if the openwrt makefile > supported a "make help" like the linux kernel does, in that it would > simply print all of the possible targets. one could either rewrite > the current "make help" target, or create a new one like, say, "make > list_targets". > > but a comprehensive list of openwrt targets would be *immensely* > helpful. Ditto. I have found a number of useful targets, but I certainly couldn't give you a definitive list (or know how to find one). I use 'make package/-prepare', 'make package/-install' and 'make package/-clean' for individual packages. See http://forum.openwrt.org/viewtopic.php?pid=31794 for some details. I also use make target/linux-prepare QUILT=1 to start working on the kernel source. make kernel_menuconfig allows you to reconfigure the kernel, but beware that it will be merged with what is necessary for the main menuconfig entries you have chosen, so you often can't turn some individual things off. -- Peter Denison ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Xilinx Spartan 3E Starter Kit port
On Wed, 26 Mar 2008, RHS Linux User wrote: > I am still seeing the kernel being compiled with -march=mips32. There > must be some other place I should change so the kernel and modules are > compiled for R3000? > Under the "Advanced configuration options (for developers)" menu, "Toolchain options", the final entry for "Target optimization", you can put "-mips1 -march=r3000 -mtune=r3000" > Is there a way by examining the compiled code to tell which CPU it was > in fact compiled for? > I couldn't see how immediately, but perhaps objdump (or rather mispel-linux-objdump) can do it. -- Peter Denison (WRTSL54GS hardware and software hacking) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Revised patch for brcm47xx-2.6 branch compilation
Here's a revised patch to get the brcm47xx-2.6 target to compile. It
actually boots now.
--
Peter Denison
Index: target/linux/brcm47xx-2.6/profiles/WRTSL54GS.mk
===
--- target/linux/brcm47xx-2.6/profiles/WRTSL54GS.mk (revision 0)
+++ target/linux/brcm47xx-2.6/profiles/WRTSL54GS.mk (revision 0)
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/WRTSL54GS
+ NAME:=Linksys WRTSL54GS
+ PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-storage
kmod-fs-ext3 e2fsprogs
+endef
+
+define Profile/WRTSL54GS/Description
+ Package set compatible with the Linksys WRTSL54GS. Contains USB support
+endef
+$(eval $(call Profile,WRTSL54GS))
+
Index: target/linux/brcm47xx-2.6/patches/100-board_support.patch
===
--- target/linux/brcm47xx-2.6/patches/100-board_support.patch (revision 7334)
+++ target/linux/brcm47xx-2.6/patches/100-board_support.patch (working copy)
@@ -12,7 +12,7 @@
mainmenu "Linux/MIPS Kernel Configuration"
menu "Machine selection"
-@@ -222,6 +226,23 @@
+@@ -240,6 +240,23 @@
Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
Olivetti M700-10 workstations.
@@ -39,7 +39,7 @@
diff -urN linux.old/arch/mips/kernel/cpu-probe.c
linux.dev/arch/mips/kernel/cpu-probe.c
--- linux.old/arch/mips/kernel/cpu-probe.c 2007-01-26 00:51:33.0
+0100
+++ linux.dev/arch/mips/kernel/cpu-probe.c 2007-01-25 23:34:01.0
+0100
-@@ -723,6 +723,28 @@
+@@ -711,6 +711,28 @@
}
@@ -68,7 +68,7 @@
__init void cpu_probe(void)
{
struct cpuinfo_mips *c = ¤t_cpu_data;
-@@ -745,6 +767,9 @@
+@@ -733,6 +755,9 @@
case PRID_COMP_SIBYTE:
cpu_probe_sibyte(c);
break;
@@ -93,7 +93,7 @@
diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
--- linux.old/arch/mips/Makefile 2007-01-26 00:51:33.0 +0100
+++ linux.dev/arch/mips/Makefile 2007-01-25 23:34:01.0 +0100
-@@ -571,6 +571,18 @@
+@@ -576,6 +576,18 @@
load-$(CONFIG_SIBYTE_BIGSUR) := 0x8010
#
@@ -109,13 +109,13 @@
+core-$(CONFIG_CFE)+= arch/mips/cfe/
+
+#
- # SNI RM200 PCI
+ # SNI RM
#
- core-$(CONFIG_SNI_RM200_PCI) += arch/mips/sni/
+ core-$(CONFIG_SNI_RM) += arch/mips/sni/
diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
--- linux.old/arch/mips/mm/tlbex.c 2007-01-26 00:51:33.0 +0100
+++ linux.dev/arch/mips/mm/tlbex.c 2007-01-25 23:34:01.0 +0100
-@@ -880,6 +880,8 @@
+@@ -892,6 +892,8 @@
case CPU_4KSC:
case CPU_20KC:
case CPU_25KF:
@@ -139,15 +139,15 @@
diff -urN linux.old/drivers/Makefile linux.dev/drivers/Makefile
--- linux.old/drivers/Makefile 2007-01-26 00:51:33.0 +0100
+++ linux.dev/drivers/Makefile 2007-01-25 23:34:01.0 +0100
-@@ -77,3 +77,4 @@
- obj-$(CONFIG_SUPERH) += sh/
- obj-$(CONFIG_GENERIC_TIME)+= clocksource/
+@@ -81,3 +81,4 @@
obj-$(CONFIG_DMA_ENGINE) += dma/
+ obj-$(CONFIG_HID) += hid/
+ obj-$(CONFIG_PPC_PS3) += ps3/
+obj-$(CONFIG_SSB) += ssb/
diff -urN linux.old/include/asm-mips/bootinfo.h
linux.dev/include/asm-mips/bootinfo.h
--- linux.old/include/asm-mips/bootinfo.h 2007-01-26 00:51:33.0
+0100
+++ linux.dev/include/asm-mips/bootinfo.h 2007-01-25 23:34:01.0
+0100
-@@ -212,6 +212,12 @@
+@@ -213,6 +213,12 @@
#define MACH_GROUP_NEC_EMMA2RH 25 /* NEC EMMA2RH (was 23) */
#define MACH_NEC_MARKEINS0 /* NEC EMMA2RH Mark-eins*/
@@ -191,7 +191,7 @@
diff -urN linux.old/include/linux/pci_ids.h linux.dev/include/linux/pci_ids.h
--- linux.old/include/linux/pci_ids.h 2007-01-26 00:51:33.0 +0100
+++ linux.dev/include/linux/pci_ids.h 2007-01-25 23:34:01.0 +0100
-@@ -1950,6 +1950,7 @@
+@@ -1981,6 +1981,7 @@
#define PCI_DEVICE_ID_TIGON3_5906M0x1713
#define PCI_DEVICE_ID_BCM4401 0x4401
#define PCI_DEVICE_ID_BCM4401B0 0x4402
Index: target/linux/brcm47xx-2.6/patches/160-kmap_coherent.patch
===
--- target/linux/brcm47xx-2.6/patches/160-kmap_coherent.patch (revision 7334)
+++ target/linux/brcm47xx-2.6/patches/160-kmap_coherent.patch (working copy)
@@ -1,6 +1,15 @@
--- ./arch/mips/mm/init.c.orig 2007-03-22 08:08:34.0 -0600
+++ ./arch/mips/mm/init.c 2007-03-22 08:09:04.0 -0600
@@ -207,7 +207,7 @@
+ void *vfrom, *vto;
+
+ vto = kmap_atomic(to, KM_USER1);
+- if (cpu_has_dc_aliases) {
++ if (cpu_has_dc_aliases && cpu_use_kmap_coherent) {
+ vfrom = kmap_coherent(from, vaddr);
+
Re: [OpenWrt-Devel] PATCH: Make brcm47xx-2.6 architecture build
On Fri, 25 May 2007, Felix Fietkau wrote:
Peter Denison wrote:
Here's a set of patches (to the patches - reading them by hand is a
nightmare!) to let the brcm47xx-2.6 target compile against the 2.6.21.1
kernel. Note this allows it to compile and make the full image - it was
too late to test booting, which I'll do tomorrow.
Somehow the patch got corrupted on the way to the list. Please resend
and put it in as attachment instead of inline.
Thanks,
Oops, sorry.
Index: target/linux/brcm47xx-2.6/profiles/WRTSL54GS.mk
===
--- target/linux/brcm47xx-2.6/profiles/WRTSL54GS.mk (revision 0)
+++ target/linux/brcm47xx-2.6/profiles/WRTSL54GS.mk (revision 0)
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/WRTSL54GS
+ NAME:=Linksys WRTSL54GS
+ PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 webif
+endef
+
+define Profile/WRTSL54GS/Description
+ Package set compatible with the Linksys WRTSL54GS. Contains USB support
+endef
+$(eval $(call Profile,WRTSL54GS))
+
Index: target/linux/brcm47xx-2.6/config/default
===
--- target/linux/brcm47xx-2.6/config/default(revision 7326)
+++ target/linux/brcm47xx-2.6/config/default(working copy)
@@ -6,7 +6,7 @@
# CONFIG_ATMEL is not set
CONFIG_B44=y
CONFIG_BASE_SMALL=0
-# CONFIG_BCM43XX is not set
+CONFIG_BCM43XX=m
CONFIG_BCM947XX=y
# CONFIG_BONDING is not set
# CONFIG_BRIDGE_NETFILTER is not set
Index: target/linux/brcm47xx-2.6/patches/100-board_support.patch
===
--- target/linux/brcm47xx-2.6/patches/100-board_support.patch (revision 7326)
+++ target/linux/brcm47xx-2.6/patches/100-board_support.patch (working copy)
@@ -12,7 +12,7 @@
mainmenu "Linux/MIPS Kernel Configuration"
menu "Machine selection"
-@@ -222,6 +226,23 @@
+@@ -240,6 +240,22 @@
Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
Olivetti M700-10 workstations.
@@ -29,7 +29,6 @@
+ select SSB_DRIVER_PCICORE
+ select SSB_PCICORE_HOSTMODE
+ select CFE
-+ select GENERIC_GPIO
+ help
+ Support for BCM947xx based boards
+
@@ -39,7 +38,7 @@
diff -urN linux.old/arch/mips/kernel/cpu-probe.c
linux.dev/arch/mips/kernel/cpu-probe.c
--- linux.old/arch/mips/kernel/cpu-probe.c 2007-01-26 00:51:33.0
+0100
+++ linux.dev/arch/mips/kernel/cpu-probe.c 2007-01-25 23:34:01.0
+0100
-@@ -723,6 +723,28 @@
+@@ -711,6 +711,28 @@
}
@@ -68,7 +67,7 @@
__init void cpu_probe(void)
{
struct cpuinfo_mips *c = ¤t_cpu_data;
-@@ -745,6 +767,9 @@
+@@ -733,6 +755,9 @@
case PRID_COMP_SIBYTE:
cpu_probe_sibyte(c);
break;
@@ -93,7 +92,7 @@
diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
--- linux.old/arch/mips/Makefile 2007-01-26 00:51:33.0 +0100
+++ linux.dev/arch/mips/Makefile 2007-01-25 23:34:01.0 +0100
-@@ -571,6 +571,18 @@
+@@ -576,6 +576,18 @@
load-$(CONFIG_SIBYTE_BIGSUR) := 0x8010
#
@@ -109,13 +108,13 @@
+core-$(CONFIG_CFE)+= arch/mips/cfe/
+
+#
- # SNI RM200 PCI
+ # SNI RM
#
- core-$(CONFIG_SNI_RM200_PCI) += arch/mips/sni/
+ core-$(CONFIG_SNI_RM) += arch/mips/sni/
diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
--- linux.old/arch/mips/mm/tlbex.c 2007-01-26 00:51:33.0 +0100
+++ linux.dev/arch/mips/mm/tlbex.c 2007-01-25 23:34:01.0 +0100
-@@ -880,6 +880,8 @@
+@@ -892,6 +892,8 @@
case CPU_4KSC:
case CPU_20KC:
case CPU_25KF:
@@ -139,15 +138,15 @@
diff -urN linux.old/drivers/Makefile linux.dev/drivers/Makefile
--- linux.old/drivers/Makefile 2007-01-26 00:51:33.0 +0100
+++ linux.dev/drivers/Makefile 2007-01-25 23:34:01.0 +0100
-@@ -77,3 +77,4 @@
- obj-$(CONFIG_SUPERH) += sh/
- obj-$(CONFIG_GENERIC_TIME)+= clocksource/
+@@ -81,3 +81,4 @@
obj-$(CONFIG_DMA_ENGINE) += dma/
+ obj-$(CONFIG_HID) += hid/
+ obj-$(CONFIG_PPC_PS3) += ps3/
+obj-$(CONFIG_SSB) += ssb/
diff -urN linux.old/include/asm-mips/bootinfo.h
linux.dev/include/asm-mips/bootinfo.h
--- linux.old/include/asm-mips/bootinfo.h 2007-01-26 00:51:33.0
+0100
+++ linux.dev/include/asm-mips/bootinfo.h 2007-01-25 23:34:01.0
+0100
-@@ -212,6 +212,12 @@
+@@ -213,6 +213,12 @@
#define MACH_GROUP_NEC_EMMA2RH 25 /* NEC EMMA2RH (was 23) */
#define MACH_NEC_MARKEINS0 /* NEC EMMA2RH Mark-eins*/
@@ -191,7 +190,7 @@
diff -urN linux.old/include/linux/pci_ids.h linux.dev/include/linux/pci_ids.h
--- linux.old/include/linux/pci_ids.h 2007-01-26 00:51:33.
[OpenWrt-Devel] PATCH: Make brcm47xx-2.6 architecture build
ait.patch
===
--- target/linux/brcm47xx-2.6/patches/170-cpu_wait.patch(revision 7326)
+++ target/linux/brcm47xx-2.6/patches/170-cpu_wait.patch(working copy)
@@ -1,12 +1,12 @@
diff -urN linux-2.6.19.2.old/arch/mips/kernel/cpu-probe.c
linux-2.6.19.2/arch/mips/kernel/cpu-probe.c
--- linux-2.6.19.2.old/arch/mips/kernel/cpu-probe.c 2007-05-01
19:28:06.937756121 +0100
+++ linux-2.6.19.2/arch/mips/kernel/cpu-probe.c 2007-05-01
19:31:46.867756121 +0100
-@@ -145,6 +145,8 @@
+@@ -143,6 +143,8 @@
case CPU_34K:
case CPU_74K:
case CPU_PR4450:
+ case CPU_BCM3302:
+case CPU_BCM4710:
cpu_wait = r4k_wait;
- printk(" available.\n");
break;
+ case CPU_TX49XX: Index: package/broadcom-diag/src/diag.c
===
--- package/broadcom-diag/src/diag.c(revision 7326)
+++ package/broadcom-diag/src/diag.c(working copy)
@@ -675,8 +675,14 @@
gpio_set_irqenable(0, button_handler);
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+static void hotplug_button(struct work_struct *work)
+{
+ struct event_t *event = container_of(work, struct event_t, wq);
+#else
static void hotplug_button(struct event_t *event)
{
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
call_usermodehelper (event->argv[0], event->argv, event->envp, 1);
#else
@@ -724,7 +730,11 @@
scratch += sprintf (scratch, "SEEN=%ld", (jiffies -
b->seen)/HZ) + 1;
event->envp[i] = 0;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+ INIT_WORK(&event->wq, (void *)(void *)hotplug_button);
+#else
INIT_WORK(&event->wq, (void *)(void *)hotplug_button,
(void *)event);
+#endif
schedule_work(&event->wq);
}
Index: package/broadcom-diag/src/diag.h
===
--- package/broadcom-diag/src/diag.h(revision 7326)
+++ package/broadcom-diag/src/diag.h(working copy)
@@ -88,7 +88,11 @@
static void register_buttons(struct button_t *b);
static void unregister_buttons(struct button_t *b);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+static void hotplug_button(struct work_struct *work);
+#else
static void hotplug_button(struct event_t *event);
+#endif
static irqreturn_t button_handler(int irq, void *dev_id, struct pt_regs
*regs);
/* leds */
--
Peter Denison
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
