Re: [OpenWrt-Devel] [PATCH] Add support for WeIO board. WeIO board (http://we-io.net) is based on Carambola2 module from 8Devices, and the patch adds a separate profile.
Hi Karl, On Sun, Jul 26, 2015 at 4:41 AM, Karl Palsson ka...@tweak.net.au wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Let me just preface this with... I am _not_ any sort of authority on code style, or any sort of approved openwrt commit police. I'm just some person subscribed to the mailing list. You are _absolutely_ entitled to ignore anything I say. ... Apparently that makes people happier Anyway... I'd like to thank you for your reviews - I tried to correct all errors that you spotted. Anyway, new patch related to 4.1 kernel was sent yesterday evening, so this one is not relevant anymore Drasko DRASKOVIC drasko.drasko...@gmail.com wrote: Hi Karl, + +MIPS_MACHINE(ATH79_MACH_WEIO, WEIO, WeIO board from Drasko DRASKOVIC and Uros PETREVSKI, Really? That's your model name? Really? Are you _sure_ that's what you want? Yes, the name of the board is WeIO. #define MIPS_MACHINE(_type, _id, _name, _setup) The ID might be WEIO, I personally was checking whether you really wanted your board to be called WeIO board from Drasko DRASKOVIC and Uros PETREVSKI You want this root@blah:~# grep machine /proc/cpuinfo machine : WeIO board from Drasko DRASKOVIC and Uros PETREVSKI root@blah:~# Maybe you do, that's fine, it seems a little unusual to me, and I was just asking if you'd really thought about this all the way. I know this is strange, but this is what is written on the back of the board and looks OK for this particular product. diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch index f8a561c..e8c8d5a 100644 --- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch +++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h -@@ -16,22 +16,191 @@ +@@ -16,22 +16,192 @@ enum ath79_mach_type { ATH79_MACH_GENERIC = 0, @@ -25,6 +25,7 @@ +ATH79_MACH_BHU_BXU2000N2_A1,/* BHU BXU2000n-2 A1 */ +ATH79_MACH_CAP4200AG, /* Senao CAP4200AG */ +ATH79_MACH_CARAMBOLA2, /* 8devices Carambola2 */ ++ATH79_MACH_WEIO,/* WeIO board */ Cmon man, are you sure you attached the right patch here? Yes, why? I can see nothing wrong with this patch. The reason I asked is that already in the earlier version it had been raised (by me) that this was not in alphabetical order. Yes, there are out of place entried in that file, but that enum is mostly well ordered. It's a good idea to keep it well ordered. The fact that the WEIO board has a carambola2 module soldered down is irrelevant. It can't be changed, it's not a user serviceable part, they're different boards that happen to be ar71xx. Yes, I agree. And I tried to respect this everywhere it made sense. BR, Drasko ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/2] sunxi: fix uboot install location
On Fri, 24 Jul 2015, John Crispin wrote: On 16/07/2015 22:20, Matthias Schiffer wrote: -BOARDS:= \ - sun4i-a10-cubieboard \ - sun4i-a10-olinuxino-lime \ - sun4i-a10-pcduino \ - sun5i-a13-olinuxino \ - sun6i-a31-colombus \ - sun6i-a31-m9 \ - sun7i-a20-bananapi \ - sun7i-a20-bananapro \ - sun7i-a20-cubieboard2 \ - sun7i-a20-cubietruck \ - sun7i-a20-olinuxino-lime \ - sun7i-a20-olinuxino-micro \ - sun7i-a20-pcduino3 \ - sun7i-a20-lamobo-r1 - define Image/BuildKernel mkimage -A arm -O linux -T kernel -C none \ -a 0x40008000 -e 0x40008000 \ -n 'ARM OpenWrt Linux-$(LINUX_VERSION)' \ -d $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-uImage - + ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) $(CP) $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs echo -ne '\x00\x00\x00\x00' $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs @@ -42,27 +26,23 @@ define Image/BuildKernel $(BIN_DIR)/$(IMG_PREFIX)-uImage-initramfs \ ) endif - - $(foreach board,$(BOARDS), - $(CP) $(DTS_DIR)/$(board).dtb $(BIN_DIR)/ - ) endef not sure about this change. maybe just stage the dtb file of the selected profile. i am not sure if zoltan added this for a reason. Thanks John and Matthias for checking on this. I'm offline until the 30th, will get back on this at that time. Regards, -w- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 04/13] ramips: sort boards alphabetically and optimize base-files/etc/{diag.sh, board.d/*} scripts
The following patch: * combines together boards with same configuration * removes unnecessary spaces in base-files/etc/diag.sh script and: * sorts boards alphabetically in base-files/etc/board.d/* scripts. Signed-off-by: Piotr Dymacz pep...@gmail.com --- target/linux/ramips/base-files/etc/board.d/01_leds | 132 +- .../linux/ramips/base-files/etc/board.d/02_network | 272 ++--- target/linux/ramips/base-files/etc/diag.sh | 152 ++-- 3 files changed, 284 insertions(+), 272 deletions(-) diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index d408659..2e6f2f9 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -17,6 +17,10 @@ board=$(ramips_board_name) board_config_update case $board in +3g150b|\ +3g300m) + set_usb_led tenda:blue:3g + ;; 3g-6200n) set_wifi_led edimax:amber:wlan set_usb_led edimax:blue:3g @@ -24,21 +28,21 @@ case $board in 3g-6200nl) set_wifi_led edimax:green:wlan ;; -3g150b|\ -3g300m) - set_usb_led tenda:blue:3g +a5-v11) + ucidef_set_led_default power POWER a5-v11:red:power 1 ;; ai-br100) ucidef_set_led_netdev wan wan aigale:blue:wan eth0.2 set_wifi_led aigale:blue:wlan ;; -a5-v11) - ucidef_set_led_default power POWER a5-v11:red:power 1 - ;; air3gii) set_wifi_led airlive:green:wlan set_usb_led airlive:green:mobile ;; +all0239-3g|\ +hw550-3g) + set_usb_led hw550-3g:green:usb + ;; all0256n) ucidef_set_rssimon wlan0 4 1 ucidef_set_led_rssi rssilow RSSILOW all0256n:green:rssilow wlan0 1 40 0 6 @@ -66,13 +70,13 @@ br6425) br-6475nd) set_wifi_led edimax:amber:wlan ;; +br6524n) + set_wifi_led edimax:blue:wlan + ;; broadway) set_usb_led red:diskmounted set_wifi_led red:wps_active ;; -br6524n) - set_wifi_led edimax:blue:wlan - ;; cf-wr800n) ucidef_set_led_netdev lan lan comfast:white:ethernet eth0.1 set_wifi_led comfast:white:wifi @@ -97,17 +101,6 @@ dir-620-a1) ucidef_set_led_default wan WAN LED (amber) d-link:amber:wan 1 set_wifi_led rt2800pci-phy0::radio ;; -dir-615-d|\ -dir-615-h1) - ucidef_set_led_default status Status LED (amber) d-link:amber:status 0 - set_wifi_led rt2800pci-phy0::radio - ;; -dir-620-d1) - set_wifi_led d-link:green:wifi - ;; -dir-810l) - ucidef_set_led_default power POWER d-link:green:power 1 - ;; dir-300-b7|\ dir-320-b1|\ dir-610-a1|\ @@ -119,6 +112,17 @@ w306r-v20|\ wt1520) set_wifi_led rt2800pci-phy0::radio ;; +dir-615-d|\ +dir-615-h1) + ucidef_set_led_default status Status LED (amber) d-link:amber:status 0 + set_wifi_led rt2800pci-phy0::radio + ;; +dir-620-d1) + set_wifi_led d-link:green:wifi + ;; +dir-810l) + ucidef_set_led_default power POWER d-link:green:power 1 + ;; f5d8235-v1) set_usb_led f5d8235-v1:blue:storage ;; @@ -129,13 +133,18 @@ fonera20n) set_usb_led fonera20n:orange:usb set_wifi_led fonera20n:orange:wifi ;; +hg255d) + set_wifi_led hg255d:wlan + set_usb_led hg255d:usb + ucidef_set_led_interface lan hg255d:internet + ;; ht-tm02) ucidef_set_led_netdev eth Ethernet ht-tm02:green:lan eth0 set_wifi_led ht-tm02:blue:wlan ;; -all0239-3g|\ -hw550-3g) - set_usb_led hw550-3g:green:usb +m2m) + set_wifi_led m2m:blue:wifi + ucidef_set_led_netdev eth Ethernet m2m:green:wan eth0 ;; mlw221|\ mlwg2) @@ -153,6 +162,9 @@ mr-102n) set_wifi_led mr-102n:green:wlan set_usb_led mr-102n:green:usb ;; +mzk-dp150n) + ucidef_set_led_default power power mzkdp150n:green:power 1 + ;; mzk-w300nh2) set_wifi_led mzkw300nh2:amber:wlan ;; @@ -162,10 +174,6 @@ na930) nw718) set_usb_led nw718:amber:usb ;; -m2m) - set_wifi_led m2m:blue:wifi - ucidef_set_led_netdev eth Ethernet m2m:green:wan eth0 - ;; omni-emb-hpm) ucidef_set_led_default power POWER emb:orange:power 1 ucidef_set_led_netdev eth ETH emb:green:eth eth0 @@ -175,15 +183,34 @@ omni-plug) set_wifi_led miniplug:green:wlan set_usb_led miniplug:green:mobile ;; -px4885) - set_wifi_led 7links:orange:wifi - set_usb_led 7links:blue:storage +oy-0001) + ucidef_set_led_default power power oy:green:power 1 + set_wifi_led oy:green:wifi ;; pbr-m1) ucidef_set_led_netdev internet internet pbr-m1:green:internet eth0.2 ucidef_set_led_default power power pbr-m1:green:power 1 ucidef_set_led_default sys sys pbr-m1:green:sys 1 ;; +px4885) + set_wifi_led 7links:orange:wifi + set_usb_led
[OpenWrt-Devel] [PATCH 08/13] ramips: remove unnecessary LED declaration for WT1520 in diag.sh
This device doesn't have any LEDs in dts file. Signed-off-by: Piotr Dymacz pep...@gmail.com --- target/linux/ramips/base-files/etc/diag.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index 8c96b3b..29ee2da 100644 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -128,9 +128,6 @@ get_status_led() { nbg-419n) status_led=nbg-419n:green:power ;; - nexx-wt1520) - status_led=nexx-wt1520:white:power - ;; nw718) status_led=nw718:amber:cpu ;; -- 2.4.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 11/13] ramips: rename dts file for Asus RT-N56U to RT-N56U.dts
Other Asus RT-N dts files are named RT-N... (not RTN...), so use the same for RT-N56U. Signed-off-by: Piotr Dymacz pep...@gmail.com --- target/linux/ramips/dts/RT-N56U.dts | 146 target/linux/ramips/dts/RTN56U.dts | 146 target/linux/ramips/image/Makefile | 4 +- 3 files changed, 148 insertions(+), 148 deletions(-) create mode 100644 target/linux/ramips/dts/RT-N56U.dts delete mode 100644 target/linux/ramips/dts/RTN56U.dts diff --git a/target/linux/ramips/dts/RT-N56U.dts b/target/linux/ramips/dts/RT-N56U.dts new file mode 100644 index 000..99abb9a --- /dev/null +++ b/target/linux/ramips/dts/RT-N56U.dts @@ -0,0 +1,146 @@ +/dts-v1/; + +/include/ rt3883.dtsi + +/ { + compatible = RT-N56U, ralink,rt3883-soc; + model = Asus RT-N56U; + + palmbus@1000 { + gpio1: gpio@638 { + status = okay; + }; + }; + + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = spi, i2c, jtag, uartf; + ralink,function = gpio; + }; + }; + }; + + ethernet@1010 { + mtd-mac-address = factory 0x4; + port@0 { + ralink,fixed-link = 1000 1 1 1; + }; + }; + + pci@1014 { + status = okay; + + pinctrl-names = default; + pinctrl-0 = pci_pins; + pci_pins: pci { + pci { + ralink,group = pci; + ralink,function = pci-fnc; + }; + }; + + host-bridge { + pci-bridge@1 { + status = okay; + wmac@0,0 { + compatible = ralink,rt2880-pci, pciclass060400, pciclass0604; + reg = 0x1 0 0 0 0 ; + ralink,eeprom = rt2x00pci_1_0.eeprom; + }; + + }; + }; + }; + + wmac@1018 { + status = okay; + ralink,2ghz = 0; + ralink,mtd-eeprom = factory 0; + }; + + ehci@101c { + status = okay; + }; + + ohci@101c1000 { + status = okay; + }; + + nor-flash@1c00 { + compatible = cfi-flash; + reg = 0x1c00 0x80; + + bank-width = 2; + #address-cells = 1; + #size-cells = 1; + + partition@0 { + reg = 0x0 0x003; + label = u-boot; + read-only; + }; + + partition@3 { + reg = 0x0003 0x0001; + label = u-boot-env; + read-only; + }; + + factory: partition@4 { + reg = 0x0004 0x0001; + label = factory; + read-only; + }; + + partition@5 { + reg = 0x0005 0x007b; + label = firmware; + }; + }; + + rtl8367 { + compatible = realtek,rtl8367; + gpio-sda = gpio0 1 0; + gpio-sck = gpio0 2 0; + realtek,extif1 = 1 0 1 1 1 1 1 1 2; + }; + + gpio-keys-polled { + compatible = gpio-keys-polled; + #address-cells = 1; + #size-cells = 0; + poll-interval = 100; + reset { + label = reset; + gpios = gpio0 13 1; + linux,code = 0x198; + }; + wps { + label = wps; + gpios = gpio1 2 1; + linux,code = 0x211; + }; + }; + + gpio-leds { + compatible = gpio-leds; + + power { + label = asus:blue:power; + gpios = gpio0 0 1; + }; + lan { + label = asus:blue:lan; + gpios = gpio0 19 1; + }; + wan { + label = asus:blue:wan; + gpios = gpio1 3 1; + }; + usb { + label = asus:blue:usb; + gpios = gpio1 0 1; + }; + }; +}; diff --git a/target/linux/ramips/dts/RTN56U.dts b/target/linux/ramips/dts/RTN56U.dts deleted file mode 100644 index 99abb9a..000 ---
[OpenWrt-Devel] [PATCH 12/13] ramips: be consistent with case statement in base-files/lib/upgrade/platform.sh
Always use |\ (without spaces) and keep boards in alphabetical order. Signed-off-by: Piotr Dymacz pep...@gmail.com --- .../ramips/base-files/lib/upgrade/platform.sh | 232 ++--- 1 file changed, 116 insertions(+), 116 deletions(-) diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 7aab6a1..095570a 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -14,120 +14,120 @@ platform_check_image() { [ $# -gt 1 ] return 1 case $board in - 3g-6200n | \ - 3g-6200nl | \ - 3g150b | \ - 3g300m | \ - a5-v11 | \ - air3gii | \ - ai-br100 |\ - all0239-3g | \ - all0256n | \ - all5002 | \ - all5003 | \ - ar725w | \ - asl26555 | \ - awapn2403 | \ - awm002-evb | \ - awm003-evb | \ - bc2 | \ - broadway | \ - carambola | \ - cf-wr800n | \ - d105 | \ - dap-1350 | \ - dcs-930 | \ - dcs-930l-b1 | \ - dir-300-b1 | \ - dir-300-b7 | \ - dir-320-b1 | \ - dir-600-b1 | \ - dir-600-b2 | \ - dir-615-d | \ - dir-615-h1 | \ - dir-620-a1 | \ - dir-620-d1 | \ - dir-810l | \ - e1700 | \ - esr-9753 | \ - f7c027 | \ - fonera20n | \ - freestation5 | \ - firewrt |\ - pbr-m1 |\ - hg255d | \ - hlk-rm04 | \ - ht-tm02 | \ - hw550-3g | \ - ip2202 | \ - m2m | \ - m3 | \ - m4 | \ - microwrt | \ - mlw221 | \ - mlwg2 | \ - mofi3500-3gn | \ - mpr-a1 | \ - mpr-a2 | \ - mr-102n | \ - mzk-w300nh2 | \ - mzk-dp150n | \ - nbg-419n | \ - nw718 | \ - omni-emb | \ - omni-emb-hpm | \ - omni-plug | \ - olinuxino-rt5350f | \ - olinuxino-rt5350f-evb | \ - psr-680w | \ - px4885 | \ - re6500 | \ - rp-n53 | \ - rt-g32-b1 | \ - rt-n10-plus | \ - rt-n13u | \ - rt-n14u | \ - rt-n15 | \ - rt-n56u | \ - rut5xx | \ - sap-g3200u3 | \ - sl-r7205 | \ - tew-691gr | \ - tew-692gr | \ - ur-326n4g |\ - ur-336un |\ - v22rw-2x2 | \ - vocore | \ - w150m | \ - w306r-v20 |\ - w502u |\ - whr-g300n |\ - whr-300hp2 |\ - whr-600d |\ - whr-1166d |\ - wsr-600 |\ - wl-330n | \ - wl-330n3g | \ - wl-351 | \ - wl341v3 | \ - wli-tx4-ag300n | \ - wzr-agl300nh | \ - wmr300 |\ - wnce2001 | \ - wr512-3gn |\ - wr6202 |\ - wrtnode |\ - oy-0001 |\ - wt1520 |\ - wt3020 |\ - x5 |\ - x8 |\ - xiaomi-miwifi-mini |\ - y1 |\ - y1s |\ - zte-q7 |\ + 3g150b|\ + 3g300m|\ + 3g-6200n|\ + 3g-6200nl|\ + a5-v11|\ + ai-br100|\ + air3gii|\ + all0239-3g|\ + all0256n|\ + all5002|\ + all5003|\ + ar725w|\ + asl26555|\ + awapn2403|\ + awm002-evb|\ + awm003-evb|\ + bc2|\ + broadway|\ + carambola|\ + cf-wr800n|\ + d105|\ + dap-1350|\ + dcs-930|\ + dcs-930l-b1|\ + dir-300-b1|\ + dir-300-b7|\ + dir-320-b1|\ + dir-600-b1|\ + dir-600-b2|\ + dir-615-d|\ + dir-615-h1|\ + dir-620-a1|\ + dir-620-d1|\ + dir-810l|\ + e1700|\ + esr-9753|\ + f7c027|\ + firewrt|\ + fonera20n|\ + freestation5|\ + hg255d|\ + hlk-rm04|\ + ht-tm02|\ + hw550-3g|\ + ip2202|\ + m2m|\ + m3|\ + m4|\ + microwrt|\ + mlw221|\ + mlwg2|\ + mofi3500-3gn|\ + mpr-a1|\ + mpr-a2|\ + mr-102n|\ + mzk-dp150n|\ + mzk-w300nh2|\ + nbg-419n|\ + nw718|\ + olinuxino-rt5350f|\ + olinuxino-rt5350f-evb|\ + omni-emb|\ + omni-emb-hpm|\ + omni-plug|\ + oy-0001|\ + pbr-m1|\ + psr-680w|\ + px4885|\ + re6500|\ + rp-n53|\ + rt-g32-b1|\ + rt-n10-plus|\ + rt-n13u|\ + rt-n14u|\ + rt-n15|\ + rt-n56u|\ + rut5xx|\ + sap-g3200u3|\ + sl-r7205|\ + tew-691gr|\ + tew-692gr|\ + ur-326n4g|\ + ur-336un|\ + v22rw-2x2|\ + vocore|\ + w150m|\ + w306r-v20|\ + w502u|\ + whr-1166d|\ + whr-300hp2|\ + whr-600d|\ + whr-g300n|\ + wl-330n|\ + wl-330n3g|\ + wl341v3|\ + wl-351|\ + wli-tx4-ag300n|\ + wmr300|\ + wnce2001|\ + wr512-3gn|\ + wr6202|\ + wrtnode|\ + wsr-600|\ + wt1520|\ + wt3020|\ + wzr-agl300nh|\ + x5|\ + x8|\ +
[OpenWrt-Devel] [PATCH 09/13] ramips: use consistent naming scheme for LEDs in the remaining, branded devices
Signed-off-by: Piotr Dymacz pep...@gmail.com --- target/linux/ramips/base-files/etc/board.d/01_leds | 52 +++--- target/linux/ramips/base-files/etc/diag.sh | 42 - target/linux/ramips/dts/ALL0239-3G.dts | 8 ++-- target/linux/ramips/dts/ALL0256N-4M.dts| 6 +-- target/linux/ramips/dts/ALL0256N-8M.dts| 6 +-- target/linux/ramips/dts/ARGUS_ATP52B.dts | 4 +- target/linux/ramips/dts/ASL26555-16M.dts | 16 +++ target/linux/ramips/dts/ASL26555-8M.dts| 16 +++ target/linux/ramips/dts/AWM002-EVB-4M.dts | 6 +-- target/linux/ramips/dts/AWM002-EVB-8M.dts | 6 +-- target/linux/ramips/dts/AWM003-EVB.dts | 6 +-- target/linux/ramips/dts/BC2.dts| 2 +- target/linux/ramips/dts/BROADWAY.dts | 4 +- target/linux/ramips/dts/ESR-9753.dts | 4 +- target/linux/ramips/dts/FONERA20N.dts | 6 +-- target/linux/ramips/dts/FREESTATION5.dts | 6 +-- target/linux/ramips/dts/HLKRM04.dts| 2 +- target/linux/ramips/dts/HT-TM02.dts| 4 +- target/linux/ramips/dts/HW550-3G.dts | 8 ++-- target/linux/ramips/dts/M2M.dts| 4 +- target/linux/ramips/dts/MOFI3500-3GN.dts | 8 ++-- target/linux/ramips/dts/MR-102N.dts| 6 +-- target/linux/ramips/dts/NA930.dts | 8 ++-- target/linux/ramips/dts/NBG-419N.dts | 4 +- target/linux/ramips/dts/NCS601W.dts| 4 +- target/linux/ramips/dts/NW718.dts | 6 +-- target/linux/ramips/dts/PSR-680W.dts | 2 +- target/linux/ramips/dts/PWH2004.dts| 4 +- target/linux/ramips/dts/RUT5XX.dts | 2 +- target/linux/ramips/dts/SL-R7205.dts | 2 +- target/linux/ramips/dts/WCR150GN.dts | 4 +- target/linux/ramips/dts/WR6202.dts | 4 +- 32 files changed, 133 insertions(+), 129 deletions(-) diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index 52da1ff..29032b0 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -39,15 +39,14 @@ air3gii) set_wifi_led airlive:green:wlan set_usb_led airlive:green:mobile ;; -all0239-3g|\ -hw550-3g) - set_usb_led hw550-3g:green:usb +all0239-3g) + set_usb_led allnet:green:usb ;; all0256n) ucidef_set_rssimon wlan0 4 1 - ucidef_set_led_rssi rssilow RSSILOW all0256n:green:rssilow wlan0 1 40 0 6 - ucidef_set_led_rssi rssimedium RSSIMEDIUM all0256n:green:rssimed wlan0 30 80 -29 5 - ucidef_set_led_rssi rssihigh RSSIHIGH all0256n:green:rssihigh wlan0 70 100 -69 8 + ucidef_set_led_rssi rssilow RSSILOW allnet:green:rssilow wlan0 1 40 0 6 + ucidef_set_led_rssi rssimedium RSSIMEDIUM allnet:green:rssimed wlan0 30 80 -29 5 + ucidef_set_led_rssi rssihigh RSSIHIGH allnet:green:rssihigh wlan0 70 100 -69 8 set_wifi_led rt2800pci-phy0::radio ;; ar670w|\ @@ -56,13 +55,13 @@ awapn2403) set_wifi_led rt2800soc-phy0::radio ;; asl26555) - ucidef_set_led_default power POWER asl26555:green:power 1 - ucidef_set_led_netdev eth ETH asl26555:green:eth eth0 - set_wifi_led asl26555:green:wlan - set_usb_led asl26555:green:3g + ucidef_set_led_default power POWER alpha:green:power 1 + ucidef_set_led_netdev eth ETH alpha:green:eth eth0 + set_wifi_led alpha:green:wlan + set_usb_led alpha:green:3g ;; bc2) - set_usb_led bc2:blue:usb + set_usb_led nexaira:blue:usb ;; br6425) set_wifi_led edimax:orange:wlan @@ -74,8 +73,8 @@ br6524n) set_wifi_led edimax:blue:wlan ;; broadway) - set_usb_led red:diskmounted - set_wifi_led red:wps_active + set_usb_led hauppauge:red:diskmounted + set_wifi_led hauppauge:red:wps_active ;; cf-wr800n) ucidef_set_led_netdev lan lan comfast:white:ethernet eth0.1 @@ -128,8 +127,8 @@ f5d8235-v2) set_usb_led belkin:blue:storage ;; fonera20n) - set_usb_led fonera20n:orange:usb - set_wifi_led fonera20n:orange:wifi + set_usb_led fonera:orange:usb + set_wifi_led fonera:orange:wifi ;; hg255d) set_wifi_led huawei:green:wlan @@ -137,12 +136,15 @@ hg255d) ucidef_set_led_interface lan huawei:green:internet ;; ht-tm02) - ucidef_set_led_netdev eth Ethernet ht-tm02:green:lan eth0 - set_wifi_led ht-tm02:blue:wlan + ucidef_set_led_netdev eth Ethernet hootoo:green:lan eth0 + set_wifi_led hootoo:blue:wlan + ;; +hw550-3g) + set_usb_led aztech:green:usb ;; m2m) - set_wifi_led m2m:blue:wifi - ucidef_set_led_netdev
[OpenWrt-Devel] [PATCH 05/13] ramips: use consistent naming scheme for LEDs, for various manufacturers
For some boards in ramips (and other targets) naming scheme for LEDs is: manufacturer:color:led-name, but there are many other boards which don't follow this approach. This patch switches ramips boards from the following manufacturers: * Airlink101 * Asus * Belkin * Buffalo * Huawei * Omnima * Planex * Poray * Ralink * Sitecom * Tenda * UPVEL * ZBT to the manufacturer:color:led-name naming scheme for all defined LEDs. Signed-off-by: Piotr Dymacz pep...@gmail.com --- target/linux/ramips/base-files/etc/board.d/01_leds | 34 ++-- target/linux/ramips/base-files/etc/diag.sh | 64 -- target/linux/ramips/dts/AR670W.dts | 4 +- target/linux/ramips/dts/AR725W.dts | 6 +- target/linux/ramips/dts/D105.dts | 4 +- target/linux/ramips/dts/F5D8235_V1.dts | 4 +- target/linux/ramips/dts/F5D8235_V2.dts | 18 +++--- target/linux/ramips/dts/HG255D.dts | 12 ++-- target/linux/ramips/dts/IP2202.dts | 4 +- target/linux/ramips/dts/M3.dts | 2 +- target/linux/ramips/dts/M4-4M.dts | 2 +- target/linux/ramips/dts/M4-8M.dts | 2 +- target/linux/ramips/dts/MZK-750DHP.dts | 4 +- target/linux/ramips/dts/MZK-DP150N.dts | 2 +- target/linux/ramips/dts/MZK-W300NH2.dts| 6 +- target/linux/ramips/dts/OMNI-EMB-HPM.dts | 12 ++-- target/linux/ramips/dts/OMNI-EMB.dts | 4 +- target/linux/ramips/dts/OMNI-PLUG.dts | 4 +- target/linux/ramips/dts/RT-N13U.dts| 4 +- target/linux/ramips/dts/RT-N15.dts | 2 +- target/linux/ramips/dts/UR-326N4G.dts | 10 ++-- target/linux/ramips/dts/UR-336UN.dts | 10 ++-- target/linux/ramips/dts/V11STFE.dts| 2 +- target/linux/ramips/dts/V22RW-2X2.dts | 4 +- target/linux/ramips/dts/W306R_V20.dts | 4 +- target/linux/ramips/dts/WHR-G300N.dts | 6 +- target/linux/ramips/dts/WL-351.dts | 6 +- target/linux/ramips/dts/WL341V3.dts| 14 ++--- target/linux/ramips/dts/WR8305RT.dts | 6 +- target/linux/ramips/dts/X5.dts | 8 +-- target/linux/ramips/dts/X8.dts | 2 +- 31 files changed, 124 insertions(+), 142 deletions(-) diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index 2e6f2f9..d73ffe2 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -86,8 +86,8 @@ cy-swr1100) set_usb_led samsung:blue:usb ;; d105) - ucidef_set_led_default power POWER d105:red:power 1 - set_usb_led d105:green:usb + ucidef_set_led_default power POWER huawei:red:power 1 + set_usb_led huawei:green:usb ;; dcs-930l-b1) ucidef_set_led_default power POWER d-link:red:power 1 @@ -123,20 +123,18 @@ dir-620-d1) dir-810l) ucidef_set_led_default power POWER d-link:green:power 1 ;; -f5d8235-v1) - set_usb_led f5d8235-v1:blue:storage - ;; +f5d8235-v1|\ f5d8235-v2) - set_usb_led f5d8235v2:blue:storage + set_usb_led belkin:blue:storage ;; fonera20n) set_usb_led fonera20n:orange:usb set_wifi_led fonera20n:orange:wifi ;; hg255d) - set_wifi_led hg255d:wlan - set_usb_led hg255d:usb - ucidef_set_led_interface lan hg255d:internet + set_wifi_led huawei:green:wlan + set_usb_led huawei:green:usb + ucidef_set_led_interface lan huawei:green:internet ;; ht-tm02) ucidef_set_led_netdev eth Ethernet ht-tm02:green:lan eth0 @@ -163,10 +161,10 @@ mr-102n) set_usb_led mr-102n:green:usb ;; mzk-dp150n) - ucidef_set_led_default power power mzkdp150n:green:power 1 + ucidef_set_led_default power power planex:green:power 1 ;; mzk-w300nh2) - set_wifi_led mzkw300nh2:amber:wlan + set_wifi_led planex:amber:wlan ;; na930) set_usb_led na930:blue:status @@ -175,13 +173,13 @@ nw718) set_usb_led nw718:amber:usb ;; omni-emb-hpm) - ucidef_set_led_default power POWER emb:orange:power 1 - ucidef_set_led_netdev eth ETH emb:green:eth eth0 + ucidef_set_led_default power POWER omnima:orange:power 1 + ucidef_set_led_netdev eth ETH omnima:green:eth eth0 set_wifi_led emb:green:wifi ;; omni-plug) - set_wifi_led miniplug:green:wlan - set_usb_led miniplug:green:mobile + set_wifi_led omnima:green:wlan + set_usb_led omnima:green:mobile ;; oy-0001) ucidef_set_led_default power power oy:green:power 1 @@ -235,9 +233,9 @@ wnce2001) set_wifi_led netgear:green:wlan ;; wr8305rt) - ucidef_set_led_default power
[OpenWrt-Devel] [PATCH 10/13] ramips: change board name for Asus WL-330N{, 3G} to WL-330N{, 3G}
There are other Asus boards supported in ramips target, so use the same naming scheme for WL-330N{,3G} boards and their DTS files. Signed-off-by: Piotr Dymacz pep...@gmail.com --- target/linux/ramips/dts/WL-330N.dts | 95 +++ target/linux/ramips/dts/WL-330N3G.dts | 103 ++ target/linux/ramips/dts/WL_330N.dts | 95 --- target/linux/ramips/dts/WL_330N3G.dts | 103 -- target/linux/ramips/image/Makefile| 8 +-- 5 files changed, 202 insertions(+), 202 deletions(-) create mode 100644 target/linux/ramips/dts/WL-330N.dts create mode 100644 target/linux/ramips/dts/WL-330N3G.dts delete mode 100644 target/linux/ramips/dts/WL_330N.dts delete mode 100644 target/linux/ramips/dts/WL_330N3G.dts diff --git a/target/linux/ramips/dts/WL-330N.dts b/target/linux/ramips/dts/WL-330N.dts new file mode 100644 index 000..a7af86e --- /dev/null +++ b/target/linux/ramips/dts/WL-330N.dts @@ -0,0 +1,95 @@ +/dts-v1/; + +/include/ rt3050.dtsi + +/ { + compatible = WL-330N, ralink,rt3050-soc; + model = Asus WL-330N; + + palmbus@1000 { + spi@b00 { + status = okay; + m25p80@0 { + #address-cells = 1; + #size-cells = 1; + compatible = mx25l3205d; + reg = 0 0; + linux,modalias = m25p80, mx25l3205d; + spi-max-frequency = 1000; + + partition@0 { + label = u-boot; + reg = 0x0 0x3; + read-only; + }; + + partition@3 { + label = u-boot-env; + reg = 0x3 0x1; + read-only; + }; + + factory: partition@4 { + label = factory; + reg = 0x4 0x1; + read-only; + }; + + partition@5 { + label = firmware; + reg = 0x5 0x3b; + }; + }; + }; + }; + + pinctrl { + state_default: pinctrl0 { + gpio { + ralink,group = i2c, jtag, rgmii, mdio, uartf; + ralink,function = gpio; + }; + }; + }; + + ethernet@1010 { + mtd-mac-address = factory 0x4; + }; + + esw@1011 { + ralink,portmap = 0x3e; + }; + + wmac@1018 { + ralink,mtd-eeprom = factory 0; + }; + + gpio-leds { + compatible = gpio-leds; + link { + label = asus:blue:link; + gpios = gpio0 9 1; + }; + power { + label = asus:blue:power; + gpios = gpio0 11 1; + }; + }; + + gpio-keys-polled { + compatible = gpio-keys-polled; + #address-cells = 1; + #size-cells = 0; + poll-interval = 20; + reset { + label = reset; + gpios = gpio0 10 1; + linux,code = 0x198; + }; + wps { + label = wps; + gpios = gpio0 0 1; + linux,code = 0x198; + }; + }; +}; diff --git a/target/linux/ramips/dts/WL-330N3G.dts b/target/linux/ramips/dts/WL-330N3G.dts new file mode 100644 index 000..5152f1d --- /dev/null +++ b/target/linux/ramips/dts/WL-330N3G.dts @@ -0,0 +1,103 @@ +/dts-v1/; + +/include/ rt3050.dtsi + +/ { + compatible = WL-330N3G, ralink,rt3050-soc; + model = Asus WL-330N3G; + + palmbus@1000 { + spi@b00 { + status = okay; + m25p80@0 { + #address-cells = 1; + #size-cells = 1; + compatible = mx25l3205d; + reg = 0 0; + linux,modalias = m25p80, mx25l3205d; + spi-max-frequency = 1000; + + partition@0 { + label = u-boot; +
[OpenWrt-Devel] [PATCH 01/13] ramips: fix indentation and other mistakes in .dts{, i} files
The following patch fixes: * wrong indentations * doubled gpio-keys-polled nodes (DIR-300-B7, DIR-320-B1, DIR-610-A1) * duplicate spacings * empty lines at end * trailing whitespace in .dts{,i} files, for ramips target. Signed-off-by: Piotr Dymacz pep...@gmail.com --- target/linux/ramips/dts/AWAPN2403.dts | 2 +- target/linux/ramips/dts/CF-WR800N.dts | 24 +-- target/linux/ramips/dts/DCS-930L-B1.dts | 2 +- target/linux/ramips/dts/DIR-300-B7.dts| 65 target/linux/ramips/dts/DIR-320-B1.dts| 20 +-- target/linux/ramips/dts/DIR-610-A1.dts| 20 +-- target/linux/ramips/dts/F5D8235_V1.dts| 2 +- target/linux/ramips/dts/MicroWRT.dts | 2 +- target/linux/ramips/dts/OLINUXINO-RT5350F-EVB.dts | 190 +++--- target/linux/ramips/dts/OLINUXINO-RT5350F.dts | 122 +++--- target/linux/ramips/dts/OY-0001.dts | 6 +- target/linux/ramips/dts/PBR-M1.dts| 6 +- target/linux/ramips/dts/RT-N15.dts| 2 +- target/linux/ramips/dts/RTN56U.dts| 10 +- target/linux/ramips/dts/RUT5XX.dts| 6 +- target/linux/ramips/dts/WLI-TX4-AG300N.dts| 2 +- target/linux/ramips/dts/WT3020-4M.dts | 26 +-- target/linux/ramips/dts/WT3020-8M.dts | 26 +-- target/linux/ramips/dts/WZR-AGL300NH.dts | 2 +- target/linux/ramips/dts/mt7620a.dtsi | 2 +- target/linux/ramips/dts/mt7620n.dtsi | 2 +- target/linux/ramips/dts/mt7621.dtsi | 4 +- target/linux/ramips/dts/mt7628an.dtsi | 2 +- target/linux/ramips/dts/rt2880.dtsi | 2 +- 24 files changed, 270 insertions(+), 277 deletions(-) diff --git a/target/linux/ramips/dts/AWAPN2403.dts b/target/linux/ramips/dts/AWAPN2403.dts index 2de0402..7898e2e 100644 --- a/target/linux/ramips/dts/AWAPN2403.dts +++ b/target/linux/ramips/dts/AWAPN2403.dts @@ -4,7 +4,7 @@ / { compatible = AWAPN2403, ralink,rt3052-soc; - model = AsiaRF AWAPN2403; + model = AsiaRF AWAPN2403; palmbus@1000 { spi@b00 { diff --git a/target/linux/ramips/dts/CF-WR800N.dts b/target/linux/ramips/dts/CF-WR800N.dts index 5db6c83..16b184a 100644 --- a/target/linux/ramips/dts/CF-WR800N.dts +++ b/target/linux/ramips/dts/CF-WR800N.dts @@ -8,7 +8,7 @@ chosen { bootargs = console=ttyS0,115200; -}; + }; palmbus@1000 { gpio0: gpio@600 { @@ -100,15 +100,15 @@ }; }; -gpio-keys-polled { -compatible = gpio-keys-polled; -#address-cells = 1; -#size-cells = 0; -poll-interval = 20; -reset { -label = reset; -gpios = gpio0 2 1; -linux,code = 0x198; -}; -}; + gpio-keys-polled { + compatible = gpio-keys-polled; + #address-cells = 1; + #size-cells = 0; + poll-interval = 20; + reset { + label = reset; + gpios = gpio0 2 1; + linux,code = 0x198; + }; + }; }; diff --git a/target/linux/ramips/dts/DCS-930L-B1.dts b/target/linux/ramips/dts/DCS-930L-B1.dts index f73a997..673eb10 100644 --- a/target/linux/ramips/dts/DCS-930L-B1.dts +++ b/target/linux/ramips/dts/DCS-930L-B1.dts @@ -3,7 +3,7 @@ /include/ rt5350.dtsi / { - compatible = DCS-930L-B1, ralink,rt5350-soc; + compatible = DCS-930L-B1, ralink,rt5350-soc; model = D-Link DCS-930L B1; palmbus@1000 { diff --git a/target/linux/ramips/dts/DIR-300-B7.dts b/target/linux/ramips/dts/DIR-300-B7.dts index c1a1385..b04e153 100644 --- a/target/linux/ramips/dts/DIR-300-B7.dts +++ b/target/linux/ramips/dts/DIR-300-B7.dts @@ -56,41 +56,39 @@ mtd-mac-address = factory 0x4; }; -esw@1011 { -ralink,portmap = 0x2f; -ralink,led_polarity = 0x17; -}; + esw@1011 { + ralink,portmap = 0x2f; + ralink,led_polarity = 0x17; + }; -gpio-leds { -compatible = gpio-leds; -status { -label = d-link:green:status; -gpios = gpio0 9 1; -}; -wps { -label = d-link:blue:wps; -gpios = gpio0 13 1; -}; -}; + gpio-leds { + compatible = gpio-leds; + status { + label = d-link:green:status; + gpios = gpio0 9 1; + }; + wps { + label = d-link:blue:wps; +
[OpenWrt-Devel] [PATCH 03/13] ramips: fix indentation, case statements structure and optimize base-files/etc/board.d/* scripts
The following patch: * fixes wrong indentation * combines together boards with same configuration * removes unnecessary spaces * removes empty lines after ;; (for consistency) * removes indentation for case...esac body (for consistency) in base-files/etc/board.d/* scripts. Signed-off-by: Piotr Dymacz pep...@gmail.com --- target/linux/ramips/base-files/etc/board.d/01_leds | 496 ++--- .../linux/ramips/base-files/etc/board.d/02_network | 240 -- 2 files changed, 337 insertions(+), 399 deletions(-) diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index c6bfd7e..d408659 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -17,260 +17,248 @@ board=$(ramips_board_name) board_config_update case $board in - 3g-6200n) - set_wifi_led edimax:amber:wlan - set_usb_led edimax:blue:3g - ;; - 3g-6200nl) - set_wifi_led edimax:green:wlan - ;; - 3g150b |\ - 3g300m) - set_usb_led tenda:blue:3g - ;; - ai-br100) - ucidef_set_led_netdev wan wan aigale:blue:wan eth0.2 - set_wifi_led aigale:blue:wlan - ;; - a5-v11) - ucidef_set_led_default power POWER a5-v11:red:power 1 - ;; - air3gii) - set_wifi_led airlive:green:wlan - set_usb_led airlive:green:mobile - ;; - all0256n) - ucidef_set_rssimon wlan0 4 1 - ucidef_set_led_rssi rssilow RSSILOW all0256n:green:rssilow wlan0 1 40 0 6 - ucidef_set_led_rssi rssimedium RSSIMEDIUM all0256n:green:rssimed wlan0 30 80 -29 5 - ucidef_set_led_rssi rssihigh RSSIHIGH all0256n:green:rssihigh wlan0 70 100 -69 8 - set_wifi_led rt2800pci-phy0::radio - ;; - ar670w|\ - ar725w|\ - awapn2403) - set_wifi_led rt2800soc-phy0::radio - ;; - asl26555) - ucidef_set_led_default power POWER asl26555:green:power 1 - ucidef_set_led_netdev eth ETH asl26555:green:eth eth0 - set_wifi_led asl26555:green:wlan - set_usb_led asl26555:green:3g - ;; - bc2) - set_usb_led bc2:blue:usb - ;; - br6425) - set_wifi_led edimax:orange:wlan - ;; - br-6475nd) - set_wifi_led edimax:amber:wlan - ;; - broadway) - set_usb_led red:diskmounted - set_wifi_led red:wps_active - ;; - br6524n) - set_wifi_led edimax:blue:wlan - ;; - cf-wr800n) - ucidef_set_led_netdev lan lan comfast:white:ethernet eth0.1 - set_wifi_led comfast:white:wifi - ;; - cy-swr1100) - ucidef_set_led_default wps WPS samsung:blue:wps 0 - set_usb_led samsung:blue:usb - ;; - d105) - ucidef_set_led_default power POWER d105:red:power 1 - set_usb_led d105:green:usb - ;; - dcs-930l-b1) - ucidef_set_led_default power POWER d-link:red:power 1 - ucidef_set_led_netdev wifi WiFi d-link:blue:wps - ;; - dir-300-b1|\ - dir-600-b1|\ - dir-600-b2|\ - dir-620-a1) - # ANDed with vlan switch port 4 led state - ucidef_set_led_default wan WAN LED (amber) d-link:amber:wan 1 - set_wifi_led rt2800pci-phy0::radio - ;; - dir-615-d|\ - dir-615-h1) - ucidef_set_led_default status Status LED (amber) d-link:amber:status 0 - set_wifi_led rt2800pci-phy0::radio - ;; - dir-620-d1) - set_wifi_led d-link:green:wifi - ;; - dir-810l) - ucidef_set_led_default power POWER d-link:green:power 1 - ;; - dir-610-a1 |\ - dir-300-b7 |\ - dir-320-b1 |\ - esr-9753) - set_wifi_led rt2800pci-phy0::radio - ;; - f5d8235-v1) - set_usb_led f5d8235-v1:blue:storage - ;; - f5d8235-v2) - set_usb_led f5d8235v2:blue:storage - ;; - fonera20n) - set_usb_led fonera20n:orange:usb - set_wifi_led fonera20n:orange:wifi - ;; - hlk-rm04) - set_wifi_led rt2800pci-phy0::radio - ;; - ht-tm02) - ucidef_set_led_netdev eth Ethernet ht-tm02:green:lan eth0 - set_wifi_led ht-tm02:blue:wlan - ;; - all0239-3g|\ - hw550-3g) - set_usb_led hw550-3g:green:usb - ;; -
[OpenWrt-Devel] [PATCH 07/13] ramips: change board name for Zbtlink WR8305RT to ZBT-WR8305RT
There is another Zbtlink board (ZBT-WA05) supported in ramips target, so use the same naming scheme for WR8305RT board and its DTS file. Signed-off-by: Piotr Dymacz pep...@gmail.com --- target/linux/ramips/base-files/etc/board.d/01_leds | 2 +- .../linux/ramips/base-files/etc/board.d/02_network | 2 +- target/linux/ramips/base-files/etc/diag.sh | 2 +- target/linux/ramips/base-files/lib/ramips.sh | 4 +- .../ramips/base-files/lib/upgrade/platform.sh | 4 +- target/linux/ramips/dts/WR8305RT.dts | 112 - target/linux/ramips/dts/ZBT-WR8305RT.dts | 112 + target/linux/ramips/image/Makefile | 4 +- 8 files changed, 121 insertions(+), 121 deletions(-) delete mode 100644 target/linux/ramips/dts/WR8305RT.dts create mode 100644 target/linux/ramips/dts/ZBT-WR8305RT.dts diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index d73ffe2..52da1ff 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -232,7 +232,7 @@ whr-600d) wnce2001) set_wifi_led netgear:green:wlan ;; -wr8305rt) +zbt-wr8305rt) ucidef_set_led_default power power zbtlink:green:sys 1 set_usb_led zbtlink:green:usb set_wifi_led zbtlink:green:wifi diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index a781f46..038a66e 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -218,7 +218,7 @@ ramips_setup_interfaces() ucidef_add_switch_vlan switch0 1 0 1 2 3 6t ucidef_add_switch_vlan switch0 2 5 6t ;; - wr8305rt) + zbt-wr8305rt) ucidef_set_interfaces_lan_wan eth0.1 eth0.2 ucidef_add_switch switch0 1 1 ucidef_add_switch_vlan switch0 1 0 1 2 3 4 6t diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index 91a931b..8c96b3b 100644 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -228,7 +228,7 @@ get_status_led() { wr512-3gn) status_led=wr512:green:wps ;; - wr8305rt) + zbt-wr8305rt) status_led=zbtlink:green:sys ;; wt3020) diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 8643613..f9f3b5c 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -421,8 +421,8 @@ ramips_board_detect() { *Xiaomi MiWiFi Mini) name=xiaomi-miwifi-mini ;; - *ZBT WR8305RT) - name=wr8305rt + *Zbtlink ZBT-WR8305RT) + name=zbt-wr8305rt ;; *Zbtlink ZBT-WA05) name=zbt-wa05 diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 8221997..7aab6a1 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -116,7 +116,6 @@ platform_check_image() { wnce2001 | \ wr512-3gn |\ wr6202 |\ - wr8305rt |\ wrtnode |\ oy-0001 |\ wt1520 |\ @@ -127,7 +126,8 @@ platform_check_image() { y1 |\ y1s |\ zte-q7 |\ - zbt-wa05) + zbt-wa05|\ + zbt-wr8305rt) [ $magic != 27051956 ] { echo Invalid image type. return 1 diff --git a/target/linux/ramips/dts/WR8305RT.dts b/target/linux/ramips/dts/WR8305RT.dts deleted file mode 100644 index 007473f..000 --- a/target/linux/ramips/dts/WR8305RT.dts +++ /dev/null @@ -1,112 +0,0 @@ -/dts-v1/; - -/include/ mt7620n.dtsi - -/ { - compatible = wr8305rt, ralink,mt7620n-soc; - model = ZBT WR8305RT; - - palmbus@1000 { - gpio1: gpio@638 { - status = okay; - }; - gpio3: gpio@688 { - status = okay; - }; - - spi@b00 { - status = okay; - - m25p80@0 { - #address-cells = 1; - #size-cells = 1; - compatible = mx25l6405d; - reg = 0 0; - linux,modalias = m25p80, en25q64; - spi-max-frequency = 1000; - - partition@0 { - label = u-boot; - reg = 0x0 0x3; -
[OpenWrt-Devel] [PATCH 06/13] ramips: fix UPVEL model names
Signed-off-by: Piotr Dymacz pep...@gmail.com --- target/linux/ramips/base-files/lib/ramips.sh | 4 ++-- target/linux/ramips/dts/UR-326N4G.dts| 2 +- target/linux/ramips/dts/UR-336UN.dts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 8b9d731..8643613 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -367,10 +367,10 @@ ramips_board_detect() { *TEW-692GR) name=tew-692gr ;; - *UR-326N4G Wireless N router) + *UPVEL UR-326N4G) name=ur-326n4g ;; - *UR-336UN Wireless N router) + *UPVEL UR-336UN) name=ur-336un ;; *V22RW-2X2) diff --git a/target/linux/ramips/dts/UR-326N4G.dts b/target/linux/ramips/dts/UR-326N4G.dts index 8d131f5..11c03eb 100644 --- a/target/linux/ramips/dts/UR-326N4G.dts +++ b/target/linux/ramips/dts/UR-326N4G.dts @@ -4,7 +4,7 @@ / { compatible = UR-326N4G, ralink,rt3052-soc; - model = UR-326N4G Wireless N router; + model = UPVEL UR-326N4G; pinctrl { state_default: pinctrl0 { diff --git a/target/linux/ramips/dts/UR-336UN.dts b/target/linux/ramips/dts/UR-336UN.dts index ab93fb3..e33a56b 100644 --- a/target/linux/ramips/dts/UR-336UN.dts +++ b/target/linux/ramips/dts/UR-336UN.dts @@ -4,7 +4,7 @@ / { compatible = UR-336UN, ralink,rt3052-soc; - model = UR-336UN Wireless N router; + model = UPVEL UR-336UN; pinctrl { state_default: pinctrl0 { -- 2.4.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 13/13] ramips: fix image name for Belkin F7C027
For other Belkin devices we use only their model names in image names, so make the same for Belkin F7C027 (instead of belkinf7c027). Signed-off-by: Piotr Dymacz pep...@gmail.com --- target/linux/ramips/image/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index f97cfcf..aef0ad4 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -525,7 +525,7 @@ Image/Build/Profile/F5D8235V2=$(call BuildFirmware/CustomFlash/$(1),$(1),f5d8235 # 0x77 belkin_f7c027_mtd_size=7798784 -Image/Build/Profile/F7C027=$(call BuildFirmware/CustomFlash/$(1),$(1),belkinf7c027,F7C027,$(belkin_f7c027_mtd_size)) +Image/Build/Profile/F7C027=$(call BuildFirmware/CustomFlash/$(1),$(1),f7c027,F7C027,$(belkin_f7c027_mtd_size)) Image/Build/Profile/FONERA20N=$(call BuildFirmware/Edimax/$(1),$(1),fonera20n,FONERA20N,$(ralink_default_fw_size_8M),RSDK,NL1T,0x5,0xc) -- 2.4.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] obtaining openwrt linux kernel git repo for selected target
Hi All! I want to obtain openwrt linux kernel sources for ar71xx in the form of git repo. So I want to convert the patches from openwrt.git/target/linux/ar71xx/patches-3.18/ into git commits. I'm trying to 'git am' patches from openwrt repo: $ cd linux.git $ git checkout v3.18 $ git am ../openwrt.git/target/linux/ar71xx/patches-3.18/* Applying: MIPS: ath79: Avoid using unitialized 'reg' variable Applying: spi/ath79: make chipselect logic more flexible Patch does not have a valid e-mail address. $ So simple 'git am' can't help me :( Is there any conventional way for getting openwrt linux kernel sources git repo? -- Best regards, Antony Pavlov ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 05/13] ramips: use consistent naming scheme for LEDs, for various manufacturers
On Sun, 26 Jul 2015 18:24:30 +0200, Piotr Dymacz pep...@gmail.com wrote: For some boards in ramips (and other targets) naming scheme for LEDs is: manufacturer:color:led-name, but there are many other boards which don't follow this approach. The upstream convention is device:color:led-name. So actually, the wrong way is where we do the other way around. Imre ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 05/13] ramips: use consistent naming scheme for LEDs, for various manufacturers
On Sun, Jul 26, 2015 at 9:34 PM, Piotr Dymacz pep...@gmail.com wrote: 2015-07-26 21:16 GMT+02:00 Imre Kaloz ka...@openwrt.org: On Sun, 26 Jul 2015 18:24:30 +0200, Piotr Dymacz pep...@gmail.com wrote: For some boards in ramips (and other targets) naming scheme for LEDs is: manufacturer:color:led-name, but there are many other boards which don't follow this approach. The upstream convention is device:color:led-name. So actually, the wrong way is where we do the other way around. That's bad news... I will fix it. But, why then patches with wrong convention are still accepted? Examples: https://dev.openwrt.org/changeset/46248 https://dev.openwrt.org/changeset/46349 https://dev.openwrt.org/changeset/46444 https://dev.openwrt.org/changeset/46454 https://dev.openwrt.org/changeset/46458 Sometimes things slip through. People do mistakes. And, when the convention was changed? It has always been this way since 2006: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=75c1d31d9ea71025b73430c696b727e8aa15872d only the :function part was added a year later. Jonas ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Add WeIO board (http://we-io.net) profile. This patch adds support for WeIO board, which is based on Carambola2 board from 8Devices.
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Just one more, I promise :) Drasko DRASKOVIC drasko.drasko...@gmail.com wrote: + +static void __init weio_common_setup(void) +{ + u8 *art = (u8 *) KSEG1ADDR(0x1fff); + + ath79_register_m25p80(NULL); + ath79_register_wmac(art + WEIO_CALDATA_OFFSET, + art + WEIO_WMAC_MAC_OFFSET); + +/** WeIO uses only WiFi by default (no ETH). If ETH jack is soldered, uncomment following lines */ +#if 0 + ath79_setup_ar933x_phy4_switch(true, true); + + ath79_init_mac(ath79_eth0_data.mac_addr, art + WEIO_MAC0_OFFSET, 0); + ath79_init_mac(ath79_eth1_data.mac_addr, art + WEIO_MAC1_OFFSET, 0); + + ath79_register_mdio(0, 0x0); + + /* LAN ports */ + ath79_register_eth(1); + + /* WAN port */ + ath79_register_eth(0); +#endif /** commented out ETH */ +} + I still think this #ifdefed code should be removed. None of the product literature on your site shows any way of this being added. It's not like there is a two port ethernet footprint that's simply not mounted, you'd have to connect it to the breadboard headers on the side of the board, by the time someone's done that, it's not really the weio board anymore is it? Cheers, Karl P -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBAgAGBQJVtZMXAAoJEBmotQ/U1cr2G6gQALxTf1xexyD9kGcjNDT21HCb t2SjZEPVBEcIYe1RUShCRdAyUs3sgDNPXHoGO9W5i/XjgX0fUxn905hQnVubBRF8 CoOfaJbxoum0RYTF9cqXeGyQVPULGTYl79yQLJqNmnoBuXkDOSQ+dkFH9lcOcTVO 4pFYSD2tt1BX8IXokET/47kMkosYK0adkjzJvppG1EXvOaRUbeM9CVlyaN+BRih5 W0oFCLEnXQdlMCj8AmIMKkohZpBj69V9yXHZVYtRuKbLcJvG3CMAIp6DRqG/Z0YT 1dAdB5rkI86OjvDUPlpLYinFPazDJ6ibpyTWNWhZ/j7NcWU7beX1t3h6Uxfs/kbq V8lzbx2QjreVTTceNi6zDCGCqkejVwV2qH2UIK7g4Lu5m5UiF+1ttbr8CoOxtPT+ adZrFOuVtAD8OsHyx9BKcxNvmUx+1+6YfhGw4dCrePyMfG1AxTHGv6i3yguA63Yf 7LYKA/SIwTCUJiKTdwON0VpRQwnvwSIqFTXp1iah5b8Jpxpu3a8LzjH396dOfYZ2 H3IXByuMpcHkR+sst3iqhPj9ge8O9Ssp2u59HFRYTPOt+e5MTjcQVKxIFGfNXH34 1iSVInuD3MlWfLDqAGeM8dZU3KXA+DYA3hvdarRqcePXS6MdLT6NJAZ9+p3ntw2c WfBsXbyZhdpzmSSXjkru =1Xp3 -END PGP SIGNATURE- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Syntax error in radvd.conf
I have replaced eth0 with lan, but still getting same error /etc/radvd.conf:1 error: syntax error, unexpected STRING, expecting T_INTERFACE [Jul 24 10:51:59] radvd (950): exiting, failed to read config file What this 950 denotes in above error ? Do I need to change something in /etc/config/network ? config interface 'loopback' option ifname 'lo' option proto 'static' option ipaddr '127.0.0.1' option netmask '255.0.0.0' config interface 'lan' option ifname 'eth0' option type 'bridge' option proto 'static' option ipaddr '192.168.1.1' option netmask '255.255.255.0' option ip6assign '60' config globals 'globals' option ula_prefix 'fdf4:7b51:d11d::/48' On Fri, Jul 24, 2015 at 9:26 PM, Luiz Angelo Daros de Luca luizl...@gmail.com wrote: This is a question for openwrt-users. Anyway, interface is the logical openwrt interface (lan, wan), not Linux devices. http://wiki.openwrt.org/doc/uci/radvd Regards, Em sex, 24 de jul de 2015 09:36, Pratik Prajapati pratik.prajapat...@gmail.com escreveu: Hi, I want to run radvd on OpenWrt but its giving me syntax error in radvd.conf radvd.conf: config 'interface' option 'interface' 'eth0' option 'AdvSendAdvert' '1' option 'AdvManagedFlag' '0' option 'AdvOtherConfigFlag' '0' config 'prefix' option 'interface' 'eth0' option 'AdvOnLink' '1' option 'AdvAutonomous' '1' option 'AdvRouterAddr' '0' config 'route' option 'interface''eth0' option 'prefix' '2001:0DB8:1234:5677::/64' option 'AdvRouteLifetime' 'infinity' Error on running: radvd start /etc/radvd.conf:1 error: syntax error, unexpected STRING, expecting T_INTERFACE [Jul 24 12:28:09] radvd (1202): exiting, failed to read config file What needs to be corrected in radvd.conf ? Thanks, Pratik ___ 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
[OpenWrt-Devel] [PATCH 02/13] ramips: remove leading spaces and sort boards alphabetically in base-files/lib/ramips.sh
Signed-off-by: Piotr Dymacz pep...@gmail.com --- target/linux/ramips/base-files/lib/ramips.sh | 288 +-- 1 file changed, 144 insertions(+), 144 deletions(-) diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 7db6d37..8b9d731 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -19,12 +19,6 @@ ramips_board_detect() { *8devices Carambola) name=carambola ;; - *Edimax 3g-6200n) - name=3g-6200n - ;; - *Edimax 3g-6200nl) - name=3g-6200nl - ;; *A5-V11) name=a5-v11 ;; @@ -40,9 +34,6 @@ ramips_board_detect() { *AirLive Air3GII) name=air3gii ;; - *Edimax BR-6425) - name=br6425 - ;; *Allnet ALL0239-3G) name=all0239-3g ;; @@ -55,6 +46,9 @@ ramips_board_detect() { *Allnet ALL5003) name=all5003 ;; + *Alpha ASL26555) + name=asl26555 + ;; *ARC FreeStation5) name=freestation5 ;; @@ -64,14 +58,23 @@ ramips_board_detect() { *Argus ATP-52B) name=argus-atp52b ;; + *AsiaRF AWAPN2403) + name=awapn2403 + ;; *AsiaRF AWM002 EVB) name=awm002-evb ;; *AsiaRF AWM003 EVB) name=awm003-evb ;; - *AsiaRF AWAPN2403) - name=awapn2403 + *Asus RP-N53) + name=rp-n53 + ;; + *Asus RT-N13U) + name=rt-n13u + ;; + *Asus RT-N14U) + name=rt-n14u ;; *Asus WL-330N) name=wl-330n @@ -79,30 +82,30 @@ ramips_board_detect() { *Asus WL-330N3G) name=wl-330n3g ;; - *Alpha ASL26555) - name=asl26555 - ;; - *Aztech HW550-3G) - name=hw550-3g + *AWB WR6202) + name=wr6202 ;; *AXIMCom MR-102N) name=mr-102n ;; - *Buffalo WSR-600DHP) - name=wsr-600 + *Aztech HW550-3G) + name=hw550-3g ;; *Buffalo WSR-1166DHP) name=wsr-1166 ;; + *Buffalo WSR-600DHP) + name=wsr-600 + ;; *Comfast CF-WR800N) name=cf-wr800n ;; - *Firefly FireWRT) - name=firewrt - ;; *CY-SWR1100) name=cy-swr1100 ;; + *DAP-1350) + name=dap-1350 + ;; *DCS-930) name=dcs-930 ;; @@ -127,18 +130,18 @@ ramips_board_detect() { *DIR-610 A1) name=dir-610-a1 ;; + *DIR-615 D) + name=dir-615-d + ;; + *DIR-615 H1) + name=dir-615-h1 + ;; *DIR-620 A1) name=dir-620-a1 ;; *DIR-620 D1) name=dir-620-d1 ;; - *DIR-615 H1) - name=dir-615-h1 - ;; - *DIR-615 D) - name=dir-615-d - ;; *DIR-645) name=dir-645 ;; @@ -148,20 +151,23 @@ ramips_board_detect() { *DIR-860L B1) name=dir-860l-b1 ;; - *DAP-1350) - name=dap-1350 - ;; - *ESR-9753) - name=esr-9753 - ;; *EASYACC WI-STOR WIZARD 8800) name=wizard8800 ;; + *Edimax 3g-6200n) + name=3g-6200n + ;; + *Edimax 3g-6200nl) + name=3g-6200nl + ;; + *Edimax BR-6425) + name=br6425 + ;; *Edimax BR-6475nD) name=br-6475nd ;; - *F7C027) - name=f7c027 + *ESR-9753) + name=esr-9753 ;; *F5D8235 v1) name=f5d8235-v1 @@ -169,23 +175,23 @@ ramips_board_detect() { *F5D8235 v2) name=f5d8235-v2 ;; - *Hauppauge Broadway) - name=broadway + *F7C027) + name=f7c027 ;; - *Huawei D105) - name=d105 + *Firefly FireWRT) + name=firewrt ;; - *La Fonera 2.0N) - name=fonera20n + *HAME MPR-A1) + name=mpr-a1 ;; - *Asus RT-N14U) - name=rt-n14u + *HAME MPR-A2) +
Re: [OpenWrt-Devel] [PATCH 05/13] ramips: use consistent naming scheme for LEDs, for various manufacturers
2015-07-26 21:16 GMT+02:00 Imre Kaloz ka...@openwrt.org: On Sun, 26 Jul 2015 18:24:30 +0200, Piotr Dymacz pep...@gmail.com wrote: For some boards in ramips (and other targets) naming scheme for LEDs is: manufacturer:color:led-name, but there are many other boards which don't follow this approach. The upstream convention is device:color:led-name. So actually, the wrong way is where we do the other way around. That's bad news... I will fix it. But, why then patches with wrong convention are still accepted? Examples: https://dev.openwrt.org/changeset/46248 https://dev.openwrt.org/changeset/46349 https://dev.openwrt.org/changeset/46444 https://dev.openwrt.org/changeset/46454 https://dev.openwrt.org/changeset/46458 And, when the convention was changed? Piotr ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel