Re: [OpenWrt-Devel] [PATCH] Add RouterBOARD 951Ui-2HnD Support
This patch enables OpenWRT to be ran on the RouterBOARD 951Ui-2HnD. GPIO 2 enables or disables the POE on port 5. By default we enable GPIO2. GPIO 20 controls the USB Power, by default it enables the USB port. Attached is 624-MIPS-ath79-RB951u-support.patch Signed-off-by: Davey Hutchison --- target/linux/ar71xx/files/arch/mips/ath79/mach-rb95x.c +++ target/linux/ar71xx/files/arch/mips/ath79/mach-rb95x.c @@ -37,6 +37,7 @@ #include "dev-wmac.h" #include "machtypes.h" #include "routerboot.h" +#include "dev-leds-gpio.h" #define RB95X_GPIO_NAND_NCE14 @@ -89,6 +90,38 @@ } }; +static struct gpio_led rb951ui_leds_gpio[] __initdata = { +{ +.name= "rb951ui:wlan", +.gpio= 11, +.active_low= 1, +}, { +.name= "rb951ui:act", +.gpio= 3, +.active_low= 1, +}, { +.name= "rb951ui:lan:port1", +.gpio= 13, +.active_low= 1, +}, { +.name= "rb951ui:lan:port2", +.gpio= 12, +.active_low= 1, +}, { +.name= "rb951ui:lan:port3", +.gpio= 4, +.active_low= 1, +}, { +.name= "rb951ui:lan:port4", +.gpio= 21, +.active_low= 1, +}, { +.name= "rb951ui:lan:port5", +.gpio= 16, +.active_low= 1, +} +}; + static struct mdio_board_info rb95x_mdio0_info[] = { { .bus_id = "ag71xx-mdio.0", @@ -212,3 +245,43 @@ MIPS_MACHINE(ATH79_MACH_RB_951G, "951G", "MikroTik RouterBOARD 951G-2HnD", rb951g_setup); + +static void __init rb951ui_setup(void) +{ +rb95x_gpio_init(); +rb95x_nand_init(); + +ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_ONLY_MODE); + +ath79_register_mdio(1, 0x0); + +ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0); +ath79_init_mac(ath79_eth1_data.mac_addr, ath79_mac_base, 1); + +ath79_switch_data.phy4_mii_en = 1; +ath79_switch_data.phy_poll_mask = BIT(4); +ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII; +ath79_eth0_data.phy_mask = BIT(4); +ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev; +ath79_register_eth(0); + +ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII; +ath79_register_eth(1); + +gpio_request_one(20, +GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_CHANGEABLE, +"USB power"); + +gpio_request_one(2, +GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_CHANGEABLE, +"POE power"); + +rb95x_wlan_init(); +ath79_register_usb(); + +ath79_register_leds_gpio(-1, ARRAY_SIZE(rb951ui_leds_gpio), +rb951ui_leds_gpio); +} + +MIPS_MACHINE(ATH79_MACH_RB_951U, "951HnD", "MikroTik RouterBOARD 951Ui-2HnD", + rb951ui_setup); On Wed, Aug 28, 2013 at 2:19 AM, Gabor Juhos wrote: > 2013.08.28. 7:46 keltezéssel, Вячеслав Адаманов írta: >> Gabor Juhos, >> tell me, is it possible to port RB / SXT 2nDr2 Lite 2? Or are have any of the >> nuances for which it can not or imposible. > > Although I don't know the hardware details of the SXT Lite boards but it > should > be possible. > > -Gabor > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel 624-MIPS-ath79-RB951U-support.patch Description: Binary data ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] dnsmasq: check for udhcpc
Added a check to the dnsmasq init script to get rid of the error messages if udhcpc is not installed. Signed-off-by: Mathis Wolff 100-dnsmasq_check_udhcpc.patch Description: Binary data ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] broadcom-diag: add Linksys E2000 in diag.c
Signed-off-by: Mathis Wolff 000-E2000_diag.patch Description: Binary data ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] base-files: add color to PS1
From: "Luis R. Rodriguez" Signed-off-by: Luis R. Rodriguez --- package/base-files/files/etc/profile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/base-files/files/etc/profile b/package/base-files/files/etc/profile index e9a7119..7caabf1 100644 --- a/package/base-files/files/etc/profile +++ b/package/base-files/files/etc/profile @@ -4,7 +4,7 @@ export PATH=/usr/bin:/usr/sbin:/bin:/sbin export HOME=$(grep -e "^${USER:-root}:" /etc/passwd | cut -d ":" -f 6) export HOME=${HOME:-/root} -export PS1='\u@\h:\w\$ ' +export PS1="\[\033[01;31m\]\u@\[\033[01;33m\]\h\[\033[01;34m\] \w \[\033[31m\]\\[\033[00m\]#\[\033[00m\] " [ -x /bin/more ] || alias more=less [ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi -- 1.7.10.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] [package] dnsmasq: use host-record instead of address
I should have sent this AFTER trying out patch 3828. Julian's patch is even simpler than my suggestion. On 08/28/2013 02:42 PM, Philip A. Prindeville wrote: > Sorry if it's a little after-the-fact, but I've been wondering about the need > to have a separate "config domain" section at all. > > Why not just have something like: > > config host > ... > option wants-dns-rr on > > Yes, "config domain" is still useful for external sites or for resources with > static addresses that aren't served by dnsmasq, buy why not reduce the amount > of configuration for a host to have a A/PTR pair to a single line? > > For that matter, in the "config dnsmasq" section, why not have an option like > "option publish-dns-rr on" and enable it globally for all host blocks? > > Am I missing something? > > -Philip > > > On 06/04/2013 10:44 PM, Adam Gensler wrote: >> Hi all, >> >> TL;DR - using "--address" for individual host A records is broken, use >> "--host-record" instead. >> >> The following patch changes dnsmasq.init to build individual host records >> using "--host-record" instead of "--address". Using "--address" in this >> context is incorrect. For example, the current init script will create the >> following two entries in /var/etc/dnsmasq.conf: >> >> address=/OpenWrt.lan/192.168.1.1 >> ptr-record=1.1.168.192.in-addr.arpa,OpenWrt.lan >> >> At first glance this has the desired effect, "OpenWrt.lan" resolves to >> 192.168.1.1. However, what it really says is "for anything that ends with >> "OpenWrt.lan," that I don't have a record for, return 192.168.1.1". For >> example: >> >> fakeaddress.OpenWrt.lan would return 192.168.1.1. >> adsfasdfsdfsd.OpenWrt.lan would return 192.168.1.1. >> >> That's wrong and it causes problems when using a real domain name, such as >> domain.com. Often it's desirable to have "domain.com" resolve to an address >> so users can hit the http service at http://domain.com. By using the >> existing "config domain" option, you would configure this as follows: >> >> config domain >> option name 'domain.com' >> option ip '192.168.1.100' >> >> This would create these config items: >> >> address=/domain.com/192.168.1.100 >> ptr-record=100.1.168.192.in-addr.arpa,domain.com >> >> Now, as a result, anything that doesn't have its own, preexisting record, >> will also resolve to 192.168.1.100. That's no good because things like >> Windows do proxy requests by default for wpad.domain.com and instead of >> getting back an NXDOMAIN, it gets 192.168.1.100 and goes hunting for a pac >> file that doesn't exist. >> >> The solution for this is to use "--host-record". This is actually a lot >> easier to configure because dnsmasq will create the PTR records >> automatically, so there's no need to manual calculate it like is done today. >> This means that IPv6 addresses can be supported as well. The attached patch >> makes this adjustment and accomplishes the following: >> >> 1. By default, the router's hostname is now added to the configuration using >> "--host-record" instead of "--address". If there's a domain configured, the >> default host-record entry looks like this: >> >> host-record=OpenWrt.lan,OpenWrt,192.168.1.1 >> >> With this, now both "OpenWrt.lan" and "OpenWrt" will both resolve to >> 192.168.1.1. In the reverse, 192.168.1.1 will resolve to only "OpenWrt.lan". >> >> 2. It introduces a new configuration structure to define additional host >> records. For example: >> >> config hostrecord >> list name 'mail.domain.com' >> list name 'www.domain.com' >> list name 'domain.com' >> list ip '192.168.1.100' >> >> It uses lists here because dnsmasq can accept multiple hostnames and IP >> addresses in a single host-record. This generates the following config: >> >> host-record=mail.domain.com,www.domain.com,domain.com,192.168.1.100 >> >> All of those hostnames will resolve to 192.168.1.100 in the forward >> direction. 192.168.1.100 will resolve to "mail.domain.com" in the reverse. >> >> 3. It restructures "dhcp_domain_add()" to remove the manual PTR record >> calculation and configuration. This only supported IPv4 and isn't the proper >> use of the "--address" option. Now it will build a proper "--address" config >> that can support multiple domain names to a single IP address as per the >> dnsmasq MAN page. >> >> Note, the domain name is no longer automatically appended to the end of >> either "config hostrecord" or "config domain" entries as was previously the >> case. To define a specific fqdn, one needs to manually configure it as such. >> This makes the configuration more consistent; only what's configured is what >> is generated for dnsmasq. >> >> Sorry for the long email. I hope it all made sense. If not, please let me >> know. >> >> Thanks, >> Adam >> >> >> Signed-off-by: Adam Gensler >> --- >> [snip] > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwr
Re: [OpenWrt-Devel] [PATCH] dnsmasq: add an --address entry for each host
On 07/16/2013 08:48 PM, Julián Landerreche wrote: > Thinking a little more about this, I'd dare to say: the dhcp_domain_add > function might be ditched without remorse. After r36943 changeset, it seems > it's not currently used any more. Also, after reading & re-reading the > dnsmasq man page a few times, I'd dare to say that it doesn't make too much > sense to set an "--address=/domain/ip" for a 'domain' config in OpenWRT. > > Why would someone want to resolve the domain for the whole LAN (ie. > ".localnet" to a particular host in the LAN? > Of course, I may be missing something not so obvious here. > Hi Julian. I tested your patch and I like it a lot. It removes, as you point out, the need for supplementing 'host' configs with additional 'domain' configs. But there is still some value to 'domain' configs. For instance, for devices with static IP addresses on the LAN which you want to be able resolve internally, or for blacklisting certain external sites, i.e. config domain option name 'www.yahoo.com.' option ip '127.0.0.99' or to some other invalid/unroutable IP address. So while I like your functionality, I don't think it completely deprecates the config 'domain'. -Philip ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] [package] dnsmasq: use host-record instead of address
Sorry if it's a little after-the-fact, but I've been wondering about the need to have a separate "config domain" section at all. Why not just have something like: config host ... option wants-dns-rr on Yes, "config domain" is still useful for external sites or for resources with static addresses that aren't served by dnsmasq, buy why not reduce the amount of configuration for a host to have a A/PTR pair to a single line? For that matter, in the "config dnsmasq" section, why not have an option like "option publish-dns-rr on" and enable it globally for all host blocks? Am I missing something? -Philip On 06/04/2013 10:44 PM, Adam Gensler wrote: > Hi all, > > TL;DR - using "--address" for individual host A records is broken, use > "--host-record" instead. > > The following patch changes dnsmasq.init to build individual host records > using "--host-record" instead of "--address". Using "--address" in this > context is incorrect. For example, the current init script will create the > following two entries in /var/etc/dnsmasq.conf: > > address=/OpenWrt.lan/192.168.1.1 > ptr-record=1.1.168.192.in-addr.arpa,OpenWrt.lan > > At first glance this has the desired effect, "OpenWrt.lan" resolves to > 192.168.1.1. However, what it really says is "for anything that ends with > "OpenWrt.lan," that I don't have a record for, return 192.168.1.1". For > example: > > fakeaddress.OpenWrt.lan would return 192.168.1.1. > adsfasdfsdfsd.OpenWrt.lan would return 192.168.1.1. > > That's wrong and it causes problems when using a real domain name, such as > domain.com. Often it's desirable to have "domain.com" resolve to an address > so users can hit the http service at http://domain.com. By using the existing > "config domain" option, you would configure this as follows: > > config domain > option name 'domain.com' > option ip '192.168.1.100' > > This would create these config items: > > address=/domain.com/192.168.1.100 > ptr-record=100.1.168.192.in-addr.arpa,domain.com > > Now, as a result, anything that doesn't have its own, preexisting record, > will also resolve to 192.168.1.100. That's no good because things like > Windows do proxy requests by default for wpad.domain.com and instead of > getting back an NXDOMAIN, it gets 192.168.1.100 and goes hunting for a pac > file that doesn't exist. > > The solution for this is to use "--host-record". This is actually a lot > easier to configure because dnsmasq will create the PTR records > automatically, so there's no need to manual calculate it like is done today. > This means that IPv6 addresses can be supported as well. The attached patch > makes this adjustment and accomplishes the following: > > 1. By default, the router's hostname is now added to the configuration using > "--host-record" instead of "--address". If there's a domain configured, the > default host-record entry looks like this: > > host-record=OpenWrt.lan,OpenWrt,192.168.1.1 > > With this, now both "OpenWrt.lan" and "OpenWrt" will both resolve to > 192.168.1.1. In the reverse, 192.168.1.1 will resolve to only "OpenWrt.lan". > > 2. It introduces a new configuration structure to define additional host > records. For example: > > config hostrecord > list name 'mail.domain.com' > list name 'www.domain.com' > list name 'domain.com' > list ip '192.168.1.100' > > It uses lists here because dnsmasq can accept multiple hostnames and IP > addresses in a single host-record. This generates the following config: > > host-record=mail.domain.com,www.domain.com,domain.com,192.168.1.100 > > All of those hostnames will resolve to 192.168.1.100 in the forward > direction. 192.168.1.100 will resolve to "mail.domain.com" in the reverse. > > 3. It restructures "dhcp_domain_add()" to remove the manual PTR record > calculation and configuration. This only supported IPv4 and isn't the proper > use of the "--address" option. Now it will build a proper "--address" config > that can support multiple domain names to a single IP address as per the > dnsmasq MAN page. > > Note, the domain name is no longer automatically appended to the end of > either "config hostrecord" or "config domain" entries as was previously the > case. To define a specific fqdn, one needs to manually configure it as such. > This makes the configuration more consistent; only what's configured is what > is generated for dnsmasq. > > Sorry for the long email. I hope it all made sense. If not, please let me > know. > > Thanks, > Adam > > > Signed-off-by: Adam Gensler > --- > [snip] ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] build scripts: fix 'make defconfig' damage
Looking at the target 'defconfig' in include/toplevel, it doesn't directly reference $(HOME)/.openwrt/defconfig nor does it reference any prerequisites using it as a target. Therefore, building "defconfig" as a target uses the defaults in the tree, but not the defaults that a user might have explicitly specified. This patch fixes this regression from r36361. Signed-off-by: Philip Prindeville Index: include/toplevel.mk === --- include/toplevel.mk (revision 37824) +++ include/toplevel.mk (working copy) @@ -89,6 +89,7 @@ defconfig: scripts/config/conf prepare-tmpinfo FORCE touch .config + @if [ -e $(HOME)/.openwrt/defconfig ]; then cp $(HOME)/.openwrt/defconfig .config; fi $< --defconfig=.config Config.in confdefault-y=allyes @@ -152,7 +153,7 @@ @+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq @( \ cp .config tmp/.config; \ - ./scripts/config/conf --defconfig tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \ + ./scripts/config/conf --defconfig=tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \ if ./scripts/kconfig.pl '>' .config tmp/.config | grep -q CONFIG; then \ printf "$(_R)WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!$(_N)\n" >&2; \ fi \ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] mac80211: make package depend on readlink requirements
From: "Luis R. Rodriguez" The mac80211.sh script uses readlink -f which requires CONFIG_BUSYBOX_CONFIG_READLINK CONFIG_BUSYBOX_CONFIG_FEATURE_READLINK_FOLLOW Without these wifi detect will fail and users end up puzzled with error messages such as: PHY for wifi device radio0 not found This is due to the fact that without these options mac80211.sh readlink -f command will fail and not assign the appropriate phy for the devices. This fixes initial configuration with OpenWrt with the as 'wifi detect > /etc/config/wireless' depends on mac80211.sh. Cc: Kalle Valo Cc: Kathy Giori Cc: Mathieu Olivari Cc: Jerome Proffit Cc: Sujith Manoharan Cc: Matthew McClintock Signed-off-by: Luis R. Rodriguez --- package/kernel/mac80211/Makefile |2 ++ 1 file changed, 2 insertions(+) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index 6f25413..bf03f56 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -56,12 +56,14 @@ define KernelPackage/mac80211/Default URL:=http://linuxwireless.org/ MAINTAINER:=Felix Fietkau DEPENDS:=@(!(TARGET_avr32||TARGET_ps3||TARGET_pxcab)||BROKEN) + DEPENDS+= +@BUSYBOX_CONFIG_READLINK +@BUSYBOX_CONFIG_FEATURE_READLINK_FOLLOW endef define KernelPackage/cfg80211 $(call KernelPackage/mac80211/Default) TITLE:=cfg80211 - wireless configuration API DEPENDS+= +iw + DEPENDS+= +@BUSYBOX_CONFIG_READLINK +@BUSYBOX_CONFIG_FEATURE_READLINK_FOLLOW FILES:= \ $(PKG_BUILD_DIR)/compat/compat.ko \ $(PKG_BUILD_DIR)/net/wireless/cfg80211.ko -- 1.7.10.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v6] authsae 80211s authentication daemon
Hi Le 28/08/2013 20:07, Justyn Bell a écrit : > Etienne, > > I'm very sorry for bothering you. I just found this patch in the mailing > list for OpenWRT. But I can't really find much more information online. > > This is such a newbie question, I didn't want to embarass myself in front of > the mailing list, so I You're always the newbie of someone, and asking shouldn't be an embarrassment (it can be a real time saver). You have many patches to apply to make it work on AA: see https://dev.openwrt.org/ticket/12078#comment:12 I haven't tested authsae on AA and I haven't checked if some of these patches has been backported from trunk to AA I'm CCing the mailing list, it can help someone else > figured I would start by asking you: is there a package in which I can > install the latest version of AuthSAE for Attitude Adjustment simply? Ie, > doing a sort of opkg install, or grabbing a feed? I'm not working on the > OpenWRT trunk. > > Thanks for your time, > Justyn > > > On 07/24/2013 01:34 PM, Etienne Champetier wrote: >> This patch adds authsae open80211s authentication daemon >> (http://open80211s.org) >> > ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] dlan-usb-extender: fix usbdev trigger
Every device I connect to the USB port is detected as 2-1, not 1-1. So adjust the default setting accordingly. Signed-off-by: Michael Heimpold --- target/linux/mcs814x/base-files/etc/uci-defaults/01_leds |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mcs814x/base-files/etc/uci-defaults/01_leds b/target/linux/mcs814x/base-files/etc/uci-defaults/01_leds index 8ab8b4e..0c6972d 100644 --- a/target/linux/mcs814x/base-files/etc/uci-defaults/01_leds +++ b/target/linux/mcs814x/base-files/etc/uci-defaults/01_leds @@ -10,7 +10,7 @@ board=$(mcs814x_board_name) case "$board" in dlan-usb-extender) - ucidef_set_led_usbdev "usb" "USB" "dlan-usb-extender:green:usb" "1-1" + ucidef_set_led_usbdev "usb" "USB" "dlan-usb-extender:green:usb" "2-1" ;; rbt-832) ucidef_set_led_usbdev "usb1" "USB1" "rbt-832:red:usb0" "1-1" -- 1.7.10.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH V2] [packages] dropbear: update to version 2013.58 / Patch for X86/32bit
The problem that patch is fixing is relative to a bug the author observed in other circumstances. In other words, it can arise even when the entropy isn't considered enough. Please, do not discard it Inviato da iPhone Il giorno 28/ago/2013, alle ore 17:47, Felix Fietkau ha scritto: > On 2013-08-28 5:43 PM, Bastian Bittorf wrote: >> * Enrico Mioso [28.08.2013 13:33]: >>> Update dropbear to it's latest stable version, and delete unneeded patches: >>> - IPV6 splitted port notation now supported upstream >>> - if a dbclient invalid option is passed, only a warning is emitted >>> >>> Signed-off-by: Enrico Mioso >> >> i have tested the patch und i'am fine with it. >> >> i suggest adding the attached patch, which is from dropbear/upstream >> but not included in the recent release but in HG-repo. it seems that >> this is needed for arch X86/32bit. otherwise connecting to an old >> client hangs infinitely while parsing /proc/timer_list during >> connection: >> >> https://secure.ucc.asn.au/hg/dropbear/rev/5de524aec047 >> >> i tested on x86 32+64bit, mips/ar71xx and brcm47xx. > OpenWrt has a kernel patch for the /proc/timer_list problem, so a > workaround in dropbear will probably not be necessary. > > - Felix > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH V2] [packages] dropbear: update to version 2013.58 / Patch for X86/32bit
On 2013-08-28 5:43 PM, Bastian Bittorf wrote: > * Enrico Mioso [28.08.2013 13:33]: >> Update dropbear to it's latest stable version, and delete unneeded patches: >> - IPV6 splitted port notation now supported upstream >> - if a dbclient invalid option is passed, only a warning is emitted >> >> Signed-off-by: Enrico Mioso > > i have tested the patch und i'am fine with it. > > i suggest adding the attached patch, which is from dropbear/upstream > but not included in the recent release but in HG-repo. it seems that > this is needed for arch X86/32bit. otherwise connecting to an old > client hangs infinitely while parsing /proc/timer_list during > connection: > > https://secure.ucc.asn.au/hg/dropbear/rev/5de524aec047 > > i tested on x86 32+64bit, mips/ar71xx and brcm47xx. OpenWrt has a kernel patch for the /proc/timer_list problem, so a workaround in dropbear will probably not be necessary. - Felix ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH V2] [packages] dropbear: update to version 2013.58 / Patch for X86/32bit
* Enrico Mioso [28.08.2013 13:33]: > Update dropbear to it's latest stable version, and delete unneeded patches: > - IPV6 splitted port notation now supported upstream > - if a dbclient invalid option is passed, only a warning is emitted > > Signed-off-by: Enrico Mioso i have tested the patch und i'am fine with it. i suggest adding the attached patch, which is from dropbear/upstream but not included in the recent release but in HG-repo. it seems that this is needed for arch X86/32bit. otherwise connecting to an old client hangs infinitely while parsing /proc/timer_list during connection: https://secure.ucc.asn.au/hg/dropbear/rev/5de524aec047 i tested on x86 32+64bit, mips/ar71xx and brcm47xx. bye, bastian diff -r 1d1f80fcbcb3 -r 5de524aec047 random.c --- a/random.c Mon May 13 21:35:13 2013 +0800 +++ b/random.c Tue May 28 22:16:57 2013 +0800 @@ -77,7 +77,7 @@ while (len == 0 || readcount < len) { int readlen, wantread; - unsigned char readbuf[2048]; + unsigned char readbuf[4096]; if (!already_blocked) { int ret; @@ -208,12 +208,13 @@ process_file(&hs, "/proc/loadavg", 0, 0); process_file(&hs, "/proc/sys/kernel/random/entropy_avail", 0, 0); - /* Mostly network visible but useful in some situations */ - process_file(&hs, "/proc/net/netstat", 0, 0); - process_file(&hs, "/proc/net/dev", 0, 0); - process_file(&hs, "/proc/net/tcp", 0, 0); + /* Mostly network visible but useful in some situations. + * Limit size to avoid slowdowns on systems with lots of routes */ + process_file(&hs, "/proc/net/netstat", 4096, 0); + process_file(&hs, "/proc/net/dev", 4096, 0); + process_file(&hs, "/proc/net/tcp", 4096, 0); /* Also includes interface lo */ - process_file(&hs, "/proc/net/rt_cache", 0, 0); + process_file(&hs, "/proc/net/rt_cache", 4096, 0); process_file(&hs, "/proc/vmstat", 0, 0); #endif ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [ar71xx] Add support for Netgear WNR2200 wireless router
This patch adds OpenWRT support for the Netgear WNR2200 (N300) wireless router with USB. Technical details of this router can be found at http://www.netgear.com/home/products/wirelessrouters/work-and-play/WNR2200.aspx and http://wikidevi.com/wiki/Netgear_WNR2200 The patch includes a new ar71xx/files/arch/mips/ath79/mach-wnr2200.c file and corresponding updates to the base-files/etc/diag.sh, base-files/etc/uci-defaults/02_network, ar71xx/base-files/lib/ar71xx.sh, ar71xx/config-3.10, ar71xx/generic/profiles/netgear.mk and ar71xx/image/Makefile files. Signed-off-by: Aidan Kissane diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c new file mode 100644 index 000..5126d3f --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c @@ -0,0 +1,170 @@ +/* + * NETGEAR WNR2200 board support + * + * Copyright (C) 2013 Aidan Kissane + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#include +#include + +#include + +#include "dev-ap9x-pci.h" +#include "dev-eth.h" +#include "dev-gpio-buttons.h" +#include "dev-leds-gpio.h" +#include "dev-m25p80.h" +#include "dev-usb.h" +##include "machtypes.h" + +//#define WNR2200_GPIO_LED_LAN1_AMBER ?? +#define WNR2200_GPIO_LED_LAN2_AMBER 0 +#define WNR2200_GPIO_LED_LAN4_AMBER 1 +#define WNR2200_GPIO_LED_WPS5 +#define WNR2200_GPIO_LED_WAN_GREEN 7 +#define WNR2200_GPIO_LED_USB8 +#define WNR2200_GPIO_LED_LAN3_AMBER 11 +#define WNR2200_GPIO_LED_WAN_AMBER 12 +#define WNR2200_GPIO_LED_LAN1_GREEN 13 +#define WNR2200_GPIO_LED_LAN2_GREEN 14 +#define WNR2200_GPIO_LED_LAN3_GREEN 15 +#define WNR2200_GPIO_LED_LAN4_GREEN 16 +#define WNR2200_GPIO_LED_PWR_AMBER 21 +#define WNR2200_GPIO_LED_PWR_GREEN 22 + +#define WNR220_GPIO_USB_POWER 24 + +//#define WNR2200_GPIO_BTN_RESET ?? +//#define WNR2200_GPIO_BTN_WIRELESS ?? +//#define WNR2200_GPIO_BTN_WPS ?? + +#define WNR2200_KEYS_POLL_INTERVAL 20 /* msecs */ +#define WNR2200_KEYS_DEBOUNCE_INTERVAL (3 * WNR2200_KEYS_POLL_INTERVAL) + +#define WNR2200_MAC0_OFFSET0 +#define WNR2200_MAC1_OFFSET6 +#define WNR2200_PCIE_CALDATA_OFFSET0x1000 + +static struct gpio_led wnr2200_leds_gpio[] __initdata = { +{ +.name = "wnr2200:amber:lan2", +.gpio = WNR2200_GPIO_LED_LAN2_AMBER, +.active_low = 1, +}, { +.name = "wnr2200:amber:lan4", +.gpio = WNR2200_GPIO_LED_LAN4_AMBER, +.active_low = 1, +}, { +.name = "wnr2200:green:wps", +.gpio = WNR2200_GPIO_LED_WPS, +.active_low = 1, +}, { +.name = "wnr2200:green:wan", +.gpio = WNR2200_GPIO_LED_WAN_GREEN, +.active_low = 1, +}, { +.name = "wnr2200:green:usb", +.gpio = WNR2200_GPIO_LED_USB, +.active_low = 1, +}, { +.name = "wnr2200:amber:lan3", +.gpio = WNR2200_GPIO_LED_LAN3_AMBER, +.active_low = 1, +}, { +.name = "wnr2200:amber:wan", +.gpio = WNR2200_GPIO_LED_WAN_AMBER, +.active_low = 1, +}, { +.name = "wnr2200:green:lan1", +.gpio = WNR2200_GPIO_LED_LAN1_GREEN, +.active_low = 1, +}, { +.name = "wnr2200:green:lan2", +.gpio = WNR2200_GPIO_LED_LAN2_GREEN, +.active_low = 1, +}, { +.name = "wnr2200:green:lan3", +.gpio = WNR2200_GPIO_LED_LAN3_GREEN, +.active_low = 1, +}, { +.name = "wnr2200:green:lan4", +.gpio = WNR2200_GPIO_LED_LAN4_GREEN, +.active_low = 1, +}, { +.name = "wnr2200:anber:power", +.gpio = WNR2200_GPIO_LED_PWR_AMBER, +.active_low = 1, +}, { +.name = "wnr2200:green:power", +.gpio = WNR2200_GPIO_LED_PWR_GREEN, +.active_low = 1, +} +}; + +/* +static struct gpio_keys_button wnr2200_gpio_keys[] __initdata = { +{ +.desc = "Reset button", +.type = EV_KEY, +.code = KEY_RESTART, +.debounce_interval = WNR220
[OpenWrt-Devel] [PATCH v3] Rename target imx23 to mxs
Freescale's i.MX23 and i.MX28 series micro processors are very similar. The linux kernel include support for both CPU series under the name 'mxs' so let's follow this naming scheme. This prevents opening a new OpenWRT target (e.g. imx28) when support for i.MX28 based devices was introduced. Signed-off-by: Michael Heimpold --- Hi Florian, thanks for the hint, looks clearly better now :-) Regards, Michael package/boot/imx-bootlets/Makefile |2 +- package/boot/uboot-imx23/Makefile |2 +- target/linux/{imx23 => mxs}/Makefile |6 +++--- target/linux/{imx23 => mxs}/base-files/etc/inittab |0 target/linux/{imx23 => mxs}/config-default |0 target/linux/{imx23 => mxs}/image/Makefile |0 target/linux/{imx23 => mxs}/modules.mk | 12 ++-- .../{imx23 => mxs}/patches/100-soc-audio-support.patch |0 .../linux/{imx23 => mxs}/patches/101-soc-audio-dts.patch |0 target/linux/{imx23 => mxs}/patches/105-imx23-dcp.patch|0 target/linux/{imx23 => mxs}/patches/106-add-dcp-dts.patch |0 target/linux/{imx23 => mxs}/patches/110-lradc-dts.patch|0 target/linux/{imx23 => mxs}/profiles/01-olinuxino.mk |0 tools/Makefile |2 +- 14 files changed, 12 insertions(+), 12 deletions(-) rename target/linux/{imx23 => mxs}/Makefile (83%) rename target/linux/{imx23 => mxs}/base-files/etc/inittab (100%) rename target/linux/{imx23 => mxs}/config-default (100%) rename target/linux/{imx23 => mxs}/image/Makefile (100%) rename target/linux/{imx23 => mxs}/modules.mk (95%) rename target/linux/{imx23 => mxs}/patches/100-soc-audio-support.patch (100%) rename target/linux/{imx23 => mxs}/patches/101-soc-audio-dts.patch (100%) rename target/linux/{imx23 => mxs}/patches/105-imx23-dcp.patch (100%) rename target/linux/{imx23 => mxs}/patches/106-add-dcp-dts.patch (100%) rename target/linux/{imx23 => mxs}/patches/110-lradc-dts.patch (100%) rename target/linux/{imx23 => mxs}/profiles/01-olinuxino.mk (100%) diff --git a/package/boot/imx-bootlets/Makefile b/package/boot/imx-bootlets/Makefile index 1c6a23c..a5b7738 100644 --- a/package/boot/imx-bootlets/Makefile +++ b/package/boot/imx-bootlets/Makefile @@ -19,7 +19,7 @@ define Package/imx-bootlets SECTION:=boot CATEGORY:=Boot Loaders TITLE:=i.MX23 bootlets - DEPENDS:=@TARGET_imx23 + DEPENDS:=@TARGET_mxs endef define Package/imx-bootlets/description diff --git a/package/boot/uboot-imx23/Makefile b/package/boot/uboot-imx23/Makefile index 13f1f96..f41b23d 100644 --- a/package/boot/uboot-imx23/Makefile +++ b/package/boot/uboot-imx23/Makefile @@ -35,7 +35,7 @@ define Package/uboot/template define Package/uboot-imx23-$(1) SECTION:=boot CATEGORY:=Boot Loaders - DEPENDS:=@TARGET_imx23 + DEPENDS:=@TARGET_mxs TITLE:=$(2) URL:=http://www.denx.de/wiki/U-Boot VARIANT:=$(1) diff --git a/target/linux/imx23/Makefile b/target/linux/mxs/Makefile similarity index 83% rename from target/linux/imx23/Makefile rename to target/linux/mxs/Makefile index 4eec4b9..c1a94cc 100644 --- a/target/linux/imx23/Makefile +++ b/target/linux/mxs/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk ARCH:=arm -BOARD:=imx23 -BOARDNAME:=Freescale i.MX23 series +BOARD:=mxs +BOARDNAME:=Freescale i.MX23/i.MX28 FEATURES:=ext4 rtc usb gpio CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s MAINTAINER:=Zoltan HERPAI @@ -16,7 +16,7 @@ LINUX_VERSION:=3.10.9 KERNELNAME:="zImage dtbs" define Target/Description - Support for Freescale i.MX233-based boards + Support for Freescale i.MX23/i.MX28-based boards. endef include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/imx23/base-files/etc/inittab b/target/linux/mxs/base-files/etc/inittab similarity index 100% rename from target/linux/imx23/base-files/etc/inittab rename to target/linux/mxs/base-files/etc/inittab diff --git a/target/linux/imx23/config-default b/target/linux/mxs/config-default similarity index 100% rename from target/linux/imx23/config-default rename to target/linux/mxs/config-default diff --git a/target/linux/imx23/image/Makefile b/target/linux/mxs/image/Makefile similarity index 100% rename from target/linux/imx23/image/Makefile rename to target/linux/mxs/image/Makefile diff --git a/target/linux/imx23/modules.mk b/target/linux/mxs/modules.mk similarity index 95% rename from target/linux/imx23/modules.mk rename to target/linux/mxs/modules.mk index f999c31..ef8a86b 100644 --- a/target/linux/imx23/modules.mk +++ b/target/linux/mxs/modules.mk @@ -7,7 +7,7 @@ define KernelPackage/rtc-stmp3xxx SUBMENU:=$(OTHER_MENU) TITLE:=STMP3xxx SoC built-in RTC support -DEPENDS:=@TARGET_imx23 +DEPENDS:=@TARGET_mxs $(call AddDepends/rtc) KCONFIG:=\ CONFIG_RTC_CLASS=y \ @@ -35,7 +35,7 @@ $(eval $(call KernelPackage,wdt-stmp3xxx)
[OpenWrt-Devel] [PATCH v2 00/10] Rename imx23 target to mxs and add support for I2SE's Duckbill series
Changes from v1: - merged patches as suggested by Luka Perkov - fixed first-time network configuration for Olinuxino boards - use the green LED on Olinuxino boards as status indicator - dropped patches already applied or obsolete Michael Heimpold (10): Rename target imx23 to mxs mxs: various small fixes for packages elftosb: support static linking mxs: enable device tree support in /proc mxs: whitespace fix mxs: add basic board runtime detection support mxs: add support for I2SE's Duckbill devices mxs: add/improve image generation support uboot-envtools: add support for mxs target mxs: remove static default network configuration in image package/boot/imx-bootlets/Makefile |2 +- package/boot/uboot-envtools/Makefile |6 +- package/boot/uboot-envtools/files/mxs | 26 + package/boot/uboot-imx23/Makefile |2 +- target/linux/imx23/Makefile| 26 - target/linux/imx23/base-files/etc/inittab |3 - target/linux/imx23/config-default | 285 -- target/linux/imx23/image/Makefile | 45 - target/linux/imx23/modules.mk | 132 - .../imx23/patches/100-soc-audio-support.patch | 2842 target/linux/imx23/patches/101-soc-audio-dts.patch | 39 - target/linux/imx23/patches/105-imx23-dcp.patch | 957 --- target/linux/imx23/patches/106-add-dcp-dts.patch | 25 - target/linux/imx23/patches/110-lradc-dts.patch | 14 - target/linux/imx23/profiles/01-olinuxino.mk| 19 - target/linux/mxs/Makefile | 26 + target/linux/mxs/base-files.mk |3 + target/linux/mxs/base-files/etc/diag.sh| 35 + target/linux/mxs/base-files/etc/inittab|3 + .../mxs/base-files/etc/uci-defaults/02_network | 23 + target/linux/mxs/base-files/lib/mxs.sh | 42 + .../base-files/lib/preinit/03_preinit_do_mxs.sh|9 + target/linux/mxs/config-default| 286 ++ .../mxs/files/arch/arm/boot/dts/imx28-duckbill.dts | 118 + target/linux/mxs/image/Makefile| 69 + target/linux/mxs/modules.mk| 131 + .../linux/mxs/patches/100-soc-audio-support.patch | 2842 target/linux/mxs/patches/101-soc-audio-dts.patch | 39 + target/linux/mxs/patches/105-imx23-dcp.patch | 957 +++ target/linux/mxs/patches/106-add-dcp-dts.patch | 25 + target/linux/mxs/patches/110-lradc-dts.patch | 14 + target/linux/mxs/patches/200-duckbill.patch| 57 + target/linux/mxs/profiles/01-olinuxino.mk | 20 + target/linux/mxs/profiles/02-duckbill.mk | 20 + tools/Makefile |2 +- tools/elftosb/Makefile | 11 +- tools/elftosb/patches/003-use-ldflags.patch| 26 + 37 files changed, 4782 insertions(+), 4399 deletions(-) create mode 100644 package/boot/uboot-envtools/files/mxs delete mode 100644 target/linux/imx23/Makefile delete mode 100644 target/linux/imx23/base-files/etc/inittab delete mode 100644 target/linux/imx23/config-default delete mode 100644 target/linux/imx23/image/Makefile delete mode 100644 target/linux/imx23/modules.mk delete mode 100644 target/linux/imx23/patches/100-soc-audio-support.patch delete mode 100644 target/linux/imx23/patches/101-soc-audio-dts.patch delete mode 100644 target/linux/imx23/patches/105-imx23-dcp.patch delete mode 100644 target/linux/imx23/patches/106-add-dcp-dts.patch delete mode 100644 target/linux/imx23/patches/110-lradc-dts.patch delete mode 100644 target/linux/imx23/profiles/01-olinuxino.mk create mode 100644 target/linux/mxs/Makefile create mode 100644 target/linux/mxs/base-files.mk create mode 100644 target/linux/mxs/base-files/etc/diag.sh create mode 100644 target/linux/mxs/base-files/etc/inittab create mode 100644 target/linux/mxs/base-files/etc/uci-defaults/02_network create mode 100644 target/linux/mxs/base-files/lib/mxs.sh create mode 100644 target/linux/mxs/base-files/lib/preinit/03_preinit_do_mxs.sh create mode 100644 target/linux/mxs/config-default create mode 100644 target/linux/mxs/files/arch/arm/boot/dts/imx28-duckbill.dts create mode 100644 target/linux/mxs/image/Makefile create mode 100644 target/linux/mxs/modules.mk create mode 100644 target/linux/mxs/patches/100-soc-audio-support.patch create mode 100644 target/linux/mxs/patches/101-soc-audio-dts.patch create mode 100644 target/linux/mxs/patches/105-imx23-dcp.patch create mode 100644 target/linux/mxs/patches/106-add-dcp-dts.patch create mode 100644 target/linux/mxs/patches/110-lradc-dts.patch create mode 100644 target/linux/mxs/patches/200-duckbill.patch create mode 100644 target/linux/mxs/profiles/01-olinuxino.mk create mode 100644 target/linux/mxs/profiles/02-duckbill.mk create mode 100644 tools/elf
[OpenWrt-Devel] [PATCH v2 10/10] mxs: remove static default network configuration in image
Signed-off-by: Michael Heimpold --- target/linux/mxs/base-files.mk |3 +++ 1 file changed, 3 insertions(+) create mode 100644 target/linux/mxs/base-files.mk diff --git a/target/linux/mxs/base-files.mk b/target/linux/mxs/base-files.mk new file mode 100644 index 000..fdd2c71 --- /dev/null +++ b/target/linux/mxs/base-files.mk @@ -0,0 +1,3 @@ +define Package/base-files/install-target + rm -f $(1)/etc/config/network +endef -- 1.7.10.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2 07/10] mxs: add support for I2SE's Duckbill devices
Signed-off-by: Michael Heimpold --- .../mxs/files/arch/arm/boot/dts/imx28-duckbill.dts | 118 target/linux/mxs/patches/200-duckbill.patch| 57 ++ target/linux/mxs/profiles/02-duckbill.mk | 20 3 files changed, 195 insertions(+) create mode 100644 target/linux/mxs/files/arch/arm/boot/dts/imx28-duckbill.dts create mode 100644 target/linux/mxs/patches/200-duckbill.patch create mode 100644 target/linux/mxs/profiles/02-duckbill.mk diff --git a/target/linux/mxs/files/arch/arm/boot/dts/imx28-duckbill.dts b/target/linux/mxs/files/arch/arm/boot/dts/imx28-duckbill.dts new file mode 100644 index 000..b102d62 --- /dev/null +++ b/target/linux/mxs/files/arch/arm/boot/dts/imx28-duckbill.dts @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2013 Michael Heimpold + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +/include/ "imx28.dtsi" + +/ { + model = "I2SE Duckbill"; + compatible = "i2se,duckbill", "fsl,imx28"; + + memory { + reg = <0x4000 0x0800>; + }; + + apb@8000 { + apbh@8000 { + ssp0: ssp@8001 { + compatible = "fsl,imx28-mmc"; + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_8bit_pins_a + &mmc0_cd_cfg &mmc0_sck_cfg>; + bus-width = <8>; + vmmc-supply = <®_3p3v>; + status = "okay"; + }; + + pinctrl@80018000 { + pinctrl-names = "default"; + pinctrl-0 = <&hog_pins_a>; + + hog_pins_a: hog@0 { + reg = <0>; + fsl,pinmux-ids = < + 0x40d3 /* MX28_PAD_ENET0_RX_CLK__GPIO_4_13, PHY Reset */ + >; + fsl,drive-strength = <0>; + fsl,voltage = <1>; + fsl,pull-up = <0>; + }; + + led_pins_a: led_gpio@0 { + reg = <0>; + fsl,pinmux-ids = < + 0x3003 /* MX28_PAD_AUART0_RX__GPIO_3_0 */ + 0x3013 /* MX28_PAD_AUART0_TX__GPIO_3_1 */ + >; + fsl,drive-strength = <0>; + fsl,voltage = <1>; + fsl,pull-up = <0>; + }; + }; + }; + + apbx@8004 { + duart: serial@80074000 { + pinctrl-names = "default"; + pinctrl-0 = <&duart_pins_a>; + status = "okay"; + }; + + usbphy0: usbphy@8007c000 { + status = "okay"; + }; + }; + }; + + ahb@8008 { + usb0: usb@8008 { + status = "okay"; + }; + + mac0: ethernet@800f { + phy-mode = "rmii"; + pinctrl-names = "default"; + pinctrl-0 = <&mac0_pins_a>; + phy-supply = <®_3p3v>; + phy-reset-gpios = <&gpio4 13 0>; + phy-reset-duration = <100>; + status = "okay"; + }; + }; + + regulators { + compatible = "simple-bus"; + + reg_3p3v: 3p3v { + compatible = "regulator-fixed"; + regulator-name = "3P3V"; + regulator-min-microvolt = <330>; + regulator-max-microvolt = <330>; + regulator-always-on; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&led_pins_a>; + + status { + label = "duckbill:green:status"; + gpios = <&gpio3 0 0>; + }; + + failure { + label = "duckbill:red:status"; + gpios
[OpenWrt-Devel] [PATCH v2 09/10] uboot-envtools: add support for mxs target
Signed-off-by: Michael Heimpold --- package/boot/uboot-envtools/Makefile |6 +- package/boot/uboot-envtools/files/mxs | 26 ++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 package/boot/uboot-envtools/files/mxs diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile index 38c5218..d4a136c 100644 --- a/package/boot/uboot-envtools/Makefile +++ b/package/boot/uboot-envtools/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uboot-envtools PKG_DISTNAME:=u-boot PKG_VERSION:=2013.07-rc1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot @@ -73,6 +73,10 @@ ifneq ($(CONFIG_TARGET_lantiq),) $(INSTALL_DIR) $(1)/etc/uci-defaults $(INSTALL_BIN) ./files/lantiq $(1)/etc/uci-defaults/30_uboot-envtools endif +ifneq ($(CONFIG_TARGET_mxs),) + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_BIN) ./files/mxs $(1)/etc/uci-defaults/30_uboot-envtools +endif ifneq ($(CONFIG_TARGET_ramips),) $(INSTALL_DIR) $(1)/etc/uci-defaults $(INSTALL_BIN) ./files/ramips $(1)/etc/uci-defaults/30_uboot-envtools diff --git a/package/boot/uboot-envtools/files/mxs b/package/boot/uboot-envtools/files/mxs new file mode 100644 index 000..ab8b4ef --- /dev/null +++ b/package/boot/uboot-envtools/files/mxs @@ -0,0 +1,26 @@ +#!/bin/sh +# +# Copyright (C) 2013 OpenWrt.org +# + +[ -e /etc/config/ubootenv ] && exit 0 + +touch /etc/config/ubootenv + +. /lib/mxs.sh +. /lib/uboot-envtools.sh +. /lib/functions.sh + +board=$(mxs_board_name) + +case "$board" in +duckbill) + ubootenv_add_uci_config "/dev/mmcblk0" "0x2" "0x2" + ubootenv_add_uci_config "/dev/mmcblk0" "0x4" "0x2" + ;; +esac + +config_load ubootenv +config_foreach ubootenv_add_app_config ubootenv + +exit 0 -- 1.7.10.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2 08/10] mxs: add/improve image generation support
Signed-off-by: Michael Heimpold --- target/linux/mxs/image/Makefile | 26 +- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/target/linux/mxs/image/Makefile b/target/linux/mxs/image/Makefile index b910237..f025da2 100644 --- a/target/linux/mxs/image/Makefile +++ b/target/linux/mxs/image/Makefile @@ -8,6 +8,10 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk +BOARDS:= \ + imx23-olinuxino \ + imx28-duckbill + define Image/BuildKernel/olinuxino-bootlet cat $(LINUX_DIR)/arch/arm/boot/zImage $(LINUX_DIR)/arch/arm/boot/dts/imx23-olinuxino.dtb > $(STAGING_DIR)/zImage_dtb (cd $(STAGING_DIR); \ @@ -34,6 +38,27 @@ define Image/BuildKernel ifeq ($(CONFIG_PACKAGE_uboot-imx23-mx23_olinuxino),y) $(call Image/BuildKernel/olinuxino-uboot) endif + + $(CP) $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/openwrt-$(BOARD)-zImage + $(foreach board,$(BOARDS), + $(CP) $(LINUX_DIR)/arch/arm/boot/dts/$(board).dtb $(BIN_DIR)/ + ) +endef + +define Image/InstallKernel + + ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL),) + mkdir -p $(TARGET_DIR)/boot + $(CP) $(LINUX_DIR)/arch/arm/boot/zImage $(TARGET_DIR)/boot/ + endif + + ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),) + mkdir -p $(TARGET_DIR)/boot + $(foreach board,$(BOARDS), + $(CP) $(LINUX_DIR)/arch/arm/boot/dts/$(board).dtb $(TARGET_DIR)/boot/ + ) + endif + endef define Image/Build @@ -42,4 +67,3 @@ define Image/Build endef $(eval $(call BuildImage)) - -- 1.7.10.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2 06/10] mxs: add basic board runtime detection support
Signed-off-by: Michael Heimpold --- target/linux/mxs/base-files/etc/diag.sh| 35 .../mxs/base-files/etc/uci-defaults/02_network | 23 +++ target/linux/mxs/base-files/lib/mxs.sh | 42 .../base-files/lib/preinit/03_preinit_do_mxs.sh|9 + 4 files changed, 109 insertions(+) create mode 100644 target/linux/mxs/base-files/etc/diag.sh create mode 100644 target/linux/mxs/base-files/etc/uci-defaults/02_network create mode 100644 target/linux/mxs/base-files/lib/mxs.sh create mode 100644 target/linux/mxs/base-files/lib/preinit/03_preinit_do_mxs.sh diff --git a/target/linux/mxs/base-files/etc/diag.sh b/target/linux/mxs/base-files/etc/diag.sh new file mode 100644 index 000..e48fa96 --- /dev/null +++ b/target/linux/mxs/base-files/etc/diag.sh @@ -0,0 +1,35 @@ +#!/bin/sh +# Copyright (C) 2013 OpenWrt.org + +. /lib/functions/leds.sh +. /lib/mxs.sh + +get_status_led() { + case $(mxs_board_name) in + duckbill) + status_led="duckbill:green:status" + ;; + olinuxino) + status_led="green" + ;; + *) + status_led=$(cd /sys/class/leds && ls -1 *:status 2> /dev/null | head -n 1) + ;; + esac +} + +set_state() { + get_status_led + + case "$1" in + preinit) + status_led_blink_preinit + ;; + failsafe) + status_led_blink_failsafe + ;; + done) + status_led_on + ;; + esac +} diff --git a/target/linux/mxs/base-files/etc/uci-defaults/02_network b/target/linux/mxs/base-files/etc/uci-defaults/02_network new file mode 100644 index 000..246cd89 --- /dev/null +++ b/target/linux/mxs/base-files/etc/uci-defaults/02_network @@ -0,0 +1,23 @@ +#!/bin/sh +# Copyright (C) 2013 OpenWrt.org + +[ -e /etc/config/network ] && exit 0 + +touch /etc/config/network + +. /lib/functions/uci-defaults.sh +. /lib/mxs.sh + +ucidef_set_interface_loopback + +board=$(mxs_board_name) + +case "$board" in +*) + ucidef_set_interface_lan 'eth0' + ;; +esac + +uci commit network + +exit 0 diff --git a/target/linux/mxs/base-files/lib/mxs.sh b/target/linux/mxs/base-files/lib/mxs.sh new file mode 100644 index 000..ed5a527 --- /dev/null +++ b/target/linux/mxs/base-files/lib/mxs.sh @@ -0,0 +1,42 @@ +#!/bin/sh +# +# Copyright (C) 2013 OpenWrt.org +# + +MXS_BOARD_NAME= +MXS_MODEL= + +mxs_board_detect() { + local machine + local name + + machine=$(cat /proc/device-tree/model) + + case "$machine" in + *"I2SE Duckbill"*) + name="duckbill" + ;; + *"i.MX23 Olinuxino Low Cost Board") + name="olinuxino" + ;; + esac + + [ -z "$name" ] && name="unknown" + + [ -z "$MXS_BOARD_NAME" ] && MXS_BOARD_NAME="$name" + [ -z "$MXS_MODEL" ] && MXS_MODEL="$machine" + + [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" + + echo "$MXS_BOARD_NAME" > /tmp/sysinfo/board_name + echo "$MXS_MODEL" > /tmp/sysinfo/model +} + +mxs_board_name() { + local name + + [ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name) + [ -z "$name" ] && name="unknown" + + echo "$name" +} diff --git a/target/linux/mxs/base-files/lib/preinit/03_preinit_do_mxs.sh b/target/linux/mxs/base-files/lib/preinit/03_preinit_do_mxs.sh new file mode 100644 index 000..692078d --- /dev/null +++ b/target/linux/mxs/base-files/lib/preinit/03_preinit_do_mxs.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +do_mxs() { + . /lib/mxs.sh + + mxs_board_detect +} + +boot_hook_add preinit_main do_mxs -- 1.7.10.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2 02/10] mxs: various small fixes for packages
- rename package sound-soc-imx23 to sound-soc-mxs - be a little more descriptive about packages contents - fix minor/cosmetic coding style issues Signed-off-by: Michael Heimpold --- target/linux/mxs/modules.mk | 35 ++--- target/linux/mxs/profiles/01-olinuxino.mk | 11 - 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/target/linux/mxs/modules.mk b/target/linux/mxs/modules.mk index ef8a86b..4b95561 100644 --- a/target/linux/mxs/modules.mk +++ b/target/linux/mxs/modules.mk @@ -9,7 +9,7 @@ define KernelPackage/rtc-stmp3xxx TITLE:=STMP3xxx SoC built-in RTC support DEPENDS:=@TARGET_mxs $(call AddDepends/rtc) -KCONFIG:=\ +KCONFIG:= \ CONFIG_RTC_CLASS=y \ CONFIG_RTC_DRV_STMP=m FILES:=$(LINUX_DIR)/drivers/rtc/rtc-stmp3xxx.ko @@ -34,16 +34,15 @@ endef $(eval $(call KernelPackage,wdt-stmp3xxx)) define KernelPackage/usb-chipidea-imx -TITLE:=Support for ChipIdea controllers on i.MX +TITLE:=Support for ChipIdea controllers on Freescale i.MX SoCs DEPENDS:=+kmod-usb-chipidea @TARGET_mxs -FILES:=\ - $(LINUX_DIR)/drivers/usb/chipidea/ci13xxx_imx.ko +FILES:=$(LINUX_DIR)/drivers/usb/chipidea/ci13xxx_imx.ko AUTOLOAD:=$(call AutoLoad,52,ci13xxx_imx,1) $(call AddDepends/usb) endef define KernelPackage/usb-chipidea-imx/description -Kernel support for USB ChipIdea controllers on i.MX +Kernel support for USB ChipIdea controllers on Freescale i.MX SoCs endef $(eval $(call KernelPackage,usb-chipidea-imx,1)) @@ -51,8 +50,7 @@ $(eval $(call KernelPackage,usb-chipidea-imx,1)) define KernelPackage/usb-mxs-phy TITLE:=Support for Freescale MXS USB PHY controllers DEPENDS:=+kmod-usb-chipidea-imx -KCONFIG:= \ - CONFIG_USB_MXS_PHY +KCONFIG:=CONFIG_USB_MXS_PHY FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-mxs-usb.ko AUTOLOAD:=$(call AutoLoad,50,phy-mxs-usb,1) $(call AddDepends/usb) @@ -79,8 +77,8 @@ endef $(eval $(call KernelPackage,usb-net-smsc95xx)) -define KernelPackage/sound-soc-imx23 -TITLE:=Freescale i.MX233 built-in SoC sound support +define KernelPackage/sound-soc-mxs +TITLE:=Freescale i.MX23/i.MX28 built-in SoC sound support KCONFIG:= \ CONFIG_SND_SOC_MXS_BUILTIN_CODEC \ CONFIG_SND_MXS_SOC_BUILTIN @@ -93,31 +91,32 @@ define KernelPackage/sound-soc-imx23 DEPENDS:=@TARGET_mxs +kmod-sound-soc-core $(call AddDepends/sound) endef - -define KernelPackage/sound-soc-imx23/description -Kernel support for i.MX233 built-in SoC audio + +define KernelPackage/sound-soc-mxs/description +Kernel support for Freescale i.MX23/i.MX28 built-in SoC audio endef -$(eval $(call KernelPackage,sound-soc-imx23)) +$(eval $(call KernelPackage,sound-soc-mxs)) define KernelPackage/iio-mxs-lradc SUBMENU:=$(OTHER_MENU) -TITLE:=LRADC driver for i.MX23/28 +TITLE:=LRADC driver for Freescale i.MX23/i.MX28 SoCs DEPENDS:=@TARGET_mxs KCONFIG:=CONFIG_MXS_LRADC -FILES:=$(LINUX_DIR)/drivers/staging/iio/adc/mxs-lradc.ko \ +FILES:= \ + $(LINUX_DIR)/drivers/staging/iio/adc/mxs-lradc.ko \ $(LINUX_DIR)/drivers/iio/industrialio-triggered-buffer.ko AUTOLOAD:=$(call AutoLoad,70,industrialio-triggered-buffer mxs-lradc) endef define KernelPackage/iio-mxs-lradc/description -Kernel module for i.MX23/28 LRADC driver +Kernel support Freescale's i.MX23/i.MX28 Low Resolution ADC (LRADC) endef $(eval $(call KernelPackage,iio-mxs-lradc)) define KernelPackage/crypto-hw-dcp -TITLE:=i.MX23/28 DCP hardware crypto module +TITLE:=Freescale i.MX23/28 DCP hardware crypto module DEPENDS:=@TARGET_mxs KCONFIG:=CONFIG_CRYPTO_DEV_DCP FILES:=$(LINUX_DIR)/drivers/crypto/dcp.ko @@ -126,7 +125,7 @@ define KernelPackage/crypto-hw-dcp endef define KernelPackage/crypto-hw-dcp/description -Kernel support for the i.MX23/28 DCP crypto engine +Kernel support for Freescale's i.MX23/i.MX28 DCP crypto engine endef $(eval $(call KernelPackage,crypto-hw-dcp)) diff --git a/target/linux/mxs/profiles/01-olinuxino.mk b/target/linux/mxs/profiles/01-olinuxino.mk index 252f99a..2b21493 100644 --- a/target/linux/mxs/profiles/01-olinuxino.mk +++ b/target/linux/mxs/profiles/01-olinuxino.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2012 OpenWrt.org +# Copyright (C) 2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,13 +7,14 @@ define Profile/olinuxino NAME:=Olimex Olinuxino boards - PACKAGES += imx-bootlets kmod-usb-mxs-phy kmod-usb-net kmod-usb-net-smsc95xx \ - kmod-gpio-mcp23s08 kmod-leds-gpio kmod-ledtrig-heartbeat kmod-rtc-stmp3xxx \ - kmod-sound-core kmod-sound-soc-imx23 kmod-iio-mxs-lradc + PACKAGES+= \ + imx-bootlets kmod-usb-mxs-phy kmod-usb-net kmod-usb-net-smsc95xx \ + kmod-gpio-mcp23s08 kmod-leds-gpio kmod-ledtrig-heartbeat kmod-rtc-
[OpenWrt-Devel] [PATCH v2 05/10] mxs: whitespace fix
Signed-off-by: Michael Heimpold --- target/linux/mxs/profiles/01-olinuxino.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mxs/profiles/01-olinuxino.mk b/target/linux/mxs/profiles/01-olinuxino.mk index 2b21493..b99e1d3 100644 --- a/target/linux/mxs/profiles/01-olinuxino.mk +++ b/target/linux/mxs/profiles/01-olinuxino.mk @@ -7,7 +7,7 @@ define Profile/olinuxino NAME:=Olimex Olinuxino boards - PACKAGES+= \ + PACKAGES+= \ imx-bootlets kmod-usb-mxs-phy kmod-usb-net kmod-usb-net-smsc95xx \ kmod-gpio-mcp23s08 kmod-leds-gpio kmod-ledtrig-heartbeat kmod-rtc-stmp3xxx \ kmod-sound-core kmod-sound-soc-mxs kmod-iio-mxs-lradc -- 1.7.10.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2 03/10] elftosb: support static linking
Signed-off-by: Michael Heimpold --- tools/elftosb/Makefile | 11 +++ tools/elftosb/patches/003-use-ldflags.patch | 26 ++ 2 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 tools/elftosb/patches/003-use-ldflags.patch diff --git a/tools/elftosb/Makefile b/tools/elftosb/Makefile index c063217..6f9b963 100644 --- a/tools/elftosb/Makefile +++ b/tools/elftosb/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -13,19 +13,14 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://repository.timesys.com/buildsources/e/elftosb/elftosb-10.12.01/ PKG_MD5SUM:=e8005d606c1e0bb3507c82f6eceb3056 -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION) - include $(INCLUDE_DIR)/host-build.mk define Host/Compile - $(MAKE) -C $(HOST_BUILD_DIR) -f makefile LDFLAGS="$(HOST_STATIC_LINKING)" + $(MAKE) -C $(HOST_BUILD_DIR) LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)" endef define Host/Install $(INSTALL_BIN) $(HOST_BUILD_DIR)/bld/linux/elftosb $(STAGING_DIR_HOST)/bin/elftosb endef -define Host/Clean -endef - $(eval $(call HostBuild)) diff --git a/tools/elftosb/patches/003-use-ldflags.patch b/tools/elftosb/patches/003-use-ldflags.patch new file mode 100644 index 000..82fd1e8 --- /dev/null +++ b/tools/elftosb/patches/003-use-ldflags.patch @@ -0,0 +1,26 @@ +--- a/makefile.rules b/makefile.rules +@@ -131,19 +131,20 @@ exec_always: + @echo "LIBS = ${LIBS}" + @echo "EXEC_FILE = ${EXEC_FILE}" + @echo "BUILD_DIR = ${BUILD_DIR}" ++ @echo "LDFLAGS = ${LDFLAGS}" + + clean: + rm -f ${OBJ_FILES_ELFTOSB2} ${OBJ_FILES_SBTOOL} ${OBJ_FILES_KEYGEN} \ + ${EXEC_FILE_ELFTOSB2} ${EXEC_FILE_SBTOOL} ${EXEC_FILE_KEYGEN} + + elftosb: ${OBJ_FILES_ELFTOSB2} +- gcc ${OBJ_FILES_ELFTOSB2} ${LIBS} -o ${EXEC_FILE_ELFTOSB2} ++ gcc ${OBJ_FILES_ELFTOSB2} ${LIBS} ${LDFLAGS} -o ${EXEC_FILE_ELFTOSB2} + + sbtool: ${OBJ_FILES_SBTOOL} +- gcc ${OBJ_FILES_SBTOOL} ${LIBS} -o ${EXEC_FILE_SBTOOL} ++ gcc ${OBJ_FILES_SBTOOL} ${LIBS} ${LDFLAGS} -o ${EXEC_FILE_SBTOOL} + + keygen: ${OBJ_FILES_KEYGEN} +- gcc ${OBJ_FILES_KEYGEN} ${LIBS} -o ${EXEC_FILE_KEYGEN} ++ gcc ${OBJ_FILES_KEYGEN} ${LIBS} ${LDFLAGS} -o ${EXEC_FILE_KEYGEN} + + + #ifeq ("${UNAMES}", "Linux") -- 1.7.10.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2 04/10] mxs: enable device tree support in /proc
Signed-off-by: Michael Heimpold --- target/linux/mxs/config-default |1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/mxs/config-default b/target/linux/mxs/config-default index 7d05e9f..ae6d874 100644 --- a/target/linux/mxs/config-default +++ b/target/linux/mxs/config-default @@ -223,6 +223,7 @@ CONFIG_PM_CLK=y CONFIG_PM_RUNTIME=y CONFIG_PPS=y # CONFIG_PREEMPT_RCU is not set +CONFIG_PROC_DEVICETREE=y CONFIG_PTP_1588_CLOCK=y # CONFIG_RCU_STALL_COMMON is not set CONFIG_REGMAP=y -- 1.7.10.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH V2] [packages] dropbear: update to version 2013.58
Update dropbear to it's latest stable version, and delete unneeded patches: - IPV6 splitted port notation now supported upstream - if a dbclient invalid option is passed, only a warning is emitted Signed-off-by: Enrico Mioso --- package/network/services/dropbear/Makefile |6 ++--- .../dropbear/patches/120-openwrt_options.patch | 27 .../patches/130-ssh_ignore_o_and_x_args.patch | 21 --- .../patches/300-ipv6_addr_port_split.patch | 11 4 files changed, 14 insertions(+), 51 deletions(-) delete mode 100644 package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch delete mode 100644 package/network/services/dropbear/patches/300-ipv6_addr_port_split.patch diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index b7708b1..1ee5ca5 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear -PKG_VERSION:=2012.55 -PKG_RELEASE:=2 +PKG_VERSION:=2013.58 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://matt.ucc.asn.au/dropbear/releases/ \ http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/ -PKG_MD5SUM:=8c784baec3054cdb1bb4bfa792c87812 +PKG_MD5SUM:=8d3579bbbfcea48404a3219643076450 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE diff --git a/package/network/services/dropbear/patches/120-openwrt_options.patch b/package/network/services/dropbear/patches/120-openwrt_options.patch index 977f631..e568b40 100644 --- a/package/network/services/dropbear/patches/120-openwrt_options.patch +++ b/package/network/services/dropbear/patches/120-openwrt_options.patch @@ -5,7 +5,7 @@ * one of them. */ #define NON_INETD_MODE -#define INETD_MODE -+/*#define INETD_MODE*/ ++/*#define INETD_MODE (disabled in OpenWrt build)*/ /* Setting this disables the fast exptmod bignum code. It saves ~5kB, but is * perhaps 20% slower for pubkey operations (it is probably worth experimenting @@ -23,11 +23,11 @@ /* Enable "Netcat mode" option. This will forward standard input/output * to a remote TCP-forwarded connection */ -#define ENABLE_CLI_NETCAT -+/*#define ENABLE_CLI_NETCAT*/ ++/*#define ENABLE_CLI_NETCAT (disabled in OpenWrt build)*/ - /* Encryption - at least one required. - * Protocol RFC requires 3DES and recommends AES128 for interoperability. -@@ -89,8 +89,8 @@ much traffic. */ + /* Whether to support "-c" and "-m" flags to choose ciphers/MACs at runtime */ + #define ENABLE_USER_ALGO_LIST +@@ -92,8 +92,8 @@ much traffic. */ #define DROPBEAR_AES256 /* Compiling in Blowfish will add ~6kB to runtime heap memory usage */ /*#define DROPBEAR_BLOWFISH*/ @@ -38,30 +38,25 @@ /* Enable "Counter Mode" for ciphers. This is more secure than normal * CBC mode against certain attacks. This adds around 1kB to binary -@@ -110,7 +110,7 @@ much traffic. */ +@@ -119,7 +119,7 @@ much traffic. */ * If you disable MD5, Dropbear will fall back to SHA1 fingerprints, * which are not the standard form. */ #define DROPBEAR_SHA1_HMAC -#define DROPBEAR_SHA1_96_HMAC +/*#define DROPBEAR_SHA1_96_HMAC*/ + /*#define DROPBEAR_SHA2_256_HMAC*/ + /*#define DROPBEAR_SHA2_512_HMAC*/ #define DROPBEAR_MD5_HMAC - - /* Hostkey/public key algorithms - at least one required, these are used -@@ -144,11 +144,11 @@ much traffic. */ - #endif - - /* Whether to do reverse DNS lookups. */ --#define DO_HOST_LOOKUP -+/*#define DO_HOST_LOOKUP*/ +@@ -157,7 +157,7 @@ much traffic. */ /* Whether to print the message of the day (MOTD). This doesn't add much code * size */ -#define DO_MOTD -+/*#define DO_MOTD*/ ++/*#define DO_MOTD(disabled in OpenWrt build)*/ /* The MOTD file path */ #ifndef MOTD_FILENAME -@@ -192,7 +192,7 @@ much traffic. */ +@@ -195,7 +195,7 @@ much traffic. */ * note that it will be provided for all "hidden" client-interactive * style prompts - if you want something more sophisticated, use * SSH_ASKPASS instead. Comment out this var to remove this functionality.*/ diff --git a/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch b/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch deleted file mode 100644 index 93647a9..000 --- a/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch +++ /dev/null @@ -1,21 +0,0 @@ a/cli-runopts.c -+++ b/cli-runopts.c -@@ -287,6 +287,10 @@ void cli_getopts(int argc, char ** argv) - debug_trace = 1; - break; - #endif -+ case 'o': -+ next = &dummy; -+ case 'x': -+ break; - case 'F
[OpenWrt-Devel] [PATCH] [packages] dropbear: update to version 2013.58
Update dropbear to it's latest stable version, and delete unneeded patches: - IPV6 splitted port notation now supported upstream - if a dbclient invalid option is passed, only a warning is emitted --- package/network/services/dropbear/Makefile |6 ++--- .../dropbear/patches/120-openwrt_options.patch | 27 .../patches/130-ssh_ignore_o_and_x_args.patch | 21 --- .../patches/300-ipv6_addr_port_split.patch | 11 4 files changed, 14 insertions(+), 51 deletions(-) delete mode 100644 package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch delete mode 100644 package/network/services/dropbear/patches/300-ipv6_addr_port_split.patch diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index b7708b1..1ee5ca5 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear -PKG_VERSION:=2012.55 -PKG_RELEASE:=2 +PKG_VERSION:=2013.58 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://matt.ucc.asn.au/dropbear/releases/ \ http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/ -PKG_MD5SUM:=8c784baec3054cdb1bb4bfa792c87812 +PKG_MD5SUM:=8d3579bbbfcea48404a3219643076450 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE diff --git a/package/network/services/dropbear/patches/120-openwrt_options.patch b/package/network/services/dropbear/patches/120-openwrt_options.patch index 977f631..e568b40 100644 --- a/package/network/services/dropbear/patches/120-openwrt_options.patch +++ b/package/network/services/dropbear/patches/120-openwrt_options.patch @@ -5,7 +5,7 @@ * one of them. */ #define NON_INETD_MODE -#define INETD_MODE -+/*#define INETD_MODE*/ ++/*#define INETD_MODE (disabled in OpenWrt build)*/ /* Setting this disables the fast exptmod bignum code. It saves ~5kB, but is * perhaps 20% slower for pubkey operations (it is probably worth experimenting @@ -23,11 +23,11 @@ /* Enable "Netcat mode" option. This will forward standard input/output * to a remote TCP-forwarded connection */ -#define ENABLE_CLI_NETCAT -+/*#define ENABLE_CLI_NETCAT*/ ++/*#define ENABLE_CLI_NETCAT (disabled in OpenWrt build)*/ - /* Encryption - at least one required. - * Protocol RFC requires 3DES and recommends AES128 for interoperability. -@@ -89,8 +89,8 @@ much traffic. */ + /* Whether to support "-c" and "-m" flags to choose ciphers/MACs at runtime */ + #define ENABLE_USER_ALGO_LIST +@@ -92,8 +92,8 @@ much traffic. */ #define DROPBEAR_AES256 /* Compiling in Blowfish will add ~6kB to runtime heap memory usage */ /*#define DROPBEAR_BLOWFISH*/ @@ -38,30 +38,25 @@ /* Enable "Counter Mode" for ciphers. This is more secure than normal * CBC mode against certain attacks. This adds around 1kB to binary -@@ -110,7 +110,7 @@ much traffic. */ +@@ -119,7 +119,7 @@ much traffic. */ * If you disable MD5, Dropbear will fall back to SHA1 fingerprints, * which are not the standard form. */ #define DROPBEAR_SHA1_HMAC -#define DROPBEAR_SHA1_96_HMAC +/*#define DROPBEAR_SHA1_96_HMAC*/ + /*#define DROPBEAR_SHA2_256_HMAC*/ + /*#define DROPBEAR_SHA2_512_HMAC*/ #define DROPBEAR_MD5_HMAC - - /* Hostkey/public key algorithms - at least one required, these are used -@@ -144,11 +144,11 @@ much traffic. */ - #endif - - /* Whether to do reverse DNS lookups. */ --#define DO_HOST_LOOKUP -+/*#define DO_HOST_LOOKUP*/ +@@ -157,7 +157,7 @@ much traffic. */ /* Whether to print the message of the day (MOTD). This doesn't add much code * size */ -#define DO_MOTD -+/*#define DO_MOTD*/ ++/*#define DO_MOTD(disabled in OpenWrt build)*/ /* The MOTD file path */ #ifndef MOTD_FILENAME -@@ -192,7 +192,7 @@ much traffic. */ +@@ -195,7 +195,7 @@ much traffic. */ * note that it will be provided for all "hidden" client-interactive * style prompts - if you want something more sophisticated, use * SSH_ASKPASS instead. Comment out this var to remove this functionality.*/ diff --git a/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch b/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch deleted file mode 100644 index 93647a9..000 --- a/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch +++ /dev/null @@ -1,21 +0,0 @@ a/cli-runopts.c -+++ b/cli-runopts.c -@@ -287,6 +287,10 @@ void cli_getopts(int argc, char ** argv) - debug_trace = 1; - break; - #endif -+ case 'o': -+ next = &dummy; -+ case 'x': -+ break; - case 'F': -
Re: [OpenWrt-Devel] [PATCH] Add RouterBOARD 951Ui-2HnD Support
2013.08.28. 7:46 keltezéssel, Вячеслав Адаманов írta: > Gabor Juhos, > tell me, is it possible to port RB / SXT 2nDr2 Lite 2? Or are have any of the > nuances for which it can not or imposible. Although I don't know the hardware details of the SXT Lite boards but it should be possible. -Gabor ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] i.MX28 based device does not boot with latest stable kernel
On 2013-08-27 11:51 PM, Michael Heimpold wrote: > Hi Felix, > > your patch below allows the board to boot with kernel v3.10.9. > Thank you very much! Committed in r37854 - Felix ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel