[OpenWrt-Devel] [PATCH 1/1] Disabling at_keyboard in the grub2 core.img fixes alix2 booting
Roberto == Roberto Riggio roberto.rig...@create-net.org writes: David Or is it actually the OpenWRT image that's the problem? If you David boot the working x86-generic-net45xx image on a Geos or David alix2, shouldn't you at least get *some* serial output from the David kernel as it boots, before something goes wrong? Roberto Same problem also here on alix2. I've tried to run the Roberto soekris image but nothing changed. I tracked it down through prodigious use of grub_dprintf()'s and debug=all in the grub menu. Grub2 seems to hang in the grub_at_fini_hw() function on alix2. Removing at_keyboard from the grub_mkimage's construction of core.img allows booting to proceed to a successful completion. Why is an uninvestigated question at the moment. Signed-off-by: Russell Senior russ...@personaltelco.net --- diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 399ce3c..7918b23 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -9,8 +9,8 @@ include $(INCLUDE_DIR)/image.mk export PATH=$(TARGET_PATH):/sbin -GRUB2_MODULES = at_keyboard biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga -GRUB2_MODULES_ISO = at_keyboard biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga +GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga +GRUB2_MODULES_ISO = biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga GRUB_TERMINALS = GRUB_SERIAL_CONFIG = GRUB_TERMINAL_CONFIG = -- 1.7.2.2 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Atheros target development questions
Good morning list, I was writing to ask if there is a current maintainer for the Atheros target that I may contact. The reason that I ask is because I was contacted about a patch that I had submitted prior in regards to allowing various EnGenius devices to successfully reboot without a kernel hang. The patch didn't receive feedback and was never accepted. I know that most maintainers have moved on to more common and higher performance chipsets as of late, however there are still a lot of ar231x and ar531x chipsets still in the field. I will be required to maintain updates on these chipsets for my company and as such I would like to find the best way to submit various patches to the target with the highest probability of getting accepted. Would me cloning the OpenWRT mirror on github and submitting pull requests be sufficient, or would each patch source have to be sent through the mailing list? Currently the target is setup through patch sets. I know that this was intended so that the platform could ultimately be mainlined into the kernel easily. I ask if I may break apart the patch sets into the 'files-3.x' overlay layout temporarily as other targets have, so that I may be able to submit various patches in a more timely manner as opposed to patching patch sets. These could just as easily be transferred into patch form again in the event of a push to get the target mainlined. On my TODO: Remove duplicate code between the ar231x and ar531x platforms. Address all gpio/led polling flash errors. Determine the hardware limitation of the CPU processing/Ethernet speed. Add ethtool support to the Ethernet driver. Add BQL to the Ethernet driver. Rewrite sections of the Ethernet driver for maximum performance. Add gpio detection mechanisms to address EnGenius products cleanly. Any feedback is greatly appreciated. Thanks, Jonathan Bither ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Atheros target development questions
On Fri, Nov 09, 2012 at 06:11:47AM -0500, Jonathan Bither wrote: Good morning list, I was writing to ask if there is a current maintainer for the Atheros target that I may contact. The reason that I ask is because I was contacted about a patch that I had submitted prior in regards to allowing various EnGenius devices to successfully reboot without a kernel hang. The patch didn't receive feedback and was never accepted. I know that most maintainers have moved on to more common and higher performance chipsets as of late, however there are still a lot of ar231x and ar531x chipsets still in the field. I will be required to maintain updates on these chipsets for my company and as such I would like to find the best way to submit various patches to the target with the highest probability of getting accepted. Would me cloning the OpenWRT mirror on github and submitting pull requests be sufficient, or would each patch source have to be sent through the mailing list? I can't speak for the maintainer or OpenWRT development team, but we still use ar2317 platforms here, and I'm more than happy to help out with testing these devices. Unfornately, we _only_ have ar2317, so I can't help with verifying any of the unification code. Sincerely, Karl P ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Atheros target development questions
On 09/11/12 13:16, Karl Palsson wrote: On Fri, Nov 09, 2012 at 06:11:47AM -0500, Jonathan Bither wrote: Good morning list, I was writing to ask if there is a current maintainer for the Atheros target that I may contact. The reason that I ask is because I was contacted about a patch that I had submitted prior in regards to allowing various EnGenius devices to successfully reboot without a kernel hang. The patch didn't receive feedback and was never accepted. I know that most maintainers have moved on to more common and higher performance chipsets as of late, however there are still a lot of ar231x and ar531x chipsets still in the field. I will be required to maintain updates on these chipsets for my company and as such I would like to find the best way to submit various patches to the target with the highest probability of getting accepted. Would me cloning the OpenWRT mirror on github and submitting pull requests be sufficient, or would each patch source have to be sent through the mailing list? I can't speak for the maintainer or OpenWRT development team, but we still use ar2317 platforms here, and I'm more than happy to help out with testing these devices. Unfornately, we _only_ have ar2317, so I can't help with verifying any of the unification code. Sincerely, Karl P ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel Hi, go ahead with your proposed idea and mail the patches to the -devel mailinglist please. John ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] dialog: update to version 20120706
Signed-off-by: Jonh Wendell jonh.wend...@oiwifi.com.br --- utils/dialog/Makefile |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/dialog/Makefile b/utils/dialog/Makefile index d407ead..872ab83 100644 --- a/utils/dialog/Makefile +++ b/utils/dialog/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dialog -PKG_VERSION:=1.1-20080819 -PKG_RELEASE:=2 +PKG_VERSION:=1.1-20120706 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=ftp://invisible-island.net/dialog -PKG_MD5SUM:=3caebd641a9f337b980becb336c5 +PKG_MD5SUM:=2e538305977178eb085a9859511c299d include $(INCLUDE_DIR)/package.mk -- 1.7.10.4 -- Jonh Wendell http://www.bani.com.br ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Atheros target development questions
Thanks, I'll setup my git environment again and merge them all into branches and split the patches. On 11/09/2012 07:22 AM, John Crispin wrote: On 09/11/12 13:16, Karl Palsson wrote: On Fri, Nov 09, 2012 at 06:11:47AM -0500, Jonathan Bither wrote: Good morning list, I was writing to ask if there is a current maintainer for the Atheros target that I may contact. The reason that I ask is because I was contacted about a patch that I had submitted prior in regards to allowing various EnGenius devices to successfully reboot without a kernel hang. The patch didn't receive feedback and was never accepted. I know that most maintainers have moved on to more common and higher performance chipsets as of late, however there are still a lot of ar231x and ar531x chipsets still in the field. I will be required to maintain updates on these chipsets for my company and as such I would like to find the best way to submit various patches to the target with the highest probability of getting accepted. Would me cloning the OpenWRT mirror on github and submitting pull requests be sufficient, or would each patch source have to be sent through the mailing list? I can't speak for the maintainer or OpenWRT development team, but we still use ar2317 platforms here, and I'm more than happy to help out with testing these devices. Unfornately, we _only_ have ar2317, so I can't help with verifying any of the unification code. Sincerely, Karl P ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel Hi, go ahead with your proposed idea and mail the patches to the -devel mailinglist please. John ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Atheros target development questions
Hi Jonathan, On Friday 09 November 2012 06:11:47 Jonathan Bither wrote: Good morning list, I was writing to ask if there is a current maintainer for the Atheros target that I may contact. The reason that I ask is because I was contacted about a patch that I had submitted prior in regards to allowing various EnGenius devices to successfully reboot without a kernel hang. The patch didn't receive feedback and was never accepted. I know that most maintainers have moved on to more common and higher performance chipsets as of late, however there are still a lot of ar231x and ar531x chipsets still in the field. I will be required to maintain updates on these chipsets for my company and as such I would like to find the best way to submit various patches to the target with the highest probability of getting accepted. Would me cloning the OpenWRT mirror on github and submitting pull requests be sufficient, or would each patch source have to be sent through the mailing list? Currently the target is setup through patch sets. I know that this was intended so that the platform could ultimately be mainlined into the kernel easily. I ask if I may break apart the patch sets into the 'files-3.x' overlay layout temporarily as other targets have, so that I may be able to submit various patches in a more timely manner as opposed to patching patch sets. These could just as easily be transferred into patch form again in the event of a push to get the target mainlined. On my TODO: Remove duplicate code between the ar231x and ar531x platforms. Address all gpio/led polling flash errors. Determine the hardware limitation of the CPU processing/Ethernet speed. Add ethtool support to the Ethernet driver. Add BQL to the Ethernet driver. Rewrite sections of the Ethernet driver for maximum performance. Add gpio detection mechanisms to address EnGenius products cleanly. Any feedback is greatly appreciated. As others said, please go ahead and send your patches to the mailing-list. I still have an AR2318-based device I could use for testing. One thing that you might want to add is also: - reading the initial UART baudrate setting and use that instead of hardcoding it to 9600 (the board mentionned above uses 115200) Thank you! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Multilink PPP in OpenWrt and LuCI
Hi, Nathan.
I'm looking at supporting Multilink PPP (using PPPoE) in OpenWrt and
LuCI.
I've experimented by adding a MLPPP protocol
to /usr/lib/lua/luci/model/network/proto_ppp.lua (and adding a copy of
proto_pppoe.lua to model/cbi/admin_network/proto_mlppp.lua).
Unfortunately the 320-custom_iface_names.patch PPP patch doesn't work
for Multilink PPP because mp_join_bundle() fails to find an IFNAME=pppX
when bringing up the second link.
So my MLPPP protocol as a virtual interface doesn't work because
virtual
interfaces have to be named $proto-$config (e.g. mlppp-wan).
Now I've tried setting MLPPP up so it's not virtual and specified ppp0
as the Custom Interface. But now I'm having trouble because my
proto_mlppp_setup() function in /lib/netifd/proto/ppp.sh doesn't seem
to
be getting called.
I suppose the best solution is to fix pppd so custom interface names
work with Multilink PPP, but for now where can I find the code that's
preventing my proto_mlppp_setup() from getting called? I'm guessing
it's because ppp0 doesn't exist (yet)?
Some time ago I've been building mlpppoe channel (its 4xpppoe over 18Mbps
adsl atm working for several months without noticeable problems). Attached
are patches I've used to get things working, network config from my ASUS
RT-N16 and /var/run/pppd2.tdb dump.
To get single pppoe-pppX bundled interface add config interface pppX to
your /etc/config/network for each link with option pppd_options multilink.
Then ifup your pppX interfaces and watch log - you should see first one
creating bundle and subsequent ones joining it.
Bear in mind patches provided won't make mlppp working for tty attached
links - only client-side mlppp with rp-pppoe or alike plugin.
Have nice day,
George
--- openwrt.orig/package/network/services/ppp/patches/404-multilink-fix-non-pppX-interface-naming.patch 1970-01-01 03:00:00.0 +0300
+++ openwrt/package/network/services/ppp/patches/404-multilink-fix-non-pppX-interface-naming.patch 2012-11-09 16:43:55.0 +0200
@@ -0,0 +1,146 @@
+From: George Kashperko geo...@znau.edu.ua
+
+Make mlppp support more generic interface naming other than pppX
+Signed-off-by: George Kashperko geo...@znau.edu.ua
+---
+ pppd/multilink.c | 55 +
+ pppd/sys-linux.c | 12 +
+ 2 files changed, 53 insertions(+), 14 deletions(-)
+--- ppp-2.4.5.orig/pppd/multilink.c 2009-11-17 00:26:07.0 +0200
ppp-2.4.5/pppd/multilink.c 2012-10-22 01:35:25.291630529 +0300
+@@ -56,7 +56,8 @@ static void iterate_bundle_links __P((vo
+
+ static int get_default_epdisc __P((struct epdisc *));
+ static int parse_num __P((char *str, const char *key, int *valp));
+-static int owns_unit __P((TDB_DATA pid, int unit));
++static int parse_str __P((char *str, const char *key, char *buf, int buflen));
++static int owns_link __P((TDB_DATA pid, char *ifname));
+
+ #define set_ip_epdisc(ep, addr) do { \
+ ep-length = 4; \
+@@ -197,35 +198,38 @@ mp_join_bundle()
+ key.dptr = bundle_id;
+ key.dsize = p - bundle_id;
+ pid = tdb_fetch(pppdb, key);
++
+ if (pid.dptr != NULL) {
++ char tmp[IFNAMSIZ];
++
+ /* bundle ID exists, see if the pppd record exists */
+ rec = tdb_fetch(pppdb, pid);
++
+ if (rec.dptr != NULL rec.dsize 0) {
+ /* make sure the string is null-terminated */
+ rec.dptr[rec.dsize-1] = 0;
+- /* parse the interface number */
+- parse_num(rec.dptr, IFNAME=ppp, unit);
++
+ /* check the pid value */
+ if (!parse_num(rec.dptr, PPPD_PID=, pppd_pid)
++ || !parse_str(rec.dptr, IFNAME=, tmp, sizeof(tmp))
++ || !parse_num(rec.dptr, IFUNIT=, unit)
+ || !process_exists(pppd_pid)
+- || !owns_unit(pid, unit))
++ || !owns_link(pid, tmp))
+ unit = -1;
+ free(rec.dptr);
+ }
+ free(pid.dptr);
+- }
+
+- if (unit = 0) {
+ /* attach to existing unit */
+- if (bundle_attach(unit)) {
++ if (unit = 0 bundle_attach(unit)) {
+ set_ifunit(0);
+ script_setenv(BUNDLE, bundle_id + 7, 0);
+ make_bundle_links(1);
+ unlock_db();
+- info(Link attached to %s, ifname);
++ info(Link attached to %s, tmp);
+ return 1;
++ /* attach failed because bundle doesn't exist */
+ }
+- /* attach failed because bundle doesn't exist */
+ }
+
+ /* we have to make a new bundle */
+@@ -408,22 +412,45 @@ parse_num(str, key, valp)
+ return 0;
+ }
+
++static int
++parse_str(str, key, buf, buflen)
++ char *str;
++ const char *key;
++ char *buf;
++ int buflen;
++{
++ char *p, *endp;
++ int i;
++
++ p = strstr(str, key);
++ if (p) {
++ p += strlen(key);
++ while (--buflen *p != 0 *p != ';')
++ *(buf++) = *(p++);
++ *buf = 0;
++ return 1;
++ }
++ return 0;
++}
++
+ /*
+- * Check whether the pppd identified by `key' still owns ppp unit `unit'.
++ * Check whether the pppd identified by `key' still owns ppp link `ifname'.
+ */
+ static int
+-owns_unit(key, unit)
++owns_link(key, ifname)
+ TDB_DATA key;
+- int unit;
++
[OpenWrt-Devel] Buffalo wbmr/lantiq kernel panik
Hi! I just tried the 3.6.6 kernel with the trunk from yesterday. I get the following kernel panic: XR9-x chip found DDR set @ 166.6MHz Check initial DDR setting...DDR check ok... start booting... ARCADYAN U-Boot 1.00 (Nov 10 2010 - 17:41:42) AR9 BOARD CLOCK CPU 333M RAM 166M DRAM: 64 MB relocate_code start relocate_code finish. Flash: 32 MB In:serial Out: serial Err: serial Net: switch chip id=1001 AR8316 amazon_s Switch Copying boot params. DONE Type run flash_nfs to mount root filesystem over NFS Hit any key to stop autoboot: 0 ## Booting image at b006 ... Image Name: MIPS OpenWrt Linux-3.6.6 Created: 2012-11-08 20:37:24 UTC Image Type: MIPS Linux Kernel Image (lzma compressed) Data Size:1049745 Bytes = 1 MB Load Address: 80002000 Entry Point: 80002000 Verifying Checksum ... OK Uncompressing Kernel Image ... OK No initrd ## Transferring control to Linux (at address 80002000) ... ## Giving linux memsize in MB, 64 Starting kernel ... [0.00] Linux version 3.6.6 (avalentin@varus) (gcc version 4.6.4 20121001 (prerelease) (Linaro GCC 4.6-2012.10) ) #6 Thu Nov 8 21:37:22 CET 2012 [0.00] SoC: AR9 rev 1.2 [0.00] bootconsole [early0] enabled [0.00] CPU revision is: 0001954c (MIPS 34Kc) [0.00] Determined physical RAM map: [0.00] memory: 0400 @ (usable) [0.00] Initrd not found or empty - disabling initrd [0.00] Zone ranges: [0.00] Normal [mem 0x-0x03ff] [0.00] Movable zone start for each node [0.00] Early memory node ranges [0.00] node 0: [mem 0x-0x03ff] [0.00] Primary instruction cache 32kB, VIPT, 4-way, linesize 32 bytes. [0.00] Primary data cache 16kB, 4-way, VIPT, no aliases, linesize 32 bytes [0.00] Built 1 zonelists in Zone order, mobility grouping on. Total pages: 16256 [0.00] Kernel command line: console=ttyLTQ0,115200 init=/etc/preinit [0.00] PID hash table entries: 256 (order: -2, 1024 bytes) [0.00] Dentry cache hash table entries: 8192 (order: 3, 32768 bytes) [0.00] Inode-cache hash table entries: 4096 (order: 2, 16384 bytes) [0.00] __ex_table already sorted, skipping sort [0.00] Writing ErrCtl register=000692a5 [0.00] Readback ErrCtl register=000692a5 [0.00] Memory: 61628k/65536k available (2455k kernel code, 3908k reserved, 428k data, 176k init, 0k highmem) [0.00] NR_IRQS:256 [0.00] CPU Clock: 600MHz [0.00] Calibrating delay loop... 397.82 BogoMIPS (lpj=795648) [0.032000] pid_max: default: 32768 minimum: 301 [0.032000] Mount-cache hash table entries: 512 [0.036000] pinctrl core: initialized pinctrl subsystem [0.04] NET: Registered protocol family 16 [0.044000] dma-xway 1e104100.dma: Init done - hw rev: 6, ports: 5, channels: 20 [0.048000] dma-xway 1e104100.dma: init done [0.052000] pinctrl-xway 1e100b10.pinmux: Init done [0.056000] gptu-xway 1e100a00.gptu: gptu: 6 timers loaded [0.06] Data bus error, epc == 80262008, ra == 80261fcc [0.06] Oops[#1]: [0.06] Cpu 0 [0.06] $ 0 : 0067 be105400 feff [0.06] $ 4 : 80295a20 83829ce4 0007 [0.06] $ 8 : 0020 0003 0008 ff80 [0.06] $12 : 03bd ac00 6400 [0.06] $16 : 83857788 8033 83857780 8033 [0.06] $20 : 81000c0c 8033 8033 8033 [0.06] $24 : 0018 8000364c [0.06] $28 : 83828000 83829d60 802b321c 80261fcc [0.06] Hi: [0.06] Lo: [0.06] epc : 80262008 0x80262008 [0.06] Not tainted [0.06] ra: 80261fcc 0x80261fcc [0.06] Status: 1100fc03KERNEL EXL IE [0.06] Cause : 1080001c [0.06] PrId : 0001954c (MIPS 34Kc) [0.06] Modules linked in: [0.06] Process swapper (pid: 1, threadinfo=83828000, task=83827928, tls=) [0.06] Stack : 83857790 ffed 802bc680 802ce634 0016 83857788 8033 802ce634 ffed 802bc680 802ce634 0016 802d3210 8016e730 83857788 802ce634 802ce634 8017009c 834015e0 838577bc 83857788 802ce634 802ce634 8030 8016e908 802ce634 8016ca1c 8385d480 802ce634 8016e89c 8016cd18 83860288 802cc0a0 8016c99c 838254cc 8385db30 ... [0.06] Call Trace:[802d3210] 0x802d3210 [0.06] [8016e730] 0x8016e730 [0.06] [8017009c] 0x8017009c [0.06] [8016e908] 0x8016e908 [0.06] [8016ca1c] 0x8016ca1c [0.06] [8016e89c] 0x8016e89c [0.06] [8016cd18] 0x8016cd18 [0.06] [8016c99c] 0x8016c99c [0.06] [8016dcc0] 0x8016dcc0 [0.06] [80106ba0] 0x80106ba0 [
Re: [OpenWrt-Devel] Buffalo wbmr/lantiq kernel panik
Hi André, On Fri, Nov 09, 2012 at 04:40:19PM +, André Valentin wrote: [0.00] Linux version 3.6.6 (avalentin@varus) (gcc version 4.6.4 20121001 (prerelease) (Linaro GCC 4.6-2012.10) ) #6 Thu Nov 8 21:37:22 CET 2012 [0.00] SoC: AR9 rev 1.2 [0.00] bootconsole [early0] enabled [0.00] CPU revision is: 0001954c (MIPS 34Kc) [0.00] Determined physical RAM map: [0.00] memory: 0400 @ (usable) [0.00] Initrd not found or empty - disabling initrd [0.00] Zone ranges: [0.00] Normal [mem 0x-0x03ff] [0.00] Movable zone start for each node [0.00] Early memory node ranges [0.00] node 0: [mem 0x-0x03ff] [0.00] Primary instruction cache 32kB, VIPT, 4-way, linesize 32 bytes. [0.00] Primary data cache 16kB, 4-way, VIPT, no aliases, linesize 32 bytes [0.00] Built 1 zonelists in Zone order, mobility grouping on. Total pages: 16256 [0.00] Kernel command line: console=ttyLTQ0,115200 init=/etc/preinit [0.00] PID hash table entries: 256 (order: -2, 1024 bytes) [0.00] Dentry cache hash table entries: 8192 (order: 3, 32768 bytes) [0.00] Inode-cache hash table entries: 4096 (order: 2, 16384 bytes) [0.00] __ex_table already sorted, skipping sort [0.00] Writing ErrCtl register=000692a5 [0.00] Readback ErrCtl register=000692a5 [0.00] Memory: 61628k/65536k available (2455k kernel code, 3908k reserved, 428k data, 176k init, 0k highmem) [0.00] NR_IRQS:256 [0.00] CPU Clock: 600MHz [0.00] Calibrating delay loop... 397.82 BogoMIPS (lpj=795648) [0.032000] pid_max: default: 32768 minimum: 301 [0.032000] Mount-cache hash table entries: 512 [0.036000] pinctrl core: initialized pinctrl subsystem [0.04] NET: Registered protocol family 16 [0.044000] dma-xway 1e104100.dma: Init done - hw rev: 6, ports: 5, channels: 20 [0.048000] dma-xway 1e104100.dma: init done [0.052000] pinctrl-xway 1e100b10.pinmux: Init done [0.056000] gptu-xway 1e100a00.gptu: gptu: 6 timers loaded [0.06] Data bus error, epc == 80262008, ra == 80261fcc [0.06] Oops[#1]: [0.06] Cpu 0 [0.06] $ 0 : 0067 be105400 feff [0.06] $ 4 : 80295a20 83829ce4 0007 [0.06] $ 8 : 0020 0003 0008 ff80 [0.06] $12 : 03bd ac00 6400 [0.06] $16 : 83857788 8033 83857780 8033 [0.06] $20 : 81000c0c 8033 8033 8033 [0.06] $24 : 0018 8000364c [0.06] $28 : 83828000 83829d60 802b321c 80261fcc [0.06] Hi: [0.06] Lo: [0.06] epc : 80262008 0x80262008 [0.06] Not tainted [0.06] ra: 80261fcc 0x80261fcc [0.06] Status: 1100fc03KERNEL EXL IE [0.06] Cause : 1080001c [0.06] PrId : 0001954c (MIPS 34Kc) [0.06] Modules linked in: [0.06] Process swapper (pid: 1, threadinfo=83828000, task=83827928, tls=) [0.06] Stack : 83857790 ffed 802bc680 802ce634 0016 83857788 8033 802ce634 ffed 802bc680 802ce634 0016 802d3210 8016e730 83857788 802ce634 802ce634 8017009c 834015e0 838577bc 83857788 802ce634 802ce634 8030 8016e908 802ce634 8016ca1c 8385d480 802ce634 8016e89c 8016cd18 83860288 802cc0a0 8016c99c 838254cc 8385db30 ... [0.06] Call Trace:[802d3210] 0x802d3210 [0.06] [8016e730] 0x8016e730 [0.06] [8017009c] 0x8017009c [0.06] [8016e908] 0x8016e908 [0.06] [8016ca1c] 0x8016ca1c [0.06] [8016e89c] 0x8016e89c [0.06] [8016cd18] 0x8016cd18 [0.06] [8016c99c] 0x8016c99c [0.06] [8016dcc0] 0x8016dcc0 [0.06] [80106ba0] 0x80106ba0 [0.06] [802e5314] 0x802e5314 [0.06] [8016ecb0] 0x8016ecb0 [0.06] [802d3210] 0x802d3210 [0.06] [80106cf8] 0x80106cf8 [0.06] [802e5314] 0x802e5314 [0.06] [802e532c] 0x802e532c [0.06] [80002900] 0x80002900 [0.06] [802d3a44] 0x802d3a44 [0.06] [802d3210] 0x802d3210 [0.06] [800064a0] 0x800064a0 [0.06] [802d3908] 0x802d3908 [0.06] [80006490] 0x80006490 [0.06] [0.06] Code: 8c440030 3c03feff 3463 00831824 ac430030 000f 8e63f6a0 8e22f6a4 3c058029 [0.064000] ---[ end trace 139ce121c98e96c9 ]--- [0.064000] Kernel panic - not syncing: Attempted to kill init! exitcode=0x000b [0.064000] Does somebody have an idea what I did wrong? It's no problem for me to test, I have serial console ;-) AFAIK 3.6 kernel
Re: [OpenWrt-Devel] Buffalo wbmr/lantiq kernel panik
Hi, there is no support for wbmr 3.6 yet. owrt does not even build an image for wbmr when selecting 3.6. so you must have tried to boot a random image on the wbmr John ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Buffalo wbmr/lantiq kernel panik
Hi, I did that on purpose. I'm not happy with the 3.3, so I gave it a try ... André -Original Message- From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] On Behalf Of John Crispin Sent: Friday, November 09, 2012 7:20 PM To: openwrt-devel@lists.openwrt.org Subject: Re: [OpenWrt-Devel] Buffalo wbmr/lantiq kernel panik Hi, there is no support for wbmr 3.6 yet. owrt does not even build an image for wbmr when selecting 3.6. so you must have tried to boot a random image on the wbmr John ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel Mit freundlichen Grüßen, André Valentin Systemadministrator -- Internet * Netzwerk * Mobile Daten Citrix Silver Solution Advisor MarcanT GmbH, Ravensberger Str. 10 G, D - 33602 Bielefeld Fon: +49 (521) 95945-0 | Fax -18 URL: http://www.marcant.net | http://www.global-m2m.com Geschäftsführer: Thorsten Hojas Handelsregister: AG Bielefeld, HRB 35827 USt-ID Nr.: DE 190203238 ___ CONFIDENTIALITY NOTICE The contents of this email are confidential to the ordinary user of the email address to which it was addressed and may also be privileged. If you are not the addressee of this email you may not copy, forward, disclose or otherwise use it or any part of it in any form whatsoever. If you have received this email in error please email the sender by replying to this message. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Buffalo wbmr/lantiq kernel panik
Hi, I'll do that and keep you informed. Thanks, André -Original Message- On Behalf Of Luka Perkov Hi André, AFAIK 3.6 kernel for lantiq is still a work in progres. Please recompile the image with symbol table information included. In make menuconfig: Global build settings Compile the kernel with symbol table information Mit freundlichen Grüßen, André Valentin Systemadministrator -- Internet * Netzwerk * Mobile Daten Citrix Silver Solution Advisor MarcanT GmbH, Ravensberger Str. 10 G, D - 33602 Bielefeld Fon: +49 (521) 95945-0 | Fax -18 URL: http://www.marcant.net | http://www.global-m2m.com Geschäftsführer: Thorsten Hojas Handelsregister: AG Bielefeld, HRB 35827 USt-ID Nr.: DE 190203238 ___ CONFIDENTIALITY NOTICE The contents of this email are confidential to the ordinary user of the email address to which it was addressed and may also be privileged. If you are not the addressee of this email you may not copy, forward, disclose or otherwise use it or any part of it in any form whatsoever. If you have received this email in error please email the sender by replying to this message. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Buffalo wbmr/lantiq kernel panik
On 09/11/12 20:45, André Valentin wrote: Hi, I did that on purpose. I'm not happy with the 3.3, so I gave it a try ... André 3.3 in general or the wbmr support ? ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Buffalo wbmr/lantiq kernel panik
Hi, both;-) I need qmi-wwan support for better 3G and 4G support, also I want the ip_vti tunnel interface. I also noticed some problems with the internal switch (i.e. hangs system isn't reachable anymore) . Another problem ist the dwc_otg. Using USB often results in kernel panic:-( André -Original Message- From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] On Behalf Of John Crispin Sent: Friday, November 09, 2012 8:46 PM To: OpenWrt Development List Subject: Re: [OpenWrt-Devel] Buffalo wbmr/lantiq kernel panik On 09/11/12 20:45, André Valentin wrote: Hi, I did that on purpose. I'm not happy with the 3.3, so I gave it a try ... André 3.3 in general or the wbmr support ? ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel Mit freundlichen Grüßen, André Valentin Systemadministrator -- Internet * Netzwerk * Mobile Daten Citrix Silver Solution Advisor MarcanT GmbH, Ravensberger Str. 10 G, D - 33602 Bielefeld Fon: +49 (521) 95945-0 | Fax -18 URL: http://www.marcant.net | http://www.global-m2m.com Geschäftsführer: Thorsten Hojas Handelsregister: AG Bielefeld, HRB 35827 USt-ID Nr.: DE 190203238 ___ CONFIDENTIALITY NOTICE The contents of this email are confidential to the ordinary user of the email address to which it was addressed and may also be privileged. If you are not the addressee of this email you may not copy, forward, disclose or otherwise use it or any part of it in any form whatsoever. If you have received this email in error please email the sender by replying to this message. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Buffalo wbmr/lantiq kernel panik
Hi Lika, after compiling it with symbols enabled it looks even worse: Starting kernel ... [0.00] Linux version 3.6.6 (avalentin@varus) (gcc version 4.6.4 20121001 (prerelease) (Linaro GCC 4.6-2012.10) ) #1 Fri Nov 9 20:54:50 CET 2012 [0.00] SoC: AR9 rev 1.2 [0.00] bootconsole [early0] enabled [0.00] CPU revision is: 0001954c (MIPS 34Kc) [0.00] DTB has bad magic, ignoring builtin OF DTB [0.00] Determined physical RAM map: [0.00] memory: 0002a000 @ 00303000 (usable after init) [0.00] Kernel panic - not syncing: Failed to load core nodess from devicetree [0.00] Rebooting in 1 seconds.. Perhaps I should wait for better support... Or could help somehow ? André ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] cns3xxx: clean up pcie patches
Thanks, merged it in r34132.
Imre
On Fri, 09 Nov 2012 00:46:46 +0100, Tim Harvey thar...@gateworks.com wrote:
Combine two pcie patches (2nd patch undid the 1st patch) together
and refresh the other affected patches
Signed-off-by: Tim Harvey thar...@gateworks.com
---
.../patches-3.3/055-cns3xxx_pci_iospace_init.patch | 76
.../cns3xxx/patches-3.3/104-cns3xxx_gpio.patch |4 +-
.../cns3xxx/patches-3.3/300-laguna_support.patch |4 +-
.../linux/cns3xxx/patches-3.3/470-gpio_irq.patch |5 +-
.../patches-3.3/480-cns3xxx_pcie_early_init.patch | 58 ++--
5 files changed, 28 insertions(+), 119 deletions(-)
delete mode 100644
target/linux/cns3xxx/patches-3.3/055-cns3xxx_pci_iospace_init.patch
diff --git
a/target/linux/cns3xxx/patches-3.3/055-cns3xxx_pci_iospace_init.patch
b/target/linux/cns3xxx/patches-3.3/055-cns3xxx_pci_iospace_init.patch
deleted file mode 100644
index e70ef96..000
--- a/target/linux/cns3xxx/patches-3.3/055-cns3xxx_pci_iospace_init.patch
+++ /dev/null
@@ -1,76 +0,0 @@
a/arch/arm/mach-cns3xxx/cns3420vb.c
-+++ b/arch/arm/mach-cns3xxx/cns3420vb.c
-@@ -32,6 +32,7 @@
- #include asm/mach/time.h
- #include mach/cns3xxx.h
- #include mach/irqs.h
-+#include mach/platform.h
- #include core.h
- #include devices.h
-
-@@ -199,6 +200,8 @@ static void __init cns3420_init(void)
- cns3xxx_ahci_init();
- cns3xxx_sdhci_init();
-
-+ cns3xxx_pcie_init(0x3);
-+
- pm_power_off = cns3xxx_power_off;
- }
-
a/arch/arm/mach-cns3xxx/core.h
-+++ b/arch/arm/mach-cns3xxx/core.h
-@@ -12,6 +12,8 @@
- #define __CNS3XXX_CORE_H
-
- extern struct sys_timer cns3xxx_timer;
-+extern int cns3xxx_pcie_init(u8 bitmap);
-+extern void cns3xxx_pcie_iotable_init(u8 bitmap);
-
- #ifdef CONFIG_CACHE_L2X0
- void __init cns3xxx_l2x0_init(void);
a/arch/arm/mach-cns3xxx/pcie.c
-+++ b/arch/arm/mach-cns3xxx/pcie.c
-@@ -365,7 +365,23 @@ static int cns3xxx_pcie_abort_handler(un
- return 0;
- }
-
--static int __init cns3xxx_pcie_init(void)
-+void __init cns3xxx_pcie_iotable_init(u8 bitmap)
-+{
-+ static int _iotable_init = 0;
-+ int i;
-+
-+ bitmap = ~_iotable_init;
-+ for (i = 0; i ARRAY_SIZE(cns3xxx_pcie); i++) {
-+ if (!(bitmap (1 i)))
-+ continue;
-+
-+ iotable_init(cns3xxx_pcie[i].cfg_bases,
-+ ARRAY_SIZE(cns3xxx_pcie[i].cfg_bases));
-+ }
-+ _iotable_init |= bitmap;
-+}
-+
-+int __init cns3xxx_pcie_init(u8 bitmap)
- {
- int i;
-
-@@ -375,9 +391,11 @@ static int __init cns3xxx_pcie_init(void
- hook_fault_code(16 + 6, cns3xxx_pcie_abort_handler, SIGBUS, 0,
- imprecise external abort);
-
-+ cns3xxx_pcie_iotable_init(bitmap);
- for (i = 0; i ARRAY_SIZE(cns3xxx_pcie); i++) {
-- iotable_init(cns3xxx_pcie[i].cfg_bases,
-- ARRAY_SIZE(cns3xxx_pcie[i].cfg_bases));
-+ if (!(bitmap (1 i)))
-+ continue;
-+
- cns3xxx_pcie_check_link(cns3xxx_pcie[i]);
- cns3xxx_pcie_hw_init(cns3xxx_pcie[i]);
- pci_common_init(cns3xxx_pcie[i].hw_pci);
-@@ -387,4 +405,3 @@ static int __init cns3xxx_pcie_init(void
-
- return 0;
- }
--device_initcall(cns3xxx_pcie_init);
diff --git a/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch
b/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch
index bda0222..1f0d444 100644
--- a/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch
+++ b/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/mach-cns3xxx/cns3420vb.c
+++ b/arch/arm/mach-cns3xxx/cns3420vb.c
-@@ -216,7 +216,7 @@ static struct map_desc cns3420_io_desc[]
+@@ -213,7 +213,7 @@ static struct map_desc cns3420_io_desc[]
static void __init cns3420_map_io(void)
{
@@ -96,7 +96,7 @@
/* used by entry-macro.S */
--- a/arch/arm/mach-cns3xxx/core.h
+++ b/arch/arm/mach-cns3xxx/core.h
-@@ -21,7 +21,7 @@ void __init cns3xxx_l2x0_init(void);
+@@ -19,7 +19,7 @@ void __init cns3xxx_l2x0_init(void);
static inline void cns3xxx_l2x0_init(void) {}
#endif /* CONFIG_CACHE_L2X0 */
diff --git a/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch
b/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch
index e73d7bd..6fa474c 100644
--- a/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch
+++ b/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch
@@ -1,11 +1,13 @@
--- a/arch/arm/mach-cns3xxx/Kconfig
+++ b/arch/arm/mach-cns3xxx/Kconfig
-@@ -10,4 +10,12 @@ config MACH_CNS3420VB
+@@ -11,4 +11,14 @@ config MACH_CNS3420VB
This is a platform with an on-board ARM11 MPCore and has support
for USB, USB-OTG, MMC/SD/SDIO, SATA, PCI-E, etc.
+config MACH_GW2388
+ bool Support for Gateworks Laguna Platform
++ select HAVE_ARM_SCU if SMP
++ select MIGHT_HAVE_PCI
+ help
+Include support for the Gateworks Laguna
[OpenWrt-Devel] Build issue with r34113
I'm sure it's something I'm doing wrong, I just can't figure out what. I've actually had this problem for a bit and just haven't had time to try to troubleshoot it. Given that nobody else seems to be having the problem, I'm sure I'm just missing some change that my build scripts aren't accounting for. When I do make world, I get the following series of messages: --- snip --- make[6]: Entering directory `/home/jhenderson/Downloads/openwrt/build_dir/target-mips_r2_uClibc-0.9.33.2/collectd-4.10.7/bindings' cd perl /usr/bin/perl Makefile.PL PREFIX=/usr Only one of PREFIX or INSTALL_BASE can be given. Not both. make[6]: *** [perl/Makefile] Error 2 make[6]: Leaving directory `/home/jhenderson/Downloads/openwrt/build_dir/target-mips_r2_uClibc-0.9.33.2/collectd-4.10.7/bindings' make[5]: *** [all-recursive] Error 1 make[5]: Leaving directory `/home/jhenderson/Downloads/openwrt/build_dir/target-mips_r2_uClibc-0.9.33.2/collectd-4.10.7/bindings' make[4]: *** [all-recursive] Error 1 make[4]: Leaving directory `/home/jhenderson/Downloads/openwrt/build_dir/target-mips_r2_uClibc-0.9.33.2/collectd-4.10.7' make[3]: *** [/home/jhenderson/Downloads/openwrt/build_dir/target-mips_r2_uClibc-0.9.33.2/collectd-4.10.7/.built] Error 2 make[3]: Leaving directory `/home/jhenderson/Downloads/openwrt/feeds/packages/utils/collectd' make[2]: *** [package/feeds/packages/collectd/compile] Error 2 make[2]: Leaving directory `/home/jhenderson/Downloads/openwrt' make[1]: *** [/home/jhenderson/Downloads/openwrt/staging_dir/target-mips_r2_uClibc-0.9.33.2/stamp/.package_compile] Error 2 make[1]: Leaving directory `/home/jhenderson/Downloads/openwrt' make: *** [world] Error 2 --- snip --- It seems the PREFIX/INSTALL_BASE message on the third line above is what's causing my issue. Looking at the makefiles, though, I can't see where it's picking up either value from. Can someone point me in the right direction to fix this? Thanks, Jim -- Jim Henderson Please keep on-topic replies on the list so everyone benefits ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/7] [package] mac80211: Make debugging wireless issues with hostapd a little easier
---
package/mac80211/files/lib/wifi/mac80211.sh | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh
b/package/mac80211/files/lib/wifi/mac80211.sh
index 4bf035e..4ecb419 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -432,7 +432,15 @@ enable_mac80211() {
done
[ -n $start_hostapd ] {
- hostapd -P /var/run/wifi-$phy.pid -B /var/run/hostapd-$phy.conf
|| {
+{
+if [ -n $debug_hostapd ]; then
+echo Debug mode ...
+hostapd -d -P /var/run/wifi-$phy.pid
/var/run/hostapd-$phy.conf
+else
+echo Normal mode ...
+hostapd -P /var/run/wifi-$phy.pid -B
/var/run/hostapd-$phy.conf
+fi
+} || {
echo Failed to start hostapd for $phy
return
}
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/7] [package] mac80211: Default second radio to 5g if it does 5g and is US or CA regulatory domain
---
package/mac80211/files/lib/wifi/mac80211.sh |6 ++
1 file changed, 6 insertions(+)
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh
b/package/mac80211/files/lib/wifi/mac80211.sh
index 4ecb419..ad5845b 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -611,6 +611,12 @@ detect_mac80211() {
dev_id=option macaddr $(cat
/sys/class/ieee80211/${dev}/macaddress)
fi
+ if [ $mode_band = g ]; then
+ ( iw reg get | grep -q US: || iw reg get | grep -q CA:
) {
+ iw phy $dev info | grep -q '5180 MHz' {
mode_band=a; channel=36 ; }
+ }
+ fi
+
cat EOF
config wifi-device radio$devidx
option type mac80211
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 3/7] [package] mac80211: Use PCS wifi mac address logic for PCS devices
---
package/mac80211/files/lib/wifi/mac80211.sh | 38 ---
1 file changed, 34 insertions(+), 4 deletions(-)
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh
b/package/mac80211/files/lib/wifi/mac80211.sh
index ad5845b..873332d 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -295,15 +295,37 @@ get_freq() {
mac80211_generate_mac() {
local off=$1
local mac=$2
+ local radio=$3
local oIFS=$IFS; IFS=:; set -- $mac; IFS=$oIFS
- local b2mask=0x00
- [ $off -gt 0 ] b2mask=0x02
- printf %02x:%s:%s:%s:%02x:%02x \
+ # For cr5000 and cap324 the manufacturer has reserved
+# MAC addresses such that wifi vifs get unique addresses
+ # with their OUI. The models are not necessarily able
+# to be determined by anything other than a file in the
+# firmware (i.e. the board definitions sometimes are
+ # shared with other users of the same basic device, therefore
+ # we use a special file to determine if it's an applicable device).
+
+ if [ -s /usr/cloud/model ]; then
+ case model in $(cat /usr/cloud/model)
+ cr5000 | cap324 )
+ printf %s:%s:%s:%02x:%s:%s\n \
+ $1 $2 $3 \
+ $(( ( 0x$4 0xf0 ) | $off )) \
+ $5 $6
+
+ ;;
+ esac
+else
+ local b2mask=0x00
+ [ $off -gt 0 ] b2mask=0x02
+
+ printf %02x:%s:%s:%s:%02x:%02x \
$(( 0x$1 | $b2mask )) $2 $3 $4 \
$(( (0x$5 + ($off / 0x100)) % 0x100 )) \
$(( (0x$6 + $off) % 0x100 ))
+ fi
}
enable_mac80211() {
@@ -398,7 +420,15 @@ enable_mac80211() {
config_get macaddr $device macaddr
config_get vif_mac $vif macaddr
[ -n $vif_mac ] || {
- vif_mac=$(mac80211_generate_mac $macidx $macaddr)
+ if [ -s /usr/cloud/model ]; then
+ case model in $(cat /usr/cloud/model)
+ cr5000 | cap324 )
+ vif_mac=$(mac80211_generate_mac
$macidx${device#radio} $macaddr)
+ ;;
+ esac
+ else
+ vif_mac=$(mac80211_generate_mac $macidx
$macaddr)
+ fi
macidx=$(($macidx + 1))
}
[ $mode = ap ] || ifconfig $ifname hw ether $vif_mac
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 6/7] [failsafe] Allow to disable failsafe
---
package/base-files/Makefile|1 +
.../base-files/files/lib/preinit/30_failsafe_wait | 10 ++
package/base-files/image-config.in | 13 ++---
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 61a109c..95444df 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -64,6 +64,7 @@ define ImageConfigOptions
echo 'pi_init_env=$(if
$(CONFIG_TARGET_INIT_ENV),$(CONFIG_TARGET_INIT_ENV),)'
$(1)/lib/preinit/00_preinit.conf
echo 'pi_init_cmd=$(if
$(CONFIG_TARGET_INIT_CMD),$(CONFIG_TARGET_INIT_CMD),/sbin/init)'
$(1)/lib/preinit/00_preinit.conf
echo 'pi_init_suppress_stderr=$(CONFIG_TARGET_INIT_SUPPRESS_STDERR)'
$(1)/lib/preinit/00_preinit.conf
+ echo 'pi_disable_failsafe=$(CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE)'
$(1)/lib/preinit/00_preinit.conf
echo 'pi_no_network=$(CONFIG_TARGET_PREINIT_NO_NETWORK)'
$(1)/lib/preinit/00_preinit.conf
echo 'pi_ifname=$(if
$(CONFIG_TARGET_PREINIT_IFNAME),$(CONFIG_TARGET_PREINIT_IFNAME),)'
$(1)/lib/preinit/00_preinit.conf
echo 'pi_ip=$(if
$(CONFIG_TARGET_PREINIT_IP),$(CONFIG_TARGET_PREINIT_IP),192.168.1.1)'
$(1)/lib/preinit/00_preinit.conf
diff --git a/package/base-files/files/lib/preinit/30_failsafe_wait
b/package/base-files/files/lib/preinit/30_failsafe_wait
index 04dc57d..2275209 100644
--- a/package/base-files/files/lib/preinit/30_failsafe_wait
+++ b/package/base-files/files/lib/preinit/30_failsafe_wait
@@ -75,10 +75,12 @@ fs_wait_for_key () {
failsafe_wait() {
FAILSAFE=
-pi_failsafe_net_message=true
-preinit_net_echo Please press button now to enter failsafe
-pi_failsafe_net_message=false
-fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout
FAILSAFE=true export FAILSAFE
+if [ $pi_disable_failsafe != y ]; then
+ pi_failsafe_net_message=true
+ preinit_net_echo Please press button now to enter failsafe
+ pi_failsafe_net_message=false
+ fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout
FAILSAFE=true export FAILSAFE
+fi
}
boot_hook_add preinit_main failsafe_wait
diff --git a/package/base-files/image-config.in
b/package/base-files/image-config.in
index 021700a..478e895 100644
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -32,6 +32,14 @@ config TARGET_PREINIT_TIMEOUT
How long to wait for failsafe mode to be entered before
continuing with a regular boot if failsafe not selected.
+config TARGET_PREINIT_DISABLE_FAILSAFE
+ bool
+ prompt Disable failsafe mode if PREINITOPT
+ default n
+ help
+ Remove failsafe mode altogether (that is don't emit failsafe
message, and
+ don't have option to enter failsafe mode, ever)
+
config TARGET_PREINIT_NO_NETWORK
bool
prompt Drop networking from preinit if PREINITOPT
@@ -53,9 +61,8 @@ config TARGET_PREINIT_SHOW_NETMSG
config TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG
bool
- prompt Suppress network message indicating failsafe if PREINITOPT
- default n if !TARGET_PREINIT_NO_NETWORK
- default y if TARGET_PREINIT_NO_NETWORK
+ prompt Suppress network message indicating failsafe if PREINITOPT
!TARGET_PREINIT_NO_NETWORK !TARGET_PREINIT_DISABLE_FAILSAFE
+ default n
help
If Show all preinit network messages above is not set, then
setting this option suppresses the only message that would be
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 5/7] [preinit] Allow disabling preinit networking
This is useful when using vlans as otherwise on boot there is cross-vlan leakage
---
package/base-files/Makefile|1 +
.../files/lib/preinit/10_indicate_preinit | 39 +++-
package/base-files/image-config.in | 15 +++-
3 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 27ce051..61a109c 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -64,6 +64,7 @@ define ImageConfigOptions
echo 'pi_init_env=$(if
$(CONFIG_TARGET_INIT_ENV),$(CONFIG_TARGET_INIT_ENV),)'
$(1)/lib/preinit/00_preinit.conf
echo 'pi_init_cmd=$(if
$(CONFIG_TARGET_INIT_CMD),$(CONFIG_TARGET_INIT_CMD),/sbin/init)'
$(1)/lib/preinit/00_preinit.conf
echo 'pi_init_suppress_stderr=$(CONFIG_TARGET_INIT_SUPPRESS_STDERR)'
$(1)/lib/preinit/00_preinit.conf
+ echo 'pi_no_network=$(CONFIG_TARGET_PREINIT_NO_NETWORK)'
$(1)/lib/preinit/00_preinit.conf
echo 'pi_ifname=$(if
$(CONFIG_TARGET_PREINIT_IFNAME),$(CONFIG_TARGET_PREINIT_IFNAME),)'
$(1)/lib/preinit/00_preinit.conf
echo 'pi_ip=$(if
$(CONFIG_TARGET_PREINIT_IP),$(CONFIG_TARGET_PREINIT_IP),192.168.1.1)'
$(1)/lib/preinit/00_preinit.conf
echo 'pi_netmask=$(if
$(CONFIG_TARGET_PREINIT_NETMASK),$(CONFIG_TARGET_PREINIT_NETMASK),255.255.255.0)'
$(1)/lib/preinit/00_preinit.conf
diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit
b/package/base-files/files/lib/preinit/10_indicate_preinit
index ab69305..84af50c 100644
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -3,37 +3,42 @@
# Copyright (C) 2010 Vertical Communications
preinit_ip() {
-# if the preinit interface isn't specified and ifname is set in
-# preinit.arch use that interface
-if [ -z $pi_ifname ]; then
- pi_ifname=$ifname
-fi
-
-[ -n $pi_ifname ] grep -q $pi_ifname /proc/net/dev {
- ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast
up
-}
+if [ $pi_no_network != y ]; then
+ # if the preinit interface isn't specified and ifname is set in
+ # preinit.arch use that interface
+ if [ -z $pi_ifname ]; then
+ pi_ifname=$ifname
+ fi
+
+ [ -n $pi_ifname ] grep -q $pi_ifname /proc/net/dev {
+ ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast
$pi_broadcast up
+ }
+ fi
}
preinit_ip_deconfig() {
-[ -n $pi_ifname ] grep -q $pi_ifname /proc/net/dev {
- ifconfig $pi_ifname 0.0.0.0 down
-}
+if [ $pi_no_network != y ]; then
+ [ -n $pi_ifname ] grep -q $pi_ifname /proc/net/dev {
+ ifconfig $pi_ifname 0.0.0.0 down
+ }
+fi
}
preinit_net_echo() {
+if [ $pi_no_network != y ]; then
[ -n $pi_ifname ] grep -q $pi_ifname /proc/net/dev {
- {
[ $pi_preinit_net_messages = y ] || {
[ $pi_failsafe_net_message = true ]
[ $pi_preinit_no_failsafe_netmsg != y ]
}
-
- } netmsg $pi_broadcast $1
- }
+ } netmsg $pi_broadcast $1
+ fi
}
preinit_echo() {
-preinit_net_echo $1
+if [ $pi_no_network != y ]; then
+ preinit_net_echo $1
+fi
echo $1
}
diff --git a/package/base-files/image-config.in
b/package/base-files/image-config.in
index ac08c8d..021700a 100644
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -32,10 +32,18 @@ config TARGET_PREINIT_TIMEOUT
How long to wait for failsafe mode to be entered before
continuing with a regular boot if failsafe not selected.
+config TARGET_PREINIT_NO_NETWORK
+ bool
+ prompt Drop networking from preinit if PREINITOPT
+ default n
+ help
+ Disable preinit (and failsafe) networking completely
+
config TARGET_PREINIT_SHOW_NETMSG
bool
prompt Show all preinit network messages if PREINITOPT
default n
+ depends !TARGET_PREINIT_NO_NETWORK
help
Show preinit all network messages (via netmsg broadcast), not
only
the message indicating to press reset to enter failsafe. Note
that
@@ -46,7 +54,8 @@ config TARGET_PREINIT_SHOW_NETMSG
config TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG
bool
prompt Suppress network message indicating failsafe if PREINITOPT
- default n
+ default n if !TARGET_PREINIT_NO_NETWORK
+ default y if TARGET_PREINIT_NO_NETWORK
help
If Show all preinit network messages above is not set, then
setting this option suppresses the only message that would be
@@ -57,6 +66,7 @@ config TARGET_PREINIT_IFNAME
string
prompt
[OpenWrt-Devel] [PATCH 7/7] [package] uci: Alternate dir for uci_get and friends
---
package/uci/files/lib/config/uci.sh |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/uci/files/lib/config/uci.sh
b/package/uci/files/lib/config/uci.sh
index db84c83..0002917 100644
--- a/package/uci/files/lib/config/uci.sh
+++ b/package/uci/files/lib/config/uci.sh
@@ -36,8 +36,9 @@ uci_load() {
export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0
export ${NO_EXPORT:+-n} CONFIG_SECTION=
fi
-
- DATA=$(/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR}
${LOAD_STATE:+-P /var/state} -S -n export $PACKAGE 2/dev/null)
+
+ LOAD_STATE_DIR=${LOAD_STATE_DIR:-/var/state}
+ DATA=$(/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR}
${LOAD_STATE:+-P $LOAD_STATE_DIR} -S -n export $PACKAGE 2/dev/null)
RET=$?
[ $RET != 0 -o -z $DATA ] || eval $DATA
unset DATA
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Various patches from PCS
Greetings, PowerCloud Systems wishes to offer a series of patches for you to consider. The email series associated with this message are patches we think might be of interest to OpenWrt, though some more than others. This patch series includes various useful things like disabling preinit networking, wifi SSID MAC address logic for PCS hardware, and so on. [PATCH 1/7] [package] mac80211: Make debugging wireless issues with [PATCH 2/7] [package] mac80211: Default second radio to 5g if it [PATCH 3/7] [package] mac80211: Use PCS wifi mac address logic for [PATCH 5/7] [preinit] Allow disabling preinit networking [PATCH 6/7] [failsafe] Allow to disable failsafe [PATCH 7/7] [package] uci: Alternate dir for uci_get and friends Regards, Daniel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/5] ubdev01 + dlrtdev01: Add support for old PCS devices
Signed-off-by: Daniel Dickinson dan...@powercloudsystems.com --- target/linux/ar71xx/generic/profiles/pcs.mk | 29 + target/linux/ar71xx/image/Makefile | 45 +++ 2 files changed, 74 insertions(+) create mode 100644 target/linux/ar71xx/generic/profiles/pcs.mk diff --git a/target/linux/ar71xx/generic/profiles/pcs.mk b/target/linux/ar71xx/generic/profiles/pcs.mk new file mode 100644 index 000..eaf9699 --- /dev/null +++ b/target/linux/ar71xx/generic/profiles/pcs.mk @@ -0,0 +1,29 @@ +# +# Copyright (C) 2009 OpenWrt.org +# Copyright (C) 2012 PowerCloud Systems +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/UBDEV01 + NAME:=PCS ubdev01 model + PACKAGES:= +endef + +define Profile/UBDEV01/Description + Package set optimized for the PCS ubdev01 +endef + +$(eval $(call Profile,UBDEV01)) + +define Profile/DLRTDEV01 + NAME:=PCS dlrtdev01 model + PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev +endef + +define Profile/DLRTDEV01/Description + Package set optimized for the PCS dlrtdev01 +endef + +$(eval $(call Profile,DLRTDEV01)) diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 31ba806..2bf66cb 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -174,9 +174,12 @@ db120_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6336k(rootfs),1 dir825b1_mtdlayout=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,1024k(kernel),5184k(rootfs),64k(caldata)ro,1600k(unknown)ro,6208k@0x5(firmware),64k@0x7f(caldata_copy) dir825b1_mtdlayout_fat=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,1024k(kernel),6784k(rootfs),64k(caldata)ro,7808k@0x5(firmware),64k@0x66(caldata_orig),6208k@0x5(firmware_orig) ew-dorin_mtdlayout_4M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env),1024k(kernel),2688k(rootfs),64k(art),3712k@0x5(firmware) +dlrtdev_mtdlayout=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,1024k(kernel),5184k(rootfs),64k(caldata)ro,640k(certs),960k(unknown)ro,6208k@0x5(firmware),64k@0x7f(caldata_copy) +dlrtdev_mtdlayout_fat=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,1024k(kernel),6544k(rootfs),640k(certs),64k(caldata)ro,7168k@0x5(firmware),64k@0x66(caldata_orig),6208k@0x5(firmware_orig) pb92_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,2752k(rootfs),896k(kernel),64k(nvram),64k(art)ro,3648k@0x5(firmware) planex_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,960k(kernel),6784k(rootfs),128k(art)ro,7744k@0x5(firmware) ubntxm_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1024k(kernel),6528k(rootfs),256k(cfg)ro,64k(EEPROM)ro,7552k@0x5(firmware) +ubdev_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1024k(kernel),6464k(rootfs),64k(certs),256k(cfg)ro,64k(EEPROM)ro,7488k@0x5(firmware) whrhpg300n_mtdlayout=mtdparts=spi0.0:248k(u-boot)ro,8k(u-boot-env)ro,960k(kernel),2816k(rootfs),64k(art)ro,3712k@0x4(firmware) wndr3700_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),6656k(rootfs),64k(art)ro,7680k@0x7(firmware) wndr3700v2_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),14848k(rootfs),64k(art)ro,15872k@0x7(firmware) @@ -229,6 +232,34 @@ define Image/Build/DIR825B1 fi endef +define Image/Build/DLRTDEV + $(call MkuImageLzma,$(2),$(3) $(dlrtdev_mtdlayout)) + $(call Sysupgrade/KRuImage,$(1),$(2),1048576,5308416) + if [ -e $(call sysupname,$(1),$(2)) ]; then \ + ( \ + dd if=$(call sysupname,$(1),$(2)); \ + echo -n $(4); \ + ) $(call imgname,$(1),$(2))-backup-loader.bin; \ + if [ `stat -c%s $(call sysupname,$(1),$(2))` -gt 4194304 ]; then \ + echo Warning: $(call sysupname,$(1),$(2)) is too big; \ + else \ + ( \ + dd if=$(call sysupname,$(1),$(2)) bs=4096k conv=sync; \ + echo -n $(5); \ + ) $(call factoryname,$(1),$(2)); \ + fi; \ + fi + $(call MkuImageLzma,$(2)-fat,$(3) $(dlrtdev_mtdlayout_fat)) + $(call CatFiles,$(KDIR_TMP)/vmlinux-$(2)-fat.uImage,1048576,$(KDIR)/root.$(1),6946816,$(KDIR_TMP)/$(2)-fat.bin) + if [ -e $(KDIR_TMP)/$(2)-fat.bin ]; then \ + echo -n $(KDIR_TMP)/$(2)-fat.dummy; \ + sh $(TOPDIR)/scripts/combined-image.sh \ + $(KDIR_TMP)/$(2)-fat.bin \ + $(KDIR_TMP)/$(2)-fat.dummy \ + $(call sysupname,$(1),$(2)-fat); \ + fi +endef + define Image/Build/WZRHPG30XNH $(call MkuImageLzma,$(2),$(3)) $(call Sysupgrade/KRuImage,$(1),$(2),1048576,31850496) @@ -377,6 +408,18 @@
[OpenWrt-Devel] [PATCH 4/5] ar93x: Add option to disable JTAG, which blocks a GPIO
Signed-off-by: Daniel Dickinson dan...@powercloudsystems.com
---
.../680-MIPS-ath79-ar93x-allow-disable-jtag.patch | 40
.../680-MIPS-ath79-ar93x-allow-disable-jtag.patch | 40
2 files changed, 80 insertions(+)
create mode 100644
target/linux/ar71xx/patches-3.3/680-MIPS-ath79-ar93x-allow-disable-jtag.patch
create mode 100644
target/linux/ar71xx/patches-3.6/680-MIPS-ath79-ar93x-allow-disable-jtag.patch
diff --git
a/target/linux/ar71xx/patches-3.3/680-MIPS-ath79-ar93x-allow-disable-jtag.patch
b/target/linux/ar71xx/patches-3.3/680-MIPS-ath79-ar93x-allow-disable-jtag.patch
new file mode 100644
index 000..a440031
--- /dev/null
+++
b/target/linux/ar71xx/patches-3.3/680-MIPS-ath79-ar93x-allow-disable-jtag.patch
@@ -0,0 +1,40 @@
+Index: linux-3.3.8/arch/mips/ath79/gpio.c
+===
+--- linux-3.3.8.orig/arch/mips/ath79/gpio.c2012-10-25 23:16:10.214087229
-0400
linux-3.3.8/arch/mips/ath79/gpio.c 2012-10-25 23:26:51.257686927 -0400
+@@ -139,6 +139,22 @@
+ .base = 0,
+ };
+
++void ar934x_gpio_function_enable(u32 mask)
++{
++
++ void __iomem *base = ath79_gpio_base;
++ unsigned long flags;
++
++ spin_lock_irqsave(ath79_gpio_lock, flags);
++
++ __raw_writel(__raw_readl(base + AR934X_GPIO_REG_FUNC) | mask,
++ base + AR934X_GPIO_REG_FUNC);
++ /* flush write */
++ __raw_readl(base + AR934X_GPIO_REG_FUNC);
++
++ spin_unlock_irqrestore(ath79_gpio_lock, flags);
++}
++
+ void ath79_gpio_function_enable(u32 mask)
+ {
+ void __iomem *base = ath79_gpio_base;
+Index: linux-3.3.8/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+===
+--- linux-3.3.8.orig/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
2012-10-25 23:16:10.174088003 -0400
linux-3.3.8/arch/mips/include/asm/mach-ath79/ar71xx_regs.h 2012-10-25
23:26:51.257686927 -0400
+@@ -626,6 +626,8 @@
+ #define AR934X_SRIF_DPLL2_OUTDIV_SHIFT13
+ #define AR934X_SRIF_DPLL2_OUTDIV_MASK 0x7
+
++#define AR934X_GPIO_FUNC_JTAG_DISABLE BIT(1)
++
+ #define AR71XX_GPIO_FUNC_STEREO_ENBIT(17)
+ #define AR71XX_GPIO_FUNC_SLIC_EN BIT(16)
+ #define AR71XX_GPIO_FUNC_SPI_CS2_EN BIT(13)
diff --git
a/target/linux/ar71xx/patches-3.6/680-MIPS-ath79-ar93x-allow-disable-jtag.patch
b/target/linux/ar71xx/patches-3.6/680-MIPS-ath79-ar93x-allow-disable-jtag.patch
new file mode 100644
index 000..cc0956e
--- /dev/null
+++
b/target/linux/ar71xx/patches-3.6/680-MIPS-ath79-ar93x-allow-disable-jtag.patch
@@ -0,0 +1,40 @@
+Index: linux-3.6.5/arch/mips/ath79/gpio.c
+===
+--- linux-3.6.5.orig/arch/mips/ath79/gpio.c2012-11-01 23:56:07.514239441
-0400
linux-3.6.5/arch/mips/ath79/gpio.c 2012-11-01 23:56:15.678091741 -0400
+@@ -139,6 +139,22 @@
+ .base = 0,
+ };
+
++void ar934x_gpio_function_enable(u32 mask)
++{
++
++ void __iomem *base = ath79_gpio_base;
++ unsigned long flags;
++
++ spin_lock_irqsave(ath79_gpio_lock, flags);
++
++ __raw_writel(__raw_readl(base + AR934X_GPIO_REG_FUNC) | mask,
++ base + AR934X_GPIO_REG_FUNC);
++ /* flush write */
++ __raw_readl(base + AR934X_GPIO_REG_FUNC);
++
++ spin_unlock_irqrestore(ath79_gpio_lock, flags);
++}
++
+ void ath79_gpio_function_enable(u32 mask)
+ {
+ void __iomem *base = ath79_gpio_base;
+Index: linux-3.6.5/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+===
+--- linux-3.6.5.orig/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
2012-11-01 23:56:07.486239947 -0400
linux-3.6.5/arch/mips/include/asm/mach-ath79/ar71xx_regs.h 2012-11-01
23:56:15.678091741 -0400
+@@ -627,6 +627,8 @@
+ #define AR934X_SRIF_DPLL2_OUTDIV_SHIFT13
+ #define AR934X_SRIF_DPLL2_OUTDIV_MASK 0x7
+
++#define AR934X_GPIO_FUNC_JTAG_DISABLE BIT(1)
++
+ #define AR71XX_GPIO_FUNC_STEREO_ENBIT(17)
+ #define AR71XX_GPIO_FUNC_SLIC_EN BIT(16)
+ #define AR71XX_GPIO_FUNC_SPI_CS2_EN BIT(13)
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/5] ubnt-unifi-outdoor: Add support for Ubquiti UnifiAP Outdoor (UniFi 2.0 outdoor AP)
Signed-off-by: Daniel Dickinson dan...@powercloudsystems.com
---
.../base-files/etc/defconfig/unifi-outdoor/network | 15 +
target/linux/ar71xx/base-files/lib/ar71xx.sh |3 +
.../ar71xx/base-files/lib/upgrade/platform.sh |3 +-
target/linux/ar71xx/generic/profiles/ubnt.mk | 11
target/linux/ar71xx/image/Makefile |3 +-
.../660-MIPS-ath79-ubnt-xm-add-unifi-outdoor.patch | 68
.../660-MIPS-ath79-ubnt-xm-add-unifi-outdoor.patch | 68
7 files changed, 169 insertions(+), 2 deletions(-)
create mode 100644
target/linux/ar71xx/base-files/etc/defconfig/unifi-outdoor/network
create mode 100644
target/linux/ar71xx/patches-3.3/660-MIPS-ath79-ubnt-xm-add-unifi-outdoor.patch
create mode 100644
target/linux/ar71xx/patches-3.6/660-MIPS-ath79-ubnt-xm-add-unifi-outdoor.patch
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/unifi-outdoor/network
b/target/linux/ar71xx/base-files/etc/defconfig/unifi-outdoor/network
new file mode 100644
index 000..c8f18c2
--- /dev/null
+++ b/target/linux/ar71xx/base-files/etc/defconfig/unifi-outdoor/network
@@ -0,0 +1,15 @@
+# Copyright (C) 2006 OpenWrt.org
+
+config interface loopback
+ option ifname lo
+ option protostatic
+ option ipaddr 127.0.0.1
+ option netmask 255.0.0.0
+
+config interface lan
+ list ifname eth0
+ list ifname eth1
+ option type bridge
+ option protostatic
+ option ipaddr 192.168.1.1
+ option netmask 255.255.255.0
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 430ef8c..7ff43b8 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -387,6 +387,9 @@ ar71xx_board_detect() {
*WLAE-AG300N)
name=wlae-ag300n
;;
+ *UniFiAP Outdoor)
+ name=unifi-outdoor
+ ;;
*WP543)
name=wp543
;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 81535ce..5946cf6 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -126,7 +126,8 @@ platform_check_image() {
whr-hp-gn | \
wlae-ag300n | \
nbg460n_550n_550nh | \
- unifi )
+ unifi | \
+ unifi-outdoor )
[ $magic != 2705 ] {
echo Invalid image type.
return 1
diff --git a/target/linux/ar71xx/generic/profiles/ubnt.mk
b/target/linux/ar71xx/generic/profiles/ubnt.mk
index 668171b..dc26956 100644
--- a/target/linux/ar71xx/generic/profiles/ubnt.mk
+++ b/target/linux/ar71xx/generic/profiles/ubnt.mk
@@ -38,6 +38,17 @@ endef
$(eval $(call Profile,UBNTUNIFI))
+define Profile/UBNTUNIFIOUTDOOR
+ NAME:=Ubiquiti UniFiAP Outdoor
+ PACKAGES:=
+endef
+
+define Profile/UBNTUNIFIOUTDOOR/Description
+ Package set optimized for the Ubiquiti UniFiAP Outdoor.
+endef
+
+$(eval $(call Profile,UBNTUNIFIOUTDOOR))
+
define Profile/UBNT
NAME:=Ubiquiti Products
PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2
diff --git a/target/linux/ar71xx/image/Makefile
b/target/linux/ar71xx/image/Makefile
index 2bf66cb..9678d66 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -885,6 +885,7 @@ $(eval $(call
SingleProfile,UBNTXM,$(fs_64k),UBNTBULLETM,ubnt-bullet-m,UBNT-BM,t
$(eval $(call
SingleProfile,UBNTXM,$(fs_64k),UBNTROCKETM,ubnt-rocket-m,UBNT-RM,ttyS0,115200,XM,XM,ar7240))
$(eval $(call
SingleProfile,UBNTXM,$(fs_64k),UBNTNANOM,ubnt-nano-m,UBNT-NM,ttyS0,115200,XM,XM,ar7240))
$(eval $(call
SingleProfile,UBNTXM,$(fs_64k),UBNTUNIFI,ubnt-unifi,UBNT-UF,ttyS0,115200,XM,XM,ar7240))
+$(eval $(call
SingleProfile,UBNTXM,$(fs_64k),UBNTUNIFIOUTDOOR,ubnt-unifi-outdoor,UBNT-U20,ttyS0,115200,XM,XM,ar7240))
$(eval $(call
SingleProfile,WHRHPG300N,$(fs_64k),WHRG301N,whr-g301n,WHR-G301N,ttyS0,115200,$$(whrhpg300n_mtdlayout),WHR-G301N))
$(eval $(call
SingleProfile,WHRHPG300N,$(fs_64k),WHRHPG300N,whr-hp-g300n,WHR-HP-G300N,ttyS0,115200,$$(whrhpg300n_mtdlayout),WHR-HP-G300N))
@@ -915,7 +916,7 @@ $(eval $(call MultiProfile,TLWR741,TLWR741NV1 TLWR741NV2
TLWR741NV4))
$(eval $(call MultiProfile,TLWR841,TLWR841NV15 TLWR841NV3 TLWR841NV5
TLWR841NV7 TLWR841NV8))
$(eval $(call MultiProfile,TLWR941,TLWR941NV2 TLWR941NV3 TLWR941NV4))
$(eval $(call MultiProfile,TLWDR4300,TLWDR3600V1 TLWDR4300V1 TLWDR4310V1))
-$(eval $(call MultiProfile,UBNT,UBNTAIRROUTER UBNTRS UBNTRSPRO UBNTLSSR71
UBNTBULLETM UBNTROCKETM UBNTNANOM UBNTUNIFI))
+$(eval $(call MultiProfile,UBNT,UBNTAIRROUTER UBNTRS UBNTRSPRO UBNTLSSR71
UBNTBULLETM UBNTROCKETM UBNTNANOM UBNTUNIFI UBNTUNIFIOUTDOOR))
$(eval $(call MultiProfile,WNDR3700,WNDR3700V1 WNDR3700V2
[OpenWrt-Devel] [PATCH 5/5] Add support for three PowerCloud devices
Signed-off-by: Daniel Dickinson dan...@powercloudsystems.com
---
target/linux/ar71xx/base-files/etc/diag.sh |6 +
.../ar71xx/base-files/etc/uci-defaults/network | 11 +
target/linux/ar71xx/base-files/lib/ar71xx.sh |6 +
.../ar71xx/base-files/lib/upgrade/platform.sh |2 +
target/linux/ar71xx/config-3.3 |1 +
target/linux/ar71xx/config-3.6 |1 +
target/linux/ar71xx/generic/profiles/pcs.mk| 32 +++
target/linux/ar71xx/image/Makefile |4 +
.../patches-3.3/690-MIPS-ath79-pcs-cr5000.patch| 278
.../patches-3.3/700-MIPS-ath79-pcs-cap324.patch| 173
.../patches-3.6/690-MIPS-ath79-pcs-cr5000.patch| 278
.../patches-3.6/700-MIPS-ath79-pcs-cap324.patch| 173
12 files changed, 965 insertions(+)
create mode 100644
target/linux/ar71xx/patches-3.3/690-MIPS-ath79-pcs-cr5000.patch
create mode 100644
target/linux/ar71xx/patches-3.3/700-MIPS-ath79-pcs-cap324.patch
create mode 100644
target/linux/ar71xx/patches-3.6/690-MIPS-ath79-pcs-cr5000.patch
create mode 100644
target/linux/ar71xx/patches-3.6/700-MIPS-ath79-pcs-cap324.patch
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
b/target/linux/ar71xx/base-files/etc/diag.sh
index 788b628..abdce8d 100755
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -60,6 +60,12 @@ get_status_led() {
db120)
status_led=db120:green:status
;;
+ cr5000)
+ status_led=cr5000:orange:power
+ ;;
+ cap324)
+ status_led=cap324:orange:power
+ ;;
dir-600-a1 |\
dir-615-e4)
status_led=d-link:green:power
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/network
b/target/linux/ar71xx/base-files/etc/uci-defaults/network
index 105f0e9..bb8ddfe 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/network
@@ -211,6 +211,17 @@ ew-dorin-router)
ucidef_add_switch_vlan eth0 1 0 2 3
;;
+cr5000)
+ ucidef_set_interfaces_lan_wan eth0.1 eth0.2
+ ucidef_add_switch eth0 1 1
+ ucidef_add_switch_vlan eth0 2 0t 5
+ ucidef_add_switch_vlan eth0 1 0t 1 2 3 4
+ ;;
+
+cap324)
+ ucidef_set_interface_lan eth0
+ ;;
+
*)
ucidef_set_interfaces_lan_wan eth0 eth1
;;
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 7ff43b8..65c33fa 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -195,6 +195,12 @@ ar71xx_board_detect() {
*DB120 reference board)
name=db120
;;
+ *CR5000 Cloud Router)
+ name=cr5000
+ ;;
+ *CAP324 Cloud AP)
+ name=cap324
+ ;;
*DIR-600 rev. A1)
name=dir-600-a1
;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 5946cf6..b697001 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -102,6 +102,8 @@ platform_check_image() {
;;
ap81 | \
ap83 | \
+ cr5000 | \
+ cap324 | \
dir-600-a1 | \
dir-615-c1 | \
dir-615-e4 | \
diff --git a/target/linux/ar71xx/config-3.3 b/target/linux/ar71xx/config-3.3
index 45e589e..f8e1bf3 100644
--- a/target/linux/ar71xx/config-3.3
+++ b/target/linux/ar71xx/config-3.3
@@ -47,6 +47,7 @@ CONFIG_ATH79_MACH_OM2P=y
CONFIG_ATH79_MACH_PB42=y
CONFIG_ATH79_MACH_PB44=y
CONFIG_ATH79_MACH_PB92=y
+CONFIG_ATH79_MACH_PCS=y
CONFIG_ATH79_MACH_RB2011=y
CONFIG_ATH79_MACH_RB4XX=y
CONFIG_ATH79_MACH_RB750=y
diff --git a/target/linux/ar71xx/config-3.6 b/target/linux/ar71xx/config-3.6
index 80f0698..ce66024 100644
--- a/target/linux/ar71xx/config-3.6
+++ b/target/linux/ar71xx/config-3.6
@@ -50,6 +50,7 @@ CONFIG_ATH79_MACH_OM2P=y
CONFIG_ATH79_MACH_PB42=y
CONFIG_ATH79_MACH_PB44=y
CONFIG_ATH79_MACH_PB92=y
+CONFIG_ATH79_MACH_PCS=y
CONFIG_ATH79_MACH_RB2011=y
CONFIG_ATH79_MACH_RB4XX=y
CONFIG_ATH79_MACH_RB750=y
diff --git a/target/linux/ar71xx/generic/profiles/pcs.mk
b/target/linux/ar71xx/generic/profiles/pcs.mk
index eaf9699..5b3e260 100644
--- a/target/linux/ar71xx/generic/profiles/pcs.mk
+++ b/target/linux/ar71xx/generic/profiles/pcs.mk
@@ -17,6 +17,17 @@ endef
$(eval $(call Profile,UBDEV01))
+define Profile/UBDEVOD
+ NAME:=PCS ubdevod model
+ PACKAGES:=
+endef
+
+define Profile/UBDEVOD/Description
+ Package set optimized for the PCS ubdevod
+endef
+
+$(eval $(call Profile,UBDEVOD))
+
define Profile/DLRTDEV01
NAME:=PCS dlrtdev01 model
[OpenWrt-Devel] [PATCH 3/5] Allow MAC address to come from platform data and calibration data from PCI-e EEPROM
There is a router that users the MAC address for wireless from the platform data
(which gets it from the flash ART partition) and the calibration data from a
PCI-e
card's EEPROM. Here we add support for this.
Signed-off-by: Daniel Dickinson dan...@powercloudsystems.com
---
...-allow-to-disable-bands-via-platform-data.patch | 33
...k-allow-mac-from-data-caldata-from-eeprom.patch | 81
...-allow-mac-from-pdata-caldata-from-eeprom.patch | 80 +++
...-allow-mac-from-pdata-caldata-from-eeprom.patch | 80 +++
4 files changed, 261 insertions(+), 13 deletions(-)
create mode 100644
package/mac80211/patches/b02-ath9k-allow-mac-from-data-caldata-from-eeprom.patch
create mode 100644
target/linux/ar71xx/patches-3.3/670-MIPS-ath79-allow-mac-from-pdata-caldata-from-eeprom.patch
create mode 100644
target/linux/ar71xx/patches-3.6/670-MIPS-ath79-allow-mac-from-pdata-caldata-from-eeprom.patch
diff --git
a/package/mac80211/patches/b01-ath9k-allow-to-disable-bands-via-platform-data.patch
b/package/mac80211/patches/b01-ath9k-allow-to-disable-bands-via-platform-data.patch
index 0a071ff..b2ea738 100644
---
a/package/mac80211/patches/b01-ath9k-allow-to-disable-bands-via-platform-data.patch
+++
b/package/mac80211/patches/b01-ath9k-allow-to-disable-bands-via-platform-data.patch
@@ -1,18 +1,21 @@
a/include/linux/ath9k_platform.h
-+++ b/include/linux/ath9k_platform.h
-@@ -31,6 +31,9 @@ struct ath9k_platform_data {
+Index: compat-wireless-2012-09-07/include/linux/ath9k_platform.h
+===
+--- compat-wireless-2012-09-07.orig/include/linux/ath9k_platform.h
2012-11-02 01:00:58.0 -0400
compat-wireless-2012-09-07/include/linux/ath9k_platform.h 2012-11-02
01:02:11.866637863 -0400
+@@ -31,6 +31,8 @@
bool endian_check;
bool is_clk_25mhz;
+ bool disable_2ghz;
+ bool disable_5ghz;
-+
int (*get_mac_revision)(void);
int (*external_reset)(void);
a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2413,17 +2413,25 @@ int ath9k_hw_fill_cap_info(struct ath_hw
+Index: compat-wireless-2012-09-07/drivers/net/wireless/ath/ath9k/hw.c
+===
+--- compat-wireless-2012-09-07.orig/drivers/net/wireless/ath/ath9k/hw.c
2012-11-02 01:00:59.063918071 -0400
compat-wireless-2012-09-07/drivers/net/wireless/ath/ath9k/hw.c
2012-11-02 01:00:59.659907593 -0400
+@@ -2413,17 +2413,25 @@
}
eeval = ah-eep_ops-get_eeprom(ah, EEP_OP_MODE);
@@ -46,9 +49,11 @@
if (AR_SREV_9485(ah) || AR_SREV_9285(ah) || AR_SREV_9330(ah))
chip_chainmask = 1;
a/drivers/net/wireless/ath/ath9k/hw.h
-+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -927,6 +927,8 @@ struct ath_hw {
+Index: compat-wireless-2012-09-07/drivers/net/wireless/ath/ath9k/hw.h
+===
+--- compat-wireless-2012-09-07.orig/drivers/net/wireless/ath/ath9k/hw.h
2012-11-02 01:00:59.067917999 -0400
compat-wireless-2012-09-07/drivers/net/wireless/ath/ath9k/hw.h
2012-11-02 01:00:59.663907524 -0400
+@@ -927,6 +927,8 @@
bool is_clk_25mhz;
int (*get_mac_revision)(void);
int (*external_reset)(void);
@@ -57,9 +62,11 @@
};
struct ath_bus_ops {
a/drivers/net/wireless/ath/ath9k/init.c
-+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -537,6 +537,8 @@ static int ath9k_init_softc(u16 devid, s
+Index: compat-wireless-2012-09-07/drivers/net/wireless/ath/ath9k/init.c
+===
+--- compat-wireless-2012-09-07.orig/drivers/net/wireless/ath/ath9k/init.c
2012-11-02 01:00:58.863921587 -0400
compat-wireless-2012-09-07/drivers/net/wireless/ath/ath9k/init.c
2012-11-02 01:00:59.663907524 -0400
+@@ -537,6 +537,8 @@
ah-is_clk_25mhz = pdata-is_clk_25mhz;
ah-get_mac_revision = pdata-get_mac_revision;
ah-external_reset = pdata-external_reset;
diff --git
a/package/mac80211/patches/b02-ath9k-allow-mac-from-data-caldata-from-eeprom.patch
b/package/mac80211/patches/b02-ath9k-allow-mac-from-data-caldata-from-eeprom.patch
new file mode 100644
index 000..6d14366
--- /dev/null
+++
b/package/mac80211/patches/b02-ath9k-allow-mac-from-data-caldata-from-eeprom.patch
@@ -0,0 +1,81 @@
+Index: compat-wireless-2012-09-07/include/linux/ath9k_platform.h
+===
+--- compat-wireless-2012-09-07.orig/include/linux/ath9k_platform.h
2012-11-02 01:02:11.0 -0400
compat-wireless-2012-09-07/include/linux/ath9k_platform.h 2012-11-02
01:05:31.563122751 -0400
+@@ -33,6 +33,8 @@
+ bool is_clk_25mhz;
+ bool disable_2ghz;
+ bool disable_5ghz;
++ bool no_eeprom_data;
++
+
[OpenWrt-Devel] Add support for PowerCloud Systems Hardware
Greetings, PowerCloud Systems wishes to offer a series of patches for you to consider. The email series associated with this message are patches we think might be of interest to OpenWrt, though some more than others. This patch series adds support for PCS hardware. [PATCH 1/5] ubdev01 + dlrtdev01: Add support for old PCS devices [PATCH 2/5] ubnt-unifi-outdoor: Add support for Ubquiti UnifiAP [PATCH 3/5] Allow MAC address to come from platform data and [PATCH 4/5] ar93x: Add option to disable JTAG, which blocks a GPIO [PATCH 5/5] Add support for three PowerCloud devices Regards, Daniel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
