From 74cbc4408645845d217797b67abd17c1a684d3df Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 5 Mar 2020 12:21:40 +0100 Subject: [PATCH 1/6] ipq40xx: fix support of EnGenius EAP2200 This fixes a typo in the device string for MAC address setup in 02_network and corrects the indent in the device's DTS files. While at it, move the aliases section before the keys section to have it closer to the top of the file. Fixes: a736d912e2ba ("ipq40xx: add support for EnGenius EAP2200") Signed-off-by: Adrian Schmutzler --- .../ipq40xx/base-files/etc/board.d/02_network | 2 +- .../arm/boot/dts/qcom-ipq4019-eap2200.dts | 20 +++++++++---------- .../arm/boot/dts/qcom-ipq4019-eap2200.dts | 20 +++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network index 190286541a..fb41572e37 100755 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network @@ -110,7 +110,7 @@ ipq40xx_setup_macs() lan_mac=$(mtd_get_mac_ascii bdcfg lanmac) label_mac=$lan_mac ;; - engenius,eap220|\ + engenius,eap2200|\ engenius,emd1) lan_mac=$(mtd_get_mac_ascii 0:APPSBLENV ethaddr) label_mac=$lan_mac diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts index 6862ca87e3..ec3ce447cc 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts @@ -8,16 +8,6 @@ model = "EnGenius EAP2200"; compatible = "engenius,eap2200"; - keys { - compatible = "gpio-keys"; - - wps { - label = "wps"; - gpios = <&tlmm 18 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; - aliases { led-boot = &led_power; led-failsafe = &led_power; @@ -25,6 +15,16 @@ led-upgrade = &led_power; }; + keys { + compatible = "gpio-keys"; + + wps { + label = "wps"; + gpios = <&tlmm 18 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + leds { compatible = "gpio-leds"; diff --git a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts index 6862ca87e3..ec3ce447cc 100644 --- a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts +++ b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts @@ -8,16 +8,6 @@ model = "EnGenius EAP2200"; compatible = "engenius,eap2200"; - keys { - compatible = "gpio-keys"; - - wps { - label = "wps"; - gpios = <&tlmm 18 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; - aliases { led-boot = &led_power; led-failsafe = &led_power; @@ -25,6 +15,16 @@ led-upgrade = &led_power; }; + keys { + compatible = "gpio-keys"; + + wps { + label = "wps"; + gpios = <&tlmm 18 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + leds { compatible = "gpio-leds"; From bdd4153b0ee2cf2bcd26902be41b93827507b856 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 5 Mar 2020 12:28:43 +0100 Subject: [PATCH 2/6] ipq806x: add newline at the end of qcom-ipq8064-v1.0.dtsi The file does not have a newline at the end. Add it to apply to common style. Signed-off-by: Adrian Schmutzler --- .../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi index a22967ebc4..7093b075e4 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi @@ -1 +1 @@ -#include "qcom-ipq8064.dtsi" \ No newline at end of file +#include "qcom-ipq8064.dtsi" From 6b7a525a725a78ff961d91a76e4ea9fbb7066178 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 27 Feb 2020 14:46:24 +0100 Subject: [PATCH 3/6] ramips: fix partition offset for D-Link DIR-810L The Jffs2 partition for the D-Link DIR-810L is currently off by 0x10000. Apply the correct offset based on the other partitions' size/offset and the information about stock OS from the Wiki. This is just based on the named information and _not_ verified on device. Fixes: 36e3424fa520 ("ramips: add support for dir810l and asus rp-n53") Signed-off-by: Adrian Schmutzler Tested-by: Roger Pueyo Centelles --- target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts index da8d2238a1..0b1ca26ba4 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts @@ -102,9 +102,9 @@ read-only; }; - partition@e0000 { + partition@f0000 { label = "Jffs2"; - reg = <0xe0000 0x80000>; + reg = <0xf0000 0x80000>; read-only; }; From 938bc57a45a7f76597c8a38d3dbe930414b10aab Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 27 Feb 2020 14:46:25 +0100 Subject: [PATCH 4/6] ramips: fix and tidy up DTS for D-Link DIR-810L This patch addresses several issues for D-Link DIR-810L: - add correct button codes - harmonize button node names - use generic flash@0 - remove unused pin groups from state_default - improve sorting of properties Signed-off-by: Adrian Schmutzler Tested-by: Roger Pueyo Centelles --- .../ramips/dts/mt7620a_dlink_dir-810l.dts | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts index 0b1ca26ba4..514e9cc354 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts @@ -23,20 +23,20 @@ reset { label = "reset"; gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; - linux,code = ; + linux,code = ; }; wps { label = "wps"; gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; - linux,code = ; + linux,code = ; }; }; leds { compatible = "gpio-leds"; - led_power_green: power { + led_power_green: power_green { label = "dir-810l:green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; }; @@ -46,7 +46,7 @@ gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; }; - power2 { + power_orange { label = "dir-810l:orange:power"; gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; }; @@ -56,7 +56,7 @@ &spi0 { status = "okay"; - m25p80@0 { + flash@0 { compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <10000000>; @@ -119,7 +119,7 @@ &state_default { gpio { - ralink,group = "mdio", "rgmii1", "i2c", "wled", "uartf"; + ralink,group = "i2c", "uartf"; ralink,function = "gpio"; }; }; @@ -130,9 +130,10 @@ }; &gsw { - mediatek,port4 = "ephy"; pinctrl-names = "default"; pinctrl-0 = <&ephy_pins>; + + mediatek,port4 = "ephy"; }; &pcie { @@ -140,9 +141,10 @@ }; &wmac { - ralink,mtd-eeprom = <&factory 0x0>; pinctrl-names = "default"; pinctrl-0 = <&pa_pins>; + + ralink,mtd-eeprom = <&factory 0x0>; mtd-mac-address = <&factory 0x28>; }; From a508ab1ac843c5a60a134bf3cdc8837aee6b8ccc Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 5 Mar 2020 12:41:51 +0100 Subject: [PATCH 5/6] ramips: increase spi-max-frequency to 50 MHz for D-Link DIR-810L Read times drop when increasing frequency to 25 MHz and 50 MHz, but not in between or for further increase. So, use 50 MHz as the lowest frequency with the fastest speed. Test results (thanks to Roger): The device reports a mx25l6405d flash chip. I tried all the maximum values in the devices' datasheet (Table 10. AC CHARACTERISTICS). All of them worked with and without "m25p,fast-read": > 10 MHz root@OpenWrt:~# time cat /dev/mtd* > /dev/null real 1m 33.00s user 0m 0.01s sys 1m 7.56s > 25 MHz root@OpenWrt:~# time cat /dev/mtd* > /dev/null real 0m 34.42s user 0m 0.02s sys 0m 23.58s > 25 MHz, fast read root@OpenWrt:~# time cat /dev/mtd* > /dev/null real 0m 34.45s user 0m 0.02s sys 0m 23.59s > 33 MHz root@OpenWrt:~# time cat /dev/mtd* > /dev/null real 0m 34.39s user 0m 0.00s sys 0m 23.60s > 33 MHz, fast read root@OpenWrt:~# time cat /dev/mtd* > /dev/null real 0m 34.46s user 0m 0.01s sys 0m 23.62s > 50 MHz root@OpenWrt:~# time cat /dev/mtd* > /dev/null real 0m 26.81s user 0m 0.01s sys 0m 18.25s > 50 MHz, fast read root@OpenWrt:~# time cat /dev/mtd* > /dev/null real 0m 26.84s user 0m 0.00s sys 0m 18.25s > 66 MHz root@OpenWrt:~# time cat /dev/mtd* > /dev/null real 0m 26.80s user 0m 0.01s sys 0m 18.23s > 66 MHz, fast read root@OpenWrt:~# time cat /dev/mtd* > /dev/null real 0m 26.80s user 0m 0.02s sys 0m 18.23s > 86 MHz root@OpenWrt:~# time cat /dev/mtd* > /dev/null real 0m 26.84s user 0m 0.01s sys 0m 18.24s > 86 MHz, fast read root@OpenWrt:~# time cat /dev/mtd* > /dev/null real 0m 26.80s user 0m 0.02s sys 0m 18.23s Signed-off-by: Adrian Schmutzler Tested-by: Roger Pueyo Centelles --- target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts index 514e9cc354..0a22eee3b5 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts @@ -59,7 +59,7 @@ flash@0 { compatible = "jedec,spi-nor"; reg = <0>; - spi-max-frequency = <10000000>; + spi-max-frequency = <50000000>; partitions { compatible = "fixed-partitions"; From a017773a92d624142a78452bc0c00e6bc6523967 Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Thu, 5 Mar 2020 00:07:54 +0800 Subject: [PATCH 6/6] ncurses: update to 6.2 Update ncurses to 6.2 Signed-off-by: DENG Qingfang --- package/libs/ncurses/Makefile | 6 +++--- .../100-ncurses-5.6-20080112-urxvt.patch | 2 +- .../101-ncurses-5.6-20080628-kbs.patch | 20 +++++++++---------- .../patches/102-ncurses-5.9-gcc-5.patch | 2 +- .../patches/103-ncurses-ar-determinism.patch | 4 ++-- .../patches/200-fix_missing_include.patch | 2 +- .../libs/ncurses/patches/900-terminfo.patch | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile index e22eb2b893..cc1e960a0c 100644 --- a/package/libs/ncurses/Makefile +++ b/package/libs/ncurses/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ncurses -PKG_VERSION:=6.1 -PKG_RELEASE:=5 +PKG_VERSION:=6.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_HASH:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 +PKG_HASH:=30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d PKG_LICENSE:=MIT PKG_LICENSE_FILES:=README diff --git a/package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch b/package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch index ed7b2ee448..d654eb28f0 100644 --- a/package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch +++ b/package/libs/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch @@ -1,6 +1,6 @@ --- a/misc/terminfo.src +++ b/misc/terminfo.src -@@ -5875,6 +5875,172 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -6145,6 +6145,172 @@ rxvt-cygwin-native|rxvt terminal emulato rxvt-16color|rxvt with 16 colors like aixterm, ncv#32, use=ibm+16color, use=rxvt, diff --git a/package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch b/package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch index ebd6df2e91..835c0c53d6 100644 --- a/package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch +++ b/package/libs/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch @@ -1,14 +1,14 @@ --- a/misc/terminfo.src +++ b/misc/terminfo.src -@@ -4327,6 +4327,7 @@ xterm-xfree86|xterm terminal emulator (X +@@ -4513,6 +4513,7 @@ xterm-xfree86|xterm terminal emulator (X # This version reflects the current xterm features. xterm-new|modern xterm terminal emulator, npc, + kbs=\177, - indn=\E[%p1%dS, kb2=\EOE, kcbt=\E[Z, kent=\EOM, - rin=\E[%p1%dT, use=ansi+rep, use=ecma+strikeout, + kcbt=\E[Z, kent=\EOM, use=ecma+index, use=ansi+rep, + use=ecma+strikeout, use=xterm+keypad, use=vt420+lrmm, use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux, -@@ -5703,6 +5704,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -5943,6 +5944,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 rxvt-basic|rxvt terminal base (X Window System), OTbs, am, bce, eo, mir, msgr, xenl, xon, XT, cols#80, it#8, lines#24, @@ -16,16 +16,16 @@ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[2J, cnorm=\E[?25h, cr=\r, -@@ -5713,7 +5715,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5953,7 +5955,7 @@ rxvt-basic|rxvt terminal base (X Window enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H, - ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, - il1=\E[L, ind=\n, is1=\E[?47l\E=\E[?1l, + ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, + ind=\n, is1=\E[?47l\E=\E[?1l, - is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H, + is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m, -@@ -6883,6 +6885,7 @@ dumb-emacs-ansi|Emacs dumb terminal with +@@ -7454,6 +7456,7 @@ dumb-emacs-ansi|Emacs dumb terminal with screen|VT 100/ANSI X3.64 virtual terminal, OTbs, OTpt, am, km, mir, msgr, xenl, G0, colors#8, cols#80, it#8, lines#24, ncv@, pairs#64, U8#1, @@ -33,7 +33,7 @@ acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy yzz{{||}}~~, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, -@@ -6894,7 +6897,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -7465,7 +7468,7 @@ screen|VT 100/ANSI X3.64 virtual termina dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, @@ -42,7 +42,7 @@ kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, -@@ -7023,6 +7026,7 @@ screen.xterm-r6|screen customized for X1 +@@ -7594,6 +7597,7 @@ screen.xterm-r6|screen customized for X1 # on Solaris because Sun's curses implementation gets confused. screen.teraterm|disable ncv in teraterm, ncv#127, diff --git a/package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch b/package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch index b84fcb965c..972b64977d 100644 --- a/package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch +++ b/package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch @@ -15,7 +15,7 @@ Subject: [PATCH] ncurses 5.9 - patch 20141206 --- a/ncurses/base/MKlib_gen.sh +++ b/ncurses/base/MKlib_gen.sh -@@ -505,11 +505,22 @@ sed -n -f $ED1 \ +@@ -502,11 +502,22 @@ sed -n -f $ED1 \ -e 's/gen_$//' \ -e 's/ / /g' >>$TMP diff --git a/package/libs/ncurses/patches/103-ncurses-ar-determinism.patch b/package/libs/ncurses/patches/103-ncurses-ar-determinism.patch index d4c8f11703..1bfa93e3aa 100644 --- a/package/libs/ncurses/patches/103-ncurses-ar-determinism.patch +++ b/package/libs/ncurses/patches/103-ncurses-ar-determinism.patch @@ -1,6 +1,6 @@ --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -451,7 +451,7 @@ AC_REQUIRE([CF_PROG_AR]) +@@ -454,7 +454,7 @@ AC_REQUIRE([CF_PROG_AR]) AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[ cf_cv_ar_flags=unknown @@ -11,7 +11,7 @@ # check if $ARFLAGS already contains this choice --- a/configure +++ b/configure -@@ -4503,7 +4503,7 @@ if test "${cf_cv_ar_flags+set}" = set; t +@@ -4751,7 +4751,7 @@ if test "${cf_cv_ar_flags+set}" = set; t else cf_cv_ar_flags=unknown diff --git a/package/libs/ncurses/patches/200-fix_missing_include.patch b/package/libs/ncurses/patches/200-fix_missing_include.patch index 4616c4fb70..3c4a0d13a7 100644 --- a/package/libs/ncurses/patches/200-fix_missing_include.patch +++ b/package/libs/ncurses/patches/200-fix_missing_include.patch @@ -1,6 +1,6 @@ --- a/ncurses/curses.priv.h +++ b/ncurses/curses.priv.h -@@ -55,6 +55,11 @@ extern "C" { +@@ -56,6 +56,11 @@ extern "C" { #include diff --git a/package/libs/ncurses/patches/900-terminfo.patch b/package/libs/ncurses/patches/900-terminfo.patch index 645b7ad90e..3c37183f28 100644 --- a/package/libs/ncurses/patches/900-terminfo.patch +++ b/package/libs/ncurses/patches/900-terminfo.patch @@ -1,6 +1,6 @@ --- a/misc/terminfo.src +++ b/misc/terminfo.src -@@ -5563,12 +5563,11 @@ konsole-xf3x|KDE console window with key +@@ -5802,12 +5802,11 @@ konsole-xf3x|KDE console window with key # The value for kbs (see konsole-vt100) reflects local customization rather # than the settings used for XFree86 xterm. konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,