From 0a19f77f32caef2f3360ae2b4fe46280e826fd96 Mon Sep 17 00:00:00 2001 From: Stijn Segers Date: Thu, 18 Feb 2021 14:10:57 +0100 Subject: [PATCH 01/11] ramips: overwrite reset gpio properties in DIR-860L DTS As suggested by Sergio, this adds GPIOs 19 and 8 explicitly into the DIR-860L DTS, so the PCI-E ports get reset and the N radio (radio1) on PCI-E port 1 comes up reliably. Fixes the following error that popped up in dmesg: [ 1.638942] mt7621-pci 1e140000.pcie: pcie1 no card, disable it (RST & CLK) Suggested-by: Sergio Paracuellos Signed-off-by: Stijn Segers Reviewed-by: Sergio Paracuellos (cherry picked from commit 06356f00200639c48d95330e633965957b0347ab) --- target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts index 5d1c336736..f843f62801 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts @@ -143,6 +143,9 @@ &pcie { status = "okay"; + + reset-gpios = <&gpio 19 GPIO_ACTIVE_LOW>, + <&gpio 8 GPIO_ACTIVE_LOW>; }; &pcie0 { From c53a86806d33a16fe8101719f44e13a53630d887 Mon Sep 17 00:00:00 2001 From: Sander Vanheule Date: Sat, 20 Feb 2021 14:45:26 +0100 Subject: [PATCH 02/11] ramips: mt7621: enable SX150x driver The Netgear R6800 and R6700v2 devices have a Semtech SX1503 GPIO expander controlling the device LEDs. This expander was initially supported on 4.14, but support was lost in the transition to 5.4. Since this driver cannot be built as a kernel module, enable it in the kernel config for all mt7621 devices. Run-tested on a Netgear R6800. Cc: Stijn Segers Cc: Hauke Mehrtens Signed-off-by: Sander Vanheule Tested-by: Stijn Segers (cherry picked from commit 773949c152f7378a303919e790210113012fea04) --- target/linux/ramips/mt7621/config-5.4 | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ramips/mt7621/config-5.4 b/target/linux/ramips/mt7621/config-5.4 index fba22a39cf..057c782760 100644 --- a/target/linux/ramips/mt7621/config-5.4 +++ b/target/linux/ramips/mt7621/config-5.4 @@ -210,6 +210,7 @@ CONFIG_PHYLINK=y CONFIG_PINCTRL=y CONFIG_PINCTRL_RT2880=y # CONFIG_PINCTRL_SINGLE is not set +CONFIG_PINCTRL_SX150X=y CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_SUPPLY=y From 0e8d67023bb7d21f9c4b3db86e9d983b15530ae0 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Sun, 21 Feb 2021 18:33:30 -0300 Subject: [PATCH 03/11] wolfssl: bump to v4.7.0-stable Biggest fix for this version is CVE-2021-3336, which has already been applied here. There are a couple of low severity security bug fixes as well. Three patches are no longer needed, and were removed; the one remaining was refreshed. This tool shows no ABI changes: https://abi-laboratory.pro/index.php?view=objects_report&l=wolfssl&v1=4.6.0&v2=4.7.0 Signed-off-by: Eneas U de Queiroz (cherry picked from commit d1dfb577f1c0d5b1f1fa35000c9ad7abdb7d10ed) --- package/libs/wolfssl/Makefile | 6 +-- .../wolfssl/patches/010-CVE-2021-3336.patch | 53 ------------------- .../patches/100-disable-hardening-check.patch | 2 +- ...Fix-linking-against-hostapd-with-LTO.patch | 25 --------- .../patches/120-enable-secret-callback.patch | 10 ---- 5 files changed, 4 insertions(+), 92 deletions(-) delete mode 100644 package/libs/wolfssl/patches/010-CVE-2021-3336.patch delete mode 100644 package/libs/wolfssl/patches/110-Fix-linking-against-hostapd-with-LTO.patch delete mode 100644 package/libs/wolfssl/patches/120-enable-secret-callback.patch diff --git a/package/libs/wolfssl/Makefile b/package/libs/wolfssl/Makefile index 846351f06d..53cd932d1f 100644 --- a/package/libs/wolfssl/Makefile +++ b/package/libs/wolfssl/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wolfssl -PKG_VERSION:=4.6.0-stable -PKG_RELEASE:=2 +PKG_VERSION:=4.7.0-stable +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/wolfSSL/wolfssl/archive/v$(PKG_VERSION) -PKG_HASH:=053aefbb02d0b06b27c5e2df6875b4b587318755b7db9d6aa8d72206b310a848 +PKG_HASH:=b0e740b31d4d877d540ad50cc539a8873fc41af02bd3091c4357b403f7106e31 PKG_FIXUP:=libtool libtool-abiver PKG_INSTALL:=1 diff --git a/package/libs/wolfssl/patches/010-CVE-2021-3336.patch b/package/libs/wolfssl/patches/010-CVE-2021-3336.patch deleted file mode 100644 index abb9bfdd9b..0000000000 --- a/package/libs/wolfssl/patches/010-CVE-2021-3336.patch +++ /dev/null @@ -1,53 +0,0 @@ -From fad1e67677bf7797b6bd6e1f21a513c289d963a7 Mon Sep 17 00:00:00 2001 -From: Sean Parkinson -Date: Thu, 21 Jan 2021 08:24:38 +1000 -Subject: [PATCH] TLS 1.3: ensure key for signature in CertificateVerify - ---- - src/tls13.c | 18 +++++++++++++----- - 1 file changed, 13 insertions(+), 5 deletions(-) - ---- a/src/tls13.c -+++ b/src/tls13.c -@@ -5624,28 +5624,36 @@ static int DoTls13CertificateVerify(WOLF - #ifdef HAVE_ED25519 - if (args->sigAlgo == ed25519_sa_algo && - !ssl->peerEd25519KeyPresent) { -- WOLFSSL_MSG("Oops, peer sent ED25519 key but not in verify"); -+ WOLFSSL_MSG("Peer sent ED22519 sig but not ED22519 cert"); -+ ret = SIG_VERIFY_E; -+ goto exit_dcv; - } - #endif - #ifdef HAVE_ED448 - if (args->sigAlgo == ed448_sa_algo && !ssl->peerEd448KeyPresent) { -- WOLFSSL_MSG("Oops, peer sent ED448 key but not in verify"); -+ WOLFSSL_MSG("Peer sent ED448 sig but not ED448 cert"); -+ ret = SIG_VERIFY_E; -+ goto exit_dcv; - } - #endif - #ifdef HAVE_ECC - if (args->sigAlgo == ecc_dsa_sa_algo && - !ssl->peerEccDsaKeyPresent) { -- WOLFSSL_MSG("Oops, peer sent ECC key but not in verify"); -+ WOLFSSL_MSG("Peer sent ECC sig but not ECC cert"); -+ ret = SIG_VERIFY_E; -+ goto exit_dcv; - } - #endif - #ifndef NO_RSA - if (args->sigAlgo == rsa_sa_algo) { -- WOLFSSL_MSG("Oops, peer sent PKCS#1.5 signature"); -+ WOLFSSL_MSG("Peer sent PKCS#1.5 algo but not in certificate"); - ERROR_OUT(INVALID_PARAMETER, exit_dcv); - } - if (args->sigAlgo == rsa_pss_sa_algo && - (ssl->peerRsaKey == NULL || !ssl->peerRsaKeyPresent)) { -- WOLFSSL_MSG("Oops, peer sent RSA key but not in verify"); -+ WOLFSSL_MSG("Peer sent RSA sig but not RSA cert"); -+ ret = SIG_VERIFY_E; -+ goto exit_dcv; - } - #endif - diff --git a/package/libs/wolfssl/patches/100-disable-hardening-check.patch b/package/libs/wolfssl/patches/100-disable-hardening-check.patch index c2793285e7..c89ff1be9d 100644 --- a/package/libs/wolfssl/patches/100-disable-hardening-check.patch +++ b/package/libs/wolfssl/patches/100-disable-hardening-check.patch @@ -1,6 +1,6 @@ --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h -@@ -2248,7 +2248,7 @@ extern void uITRON4_free(void *p) ; +@@ -2255,7 +2255,7 @@ extern void uITRON4_free(void *p) ; #endif /* warning for not using harden build options (default with ./configure) */ diff --git a/package/libs/wolfssl/patches/110-Fix-linking-against-hostapd-with-LTO.patch b/package/libs/wolfssl/patches/110-Fix-linking-against-hostapd-with-LTO.patch deleted file mode 100644 index c24a15116f..0000000000 --- a/package/libs/wolfssl/patches/110-Fix-linking-against-hostapd-with-LTO.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 391ecbd647c121300dc7dcf209e412ccb7b8d432 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Fri, 1 Jan 2021 21:57:56 +0100 -Subject: [PATCH] Fix linking against hostapd with LTO - -When running LTO on wolfssl the ecc_map() function is removed from the -binary by GCC 8.4.0. This function is used by multiple functions from -the crypto_wolfssl.c implementation of hostapd master. - -Fixes: 780e8a4619b6 ("Fixes for building `--enable-wpas=small` with WPA Supplicant v2.7.") -Signed-off-by: Hauke Mehrtens ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - ---- a/configure.ac -+++ b/configure.ac -@@ -947,6 +947,7 @@ then - AM_CFLAGS="$AM_CFLAGS -DOPENSSL_EXTRA_X509_SMALL" - - AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_PUBLIC_MP" -+ AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_PUBLIC_ECC_ADD_DBL" - AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DER_LOAD" - AM_CFLAGS="$AM_CFLAGS -DATOMIC_USER" - AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_KEY_GEN" diff --git a/package/libs/wolfssl/patches/120-enable-secret-callback.patch b/package/libs/wolfssl/patches/120-enable-secret-callback.patch deleted file mode 100644 index 9c9b361d01..0000000000 --- a/package/libs/wolfssl/patches/120-enable-secret-callback.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -943,6 +943,7 @@ then - AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ALWAYS_KEEP_SNI" - AM_CFLAGS="$AM_CFLAGS -DHAVE_EX_DATA" - AM_CFLAGS="$AM_CFLAGS -DHAVE_EXT_CACHE" -+ AM_CFLAGS="$AM_CFLAGS -DHAVE_SECRET_CALLBACK" - AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_EITHER_SIDE" - AM_CFLAGS="$AM_CFLAGS -DOPENSSL_EXTRA_X509_SMALL" - From f647d9e6bbf423078f0554ff974fdcf47b21a9ce Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sat, 20 Feb 2021 21:24:11 +0100 Subject: [PATCH 04/11] download: remove broken mirrors These mirrors don't exist anymore. Remove them. Signed-off-by: David Bauer (cherry picked from commit f04e0074915f03249cdebb460d4dc92875091c63) --- scripts/download.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/download.pl b/scripts/download.pl index e13405033f..beb3abdeee 100755 --- a/scripts/download.pl +++ b/scripts/download.pl @@ -226,7 +226,6 @@ foreach my $mirror (@ARGV) { push @mirrors, "http://ftp.acc.umu.se/mirror/gnu.org/savannah/$1"; push @mirrors, "http://nongnu.uib.no/$1"; push @mirrors, "http://ftp.igh.cnrs.fr/pub/nongnu/$1"; - push @mirrors, "http://public.p-knowledge.co.jp/Savannah-nongnu-mirror/$1"; push @mirrors, "ftp://cdimage.debian.org/mirror/gnu.org/savannah/$1"; push @mirrors, "ftp://ftp.acc.umu.se/mirror/gnu.org/savannah/$1"; } elsif ($mirror =~ /^\@KERNEL\/(.+)$/) { @@ -238,7 +237,6 @@ foreach my $mirror (@ARGV) { } foreach my $dir (@extra) { push @mirrors, "https://cdn.kernel.org/pub/$dir"; - push @mirrors, "https://mirror.rackspace.com/kernel.org/pub/$dir"; push @mirrors, "https://download.xs4all.nl/ftp.kernel.org/pub/$dir"; push @mirrors, "https://mirrors.mit.edu/kernel/$dir"; push @mirrors, "http://ftp.nara.wide.ad.jp/pub/kernel.org/$dir"; From 86801bd3d8067c1a1ccc80fd665ed1cfb9c9fb51 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sat, 20 Feb 2021 11:08:26 +0100 Subject: [PATCH 05/11] wolfssl: fix Ed25519 typo in config prompt Signed-off-by: Christian Lamparter (cherry picked from commit 09e66112f1ea9f5838ce80533f3850523dc30230) --- package/libs/wolfssl/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libs/wolfssl/Config.in b/package/libs/wolfssl/Config.in index c2f66589e6..5d1f119ac4 100644 --- a/package/libs/wolfssl/Config.in +++ b/package/libs/wolfssl/Config.in @@ -48,7 +48,7 @@ config WOLFSSL_HAS_WPAS default y config WOLFSSL_HAS_ECC25519 - bool "Include ECC Curve 22519 support" + bool "Include ECC Curve 25519 support" default n config WOLFSSL_HAS_DEVCRYPTO From a75520c678506575ec61ab6c9925364983c5be36 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 19 Feb 2021 02:30:14 +0100 Subject: [PATCH 06/11] openssl: update package sources OpenSSL downloads itself are distributed using Akamai CDN, so use these sources as the highest priority. Remove a stale mirror which seems to be offline for a longer time already. Add fallbacks to the old release path also for the mirrors. Signed-off-by: David Bauer (cherry picked from commit 10e84bde369d7cfb60d6ac6ee5c7211474bd4179) --- package/libs/openssl/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 4fb4cb2784..7dbbd65026 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -19,11 +19,13 @@ PKG_BUILD_PARALLEL:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ - http://ftp.fi.muni.cz/pub/openssl/source/ \ - http://ftp.linux.hr/pub/openssl/source/ \ - ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/ \ http://www.openssl.org/source/ \ - http://www.openssl.org/source/old/$(PKG_BASE)/ + http://www.openssl.org/source/old/$(PKG_BASE)/ \ + http://ftp.fi.muni.cz/pub/openssl/source/ \ + http://ftp.fi.muni.cz/pub/openssl/source/old/$(PKG_BASE)/ \ + ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/ \ + ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/old/$(PKG_BASE)/ + PKG_HASH:=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf PKG_LICENSE:=OpenSSL From f6b175a9bfa3a2d9ebc8672eaedf206b41d0f98b Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 24 Feb 2021 11:53:03 +0100 Subject: [PATCH 07/11] zlib: properly split patches This package had two patches (with two headers etc.) in one file, which would have quilt merging them during a refresh. Separate these patches into two files, as the original intent seems to be having them separate. Signed-off-by: Adrian Schmutzler (cherry picked from commit 221eefaf6b301043c491aab8815fcfa24e8a5583) --- ...m-specific-optimisations-for-inflate.patch | 502 ------------------ ...m-specific-optimisations-for-inflate.patch | 501 +++++++++++++++++ ...cefiles-in-patch-002-to-buildsystem.patch} | 0 ...ch => 005-relative-pkg-config-paths.patch} | 0 4 files changed, 501 insertions(+), 502 deletions(-) create mode 100644 package/libs/zlib/patches/003-arm-specific-optimisations-for-inflate.patch rename package/libs/zlib/patches/{003-attach-sourcefiles-in-patch-002-to-buildsystem.patch => 004-attach-sourcefiles-in-patch-002-to-buildsystem.patch} (100%) rename package/libs/zlib/patches/{004-relative-pkg-config-paths.patch => 005-relative-pkg-config-paths.patch} (100%) diff --git a/package/libs/zlib/patches/002-arm-specific-optimisations-for-inflate.patch b/package/libs/zlib/patches/002-arm-specific-optimisations-for-inflate.patch index 475ed6f3e9..d181b034e5 100644 --- a/package/libs/zlib/patches/002-arm-specific-optimisations-for-inflate.patch +++ b/package/libs/zlib/patches/002-arm-specific-optimisations-for-inflate.patch @@ -1907,505 +1907,3 @@ index 00000000..ac333e8c + state = (struct inflate_state FAR *)strm->state; + return (unsigned long)(state->next - state->codes); +} - -From 247147654fe5cd11cf15d8dff91440405ea57040 Mon Sep 17 00:00:00 2001 -From: Simon Hosie -Date: Wed, 12 Apr 2017 15:44:21 -0700 -Subject: [PATCH 2/2] Inflate using wider loads and stores - -In inflate_fast() the output pointer always has plenty of room to write. This -means that so long as the target is capable, wide un-aligned loads and stores -can be used to transfer several bytes at once. When the reference distance is -too short simply unroll the data a little to increase the distance. - -Change-Id: I59854eb25d2b1e43561c8a2afaf9175bf10cf674 ---- - contrib/arm/chunkcopy.h | 279 ++++++++++++++++++++++++++++++++++++++++++++++++ - contrib/arm/inffast.c | 96 +++++++---------- - contrib/arm/inflate.c | 22 ++-- - 3 files changed, 335 insertions(+), 62 deletions(-) - create mode 100644 contrib/arm/chunkcopy.h - -diff --git a/contrib/arm/chunkcopy.h b/contrib/arm/chunkcopy.h -new file mode 100644 -index 00000000..2d6fd6f9 ---- /dev/null -+++ b/contrib/arm/chunkcopy.h -@@ -0,0 +1,279 @@ -+/* chunkcopy.h -- fast copies and sets -+ * Copyright (C) 2017 ARM, Inc. -+ * For conditions of distribution and use, see copyright notice in zlib.h -+ */ -+ -+#ifndef CHUNKCOPY_H -+#define CHUNKCOPY_H -+ -+#include "zutil.h" -+#include -+ -+#if __STDC_VERSION__ >= 199901L -+#define Z_RESTRICT restrict -+#else -+#define Z_RESTRICT -+#endif -+ -+typedef uint8x16_t chunkcopy_chunk_t; -+#define CHUNKCOPY_CHUNK_SIZE sizeof(chunkcopy_chunk_t) -+ -+/* -+ Ask the compiler to perform a wide, unaligned load with an machine -+ instruction appropriate for the chunkcopy_chunk_t type. -+ */ -+static inline chunkcopy_chunk_t loadchunk(const unsigned char FAR *s) { -+ chunkcopy_chunk_t c; -+ __builtin_memcpy(&c, s, sizeof(c)); -+ return c; -+} -+ -+/* -+ Ask the compiler to perform a wide, unaligned store with an machine -+ instruction appropriate for the chunkcopy_chunk_t type. -+ */ -+static inline void storechunk(unsigned char FAR *d, chunkcopy_chunk_t c) { -+ __builtin_memcpy(d, &c, sizeof(c)); -+} -+ -+/* -+ Perform a memcpy-like operation, but assume that length is non-zero and that -+ it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE bytes of output even if -+ the length is shorter than this. -+ -+ It also guarantees that it will properly unroll the data if the distance -+ between `out` and `from` is at least CHUNKCOPY_CHUNK_SIZE, which we rely on -+ in chunkcopy_relaxed(). -+ -+ Aside from better memory bus utilisation, this means that short copies -+ (CHUNKCOPY_CHUNK_SIZE bytes or fewer) will fall straight through the loop -+ without iteration, which will hopefully make the branch prediction more -+ reliable. -+ */ -+static inline unsigned char FAR *chunkcopy_core(unsigned char FAR *out, -+ const unsigned char FAR *from, -+ unsigned len) { -+ int bump = (--len % CHUNKCOPY_CHUNK_SIZE) + 1; -+ storechunk(out, loadchunk(from)); -+ out += bump; -+ from += bump; -+ len /= CHUNKCOPY_CHUNK_SIZE; -+ while (len-- > 0) { -+ storechunk(out, loadchunk(from)); -+ out += CHUNKCOPY_CHUNK_SIZE; -+ from += CHUNKCOPY_CHUNK_SIZE; -+ } -+ return out; -+} -+ -+/* -+ Like chunkcopy_core, but avoid writing beyond of legal output. -+ -+ Accepts an additional pointer to the end of safe output. A generic safe -+ copy would use (out + len), but it's normally the case that the end of the -+ output buffer is beyond the end of the current copy, and this can still be -+ exploited. -+ */ -+static inline unsigned char FAR *chunkcopy_core_safe(unsigned char FAR *out, -+ const unsigned char FAR * from, -+ unsigned len, -+ unsigned char FAR *limit) { -+ Assert(out + len <= limit, "chunk copy exceeds safety limit"); -+ if (limit - out < CHUNKCOPY_CHUNK_SIZE) { -+ const unsigned char FAR * Z_RESTRICT rfrom = from; -+ if (len & 8) { __builtin_memcpy(out, rfrom, 8); out += 8; rfrom += 8; } -+ if (len & 4) { __builtin_memcpy(out, rfrom, 4); out += 4; rfrom += 4; } -+ if (len & 2) { __builtin_memcpy(out, rfrom, 2); out += 2; rfrom += 2; } -+ if (len & 1) { *out++ = *rfrom++; } -+ return out; -+ } -+ return chunkcopy_core(out, from, len); -+} -+ -+/* -+ Perform short copies until distance can be rewritten as being at least -+ CHUNKCOPY_CHUNK_SIZE. -+ -+ This assumes that it's OK to overwrite at least the first -+ 2*CHUNKCOPY_CHUNK_SIZE bytes of output even if the copy is shorter than -+ this. This assumption holds within inflate_fast() which starts every -+ iteration with at least 258 bytes of output space available (258 being the -+ maximum length output from a single token; see inffast.c). -+ */ -+static inline unsigned char FAR *chunkunroll_relaxed(unsigned char FAR *out, -+ unsigned FAR *dist, -+ unsigned FAR *len) { -+ const unsigned char FAR *from = out - *dist; -+ while (*dist < *len && *dist < CHUNKCOPY_CHUNK_SIZE) { -+ storechunk(out, loadchunk(from)); -+ out += *dist; -+ *len -= *dist; -+ *dist += *dist; -+ } -+ return out; -+} -+ -+ -+static inline uint8x16_t chunkset_vld1q_dup_u8x8(const unsigned char FAR * Z_RESTRICT from) { -+#if defined(__clang__) || defined(__aarch64__) -+ return vreinterpretq_u8_u64(vld1q_dup_u64((void *)from)); -+#else -+ /* 32-bit GCC uses an alignment hint for vld1q_dup_u64, even when given a -+ * void pointer, so here's an alternate implementation. -+ */ -+ uint8x8_t h = vld1_u8(from); -+ return vcombine_u8(h, h); -+#endif -+} -+ -+/* -+ Perform an overlapping copy which behaves as a memset() operation, but -+ supporting periods other than one, and assume that length is non-zero and -+ that it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE*3 bytes of output -+ even if the length is shorter than this. -+ */ -+static inline unsigned char FAR *chunkset_core(unsigned char FAR *out, -+ unsigned period, -+ unsigned len) { -+ uint8x16_t f; -+ int bump = ((len - 1) % sizeof(f)) + 1; -+ -+ switch (period) { -+ case 1: -+ f = vld1q_dup_u8(out - 1); -+ vst1q_u8(out, f); -+ out += bump; -+ len -= bump; -+ while (len > 0) { -+ vst1q_u8(out, f); -+ out += sizeof(f); -+ len -= sizeof(f); -+ } -+ return out; -+ case 2: -+ f = vreinterpretq_u8_u16(vld1q_dup_u16((void *)(out - 2))); -+ vst1q_u8(out, f); -+ out += bump; -+ len -= bump; -+ if (len > 0) { -+ f = vreinterpretq_u8_u16(vld1q_dup_u16((void *)(out - 2))); -+ do { -+ vst1q_u8(out, f); -+ out += sizeof(f); -+ len -= sizeof(f); -+ } while (len > 0); -+ } -+ return out; -+ case 4: -+ f = vreinterpretq_u8_u32(vld1q_dup_u32((void *)(out - 4))); -+ vst1q_u8(out, f); -+ out += bump; -+ len -= bump; -+ if (len > 0) { -+ f = vreinterpretq_u8_u32(vld1q_dup_u32((void *)(out - 4))); -+ do { -+ vst1q_u8(out, f); -+ out += sizeof(f); -+ len -= sizeof(f); -+ } while (len > 0); -+ } -+ return out; -+ case 8: -+ f = chunkset_vld1q_dup_u8x8(out - 8); -+ vst1q_u8(out, f); -+ out += bump; -+ len -= bump; -+ if (len > 0) { -+ f = chunkset_vld1q_dup_u8x8(out - 8); -+ do { -+ vst1q_u8(out, f); -+ out += sizeof(f); -+ len -= sizeof(f); -+ } while (len > 0); -+ } -+ return out; -+ } -+ out = chunkunroll_relaxed(out, &period, &len); -+ return chunkcopy_core(out, out - period, len); -+} -+ -+/* -+ Perform a memcpy-like operation, but assume that length is non-zero and that -+ it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE bytes of output even if -+ the length is shorter than this. -+ -+ Unlike chunkcopy_core() above, no guarantee is made regarding the behaviour -+ of overlapping buffers, regardless of the distance between the pointers. -+ This is reflected in the `restrict`-qualified pointers, allowing the -+ compiler to reorder loads and stores. -+ */ -+static inline unsigned char FAR *chunkcopy_relaxed(unsigned char FAR * Z_RESTRICT out, -+ const unsigned char FAR * Z_RESTRICT from, -+ unsigned len) { -+ return chunkcopy_core(out, from, len); -+} -+ -+/* -+ Like chunkcopy_relaxed, but avoid writing beyond of legal output. -+ -+ Unlike chunkcopy_core_safe() above, no guarantee is made regarding the -+ behaviour of overlapping buffers, regardless of the distance between the -+ pointers. This is reflected in the `restrict`-qualified pointers, allowing -+ the compiler to reorder loads and stores. -+ -+ Accepts an additional pointer to the end of safe output. A generic safe -+ copy would use (out + len), but it's normally the case that the end of the -+ output buffer is beyond the end of the current copy, and this can still be -+ exploited. -+ */ -+static inline unsigned char FAR *chunkcopy_safe(unsigned char FAR *out, -+ const unsigned char FAR * Z_RESTRICT from, -+ unsigned len, -+ unsigned char FAR *limit) { -+ Assert(out + len <= limit, "chunk copy exceeds safety limit"); -+ return chunkcopy_core_safe(out, from, len, limit); -+} -+ -+/* -+ Perform chunky copy within the same buffer, where the source and destination -+ may potentially overlap. -+ -+ Assumes that len > 0 on entry, and that it's safe to write at least -+ CHUNKCOPY_CHUNK_SIZE*3 bytes to the output. -+ */ -+static inline unsigned char FAR *chunkcopy_lapped_relaxed(unsigned char FAR *out, -+ unsigned dist, -+ unsigned len) { -+ if (dist < len && dist < CHUNKCOPY_CHUNK_SIZE) { -+ return chunkset_core(out, dist, len); -+ } -+ return chunkcopy_core(out, out - dist, len); -+} -+ -+/* -+ Behave like chunkcopy_lapped_relaxed, but avoid writing beyond of legal output. -+ -+ Accepts an additional pointer to the end of safe output. A generic safe -+ copy would use (out + len), but it's normally the case that the end of the -+ output buffer is beyond the end of the current copy, and this can still be -+ exploited. -+ */ -+static inline unsigned char FAR *chunkcopy_lapped_safe(unsigned char FAR *out, -+ unsigned dist, -+ unsigned len, -+ unsigned char FAR *limit) { -+ Assert(out + len <= limit, "chunk copy exceeds safety limit"); -+ if (limit - out < CHUNKCOPY_CHUNK_SIZE * 3) { -+ /* TODO: try harder to optimise this */ -+ while (len-- > 0) { -+ *out = *(out - dist); -+ out++; -+ } -+ return out; -+ } -+ return chunkcopy_lapped_relaxed(out, dist, len); -+} -+ -+#undef Z_RESTRICT -+ -+#endif /* CHUNKCOPY_H */ -diff --git a/contrib/arm/inffast.c b/contrib/arm/inffast.c -index 0dbd1dbc..f7f50071 100644 ---- a/contrib/arm/inffast.c -+++ b/contrib/arm/inffast.c -@@ -7,6 +7,7 @@ - #include "inftrees.h" - #include "inflate.h" - #include "inffast.h" -+#include "chunkcopy.h" - - #ifdef ASMINF - # pragma message("Assembler code may have bugs -- use at your own risk") -@@ -57,6 +58,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ - unsigned char FAR *out; /* local strm->next_out */ - unsigned char FAR *beg; /* inflate()'s initial strm->next_out */ - unsigned char FAR *end; /* while out < end, enough space available */ -+ unsigned char FAR *limit; /* safety limit for chunky copies */ - #ifdef INFLATE_STRICT - unsigned dmax; /* maximum distance from zlib header */ - #endif -@@ -84,12 +86,13 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ - out = strm->next_out; - beg = out - (start - strm->avail_out); - end = out + (strm->avail_out - 257); -+ limit = out + strm->avail_out; - #ifdef INFLATE_STRICT - dmax = state->dmax; - #endif - wsize = state->wsize; - whave = state->whave; -- wnext = state->wnext; -+ wnext = (state->wnext == 0 && whave >= wsize) ? wsize : state->wnext; - window = state->window; - hold = state->hold; - bits = state->bits; -@@ -197,70 +200,51 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ - #endif - } - from = window; -- if (wnext == 0) { /* very common case */ -- from += wsize - op; -- if (op < len) { /* some from window */ -- len -= op; -- do { -- *out++ = *from++; -- } while (--op); -- from = out - dist; /* rest from output */ -- } -+ if (wnext >= op) { /* contiguous in window */ -+ from += wnext - op; - } -- else if (wnext < op) { /* wrap around window */ -- from += wsize + wnext - op; -+ else { /* wrap around window */ - op -= wnext; -+ from += wsize - op; - if (op < len) { /* some from end of window */ - len -= op; -- do { -- *out++ = *from++; -- } while (--op); -- from = window; -- if (wnext < len) { /* some from start of window */ -- op = wnext; -- len -= op; -- do { -- *out++ = *from++; -- } while (--op); -- from = out - dist; /* rest from output */ -- } -+ out = chunkcopy_safe(out, from, op, limit); -+ from = window; /* more from start of window */ -+ op = wnext; -+ /* This (rare) case can create a situation where -+ the first chunkcopy below must be checked. -+ */ - } - } -- else { /* contiguous in window */ -- from += wnext - op; -- if (op < len) { /* some from window */ -- len -= op; -- do { -- *out++ = *from++; -- } while (--op); -- from = out - dist; /* rest from output */ -- } -- } -- while (len > 2) { -- *out++ = *from++; -- *out++ = *from++; -- *out++ = *from++; -- len -= 3; -- } -- if (len) { -- *out++ = *from++; -- if (len > 1) -- *out++ = *from++; -+ if (op < len) { /* still need some from output */ -+ out = chunkcopy_safe(out, from, op, limit); -+ len -= op; -+ /* When dist is small the amount of data that can be -+ copied from the window is also small, and progress -+ towards the dangerous end of the output buffer is -+ also small. This means that for trivial memsets and -+ for chunkunroll_relaxed() a safety check is -+ unnecessary. However, these conditions may not be -+ entered at all, and in that case it's possible that -+ the main copy is near the end. -+ */ -+ out = chunkunroll_relaxed(out, &dist, &len); -+ out = chunkcopy_safe(out, out - dist, len, limit); -+ } else { -+ /* from points to window, so there is no risk of -+ overlapping pointers requiring memset-like behaviour -+ */ -+ out = chunkcopy_safe(out, from, len, limit); - } - } - else { -- from = out - dist; /* copy direct from output */ -- do { /* minimum length is three */ -- *out++ = *from++; -- *out++ = *from++; -- *out++ = *from++; -- len -= 3; -- } while (len > 2); -- if (len) { -- *out++ = *from++; -- if (len > 1) -- *out++ = *from++; -- } -+ /* Whole reference is in range of current output. No -+ range checks are necessary because we start with room -+ for at least 258 bytes of output, so unroll and roundoff -+ operations can write beyond `out+len` so long as they -+ stay within 258 bytes of `out`. -+ */ -+ out = chunkcopy_lapped_relaxed(out, dist, len); - } - } - else if ((op & 64) == 0) { /* 2nd level distance code */ -diff --git a/contrib/arm/inflate.c b/contrib/arm/inflate.c -index ac333e8c..e40322c3 100644 ---- a/contrib/arm/inflate.c -+++ b/contrib/arm/inflate.c -@@ -84,6 +84,7 @@ - #include "inftrees.h" - #include "inflate.h" - #include "inffast.h" -+#include "contrib/arm/chunkcopy.h" - - #ifdef MAKEFIXED - # ifndef BUILDFIXED -@@ -405,10 +406,20 @@ unsigned copy; - - /* if it hasn't been done already, allocate space for the window */ - if (state->window == Z_NULL) { -+ unsigned wsize = 1U << state->wbits; - state->window = (unsigned char FAR *) -- ZALLOC(strm, 1U << state->wbits, -+ ZALLOC(strm, wsize + CHUNKCOPY_CHUNK_SIZE, - sizeof(unsigned char)); - if (state->window == Z_NULL) return 1; -+#ifdef INFLATE_CLEAR_UNUSED_UNDEFINED -+ /* Copies from the overflow portion of this buffer are undefined and -+ may cause analysis tools to raise a warning if we don't initialize -+ it. However, this undefined data overwrites other undefined data -+ and is subsequently either overwritten or left deliberately -+ undefined at the end of decode; so there's really no point. -+ */ -+ memset(state->window + wsize, 0, CHUNKCOPY_CHUNK_SIZE); -+#endif - } - - /* if window not in use yet, initialize */ -@@ -1175,17 +1186,16 @@ int flush; - else - from = state->window + (state->wnext - copy); - if (copy > state->length) copy = state->length; -+ if (copy > left) copy = left; -+ put = chunkcopy_safe(put, from, copy, put + left); - } - else { /* copy from output */ -- from = put - state->offset; - copy = state->length; -+ if (copy > left) copy = left; -+ put = chunkcopy_lapped_safe(put, state->offset, copy, put + left); - } -- if (copy > left) copy = left; - left -= copy; - state->length -= copy; -- do { -- *put++ = *from++; -- } while (--copy); - if (state->length == 0) state->mode = LEN; - break; - case LIT: diff --git a/package/libs/zlib/patches/003-arm-specific-optimisations-for-inflate.patch b/package/libs/zlib/patches/003-arm-specific-optimisations-for-inflate.patch new file mode 100644 index 0000000000..9370264c40 --- /dev/null +++ b/package/libs/zlib/patches/003-arm-specific-optimisations-for-inflate.patch @@ -0,0 +1,501 @@ +From 247147654fe5cd11cf15d8dff91440405ea57040 Mon Sep 17 00:00:00 2001 +From: Simon Hosie +Date: Wed, 12 Apr 2017 15:44:21 -0700 +Subject: [PATCH 2/2] Inflate using wider loads and stores + +In inflate_fast() the output pointer always has plenty of room to write. This +means that so long as the target is capable, wide un-aligned loads and stores +can be used to transfer several bytes at once. When the reference distance is +too short simply unroll the data a little to increase the distance. + +Change-Id: I59854eb25d2b1e43561c8a2afaf9175bf10cf674 +--- + contrib/arm/chunkcopy.h | 279 ++++++++++++++++++++++++++++++++++++++++++++++++ + contrib/arm/inffast.c | 96 +++++++---------- + contrib/arm/inflate.c | 22 ++-- + 3 files changed, 335 insertions(+), 62 deletions(-) + create mode 100644 contrib/arm/chunkcopy.h + +diff --git a/contrib/arm/chunkcopy.h b/contrib/arm/chunkcopy.h +new file mode 100644 +index 00000000..2d6fd6f9 +--- /dev/null ++++ b/contrib/arm/chunkcopy.h +@@ -0,0 +1,279 @@ ++/* chunkcopy.h -- fast copies and sets ++ * Copyright (C) 2017 ARM, Inc. ++ * For conditions of distribution and use, see copyright notice in zlib.h ++ */ ++ ++#ifndef CHUNKCOPY_H ++#define CHUNKCOPY_H ++ ++#include "zutil.h" ++#include ++ ++#if __STDC_VERSION__ >= 199901L ++#define Z_RESTRICT restrict ++#else ++#define Z_RESTRICT ++#endif ++ ++typedef uint8x16_t chunkcopy_chunk_t; ++#define CHUNKCOPY_CHUNK_SIZE sizeof(chunkcopy_chunk_t) ++ ++/* ++ Ask the compiler to perform a wide, unaligned load with an machine ++ instruction appropriate for the chunkcopy_chunk_t type. ++ */ ++static inline chunkcopy_chunk_t loadchunk(const unsigned char FAR *s) { ++ chunkcopy_chunk_t c; ++ __builtin_memcpy(&c, s, sizeof(c)); ++ return c; ++} ++ ++/* ++ Ask the compiler to perform a wide, unaligned store with an machine ++ instruction appropriate for the chunkcopy_chunk_t type. ++ */ ++static inline void storechunk(unsigned char FAR *d, chunkcopy_chunk_t c) { ++ __builtin_memcpy(d, &c, sizeof(c)); ++} ++ ++/* ++ Perform a memcpy-like operation, but assume that length is non-zero and that ++ it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE bytes of output even if ++ the length is shorter than this. ++ ++ It also guarantees that it will properly unroll the data if the distance ++ between `out` and `from` is at least CHUNKCOPY_CHUNK_SIZE, which we rely on ++ in chunkcopy_relaxed(). ++ ++ Aside from better memory bus utilisation, this means that short copies ++ (CHUNKCOPY_CHUNK_SIZE bytes or fewer) will fall straight through the loop ++ without iteration, which will hopefully make the branch prediction more ++ reliable. ++ */ ++static inline unsigned char FAR *chunkcopy_core(unsigned char FAR *out, ++ const unsigned char FAR *from, ++ unsigned len) { ++ int bump = (--len % CHUNKCOPY_CHUNK_SIZE) + 1; ++ storechunk(out, loadchunk(from)); ++ out += bump; ++ from += bump; ++ len /= CHUNKCOPY_CHUNK_SIZE; ++ while (len-- > 0) { ++ storechunk(out, loadchunk(from)); ++ out += CHUNKCOPY_CHUNK_SIZE; ++ from += CHUNKCOPY_CHUNK_SIZE; ++ } ++ return out; ++} ++ ++/* ++ Like chunkcopy_core, but avoid writing beyond of legal output. ++ ++ Accepts an additional pointer to the end of safe output. A generic safe ++ copy would use (out + len), but it's normally the case that the end of the ++ output buffer is beyond the end of the current copy, and this can still be ++ exploited. ++ */ ++static inline unsigned char FAR *chunkcopy_core_safe(unsigned char FAR *out, ++ const unsigned char FAR * from, ++ unsigned len, ++ unsigned char FAR *limit) { ++ Assert(out + len <= limit, "chunk copy exceeds safety limit"); ++ if (limit - out < CHUNKCOPY_CHUNK_SIZE) { ++ const unsigned char FAR * Z_RESTRICT rfrom = from; ++ if (len & 8) { __builtin_memcpy(out, rfrom, 8); out += 8; rfrom += 8; } ++ if (len & 4) { __builtin_memcpy(out, rfrom, 4); out += 4; rfrom += 4; } ++ if (len & 2) { __builtin_memcpy(out, rfrom, 2); out += 2; rfrom += 2; } ++ if (len & 1) { *out++ = *rfrom++; } ++ return out; ++ } ++ return chunkcopy_core(out, from, len); ++} ++ ++/* ++ Perform short copies until distance can be rewritten as being at least ++ CHUNKCOPY_CHUNK_SIZE. ++ ++ This assumes that it's OK to overwrite at least the first ++ 2*CHUNKCOPY_CHUNK_SIZE bytes of output even if the copy is shorter than ++ this. This assumption holds within inflate_fast() which starts every ++ iteration with at least 258 bytes of output space available (258 being the ++ maximum length output from a single token; see inffast.c). ++ */ ++static inline unsigned char FAR *chunkunroll_relaxed(unsigned char FAR *out, ++ unsigned FAR *dist, ++ unsigned FAR *len) { ++ const unsigned char FAR *from = out - *dist; ++ while (*dist < *len && *dist < CHUNKCOPY_CHUNK_SIZE) { ++ storechunk(out, loadchunk(from)); ++ out += *dist; ++ *len -= *dist; ++ *dist += *dist; ++ } ++ return out; ++} ++ ++ ++static inline uint8x16_t chunkset_vld1q_dup_u8x8(const unsigned char FAR * Z_RESTRICT from) { ++#if defined(__clang__) || defined(__aarch64__) ++ return vreinterpretq_u8_u64(vld1q_dup_u64((void *)from)); ++#else ++ /* 32-bit GCC uses an alignment hint for vld1q_dup_u64, even when given a ++ * void pointer, so here's an alternate implementation. ++ */ ++ uint8x8_t h = vld1_u8(from); ++ return vcombine_u8(h, h); ++#endif ++} ++ ++/* ++ Perform an overlapping copy which behaves as a memset() operation, but ++ supporting periods other than one, and assume that length is non-zero and ++ that it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE*3 bytes of output ++ even if the length is shorter than this. ++ */ ++static inline unsigned char FAR *chunkset_core(unsigned char FAR *out, ++ unsigned period, ++ unsigned len) { ++ uint8x16_t f; ++ int bump = ((len - 1) % sizeof(f)) + 1; ++ ++ switch (period) { ++ case 1: ++ f = vld1q_dup_u8(out - 1); ++ vst1q_u8(out, f); ++ out += bump; ++ len -= bump; ++ while (len > 0) { ++ vst1q_u8(out, f); ++ out += sizeof(f); ++ len -= sizeof(f); ++ } ++ return out; ++ case 2: ++ f = vreinterpretq_u8_u16(vld1q_dup_u16((void *)(out - 2))); ++ vst1q_u8(out, f); ++ out += bump; ++ len -= bump; ++ if (len > 0) { ++ f = vreinterpretq_u8_u16(vld1q_dup_u16((void *)(out - 2))); ++ do { ++ vst1q_u8(out, f); ++ out += sizeof(f); ++ len -= sizeof(f); ++ } while (len > 0); ++ } ++ return out; ++ case 4: ++ f = vreinterpretq_u8_u32(vld1q_dup_u32((void *)(out - 4))); ++ vst1q_u8(out, f); ++ out += bump; ++ len -= bump; ++ if (len > 0) { ++ f = vreinterpretq_u8_u32(vld1q_dup_u32((void *)(out - 4))); ++ do { ++ vst1q_u8(out, f); ++ out += sizeof(f); ++ len -= sizeof(f); ++ } while (len > 0); ++ } ++ return out; ++ case 8: ++ f = chunkset_vld1q_dup_u8x8(out - 8); ++ vst1q_u8(out, f); ++ out += bump; ++ len -= bump; ++ if (len > 0) { ++ f = chunkset_vld1q_dup_u8x8(out - 8); ++ do { ++ vst1q_u8(out, f); ++ out += sizeof(f); ++ len -= sizeof(f); ++ } while (len > 0); ++ } ++ return out; ++ } ++ out = chunkunroll_relaxed(out, &period, &len); ++ return chunkcopy_core(out, out - period, len); ++} ++ ++/* ++ Perform a memcpy-like operation, but assume that length is non-zero and that ++ it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE bytes of output even if ++ the length is shorter than this. ++ ++ Unlike chunkcopy_core() above, no guarantee is made regarding the behaviour ++ of overlapping buffers, regardless of the distance between the pointers. ++ This is reflected in the `restrict`-qualified pointers, allowing the ++ compiler to reorder loads and stores. ++ */ ++static inline unsigned char FAR *chunkcopy_relaxed(unsigned char FAR * Z_RESTRICT out, ++ const unsigned char FAR * Z_RESTRICT from, ++ unsigned len) { ++ return chunkcopy_core(out, from, len); ++} ++ ++/* ++ Like chunkcopy_relaxed, but avoid writing beyond of legal output. ++ ++ Unlike chunkcopy_core_safe() above, no guarantee is made regarding the ++ behaviour of overlapping buffers, regardless of the distance between the ++ pointers. This is reflected in the `restrict`-qualified pointers, allowing ++ the compiler to reorder loads and stores. ++ ++ Accepts an additional pointer to the end of safe output. A generic safe ++ copy would use (out + len), but it's normally the case that the end of the ++ output buffer is beyond the end of the current copy, and this can still be ++ exploited. ++ */ ++static inline unsigned char FAR *chunkcopy_safe(unsigned char FAR *out, ++ const unsigned char FAR * Z_RESTRICT from, ++ unsigned len, ++ unsigned char FAR *limit) { ++ Assert(out + len <= limit, "chunk copy exceeds safety limit"); ++ return chunkcopy_core_safe(out, from, len, limit); ++} ++ ++/* ++ Perform chunky copy within the same buffer, where the source and destination ++ may potentially overlap. ++ ++ Assumes that len > 0 on entry, and that it's safe to write at least ++ CHUNKCOPY_CHUNK_SIZE*3 bytes to the output. ++ */ ++static inline unsigned char FAR *chunkcopy_lapped_relaxed(unsigned char FAR *out, ++ unsigned dist, ++ unsigned len) { ++ if (dist < len && dist < CHUNKCOPY_CHUNK_SIZE) { ++ return chunkset_core(out, dist, len); ++ } ++ return chunkcopy_core(out, out - dist, len); ++} ++ ++/* ++ Behave like chunkcopy_lapped_relaxed, but avoid writing beyond of legal output. ++ ++ Accepts an additional pointer to the end of safe output. A generic safe ++ copy would use (out + len), but it's normally the case that the end of the ++ output buffer is beyond the end of the current copy, and this can still be ++ exploited. ++ */ ++static inline unsigned char FAR *chunkcopy_lapped_safe(unsigned char FAR *out, ++ unsigned dist, ++ unsigned len, ++ unsigned char FAR *limit) { ++ Assert(out + len <= limit, "chunk copy exceeds safety limit"); ++ if (limit - out < CHUNKCOPY_CHUNK_SIZE * 3) { ++ /* TODO: try harder to optimise this */ ++ while (len-- > 0) { ++ *out = *(out - dist); ++ out++; ++ } ++ return out; ++ } ++ return chunkcopy_lapped_relaxed(out, dist, len); ++} ++ ++#undef Z_RESTRICT ++ ++#endif /* CHUNKCOPY_H */ +diff --git a/contrib/arm/inffast.c b/contrib/arm/inffast.c +index 0dbd1dbc..f7f50071 100644 +--- a/contrib/arm/inffast.c ++++ b/contrib/arm/inffast.c +@@ -7,6 +7,7 @@ + #include "inftrees.h" + #include "inflate.h" + #include "inffast.h" ++#include "chunkcopy.h" + + #ifdef ASMINF + # pragma message("Assembler code may have bugs -- use at your own risk") +@@ -57,6 +58,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ + unsigned char FAR *out; /* local strm->next_out */ + unsigned char FAR *beg; /* inflate()'s initial strm->next_out */ + unsigned char FAR *end; /* while out < end, enough space available */ ++ unsigned char FAR *limit; /* safety limit for chunky copies */ + #ifdef INFLATE_STRICT + unsigned dmax; /* maximum distance from zlib header */ + #endif +@@ -84,12 +86,13 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ + out = strm->next_out; + beg = out - (start - strm->avail_out); + end = out + (strm->avail_out - 257); ++ limit = out + strm->avail_out; + #ifdef INFLATE_STRICT + dmax = state->dmax; + #endif + wsize = state->wsize; + whave = state->whave; +- wnext = state->wnext; ++ wnext = (state->wnext == 0 && whave >= wsize) ? wsize : state->wnext; + window = state->window; + hold = state->hold; + bits = state->bits; +@@ -197,70 +200,51 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ + #endif + } + from = window; +- if (wnext == 0) { /* very common case */ +- from += wsize - op; +- if (op < len) { /* some from window */ +- len -= op; +- do { +- *out++ = *from++; +- } while (--op); +- from = out - dist; /* rest from output */ +- } ++ if (wnext >= op) { /* contiguous in window */ ++ from += wnext - op; + } +- else if (wnext < op) { /* wrap around window */ +- from += wsize + wnext - op; ++ else { /* wrap around window */ + op -= wnext; ++ from += wsize - op; + if (op < len) { /* some from end of window */ + len -= op; +- do { +- *out++ = *from++; +- } while (--op); +- from = window; +- if (wnext < len) { /* some from start of window */ +- op = wnext; +- len -= op; +- do { +- *out++ = *from++; +- } while (--op); +- from = out - dist; /* rest from output */ +- } ++ out = chunkcopy_safe(out, from, op, limit); ++ from = window; /* more from start of window */ ++ op = wnext; ++ /* This (rare) case can create a situation where ++ the first chunkcopy below must be checked. ++ */ + } + } +- else { /* contiguous in window */ +- from += wnext - op; +- if (op < len) { /* some from window */ +- len -= op; +- do { +- *out++ = *from++; +- } while (--op); +- from = out - dist; /* rest from output */ +- } +- } +- while (len > 2) { +- *out++ = *from++; +- *out++ = *from++; +- *out++ = *from++; +- len -= 3; +- } +- if (len) { +- *out++ = *from++; +- if (len > 1) +- *out++ = *from++; ++ if (op < len) { /* still need some from output */ ++ out = chunkcopy_safe(out, from, op, limit); ++ len -= op; ++ /* When dist is small the amount of data that can be ++ copied from the window is also small, and progress ++ towards the dangerous end of the output buffer is ++ also small. This means that for trivial memsets and ++ for chunkunroll_relaxed() a safety check is ++ unnecessary. However, these conditions may not be ++ entered at all, and in that case it's possible that ++ the main copy is near the end. ++ */ ++ out = chunkunroll_relaxed(out, &dist, &len); ++ out = chunkcopy_safe(out, out - dist, len, limit); ++ } else { ++ /* from points to window, so there is no risk of ++ overlapping pointers requiring memset-like behaviour ++ */ ++ out = chunkcopy_safe(out, from, len, limit); + } + } + else { +- from = out - dist; /* copy direct from output */ +- do { /* minimum length is three */ +- *out++ = *from++; +- *out++ = *from++; +- *out++ = *from++; +- len -= 3; +- } while (len > 2); +- if (len) { +- *out++ = *from++; +- if (len > 1) +- *out++ = *from++; +- } ++ /* Whole reference is in range of current output. No ++ range checks are necessary because we start with room ++ for at least 258 bytes of output, so unroll and roundoff ++ operations can write beyond `out+len` so long as they ++ stay within 258 bytes of `out`. ++ */ ++ out = chunkcopy_lapped_relaxed(out, dist, len); + } + } + else if ((op & 64) == 0) { /* 2nd level distance code */ +diff --git a/contrib/arm/inflate.c b/contrib/arm/inflate.c +index ac333e8c..e40322c3 100644 +--- a/contrib/arm/inflate.c ++++ b/contrib/arm/inflate.c +@@ -84,6 +84,7 @@ + #include "inftrees.h" + #include "inflate.h" + #include "inffast.h" ++#include "contrib/arm/chunkcopy.h" + + #ifdef MAKEFIXED + # ifndef BUILDFIXED +@@ -405,10 +406,20 @@ unsigned copy; + + /* if it hasn't been done already, allocate space for the window */ + if (state->window == Z_NULL) { ++ unsigned wsize = 1U << state->wbits; + state->window = (unsigned char FAR *) +- ZALLOC(strm, 1U << state->wbits, ++ ZALLOC(strm, wsize + CHUNKCOPY_CHUNK_SIZE, + sizeof(unsigned char)); + if (state->window == Z_NULL) return 1; ++#ifdef INFLATE_CLEAR_UNUSED_UNDEFINED ++ /* Copies from the overflow portion of this buffer are undefined and ++ may cause analysis tools to raise a warning if we don't initialize ++ it. However, this undefined data overwrites other undefined data ++ and is subsequently either overwritten or left deliberately ++ undefined at the end of decode; so there's really no point. ++ */ ++ memset(state->window + wsize, 0, CHUNKCOPY_CHUNK_SIZE); ++#endif + } + + /* if window not in use yet, initialize */ +@@ -1175,17 +1186,16 @@ int flush; + else + from = state->window + (state->wnext - copy); + if (copy > state->length) copy = state->length; ++ if (copy > left) copy = left; ++ put = chunkcopy_safe(put, from, copy, put + left); + } + else { /* copy from output */ +- from = put - state->offset; + copy = state->length; ++ if (copy > left) copy = left; ++ put = chunkcopy_lapped_safe(put, state->offset, copy, put + left); + } +- if (copy > left) copy = left; + left -= copy; + state->length -= copy; +- do { +- *put++ = *from++; +- } while (--copy); + if (state->length == 0) state->mode = LEN; + break; + case LIT: diff --git a/package/libs/zlib/patches/003-attach-sourcefiles-in-patch-002-to-buildsystem.patch b/package/libs/zlib/patches/004-attach-sourcefiles-in-patch-002-to-buildsystem.patch similarity index 100% rename from package/libs/zlib/patches/003-attach-sourcefiles-in-patch-002-to-buildsystem.patch rename to package/libs/zlib/patches/004-attach-sourcefiles-in-patch-002-to-buildsystem.patch diff --git a/package/libs/zlib/patches/004-relative-pkg-config-paths.patch b/package/libs/zlib/patches/005-relative-pkg-config-paths.patch similarity index 100% rename from package/libs/zlib/patches/004-relative-pkg-config-paths.patch rename to package/libs/zlib/patches/005-relative-pkg-config-paths.patch From 7054721cf94f4aa8fe71ac4c28c922b19a69ba1d Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 24 Feb 2021 01:52:34 +0100 Subject: [PATCH 08/11] ath79: enable UART in SoC DTSI files The uart node is enabled on all devices except one (GL-USB150 *). Thus, let's not have a few hundred nodes to enable it, but do not disable it in the first place. Where the majority of devices is using it, also move the serial0 alias to the DTSI. *) Since GL-USB150 even defines serial0 alias, the missing uart is probably just a mistake. Anyway, disable it for now so this patch stays cosmetic. Apply this to 21.02 as well to remove an unnecessary backporting pitfall. Signed-off-by: Adrian Schmutzler (cherry picked from commit 3a4b751110b32380cf827f14a203190cfbc2e40f) --- target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts | 4 ---- target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts | 4 ---- target/linux/ath79/dts/ar7100.dtsi | 2 -- .../ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi | 4 ---- target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi | 4 ---- target/linux/ath79/dts/ar7161_aruba_ap-105.dts | 4 ---- .../ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi | 4 ---- target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts | 4 ---- target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts | 4 ---- target/linux/ath79/dts/ar7161_meraki_mr16.dts | 4 ---- target/linux/ath79/dts/ar7161_netgear_wndr.dtsi | 4 ---- target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts | 4 ---- .../linux/ath79/dts/ar7161_ubnt_routerstation.dtsi | 4 ---- target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts | 4 ---- target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts | 4 ---- target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts | 4 ---- target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts | 4 ---- target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi | 4 ---- target/linux/ath79/dts/ar7240_tplink.dtsi | 4 ---- target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts | 4 ---- target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi | 4 ---- target/linux/ath79/dts/ar7241_tplink.dtsi | 4 ---- .../linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts | 4 ---- target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi | 4 ---- target/linux/ath79/dts/ar7242_avm_fritz300e.dts | 4 ---- target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi | 4 ---- .../ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts | 4 ---- target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts | 4 ---- target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts | 4 ---- target/linux/ath79/dts/ar7242_meraki_mr12.dts | 4 ---- .../linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts | 4 ---- target/linux/ath79/dts/ar7242_ubnt_sw.dtsi | 4 ---- target/linux/ath79/dts/ar724x.dtsi | 2 -- target/linux/ath79/dts/ar724x_ubnt_xm.dtsi | 4 ---- target/linux/ath79/dts/ar9132.dtsi | 2 -- .../linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts | 4 ---- .../linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts | 4 ---- target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts | 4 ---- target/linux/ath79/dts/ar9330.dtsi | 6 ++++-- target/linux/ath79/dts/ar9330_dlink_dir-505.dts | 5 ----- target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts | 5 ----- target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi | 5 ----- target/linux/ath79/dts/ar9330_pqi_air-pen.dts | 5 ----- target/linux/ath79/dts/ar9331_8dev_carambola2.dts | 5 ----- .../linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi | 5 ----- target/linux/ath79/dts/ar9331_arduino_yun.dts | 12 ------------ .../ath79/dts/ar9331_embeddedwireless_dorin.dts | 5 ----- target/linux/ath79/dts/ar9331_etactica_eg200.dts | 5 ----- target/linux/ath79/dts/ar9331_glinet_64xx.dtsi | 5 ----- target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts | 5 ----- target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts | 5 ++++- target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi | 8 -------- .../ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts | 5 ----- target/linux/ath79/dts/ar9331_pisen_ts-d084.dts | 5 ----- target/linux/ath79/dts/ar9331_pisen_wmm003n.dts | 5 ----- .../linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts | 5 ----- .../linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts | 5 ----- .../ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi | 5 ----- target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi | 5 ----- .../linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi | 5 ----- target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts | 5 ----- .../linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts | 5 ----- target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi | 5 ----- target/linux/ath79/dts/ar9341_pcs_cr3000.dts | 5 ----- target/linux/ath79/dts/ar9341_pisen_wmb001n.dts | 5 ----- target/linux/ath79/dts/ar9341_tplink.dtsi | 5 ----- target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi | 5 ----- target/linux/ath79/dts/ar9342_iodata_etg3-r.dts | 4 ---- target/linux/ath79/dts/ar9342_ubnt_aircube-ac.dts | 4 ---- target/linux/ath79/dts/ar9342_ubnt_wa.dtsi | 4 ---- target/linux/ath79/dts/ar9342_ubnt_xw.dtsi | 4 ---- .../linux/ath79/dts/ar9344_aerohive_hiveap-121.dts | 4 ---- target/linux/ath79/dts/ar9344_alfa-network_n5q.dts | 4 ---- .../linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts | 5 ----- target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts | 4 ---- .../linux/ath79/dts/ar9344_devolo_magic-2-wifi.dts | 4 ---- target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts | 1 - target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts | 1 - target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi | 4 ---- target/linux/ath79/dts/ar9344_engenius_exx600.dtsi | 5 ----- .../linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts | 4 ---- .../dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi | 5 ----- target/linux/ath79/dts/ar9344_netgear_wndr.dtsi | 4 ---- target/linux/ath79/dts/ar9344_ocedo_raccoon.dts | 4 ---- target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi | 5 ----- target/linux/ath79/dts/ar9344_openmesh_om5p.dts | 5 ----- target/linux/ath79/dts/ar9344_pcs_cap324.dts | 5 ----- target/linux/ath79/dts/ar9344_pcs_cr5000.dts | 5 ----- target/linux/ath79/dts/ar9344_qihoo_c301.dts | 4 ---- target/linux/ath79/dts/ar9344_qxwlan_e750x.dtsi | 4 ---- target/linux/ath79/dts/ar9344_samsung_wam250.dts | 5 ----- target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi | 5 ----- target/linux/ath79/dts/ar9344_tplink_cpe.dtsi | 4 ---- target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi | 4 ---- target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts | 4 ---- target/linux/ath79/dts/ar9344_wd_mynet-n750.dts | 4 ---- .../ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts | 4 ---- target/linux/ath79/dts/ar9344_winchannel_wb2000.dts | 4 ---- target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts | 4 ---- target/linux/ath79/dts/ar934x.dtsi | 6 ++++-- target/linux/ath79/dts/qca9531_8dev_lima.dts | 4 ---- .../linux/ath79/dts/qca9531_alfa-network_r36a.dtsi | 4 ---- .../linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts | 4 ---- target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts | 4 ---- .../linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts | 4 ---- target/linux/ath79/dts/qca9531_comfast_cf-e5.dts | 4 ---- target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts | 4 ---- target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts | 4 ---- .../ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts | 4 ---- target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts | 4 ---- target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts | 4 ---- target/linux/ath79/dts/qca9531_engenius_ews511ap.dts | 4 ---- target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi | 4 ---- target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts | 4 ---- target/linux/ath79/dts/qca9531_glinet_gl-e750.dts | 4 ---- target/linux/ath79/dts/qca9531_glinet_gl-x750.dts | 4 ---- target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi | 4 ---- target/linux/ath79/dts/qca9531_telco_t1.dts | 4 ---- .../linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts | 4 ---- .../linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts | 4 ---- .../linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts | 4 ---- .../linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts | 4 ---- target/linux/ath79/dts/qca9531_wallys_dr531.dts | 4 ---- target/linux/ath79/dts/qca9531_yuncore_a770.dts | 4 ---- .../linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts | 4 ---- target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi | 4 ---- .../ath79/dts/qca9533_mikrotik_routerboard-16m.dtsi | 8 ++++---- .../dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi | 1 - .../dts/qca9533_mikrotik_routerboard-wapr-2nd.dts | 1 - target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi | 4 ---- .../linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi | 4 ---- target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi | 4 ---- .../linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi | 4 ---- .../linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts | 4 ---- target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi | 4 ---- target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi | 4 ---- .../linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts | 4 ---- target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts | 4 ---- target/linux/ath79/dts/qca953x.dtsi | 2 -- target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi | 4 ---- target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi | 4 ---- target/linux/ath79/dts/qca9550_airtight_c-75.dts | 4 ---- .../linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi | 4 ---- .../qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts | 4 ---- target/linux/ath79/dts/qca9557_8dev_rambutan.dts | 4 ---- target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts | 4 ---- target/linux/ath79/dts/qca9557_engenius_eap1200h.dts | 4 ---- .../ath79/dts/qca9557_engenius_enstationac-v1.dts | 4 ---- target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi | 4 ---- .../ath79/dts/qca9558_allnet_all-wap02860ac.dts | 4 ---- target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi | 4 ---- .../linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi | 4 ---- target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi | 4 ---- target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts | 4 ---- target/linux/ath79/dts/qca9558_domywifi_dw33d.dts | 4 ---- target/linux/ath79/dts/qca9558_engenius_epg5000.dts | 4 ---- .../ath79/dts/qca9558_librerouter_librerouter-v1.dts | 4 ---- .../ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi | 4 ---- target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi | 4 ---- target/linux/ath79/dts/qca9558_ocedo_koala.dts | 4 ---- target/linux/ath79/dts/qca9558_ocedo_ursus.dts | 4 ---- target/linux/ath79/dts/qca9558_openmesh_mr.dtsi | 4 ---- .../linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts | 4 ---- target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi | 4 ---- target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts | 4 ---- target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi | 4 ---- target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi | 4 ---- target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts | 4 ---- target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi | 4 ---- .../linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts | 4 ---- .../linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi | 4 ---- .../ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts | 4 ---- .../linux/ath79/dts/qca9558_trendnet_tew-823dru.dts | 4 ---- target/linux/ath79/dts/qca955x.dtsi | 2 -- target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi | 4 ---- target/linux/ath79/dts/qca955x_engenius_ecb1xxx.dtsi | 4 ---- target/linux/ath79/dts/qca955x_ubnt_xc.dtsi | 4 ---- target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi | 4 ---- target/linux/ath79/dts/qca9561_avm_fritz4020.dts | 4 ---- .../linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts | 4 ---- .../linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi | 4 ---- .../linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi | 4 ---- .../ath79/dts/qca9561_tplink_eap225-wall-v2.dts | 4 ---- .../linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts | 4 ---- target/linux/ath79/dts/qca9563_compex_wpj563.dts | 4 ---- target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi | 4 ---- target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts | 4 ---- .../linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi | 4 ---- target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi | 4 ---- target/linux/ath79/dts/qca9563_nec_wg1200cr.dts | 4 ---- target/linux/ath79/dts/qca9563_nec_wg800hp.dts | 4 ---- target/linux/ath79/dts/qca9563_netgear_wndr.dtsi | 4 ---- target/linux/ath79/dts/qca9563_phicomm_k2t.dts | 4 ---- target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi | 4 ---- target/linux/ath79/dts/qca9563_rosinson_wr818.dts | 4 ---- .../linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts | 4 ---- .../linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts | 4 ---- .../linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi | 4 ---- .../linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi | 4 ---- target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts | 4 ---- .../linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi | 4 ---- target/linux/ath79/dts/qca9563_tplink_re450.dtsi | 4 ---- .../linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi | 4 ---- .../linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi | 4 ---- target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi | 4 ---- target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi | 4 ---- target/linux/ath79/dts/qca956x.dtsi | 2 -- target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi | 4 ---- 208 files changed, 16 insertions(+), 847 deletions(-) diff --git a/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts b/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts index 2186d13667..e1d5f2dac1 100644 --- a/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts +++ b/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts @@ -196,10 +196,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &usb { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts b/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts index e2481ad70c..d008dd5ec8 100644 --- a/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts +++ b/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts @@ -150,10 +150,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi index 2617c68521..a9aabafda0 100644 --- a/target/linux/ath79/dts/ar7100.dtsi +++ b/target/linux/ath79/dts/ar7100.dtsi @@ -41,8 +41,6 @@ reg-io-width = <4>; reg-shift = <2>; no-loopback-test; - - status = "disabled"; }; usb_phy: usb-phy@18030000 { diff --git a/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi b/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi index e34c304b47..c6cbe2fda1 100644 --- a/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi +++ b/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi @@ -48,10 +48,6 @@ }; }; -&uart { - status = "okay"; -}; - &gpio { ngpios = <31>; gpio-line-names = diff --git a/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi b/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi index ab868846ff..5b4b6e3dda 100644 --- a/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi +++ b/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi @@ -91,7 +91,3 @@ }; }; }; - -&uart { - status = "okay"; -}; diff --git a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts index 3ad2486873..e24236324c 100644 --- a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts +++ b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts @@ -120,10 +120,6 @@ }; }; -&uart { - status = "okay"; -}; - &mdio0 { status = "okay"; diff --git a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi index 3b6eaf5cc8..109ed0caf3 100644 --- a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi +++ b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi @@ -212,10 +212,6 @@ }; }; -&uart { - status = "okay"; -}; - &pll { clocks = <&extosc>; }; diff --git a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts index a7115ff7e6..f2809f0549 100644 --- a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts +++ b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts @@ -159,10 +159,6 @@ }; }; -&uart { - status = "okay"; -}; - &pll { clocks = <&extosc>; }; diff --git a/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts b/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts index 145aba7d8e..826b45ff51 100644 --- a/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts +++ b/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts @@ -117,7 +117,3 @@ }; }; }; - -&uart { - status = "okay"; -}; diff --git a/target/linux/ath79/dts/ar7161_meraki_mr16.dts b/target/linux/ath79/dts/ar7161_meraki_mr16.dts index f541a00841..afbf1e31f2 100644 --- a/target/linux/ath79/dts/ar7161_meraki_mr16.dts +++ b/target/linux/ath79/dts/ar7161_meraki_mr16.dts @@ -102,10 +102,6 @@ clocks = <&extosc>; }; -&uart { - status = "okay"; -}; - &mdio0 { status = "okay"; diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi index 217128546f..c7e83631cc 100644 --- a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi +++ b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi @@ -188,10 +188,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts b/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts index 39bc318b17..9eaf5aaa1d 100644 --- a/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts +++ b/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts @@ -75,10 +75,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &mdio0 { status = "okay"; diff --git a/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi b/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi index 7768bf4c44..116bc9cfc2 100644 --- a/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi +++ b/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi @@ -67,10 +67,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb_phy { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts index 4f284ed900..e5d7ea57f1 100644 --- a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts +++ b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts @@ -181,7 +181,3 @@ pinctrl-single,bits = <0x0 0x0 0xf8>; }; }; - -&uart { - status = "okay"; -}; diff --git a/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts b/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts index 9e44420048..abd298449b 100644 --- a/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts +++ b/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts @@ -157,7 +157,3 @@ pinctrl-single,bits = <0x0 0x0 0xf8>; }; }; - -&uart { - status = "okay"; -}; diff --git a/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts b/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts index 7c819e88e7..51d4a0601d 100644 --- a/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts +++ b/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts @@ -90,10 +90,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts index 0c94c90284..7e1c87adde 100644 --- a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts +++ b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts @@ -196,7 +196,3 @@ gpio-controller; }; }; - -&uart { - status = "okay"; -}; diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi index 0360412598..7202e1d684 100644 --- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi +++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi @@ -129,7 +129,3 @@ gpio-controller; }; }; - -&uart { - status = "okay"; -}; diff --git a/target/linux/ath79/dts/ar7240_tplink.dtsi b/target/linux/ath79/dts/ar7240_tplink.dtsi index 48849ccbcb..4799fd79ec 100644 --- a/target/linux/ath79/dts/ar7240_tplink.dtsi +++ b/target/linux/ath79/dts/ar7240_tplink.dtsi @@ -115,7 +115,3 @@ pinctrl-single,bits = <0x0 0x0 0xf8>; }; }; - -&uart { - status = "okay"; -}; diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts index 831f3e9c25..de2b536227 100644 --- a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts +++ b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts @@ -201,7 +201,3 @@ gpio-controller; }; }; - -&uart { - status = "okay"; -}; diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi index 625f4b0684..e704ddd9fc 100644 --- a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi +++ b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi @@ -185,10 +185,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb_phy { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar7241_tplink.dtsi b/target/linux/ath79/dts/ar7241_tplink.dtsi index 49908066d6..6d7f7515ef 100644 --- a/target/linux/ath79/dts/ar7241_tplink.dtsi +++ b/target/linux/ath79/dts/ar7241_tplink.dtsi @@ -104,7 +104,3 @@ mtd-mac-address = <&uboot 0x1fc00>; mtd-mac-address-increment = <1>; }; - -&uart { - status = "okay"; -}; diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts index d83f4cd2a8..ca1ad270ce 100644 --- a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts +++ b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts @@ -150,7 +150,3 @@ mtd-mac-address = <&uboot 0x1fc00>; mtd-mac-address-increment = <1>; }; - -&uart { - status = "okay"; -}; diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi b/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi index 7bf79f7465..73ded0f5bd 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi +++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi @@ -27,10 +27,6 @@ }; }; -&uart { - status = "okay"; -}; - &pll { clocks = <&extosc>; }; diff --git a/target/linux/ath79/dts/ar7242_avm_fritz300e.dts b/target/linux/ath79/dts/ar7242_avm_fritz300e.dts index 3cc7198ca1..310a2b1ee2 100644 --- a/target/linux/ath79/dts/ar7242_avm_fritz300e.dts +++ b/target/linux/ath79/dts/ar7242_avm_fritz300e.dts @@ -133,10 +133,6 @@ }; }; -&uart { - status = "okay"; -}; - &pcie { status = "okay"; diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi b/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi index d1a251441e..98f6759eac 100644 --- a/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi +++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi @@ -144,10 +144,6 @@ clocks = <&extosc>; }; -&uart { - status = "okay"; -}; - &usb_phy { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts index bf570b6ea5..7cb051a475 100644 --- a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts +++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts @@ -217,10 +217,6 @@ clocks = <&extosc>; }; -&uart { - status = "okay"; -}; - &usb_phy { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts b/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts index 39a8a7f25f..07d7e4914e 100644 --- a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts +++ b/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts @@ -69,10 +69,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts b/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts index 0e06ee0128..ca488223af 100644 --- a/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts +++ b/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts @@ -69,10 +69,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar7242_meraki_mr12.dts b/target/linux/ath79/dts/ar7242_meraki_mr12.dts index 125919d4f1..ea64b947ef 100644 --- a/target/linux/ath79/dts/ar7242_meraki_mr12.dts +++ b/target/linux/ath79/dts/ar7242_meraki_mr12.dts @@ -90,10 +90,6 @@ clocks = <&extosc>; }; -&uart { - status = "okay"; -}; - &mdio0 { status = "okay"; diff --git a/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts b/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts index a07f80f55f..01f4cb7fde 100644 --- a/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts +++ b/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts @@ -134,10 +134,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb { #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi b/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi index c5122dbd9f..caae72c91f 100644 --- a/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi +++ b/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi @@ -128,10 +128,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - ð1 { status = "okay"; diff --git a/target/linux/ath79/dts/ar724x.dtsi b/target/linux/ath79/dts/ar724x.dtsi index e9daae0678..7e3f90ee78 100644 --- a/target/linux/ath79/dts/ar724x.dtsi +++ b/target/linux/ath79/dts/ar724x.dtsi @@ -45,8 +45,6 @@ reg-io-width = <4>; reg-shift = <2>; no-loopback-test; - - status = "disabled"; }; gpio: gpio@18040000 { diff --git a/target/linux/ath79/dts/ar724x_ubnt_xm.dtsi b/target/linux/ath79/dts/ar724x_ubnt_xm.dtsi index 81a1aba47d..77dbfc4ac3 100644 --- a/target/linux/ath79/dts/ar724x_ubnt_xm.dtsi +++ b/target/linux/ath79/dts/ar724x_ubnt_xm.dtsi @@ -15,10 +15,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9132.dtsi b/target/linux/ath79/dts/ar9132.dtsi index ac87884a4d..37fc32e6d6 100644 --- a/target/linux/ath79/dts/ar9132.dtsi +++ b/target/linux/ath79/dts/ar9132.dtsi @@ -72,8 +72,6 @@ reg-io-width = <4>; reg-shift = <2>; no-loopback-test; - - status = "disabled"; }; gpio: gpio@18040000 { diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts index 772c874cdd..606572aaba 100644 --- a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts +++ b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts @@ -62,10 +62,6 @@ }; }; -&uart { - status = "okay"; -}; - &pll { clocks = <&extosc>; }; diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts index f575990894..3b406e4d80 100644 --- a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts +++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts @@ -79,10 +79,6 @@ }; }; -&uart { - status = "okay"; -}; - &pll { clocks = <&extosc>; }; diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts index ad517d8baf..821c2aec66 100644 --- a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts +++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts @@ -106,10 +106,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi index 78f80b9f7e..7607fede49 100644 --- a/target/linux/ath79/dts/ar9330.dtsi +++ b/target/linux/ath79/dts/ar9330.dtsi @@ -8,6 +8,10 @@ #address-cells = <1>; #size-cells = <1>; + aliases { + serial0 = &uart; + }; + cpus { #address-cells = <1>; #size-cells = <0>; @@ -41,8 +45,6 @@ clocks = <&pll ATH79_CLK_REF>; clock-names = "uart"; - - status = "disabled"; }; gpio: gpio@18040000 { diff --git a/target/linux/ath79/dts/ar9330_dlink_dir-505.dts b/target/linux/ath79/dts/ar9330_dlink_dir-505.dts index 574165b748..ad48e07701 100644 --- a/target/linux/ath79/dts/ar9330_dlink_dir-505.dts +++ b/target/linux/ath79/dts/ar9330_dlink_dir-505.dts @@ -10,7 +10,6 @@ compatible = "dlink,dir-505", "qca,ar9330"; aliases { - serial0 = &uart; led-boot = &led_power_green; led-failsafe = &led_status_red; led-running = &led_power_green; @@ -50,10 +49,6 @@ }; }; -&uart { - status = "okay"; -}; - &gpio { led_enable { gpio-hog; diff --git a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts index 20c9a8fdd4..6a13c1bafe 100644 --- a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts +++ b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts @@ -10,7 +10,6 @@ compatible = "glinet,gl-ar150", "qca,ar9330"; aliases { - serial0 = &uart; led-boot = &led_power; led-failsafe = &led_power; led-running = &led_power; @@ -62,10 +61,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb { dr_mode = "host"; status = "okay"; diff --git a/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi b/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi index d9ca2c0f72..4f428cbb17 100644 --- a/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi +++ b/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi @@ -11,7 +11,6 @@ }; aliases { - serial0 = &uart; led-boot = &led_power_blue; led-failsafe = &led_power_blue; led-running = &led_power_blue; @@ -78,10 +77,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts index 5f2aa3b03c..607ee5f6c9 100644 --- a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts +++ b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts @@ -10,7 +10,6 @@ compatible = "pqi,air-pen", "qca,ar9330"; aliases { - serial0 = &uart; led-boot = &led_wlan; led-failsafe = &led_wlan; led-upgrade = &led_wlan; @@ -50,10 +49,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb { dr_mode = "host"; status = "okay"; diff --git a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts index 42193f857c..ba01d25d58 100644 --- a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts +++ b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts @@ -10,7 +10,6 @@ compatible = "8dev,carambola2", "qca,ar9331"; aliases { - serial0 = &uart; label-mac-device = &wmac; }; @@ -49,10 +48,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &usb { dr_mode = "host"; status = "okay"; diff --git a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi index 47133cdf5d..7734f20e04 100644 --- a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi +++ b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi @@ -11,7 +11,6 @@ led-boot = &led_vpn; led-failsafe = &led_vpn; led-upgrade = &led_vpn; - serial0 = &uart; }; keys { @@ -111,10 +110,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar9331_arduino_yun.dts b/target/linux/ath79/dts/ar9331_arduino_yun.dts index 6a5aca0541..389a83dd22 100644 --- a/target/linux/ath79/dts/ar9331_arduino_yun.dts +++ b/target/linux/ath79/dts/ar9331_arduino_yun.dts @@ -9,10 +9,6 @@ model = "Arduino Yun"; compatible = "arduino,yun", "qca,ar9331"; - aliases { - serial0 = &uart; - }; - chosen { bootargs = "console=ttyATH0,250000"; }; @@ -107,14 +103,6 @@ }; }; -&uart { - status = "okay"; -}; - -&gpio { - status = "okay"; -}; - &pinmux { pinctrl-names = "default"; pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins>; diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts index 12f1e93d44..48bf4d159f 100644 --- a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts +++ b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts @@ -14,7 +14,6 @@ led-failsafe = &led_status; led-running = &led_status; led-upgrade = &led_status; - serial0 = &uart; }; leds { @@ -43,10 +42,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb { dr_mode = "host"; status = "okay"; diff --git a/target/linux/ath79/dts/ar9331_etactica_eg200.dts b/target/linux/ath79/dts/ar9331_etactica_eg200.dts index e6feb54fcd..95c8a10e0d 100644 --- a/target/linux/ath79/dts/ar9331_etactica_eg200.dts +++ b/target/linux/ath79/dts/ar9331_etactica_eg200.dts @@ -13,7 +13,6 @@ led-boot = &led_etactica; led-failsafe = &led_etactica; led-upgrade = &led_etactica; - serial0 = &uart; }; keys { @@ -53,10 +52,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb { dr_mode = "host"; status = "okay"; diff --git a/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi b/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi index 8cdc9ac4ca..2f92123c34 100644 --- a/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi +++ b/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi @@ -7,7 +7,6 @@ / { aliases { - serial0 = &uart; label-mac-device = &wmac; }; @@ -65,10 +64,6 @@ mtd-mac-address = <&uboot 0x1fc00>; }; -&uart { - status = "okay"; -}; - &usb { dr_mode = "host"; vbus-supply = <®_usb_vbus>; diff --git a/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts b/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts index 67b587ab6e..7d6e7bd4af 100644 --- a/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts +++ b/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts @@ -10,7 +10,6 @@ model = "GL.iNet GL-MiFi"; aliases { - serial0 = &uart; label-mac-device = ð0; }; @@ -69,10 +68,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb { status = "okay"; diff --git a/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts b/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts index c75684be04..80e1f228ff 100644 --- a/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts +++ b/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts @@ -10,7 +10,6 @@ model = "GL.iNet GL-USB150"; aliases { - serial0 = &uart; led-boot = &led_power; led-failsafe = &led_power; led-running = &led_power; @@ -113,6 +112,10 @@ }; }; +&uart { + status = "disabled"; +}; + &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi b/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi index e7ca002038..3f20843b08 100644 --- a/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi +++ b/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi @@ -6,10 +6,6 @@ #include / { - aliases { - serial0 = &uart; - }; - keys: keys { compatible = "gpio-keys"; @@ -87,10 +83,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts b/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts index bbc0f1c711..62d5caeb9d 100644 --- a/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts +++ b/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts @@ -14,7 +14,6 @@ led-boot = &led_system; led-failsafe = &led_system; led-upgrade = &led_system; - serial0 = &uart; }; gpio-export { @@ -107,10 +106,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts b/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts index 8632011de3..873762088a 100644 --- a/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts +++ b/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts @@ -10,7 +10,6 @@ compatible = "pisen,ts-d084", "qca,ar9331"; aliases { - serial0 = &uart; led-boot = &led_system; led-failsafe = &led_system; led-running = &led_system; @@ -91,10 +90,6 @@ compatible = "syscon", "simple-mfd"; }; -&uart { - status = "okay"; -}; - &usb { dr_mode = "host"; status = "okay"; diff --git a/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts b/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts index 16f88c3273..3a18249aa6 100644 --- a/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts +++ b/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts @@ -10,7 +10,6 @@ compatible = "pisen,wmm003n", "qca,ar9331"; aliases { - serial0 = &uart; led-boot = &led_system; led-failsafe = &led_system; led-running = &led_system; @@ -99,10 +98,6 @@ compatible = "syscon", "simple-mfd"; }; -&uart { - status = "okay"; -}; - &usb { dr_mode = "host"; vbus-supply = <®_usb_vbus>; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts index e9533553a1..7df4ed9a98 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts +++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts @@ -10,7 +10,6 @@ compatible = "tplink,tl-mr3020-v1", "qca,ar9331"; aliases { - serial0 = &uart; led-boot = &led_wps; led-failsafe = &led_wps; led-running = &led_wps; @@ -86,10 +85,6 @@ clock-frequency = <25000000>; }; -&uart { - status = "okay"; -}; - &usb { #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts index c5f7a4fe76..6c353379b7 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts +++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts @@ -10,7 +10,6 @@ compatible = "tplink,tl-mr3040-v2", "qca,ar9331"; aliases { - serial0 = &uart; led-boot = &led_lan; led-failsafe = &led_lan; label-mac-device = ð0; @@ -82,10 +81,6 @@ clock-frequency = <25000000>; }; -&uart { - status = "okay"; -}; - &usb { #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi index ecd795580f..e31640b87f 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi +++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi @@ -7,7 +7,6 @@ / { aliases { - serial0 = &uart; led-boot = &led_system; led-failsafe = &led_system; led-running = &led_system; @@ -97,10 +96,6 @@ compatible = "syscon", "simple-mfd"; }; -&uart { - status = "okay"; -}; - &usb { dr_mode = "host"; vbus-supply = <®_usb_vbus>; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi index db43484112..7d2cbeb95c 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi +++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi @@ -7,7 +7,6 @@ / { aliases { - serial0 = &uart; led-boot = &led_system; led-failsafe = &led_system; led-running = &led_system; @@ -65,10 +64,6 @@ mtd-mac-address-increment = <(-1)>; }; -&uart { - status = "okay"; -}; - &usb { status = "okay"; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi index a542fae739..e460e4cd23 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi +++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi @@ -10,7 +10,6 @@ model = "TP-Link TL-WR741N/ND v4"; aliases { - serial0 = &uart; led-boot = &led_system; led-failsafe = &led_system; led-running = &led_system; @@ -140,10 +139,6 @@ mtd-mac-address-increment = <(-1)>; }; -&uart { - status = "okay"; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts b/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts index 7900557775..b830821977 100644 --- a/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts +++ b/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts @@ -11,7 +11,6 @@ compatible = "engenius,eap300-v2", "qca,ar9341"; aliases { - serial0 = &uart; led-boot = &led_power; led-failsafe = &led_power; led-running = &led_power; @@ -69,10 +68,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts index 38e9b381c0..8204578c17 100644 --- a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts +++ b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts @@ -11,7 +11,6 @@ compatible = "engenius,ens202ext-v1", "qca,ar9341"; aliases { - serial0 = &uart; led-boot = &led_power; led-failsafe = &led_power; led-running = &led_power; @@ -84,10 +83,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi b/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi index 403ee940c1..727064def3 100644 --- a/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi +++ b/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi @@ -11,7 +11,6 @@ }; aliases { - serial0 = &uart; led-boot = &led_power_blue; led-failsafe = &led_power_blue; led-running = &led_power_blue; @@ -82,10 +81,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &pinmux { led_lan_wan_blue_pin: pinmux_lan_wan_blue_pin { pinctrl-single,bits = <0x10 0x0 0x0000ffff>; diff --git a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts index 28076716b7..1d742a785d 100644 --- a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts +++ b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts @@ -10,7 +10,6 @@ compatible = "pcs,cr3000", "qca,ar9341"; aliases { - serial0 = &uart; led-boot = &led_power; led-failsafe = &led_power; led-running = &led_power; @@ -84,10 +83,6 @@ clock-frequency = <25000000>; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts b/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts index 98236d44a6..ffa52b437c 100644 --- a/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts +++ b/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts @@ -11,7 +11,6 @@ compatible = "pisen,wmb001n", "qca,ar9341"; aliases { - serial0 = &uart; led-boot = &led_wifi; led-failsafe = &led_wifi; led-running = &led_wifi; @@ -131,10 +130,6 @@ clock-frequency = <25000000>; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9341_tplink.dtsi b/target/linux/ath79/dts/ar9341_tplink.dtsi index f229a1917e..26410bcc11 100644 --- a/target/linux/ath79/dts/ar9341_tplink.dtsi +++ b/target/linux/ath79/dts/ar9341_tplink.dtsi @@ -7,7 +7,6 @@ / { aliases { - serial0 = &uart; led-boot = &led_power; led-failsafe = &led_power; led-running = &led_power; @@ -66,10 +65,6 @@ clock-frequency = <25000000>; }; -&uart { - status = "okay"; -}; - &gpio { pinctrl-names = "default"; pinctrl-0 = <&jtag_disable_pins &pmx_usb_power>; diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi b/target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi index 8f40675d91..499ef98201 100644 --- a/target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi +++ b/target/linux/ath79/dts/ar9341_tplink_tl-wa.dtsi @@ -7,7 +7,6 @@ / { aliases { - serial0 = &uart; label-mac-device = &wmac; }; }; @@ -50,10 +49,6 @@ }; }; -&uart { - status = "okay"; -}; - ð0 { status = "okay"; diff --git a/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts b/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts index f11d3952a3..8b354d6015 100644 --- a/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts +++ b/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts @@ -132,7 +132,3 @@ rxdv-delay = <3>; }; }; - -&uart { - status = "okay"; -}; diff --git a/target/linux/ath79/dts/ar9342_ubnt_aircube-ac.dts b/target/linux/ath79/dts/ar9342_ubnt_aircube-ac.dts index 8e0955e182..01bc487626 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_aircube-ac.dts +++ b/target/linux/ath79/dts/ar9342_ubnt_aircube-ac.dts @@ -71,10 +71,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &pcie { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi b/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi index d141d48dae..ac036ccd85 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi +++ b/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi @@ -25,10 +25,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &pcie { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi index c5fbdb94c4..3089e6b341 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi +++ b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi @@ -57,10 +57,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts b/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts index 0ef5f1b7b9..fae3eec786 100644 --- a/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts +++ b/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts @@ -65,10 +65,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &gpio { pinctrl-names = "default"; pinctrl-0 = <&jtag_disable_pins>; diff --git a/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts b/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts index dd50d2bc20..486e109c8f 100644 --- a/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts +++ b/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts @@ -144,10 +144,6 @@ }; }; -&uart { - status = "okay"; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts b/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts index 11cc2dadfd..73e06370f8 100644 --- a/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts +++ b/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts @@ -10,7 +10,6 @@ model = "COMFAST CF-E120A v3"; aliases { - serial0 = &uart; led-boot = &led_rssihigh; led-failsafe = &led_rssihigh; led-upgrade = &led_rssihigh; @@ -118,10 +117,6 @@ }; }; -&uart { - status = "okay"; -}; - ð0 { status = "okay"; phy-handle = <&swphy0>; diff --git a/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts b/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts index de8a4d5fd7..96549ec2ca 100644 --- a/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts +++ b/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts @@ -61,10 +61,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_devolo_magic-2-wifi.dts b/target/linux/ath79/dts/ar9344_devolo_magic-2-wifi.dts index d2f385c571..627265bf70 100644 --- a/target/linux/ath79/dts/ar9344_devolo_magic-2-wifi.dts +++ b/target/linux/ath79/dts/ar9344_devolo_magic-2-wifi.dts @@ -128,10 +128,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - ð0 { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts b/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts index bd4c58f3c9..e6f18cea69 100644 --- a/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts +++ b/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts @@ -11,7 +11,6 @@ led-failsafe = &led_power_orange; led-running = &led_power_blue; led-upgrade = &led_power_orange; - serial0 = &uart; }; leds { diff --git a/target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts b/target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts index 189945848d..b2fcf71bd8 100644 --- a/target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts +++ b/target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts @@ -11,7 +11,6 @@ led-failsafe = &led_power_orange; led-running = &led_power_green; led-upgrade = &led_power_orange; - serial0 = &uart; }; leds { diff --git a/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi b/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi index 4c2177bfad..e591ecd1b8 100644 --- a/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi +++ b/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi @@ -119,10 +119,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb { status = "okay"; #address-cells = <1>; diff --git a/target/linux/ath79/dts/ar9344_engenius_exx600.dtsi b/target/linux/ath79/dts/ar9344_engenius_exx600.dtsi index 340357b8de..d7036ff675 100644 --- a/target/linux/ath79/dts/ar9344_engenius_exx600.dtsi +++ b/target/linux/ath79/dts/ar9344_engenius_exx600.dtsi @@ -13,7 +13,6 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; - serial0 = &uart; }; keys { @@ -61,10 +60,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts b/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts index a387cebefc..52becec18b 100644 --- a/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts +++ b/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts @@ -96,10 +96,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &pinmux { enable_gpio_16: pinmux_enable_gpio_16 { pinctrl-single,bits = <0x10 0x0 0x000000ff>; diff --git a/target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi index 013a998a02..3ed50abefa 100644 --- a/target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi +++ b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi @@ -14,7 +14,6 @@ led-failsafe = &led_user; led-running = &led_user; led-upgrade = &led_user; - serial0 = &uart; }; leds { @@ -163,10 +162,6 @@ }; }; -&uart { - status = "okay"; -}; - ð0 { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi index ac012eafb4..52425a071c 100644 --- a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi +++ b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi @@ -260,7 +260,3 @@ gpio-controller; }; }; - -&uart { - status = "okay"; -}; diff --git a/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts b/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts index 3260d6b32d..e7ef02054e 100644 --- a/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts +++ b/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts @@ -66,10 +66,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi b/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi index 8517576787..ff532733b6 100644 --- a/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi +++ b/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi @@ -11,7 +11,6 @@ }; aliases { - serial0 = &uart; label-mac-device = ð0; }; @@ -30,10 +29,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_openmesh_om5p.dts b/target/linux/ath79/dts/ar9344_openmesh_om5p.dts index a733a922e4..636595c9ee 100644 --- a/target/linux/ath79/dts/ar9344_openmesh_om5p.dts +++ b/target/linux/ath79/dts/ar9344_openmesh_om5p.dts @@ -14,7 +14,6 @@ }; aliases { - serial0 = &uart; led-boot = &led_power_blue; led-failsafe = &led_power_blue; led-running = &led_power_blue; @@ -85,10 +84,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &pinmux { led_lan_wan_blue_pin: pinmux_lan_wan_blue_pin { pinctrl-single,bits = <0xc 0x0 0xffff0000>; diff --git a/target/linux/ath79/dts/ar9344_pcs_cap324.dts b/target/linux/ath79/dts/ar9344_pcs_cap324.dts index de75b8e0b4..3ce8bb58fc 100644 --- a/target/linux/ath79/dts/ar9344_pcs_cap324.dts +++ b/target/linux/ath79/dts/ar9344_pcs_cap324.dts @@ -10,7 +10,6 @@ compatible = "pcs,cap324", "qca,ar9344"; aliases { - serial0 = &uart; led-boot = &led_power_amber; led-failsafe = &led_power_amber; led-running = &led_power_green; @@ -73,10 +72,6 @@ clock-frequency = <25000000>; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts index 7f74ba6351..9aaabd0c24 100644 --- a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts +++ b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts @@ -10,7 +10,6 @@ compatible = "pcs,cr5000", "qca,ar9344"; aliases { - serial0 = &uart; led-boot = &led_power; led-failsafe = &led_power; led-running = &led_power; @@ -65,10 +64,6 @@ clock-frequency = <25000000>; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_qihoo_c301.dts b/target/linux/ath79/dts/ar9344_qihoo_c301.dts index b05d673137..616036fcfc 100644 --- a/target/linux/ath79/dts/ar9344_qihoo_c301.dts +++ b/target/linux/ath79/dts/ar9344_qihoo_c301.dts @@ -75,10 +75,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &gpio { gpio_ext_lna0 { gpio-hog; diff --git a/target/linux/ath79/dts/ar9344_qxwlan_e750x.dtsi b/target/linux/ath79/dts/ar9344_qxwlan_e750x.dtsi index 16e20b7498..a41e626ea4 100644 --- a/target/linux/ath79/dts/ar9344_qxwlan_e750x.dtsi +++ b/target/linux/ath79/dts/ar9344_qxwlan_e750x.dtsi @@ -100,10 +100,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_samsung_wam250.dts b/target/linux/ath79/dts/ar9344_samsung_wam250.dts index a7cea7c2b6..0f38ff82ee 100644 --- a/target/linux/ath79/dts/ar9344_samsung_wam250.dts +++ b/target/linux/ath79/dts/ar9344_samsung_wam250.dts @@ -140,11 +140,6 @@ }; }; -&uart { - status = "okay"; -}; - - &usb { status = "okay"; }; diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi b/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi index 116d797eb2..88b9170fc0 100644 --- a/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi +++ b/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi @@ -9,7 +9,6 @@ compatible = "teltonika,rut9xx", "qca,ar9344"; aliases { - serial0 = &uart; serial1 = &hs_uart; label-mac-device = ð1; }; @@ -43,10 +42,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &hs_uart { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi index 39d4bd6ea9..d4b7de440a 100644 --- a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi +++ b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi @@ -25,10 +25,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi index ea7dfeac93..a3f4dc036d 100644 --- a/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi +++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi @@ -66,10 +66,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts b/target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts index 8c62272897..4612ae1a66 100644 --- a/target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts +++ b/target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts @@ -46,10 +46,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts b/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts index 992bbf6bc1..e3faa392a8 100644 --- a/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts +++ b/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts @@ -63,10 +63,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &gpio { gpio_ext_lna0 { gpio-hog; diff --git a/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts b/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts index d04d517b19..575c72ee7c 100644 --- a/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts +++ b/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts @@ -81,10 +81,6 @@ clock-frequency = <25000000>; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts index 68d3d6a881..72cd5aab49 100644 --- a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts +++ b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts @@ -82,10 +82,6 @@ clock-frequency = <40000000>; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts b/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts index 5f24bf23d6..a3b4534cb5 100644 --- a/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts +++ b/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts @@ -68,10 +68,6 @@ pinctrl-0 = <&enable_gpio21>; }; -&uart { - status = "okay"; -}; - &gpio { pinctrl-names = "default"; pinctrl-0 = <&jtag_disable_pins>; diff --git a/target/linux/ath79/dts/ar934x.dtsi b/target/linux/ath79/dts/ar934x.dtsi index aa1003cdb5..42fbab4b60 100644 --- a/target/linux/ath79/dts/ar934x.dtsi +++ b/target/linux/ath79/dts/ar934x.dtsi @@ -8,6 +8,10 @@ #address-cells = <1>; #size-cells = <1>; + aliases { + serial0 = &uart; + }; + chosen { bootargs = "console=ttyS0,115200"; }; @@ -70,8 +74,6 @@ reg-io-width = <4>; reg-shift = <2>; no-loopback-test; - - status = "disabled"; }; gpio: gpio@18040000 { diff --git a/target/linux/ath79/dts/qca9531_8dev_lima.dts b/target/linux/ath79/dts/qca9531_8dev_lima.dts index 1adfe15b5f..7fc84a6787 100644 --- a/target/linux/ath79/dts/qca9531_8dev_lima.dts +++ b/target/linux/ath79/dts/qca9531_8dev_lima.dts @@ -24,10 +24,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &usb0 { status = "okay"; diff --git a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi index f0d3e0b617..4c9346db1e 100644 --- a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi +++ b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi @@ -97,10 +97,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb0 { status = "okay"; diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts index c3097bf93b..e14cf772af 100644 --- a/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts +++ b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts @@ -117,10 +117,6 @@ }; }; -&uart { - status = "okay"; -}; - ð1 { mtd-mac-address = <&art 0x0>; diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts index ac387040bf..757a2eaeee 100644 --- a/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts +++ b/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts @@ -116,10 +116,6 @@ }; }; -&uart { - status = "okay"; -}; - ð0 { status = "okay"; diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts index 842ed970a6..4738ba56af 100644 --- a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts +++ b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts @@ -131,10 +131,6 @@ }; }; -&uart { - status = "okay"; -}; - ð0 { status = "okay"; diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts index 45416089b7..57727754bb 100644 --- a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts +++ b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts @@ -61,10 +61,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb0 { #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts index 5065069863..a7ea34eeb0 100644 --- a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts +++ b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts @@ -130,10 +130,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &usb_phy { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts index 7114df5cbc..edb6bbe5f3 100644 --- a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts +++ b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts @@ -104,10 +104,6 @@ }; }; -&uart { - status = "okay"; -}; - ð0 { status = "okay"; diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts b/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts index d57c943810..6ae2e4eb54 100644 --- a/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts +++ b/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts @@ -104,10 +104,6 @@ }; }; -&uart { - status = "okay"; -}; - ð0 { status = "okay"; diff --git a/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts b/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts index 2cc9d46fac..89822586ff 100644 --- a/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts +++ b/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts @@ -60,10 +60,6 @@ }; }; -&uart { - status = "okay"; -}; - &pinmux { pinmux_led_eth_pins: pinmux_led_eth_pins { pinctrl-single,bits = <0x8 0x2b000000 0xff000000>, <0xc 0x00002d00 0x0000ff00>; diff --git a/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts b/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts index 9f9dd44812..d2fbc09c60 100644 --- a/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts +++ b/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts @@ -145,10 +145,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts index 736ebf2dd3..6fd28d5b36 100644 --- a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts +++ b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts @@ -84,10 +84,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi index 6422dc60f5..d0b0d88c48 100644 --- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi +++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi @@ -131,10 +131,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb0 { #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts index f3d62b36a8..24dc8aaf6a 100644 --- a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts +++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts @@ -76,10 +76,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts index de7d5f577a..98022d7cc5 100644 --- a/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts +++ b/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts @@ -47,10 +47,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &usb0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts index f32cb6e39a..c755e00033 100644 --- a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts +++ b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts @@ -59,10 +59,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &usb0 { #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi b/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi index 6ba4ae8fdf..7c6ed9f4fe 100644 --- a/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi +++ b/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi @@ -103,10 +103,6 @@ mtd-mac-address = <&pridata 0x400>; }; -&uart { - status = "okay"; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/qca9531_telco_t1.dts b/target/linux/ath79/dts/qca9531_telco_t1.dts index 252d9073c8..eaaf4f154c 100644 --- a/target/linux/ath79/dts/qca9531_telco_t1.dts +++ b/target/linux/ath79/dts/qca9531_telco_t1.dts @@ -65,10 +65,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts index f6bd7ad58f..9a39001935 100644 --- a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts +++ b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts @@ -89,10 +89,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts index d163a73228..0e2c158260 100644 --- a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts +++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts @@ -132,10 +132,6 @@ }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts index 751a69154f..82a73d301d 100644 --- a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts +++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts @@ -89,10 +89,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts index a162d9030f..69445df741 100644 --- a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts +++ b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts @@ -96,10 +96,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9531_wallys_dr531.dts b/target/linux/ath79/dts/qca9531_wallys_dr531.dts index 2375a054ce..abf821b11b 100644 --- a/target/linux/ath79/dts/qca9531_wallys_dr531.dts +++ b/target/linux/ath79/dts/qca9531_wallys_dr531.dts @@ -137,10 +137,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9531_yuncore_a770.dts b/target/linux/ath79/dts/qca9531_yuncore_a770.dts index a6738c7d9a..c58b0c4e38 100644 --- a/target/linux/ath79/dts/qca9531_yuncore_a770.dts +++ b/target/linux/ath79/dts/qca9531_yuncore_a770.dts @@ -93,10 +93,6 @@ }; }; -&uart { - status = "okay"; -}; - ð0 { status = "okay"; diff --git a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts index c4918205fd..8deeea4245 100644 --- a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts +++ b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts @@ -129,10 +129,6 @@ }; }; -&uart { - status = "okay"; -}; - ð0 { status = "okay"; diff --git a/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi b/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi index cd095c1559..f1eef86a9b 100644 --- a/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi +++ b/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi @@ -110,10 +110,6 @@ }; }; -&uart { - status = "okay"; -}; - ð0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9533_mikrotik_routerboard-16m.dtsi b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-16m.dtsi index effa2d3619..f0473c7497 100644 --- a/target/linux/ath79/dts/qca9533_mikrotik_routerboard-16m.dtsi +++ b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-16m.dtsi @@ -6,6 +6,10 @@ #include / { + aliases { + serial0 = &uart; + }; + keys { compatible = "gpio-keys"; @@ -74,10 +78,6 @@ }; }; -&uart { - status = "okay"; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi index 5448b7beb0..a45365073b 100644 --- a/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi +++ b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi @@ -11,7 +11,6 @@ led-failsafe = &led_user; led-upgrade = &led_user; led-running = &led_user; - serial0 = &uart; }; leds { diff --git a/target/linux/ath79/dts/qca9533_mikrotik_routerboard-wapr-2nd.dts b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-wapr-2nd.dts index ba674c13d8..459fc04e6c 100644 --- a/target/linux/ath79/dts/qca9533_mikrotik_routerboard-wapr-2nd.dts +++ b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-wapr-2nd.dts @@ -11,7 +11,6 @@ led-failsafe = &led_rssilow; led-upgrade = &led_rssilow; led-running = &led_rssilow; - serial0 = &uart; }; leds { diff --git a/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi b/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi index 74daba3f93..53eb08b253 100644 --- a/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi +++ b/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi @@ -77,10 +77,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi b/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi index 0bc6d4fa28..c506c849f9 100644 --- a/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi +++ b/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi @@ -59,10 +59,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi index f663a1fcd7..d5eeec13b7 100644 --- a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi +++ b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi @@ -49,10 +49,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi index 28e74d5ced..6033acddf3 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi @@ -63,10 +63,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts index e723587a0b..45fe9e86b3 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts @@ -91,10 +91,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi index 26edbb2cd0..fb034195ec 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi @@ -34,10 +34,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi index 842815d683..4166686795 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi @@ -69,10 +69,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts index f0b42a6e4c..db99f70b36 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts @@ -94,10 +94,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb0 { #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts b/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts index 8b9469ebc0..f7910b3d6f 100644 --- a/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts +++ b/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts @@ -71,10 +71,6 @@ }; }; -&uart { - status = "okay"; -}; - ð0 { status = "okay"; diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi index 1c2c1350f7..801438be29 100644 --- a/target/linux/ath79/dts/qca953x.dtsi +++ b/target/linux/ath79/dts/qca953x.dtsi @@ -53,8 +53,6 @@ reg-io-width = <4>; reg-shift = <2>; no-loopback-test; - - status = "disabled"; }; usb_phy: usb-phy@18030000 { diff --git a/target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi b/target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi index aff6eb2871..71d9fffbe3 100644 --- a/target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi +++ b/target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi @@ -45,10 +45,6 @@ }; }; -&uart { - status = "okay"; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi index 53e5fe9bcc..ab8ac92426 100644 --- a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi +++ b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi @@ -51,10 +51,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9550_airtight_c-75.dts b/target/linux/ath79/dts/qca9550_airtight_c-75.dts index a766398971..a984b38ad2 100644 --- a/target/linux/ath79/dts/qca9550_airtight_c-75.dts +++ b/target/linux/ath79/dts/qca9550_airtight_c-75.dts @@ -166,10 +166,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb_phy0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi b/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi index befb933483..d0c796fadb 100644 --- a/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi +++ b/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi @@ -17,10 +17,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts index a3f9ec28a4..f5c6731bb7 100644 --- a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts +++ b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts @@ -113,10 +113,6 @@ }; }; -&uart { - status = "okay"; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/qca9557_8dev_rambutan.dts b/target/linux/ath79/dts/qca9557_8dev_rambutan.dts index ce46555148..638d78a7a5 100644 --- a/target/linux/ath79/dts/qca9557_8dev_rambutan.dts +++ b/target/linux/ath79/dts/qca9557_8dev_rambutan.dts @@ -123,7 +123,3 @@ #address-cells = <1>; #size-cells = <0>; }; - -&uart { - status = "okay"; -}; diff --git a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts index 8d437a6792..dce1a2144f 100644 --- a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts +++ b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts @@ -134,7 +134,3 @@ full-duplex; }; }; - -&uart { - status = "okay"; -}; diff --git a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts index 72a50c922e..a7a77141e5 100644 --- a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts +++ b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts @@ -76,10 +76,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts b/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts index 2cf800cddc..af397dfd3a 100644 --- a/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts +++ b/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts @@ -80,10 +80,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi b/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi index 2f6bf4dbee..204a63cda8 100644 --- a/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi +++ b/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi @@ -174,10 +174,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb_phy0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts index aee8bbff56..ba6be49fce 100644 --- a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts +++ b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts @@ -139,10 +139,6 @@ }; }; -&uart { - status = "okay"; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi index 624e20096f..e4bb6c25e5 100644 --- a/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi +++ b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi @@ -99,10 +99,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &usb_phy0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi index 5d32551274..d8a311614f 100644 --- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi +++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi @@ -56,10 +56,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &usb_phy0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi index a1b019a7ad..7ae33c3e04 100644 --- a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi +++ b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi @@ -40,10 +40,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts index 86f889a5dc..15a32a1f3f 100644 --- a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts +++ b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts @@ -157,10 +157,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts index fae0853922..0c42208c20 100644 --- a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts +++ b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts @@ -71,10 +71,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb_phy0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts index 5e4d224d3e..35716152ad 100644 --- a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts +++ b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts @@ -153,10 +153,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb_phy1 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts index 5be931bcd0..ddb91d0791 100644 --- a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts +++ b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts @@ -75,10 +75,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb_phy0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi index 70b3ee68c3..5e919856a5 100644 --- a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi +++ b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi @@ -126,7 +126,3 @@ }; }; }; - -&uart { - status = "okay"; -}; diff --git a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi index 40a4ead19d..2f7cdcf8c3 100644 --- a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi +++ b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi @@ -120,10 +120,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &pll { clocks = <&extosc>; }; diff --git a/target/linux/ath79/dts/qca9558_ocedo_koala.dts b/target/linux/ath79/dts/qca9558_ocedo_koala.dts index a3a3cc3e31..aa3876acb1 100644 --- a/target/linux/ath79/dts/qca9558_ocedo_koala.dts +++ b/target/linux/ath79/dts/qca9558_ocedo_koala.dts @@ -59,10 +59,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &pll { clocks = <&extosc>; }; diff --git a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts index 79ed751d66..dc8329f976 100644 --- a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts +++ b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts @@ -30,10 +30,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &pll { clocks = <&extosc>; }; diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi index d51c587683..f4eed22460 100644 --- a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi +++ b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi @@ -74,10 +74,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts index 8cea2ff401..b4d452dda1 100644 --- a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts +++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts @@ -81,10 +81,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &pll { clocks = <&extosc>; }; diff --git a/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi b/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi index aa4bd75f2f..21946c42b2 100644 --- a/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi +++ b/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi @@ -144,10 +144,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb_phy0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts b/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts index 96269c4418..eee3e39bc3 100644 --- a/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts +++ b/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts @@ -131,10 +131,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb_phy0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi index 87dbdd0a5f..52cbb5d016 100644 --- a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi @@ -81,10 +81,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &usb_phy0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi index 598c5570aa..f9e8adcc9e 100644 --- a/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi @@ -136,10 +136,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &usb_phy0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts index b0a3293d4f..c0fbeb5a43 100644 --- a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts +++ b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts @@ -168,10 +168,6 @@ }; }; -&uart { - status = "okay"; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi index 225af82c93..6c487f15be 100644 --- a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi @@ -100,10 +100,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts index 8f525d57bc..0099592dc1 100644 --- a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts +++ b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts @@ -104,10 +104,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb_phy0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi index 66059b890b..959d5c35fb 100644 --- a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi @@ -72,10 +72,6 @@ }; }; -&uart { - status = "okay"; -}; - &usb_phy0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts index bb1993516e..058acda746 100644 --- a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts +++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts @@ -57,10 +57,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts index e3f3643b37..22569bfc1d 100644 --- a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts +++ b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts @@ -67,10 +67,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &usb_phy0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca955x.dtsi b/target/linux/ath79/dts/qca955x.dtsi index f910d2a822..385cbd99fe 100644 --- a/target/linux/ath79/dts/qca955x.dtsi +++ b/target/linux/ath79/dts/qca955x.dtsi @@ -53,8 +53,6 @@ reg-io-width = <4>; reg-shift = <2>; no-loopback-test; - - status = "disabled"; }; usb_phy0: usb-phy0@18030000 { diff --git a/target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi b/target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi index ac7a0c85f0..1047dfddeb 100644 --- a/target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi +++ b/target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi @@ -45,10 +45,6 @@ }; }; -&uart { - status = "okay"; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/qca955x_engenius_ecb1xxx.dtsi b/target/linux/ath79/dts/qca955x_engenius_ecb1xxx.dtsi index 0051eb2508..e448cd3012 100644 --- a/target/linux/ath79/dts/qca955x_engenius_ecb1xxx.dtsi +++ b/target/linux/ath79/dts/qca955x_engenius_ecb1xxx.dtsi @@ -47,10 +47,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca955x_ubnt_xc.dtsi b/target/linux/ath79/dts/qca955x_ubnt_xc.dtsi index 7e022e46a1..0f803945db 100644 --- a/target/linux/ath79/dts/qca955x_ubnt_xc.dtsi +++ b/target/linux/ath79/dts/qca955x_ubnt_xc.dtsi @@ -5,10 +5,6 @@ #include #include -&uart { - status = "okay"; -}; - &pcie0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi b/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi index 849063b6d1..9e1ce89c46 100644 --- a/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi +++ b/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi @@ -41,10 +41,6 @@ }; }; -&uart { - status = "okay"; -}; - &mdio0 { status = "okay"; diff --git a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts index 13e6eb1673..7c220baddd 100644 --- a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts +++ b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts @@ -95,10 +95,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts index 8776299080..bf744f1087 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts @@ -163,10 +163,6 @@ }; }; -&uart { - status = "okay"; -}; - &pcie { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi index 9ba6ccfafd..664032936c 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi @@ -117,10 +117,6 @@ }; }; -&uart { - status = "okay"; -}; - &pcie { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi index 7ba94aa42e..75d3816b72 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi @@ -63,10 +63,6 @@ }; }; -&uart { - status = "okay"; -}; - &pcie { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts b/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts index 4dea09f429..a39fde01e5 100644 --- a/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts +++ b/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts @@ -56,10 +56,6 @@ }; }; -&uart { - status = "okay"; -}; - &pcie { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts index 22bd8c941d..821f125c20 100644 --- a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts +++ b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts @@ -52,10 +52,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9563_compex_wpj563.dts b/target/linux/ath79/dts/qca9563_compex_wpj563.dts index 74b6da9468..aa829413dc 100644 --- a/target/linux/ath79/dts/qca9563_compex_wpj563.dts +++ b/target/linux/ath79/dts/qca9563_compex_wpj563.dts @@ -131,10 +131,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi b/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi index 3b45681bc0..1366e68a8f 100644 --- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi +++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi @@ -50,10 +50,6 @@ }; }; -&uart { - status = "okay"; -}; - &pcie { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts b/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts index 49805ec319..a65ccc0863 100644 --- a/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts +++ b/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts @@ -69,10 +69,6 @@ }; }; -&uart { - status = "okay"; -}; - &pcie { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi index 90d91a6d8e..78eb0fe219 100644 --- a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi +++ b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi @@ -111,10 +111,6 @@ phy-handle = <&phy0>; }; -&uart { - status = "okay"; -}; - &wmac { status = "okay"; mtd-cal-data = <&art 0x1000>; diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi index 75103afdd7..9226d37a43 100644 --- a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi +++ b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi @@ -154,10 +154,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &usb0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts b/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts index a224ddbd5f..26c1932154 100644 --- a/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts +++ b/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts @@ -160,10 +160,6 @@ }; }; -&uart { - status = "okay"; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/qca9563_nec_wg800hp.dts b/target/linux/ath79/dts/qca9563_nec_wg800hp.dts index 8a4226f35c..1069a63a5e 100644 --- a/target/linux/ath79/dts/qca9563_nec_wg800hp.dts +++ b/target/linux/ath79/dts/qca9563_nec_wg800hp.dts @@ -172,10 +172,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &wmac { status = "okay"; qca,no-eeprom; diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi index e77298bbd9..8c6a374131 100644 --- a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi +++ b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi @@ -243,7 +243,3 @@ #trigger-source-cells = <0>; }; }; - -&uart { - status = "okay"; -}; diff --git a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts index b86289a3ab..63e2e53aa5 100644 --- a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts +++ b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts @@ -46,10 +46,6 @@ }; }; -&uart { - status = "okay"; -}; - &pcie { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi b/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi index 33d0095da4..9cf146c918 100644 --- a/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi +++ b/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi @@ -144,10 +144,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts index 512d36bbe0..a88eeb3de0 100644 --- a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts +++ b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts @@ -43,10 +43,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts index 6e7bd9986a..6c4b04b81c 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts +++ b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts @@ -92,10 +92,6 @@ }; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts index e0d03e1640..63040acf4a 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts +++ b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts @@ -147,10 +147,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &usb_phy0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi b/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi index 8e46cd87fc..1a074e63a6 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi @@ -15,10 +15,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &mdio0 { status = "okay"; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi index c13bafce0b..3644cf863e 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi @@ -104,10 +104,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &usb_phy0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts b/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts index fdb3d8cdc1..6b438ce126 100644 --- a/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts +++ b/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts @@ -48,10 +48,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi b/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi index 0be46301f0..cc9e0b7ff6 100644 --- a/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi @@ -26,10 +26,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9563_tplink_re450.dtsi b/target/linux/ath79/dts/qca9563_tplink_re450.dtsi index e09c1ba63f..3354baee08 100644 --- a/target/linux/ath79/dts/qca9563_tplink_re450.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_re450.dtsi @@ -108,10 +108,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &spi { status = "okay"; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi index 1503bf4c8e..5fd314b856 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi @@ -102,10 +102,6 @@ status = "okay"; }; -&uart { - status = "okay"; -}; - &mdio0 { status = "okay"; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi index b8f48047e2..c8c69e8a65 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi @@ -84,10 +84,6 @@ }; }; -&uart { - status = "okay"; -}; - &mdio0 { status = "okay"; diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi index 85f13c1473..42fe25c781 100644 --- a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi +++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi @@ -39,10 +39,6 @@ }; }; -&uart { - status = "okay"; -}; - &pcie { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi index f8fdf5e27d..4eed20bea4 100644 --- a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi +++ b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi @@ -100,10 +100,6 @@ }; }; -&uart { - status = "okay"; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi index 6489efbf0b..f367ac27ea 100644 --- a/target/linux/ath79/dts/qca956x.dtsi +++ b/target/linux/ath79/dts/qca956x.dtsi @@ -53,8 +53,6 @@ reg-io-width = <4>; reg-shift = <2>; no-loopback-test; - - status = "disabled"; }; gpio: gpio@18040000 { diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi index 3e591ec908..31079123c5 100644 --- a/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi +++ b/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi @@ -45,10 +45,6 @@ }; }; -&uart { - status = "okay"; -}; - ð0 { status = "okay"; From 3feef9c555e6f13fd225176c95dc5b3ce165c97d Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 25 Feb 2021 15:09:17 +0100 Subject: [PATCH 09/11] ath79: enable UART node for GL-USB150 This was overlooked when adding support for this device. (It has recently been discovered that this was the only device in ath79 having &uart disabled.) Fixes: acc62630132c ("ath79: add support for GL.iNet GL-USB150") Signed-off-by: Adrian Schmutzler (cherry picked from commit 722f1bd5490abafc5d77420905179aa03c508a1f) --- target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts b/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts index 80e1f228ff..d1c2654712 100644 --- a/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts +++ b/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts @@ -112,10 +112,6 @@ }; }; -&uart { - status = "disabled"; -}; - &wmac { status = "okay"; From adc3a75d48ca13a61d849ff03e8e831add10d156 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 26 Feb 2021 14:11:18 +0100 Subject: [PATCH 10/11] octeon: re-enable CONFIG_CAVIUM_CN63XXP1 and EdgeRouter image The symbol CONFIG_CAVIUM_CN63XXP1 was disabled during the bump to 4.19 (see Fixes:) with the following reason: No supported hardware uses CN63XXP1 and it causes "slight decrease in performance" However, it later turned out that the edgerouter image needed it, which led to having the device disabled in [1]. Still, dropping support of a device seems a harsh action for just removing a "slight" decrease in performance from the other devices. Thus, this enables CONFIG_CAVIUM_CN63XXP1 again, and essentially restores the situation present until (including) kernel 4.14 on this target. For OpenWrt as a platform, it seems more desirable to support all devices (and have them tested regularly via the snapshots) in this case. Users interested in maximum performance might still just remove the symbol again in their local build. [1] 3824fa26d256 ("octeon: disable edgerouter image") Fixes: 6c22545225cd ("target/octeon: Add Linux 4.19 support") Signed-off-by: Adrian Schmutzler (cherry picked from commit cfd1a40583d66d5f6a30dec5bee0f7ebd4d252ef) --- target/linux/octeon/config-5.4 | 2 +- target/linux/octeon/image/Makefile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/target/linux/octeon/config-5.4 b/target/linux/octeon/config-5.4 index c2012372ec..9bb520a2e2 100644 --- a/target/linux/octeon/config-5.4 +++ b/target/linux/octeon/config-5.4 @@ -24,7 +24,7 @@ CONFIG_BLK_DEV_SD=y CONFIG_BLK_MQ_PCI=y CONFIG_BLK_SCSI_REQUEST=y CONFIG_BUILTIN_DTB=y -# CONFIG_CAVIUM_CN63XXP1 is not set +CONFIG_CAVIUM_CN63XXP1=y CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=0 CONFIG_CAVIUM_OCTEON_LOCK_L2=y CONFIG_CAVIUM_OCTEON_LOCK_L2_EXCEPTION=y diff --git a/target/linux/octeon/image/Makefile b/target/linux/octeon/image/Makefile index 8e97280479..11da22df3b 100644 --- a/target/linux/octeon/image/Makefile +++ b/target/linux/octeon/image/Makefile @@ -48,7 +48,6 @@ define Device/ubnt_edgerouter DEVICE_MODEL := EdgeRouter BOARD_NAME := er CMDLINE := $(ER_CMDLINE) - DEFAULT := n endef TARGET_DEVICES += ubnt_edgerouter From 2638c9801f92fc77aa07a8eb426f6bd8dbc1cc42 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Tue, 16 Feb 2021 19:35:01 +0100 Subject: [PATCH 11/11] lantiq: set maximum kernel size These boards have a fixed size kernel partition but do not limit the kernel size during image building. Disable image building for both boards as well, since the kernel of the last release as well as master are to big to fit into the 2 MByte kernel partition. Signed-off-by: Mathias Kresin (cherry picked from commit 23dd7867347ab4fd88592d0bfec1ce5a959c09f3) --- target/linux/lantiq/image/ar9.mk | 2 ++ target/linux/lantiq/image/danube.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/target/linux/lantiq/image/ar9.mk b/target/linux/lantiq/image/ar9.mk index ad061b2776..a973c90beb 100644 --- a/target/linux/lantiq/image/ar9.mk +++ b/target/linux/lantiq/image/ar9.mk @@ -34,6 +34,7 @@ define Device/bt_homehub-v3a DEVICE_VARIANT := Type A BOARD_NAME := BTHOMEHUBV3A SOC := ar9 + KERNEL_SIZE := 2048k DEVICE_PACKAGES := kmod-usb-dwc2 \ kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ @@ -42,6 +43,7 @@ define Device/bt_homehub-v3a kmod-ath9k kmod-owl-loader wpad-basic-wolfssl \ uboot-envtools SUPPORTED_DEVICES += BTHOMEHUBV3A + DEFAULT := n endef TARGET_DEVICES += bt_homehub-v3a diff --git a/target/linux/lantiq/image/danube.mk b/target/linux/lantiq/image/danube.mk index ea22081d65..73ec27222a 100644 --- a/target/linux/lantiq/image/danube.mk +++ b/target/linux/lantiq/image/danube.mk @@ -188,6 +188,7 @@ define Device/bt_homehub-v2b DEVICE_VARIANT := Type B BOARD_NAME := BTHOMEHUBV2B SOC := danube + KERNEL_SIZE := 2048k DEVICE_PACKAGES := kmod-usb-dwc2 \ kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ @@ -195,6 +196,7 @@ define Device/bt_homehub-v2b ltq-adsl-app ppp-mod-pppoa \ kmod-ath9k kmod-owl-loader wpad-basic-wolfssl SUPPORTED_DEVICES += BTHOMEHUBV2B + DEFAULT := n endef TARGET_DEVICES += bt_homehub-v2b