From 18c95c9d6ebea5cef1254ee917bff8aba993666d Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 30 Jan 2020 14:59:25 +0100 Subject: [PATCH 1/6] ath79: add gpio4 pinmux on TL-WR841N/ND v8, WR842N v2, MR3420 v2 This adds a pinmux to the shared DTSI for TP-Link TL-WR841N/ND v8, TL-WR842N v2 and TL-MR3420 v2. It is supposed to be the equivalent of: /* config gpio4 as normal gpio function */ ath79_gpio_output_select(TL_MR3420V2_GPIO_USB_POWER,AR934X_GPIO_OUT_GPIO); This allows to enable USB power on these devices. While at it, move the jtag_disable_pins to &gpio node and remove the redundant status=okay there. Tested on TP-Link TL-WR842N v2. Fixes: FS#2753 Signed-off-by: Adrian Schmutzler Tested-by: Armin Fuerst --- target/linux/ath79/dts/ar9341_tplink.dtsi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/target/linux/ath79/dts/ar9341_tplink.dtsi b/target/linux/ath79/dts/ar9341_tplink.dtsi index 0a950bd1a6..6bd7c3409b 100644 --- a/target/linux/ath79/dts/ar9341_tplink.dtsi +++ b/target/linux/ath79/dts/ar9341_tplink.dtsi @@ -18,9 +18,6 @@ keys: keys { compatible = "gpio-keys"; - pinctrl-names = "default"; - pinctrl-0 = <&jtag_disable_pins>; - rfkill { label = "WiFi"; linux,code = ; @@ -85,7 +82,14 @@ }; &gpio { - status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&jtag_disable_pins &pmx_usb_power>; +}; + +&pinmux { + pmx_usb_power: usb_power { + pinctrl-single,bits = <0x4 0x0 0xff>; + }; }; ð0 { From 0ffb7b02ba334cdd1a74a531ec751b81b51a5b06 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Mon, 3 Feb 2020 15:47:47 +0000 Subject: [PATCH 2/6] tools/libressl: Update to 3.0.2 Update libressl to 3.0.2 and remove 010-avoid-glibc.patch as fix is added by upstream Signed-off-by: Daniel Engberg --- tools/libressl/Makefile | 4 ++-- tools/libressl/patches/010-avoid-glibc.patch | 23 -------------------- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 tools/libressl/patches/010-avoid-glibc.patch diff --git a/tools/libressl/Makefile b/tools/libressl/Makefile index d029666611..1a497935e7 100644 --- a/tools/libressl/Makefile +++ b/tools/libressl/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libressl -PKG_VERSION:=2.9.2 -PKG_HASH:=c4c78167fae325b47aebd8beb54b6041d6f6a56b3743f4bd5d79b15642f9d5d4 +PKG_VERSION:=3.0.2 +PKG_HASH:=df7b172bf79b957dd27ef36dcaa1fb162562c0e8999e194aa8c1a3df2f15398e PKG_RELEASE:=1 PKG_CPE_ID:=cpe:/a:openbsd:libressl diff --git a/tools/libressl/patches/010-avoid-glibc.patch b/tools/libressl/patches/010-avoid-glibc.patch deleted file mode 100644 index e91899c7d7..0000000000 --- a/tools/libressl/patches/010-avoid-glibc.patch +++ /dev/null @@ -1,23 +0,0 @@ -From a747aacc23607c993cc481378782b2c7dd5bc53b Mon Sep 17 00:00:00 2001 -From: Ishimoto Shinobu <47295761+protonesso@users.noreply.github.com> -Date: Tue, 21 May 2019 22:41:05 +0900 -Subject: [PATCH] avoid glibc - -cause problems on musl systems ---- - crypto/compat/getprogname_linux.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - ---- a/crypto/compat/getprogname_linux.c -+++ b/crypto/compat/getprogname_linux.c -@@ -26,9 +26,7 @@ getprogname(void) - #if defined(__ANDROID_API__) && __ANDROID_API__ < 21 - extern const char *__progname; - return __progname; --#elif defined(__GLIBC__) -- return program_invocation_short_name; - #else --#error "Cannot emulate getprogname" -+ return program_invocation_short_name; - #endif - } From 82211e5f49c6517a3b83db888e72a0aea67d5211 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Mon, 3 Feb 2020 13:13:27 +0000 Subject: [PATCH 3/6] tools/patchelf: Update to 0.10 Update patchelf to 0.10 Signed-off-by: Daniel Engberg --- tools/patchelf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/patchelf/Makefile b/tools/patchelf/Makefile index 1728fba277..1b54fbb611 100644 --- a/tools/patchelf/Makefile +++ b/tools/patchelf/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=patchelf -PKG_VERSION:=0.9 +PKG_VERSION:=0.10 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://nixos.org/releases/patchelf/patchelf-$(PKG_VERSION) -PKG_HASH:=a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83 +PKG_HASH:=f670cd462ac7161588c28f45349bc20fb9bd842805e3f71387a320e7a9ddfcf3 HOST_BUILD_PARALLEL:=1 HOST_FIXUP:=autoreconf From 4b591c5e6bd1450063bac82fcf3a572c762f456d Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Mon, 3 Feb 2020 13:09:49 +0000 Subject: [PATCH 4/6] tools/sed: Update to 4.8 Update sed to 4.8 Use POSIX threads Disable i18n and selinux support Signed-off-by: Daniel Engberg --- tools/sed/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/sed/Makefile b/tools/sed/Makefile index ddeb6c457f..4218ac2d59 100644 --- a/tools/sed/Makefile +++ b/tools/sed/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sed -PKG_VERSION:=4.7 +PKG_VERSION:=4.8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_HASH:=2885768cd0a29ff8d58a6280a270ff161f6a3deb5690b2be6c49f46d4c67bd6a +PKG_HASH:=f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633 export SED:= HOST_BUILD_PARALLEL:=1 @@ -24,7 +24,9 @@ include $(INCLUDE_DIR)/host-build.mk HOST_CONFIGURE_ARGS += \ --disable-acl \ --disable-nls \ - --enable-threads=pth + --enable-threads=posix \ + --disable-i18n \ + --without-selinux HOST_CONFIGURE_VARS += \ ac_cv_search_setfilecon=no \ From 477d1c540e1f507f4d9a5184f4305faa52c06ee0 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Mon, 3 Feb 2020 13:04:07 +0000 Subject: [PATCH 5/6] tools/gmp: Remove obsolete options Remove mpbsd argument Signed-off-by: Daniel Engberg --- tools/gmp/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/gmp/Makefile b/tools/gmp/Makefile index 16a4410c31..36d51eb711 100644 --- a/tools/gmp/Makefile +++ b/tools/gmp/Makefile @@ -25,8 +25,7 @@ HOST_CONFIGURE_ARGS += \ --enable-static \ --disable-shared \ --disable-assembly \ - --enable-cxx \ - --enable-mpbsd + --enable-cxx ifeq ($(GNU_HOST_NAME),x86_64-linux-gnux32) HOST_CONFIGURE_ARGS += ABI=x32 From cf443e84f59284c872eeb3a993c9c085cc36eb88 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Mon, 3 Feb 2020 13:21:56 +0000 Subject: [PATCH 6/6] tools/e2fsprogs: Update to 1.45.5 Update e2fsprogs to 1.45.5 Enable pthreads support Signed-off-by: Daniel Engberg --- tools/e2fsprogs/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile index c7ccd4478f..035cb67c23 100644 --- a/tools/e2fsprogs/Makefile +++ b/tools/e2fsprogs/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs -PKG_VERSION:=1.45.4 -PKG_HASH:=65faf6b590ca1da97440d6446bd11de9e0914b42553740ba5d9d2a796fa0dc02 +PKG_VERSION:=1.45.5 +PKG_HASH:=f9faccc0d90f73556e797dc7cc5979b582bd50d3f8609c0f2ad48c736d44aede PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -29,7 +29,8 @@ HOST_CONFIGURE_ARGS += \ --disable-elf-shlibs \ --enable-libuuid \ --disable-tls \ - --disable-nls + --disable-nls \ + --enable-threads=pth define Host/Prepare $(call Host/Prepare/Default)