[PATCH v2] buildscript: bump openwrt to eadf19c0b43d2f75f196ea8d875a08c7c348530c

Tim Niemeyer tim at tn-x.org
Do Apr 28 07:53:51 CEST 2016


Mainly bcm53xx fixes have been introduced

But also two main changes for us:
* The fix for Nanostation/Picostation is now mainline
  -> remove ar71xx-make-bootconsole-wait-for-both-THRE-and-TEMT.patch
* WR841v11 is now in upstream
  -> remove ar71xx-Add-TL-WR841N-ND-v11-support.patch

Signed-off-by: Tim Niemeyer <tim at tn-x.org>
CC: Tobias Klaus <tk+ff at meskal.net>

---

Changes in v2:
- wr841v11 is upstream
- revert patch for common image naming is upstream

 ...e-bootconsole-wait-for-both-THRE-and-TEMT.patch | 86 ----------------------
 .../0006-ar71xx-Add-TL-WR841N-ND-v11-support.patch | 47 ------------
 buildscript                                        |  2 +-
 3 files changed, 1 insertion(+), 134 deletions(-)
 delete mode 100644 build_patches/openwrt/0005-ar71xx-make-bootconsole-wait-for-both-THRE-and-TEMT.patch
 delete mode 100644 build_patches/openwrt/0006-ar71xx-Add-TL-WR841N-ND-v11-support.patch

diff --git a/build_patches/openwrt/0005-ar71xx-make-bootconsole-wait-for-both-THRE-and-TEMT.patch b/build_patches/openwrt/0005-ar71xx-make-bootconsole-wait-for-both-THRE-and-TEMT.patch
deleted file mode 100644
index ada44bc..0000000
--- a/build_patches/openwrt/0005-ar71xx-make-bootconsole-wait-for-both-THRE-and-TEMT.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: Matthias Schiffer <mschiffer at universe-factory.net>
-Date: Thu, 24 Mar 2016 18:30:26 +0100
-Subject: ar71xx: make bootconsole wait for both THRE and TEMT
-
-Original commit message:
-
-    MIPS: ath79: make bootconsole wait for both THRE and TEMT
-
-    This makes the ath79 bootconsole behave the same way as the generic 8250
-    bootconsole.
-
-    Also waiting for TEMT (transmit buffer is empty) instead of just THRE
-    (transmit buffer is not full) ensures that all characters have been
-    transmitted before the real serial driver starts reconfiguring the serial
-    controller (which would sometimes result in garbage being transmitted.)
-    This change does not cause a visible performance loss.
-
-    In addition, this seems to fix a hang observed in certain configurations on
-    many AR7xxx/AR9xxx SoCs during autoconfig of the real serial driver.
-
-    A more complete follow-up patch will disable 8250 autoconfig for ath79
-    altogether (the serial controller is detected as a 16550A, which is not
-    fully compatible with the ath79 serial, and the autoconfig may lead to
-    undefined behavior on ath79.)
-
-diff --git a/target/linux/ar71xx/patches-3.18/103-MIPS-ath79-make-bootconsole-wait-for-both-THRE-and-T.patch b/target/linux/ar71xx/patches-3.18/103-MIPS-ath79-make-bootconsole-wait-for-both-THRE-and-T.patch
-new file mode 100644
-index 0000000..7be14ab
---- /dev/null
-+++ b/target/linux/ar71xx/patches-3.18/103-MIPS-ath79-make-bootconsole-wait-for-both-THRE-and-T.patch
-@@ -0,0 +1,54 @@
-+From f1ba020af5076172c9d29006a747ccf40027fedc Mon Sep 17 00:00:00 2001
-+Message-Id: <f1ba020af5076172c9d29006a747ccf40027fedc.1458840219.git.mschiffer at universe-factory.net>
-+From: Matthias Schiffer <mschiffer at universe-factory.net>
-+Date: Thu, 24 Mar 2016 15:34:05 +0100
-+Subject: [PATCH] MIPS: ath79: make bootconsole wait for both THRE and TEMT
-+
-+This makes the ath79 bootconsole behave the same way as the generic 8250
-+bootconsole.
-+
-+Also waiting for TEMT (transmit buffer is empty) instead of just THRE
-+(transmit buffer is not full) ensures that all characters have been
-+transmitted before the real serial driver starts reconfiguring the serial
-+controller (which would sometimes result in garbage being transmitted.)
-+This change does not cause a visible performance loss.
-+
-+In addition, this seems to fix a hang observed in certain configurations on
-+many AR7xxx/AR9xxx SoCs during autoconfig of the real serial driver.
-+
-+A more complete follow-up patch will disable 8250 autoconfig for ath79
-+altogether (the serial controller is detected as a 16550A, which is not
-+fully compatible with the ath79 serial, and the autoconfig may lead to
-+undefined behavior on ath79.)
-+
-+Cc: <stable at vger.kernel.org>
-+Signed-off-by: Matthias Schiffer <mschiffer at universe-factory.net>
-+---
-+ arch/mips/ath79/early_printk.c | 6 ++++--
-+ 1 file changed, 4 insertions(+), 2 deletions(-)
-+
-+diff --git a/arch/mips/ath79/early_printk.c b/arch/mips/ath79/early_printk.c
-+index b955faf..d1adc59 100644
-+--- a/arch/mips/ath79/early_printk.c
-++++ b/arch/mips/ath79/early_printk.c
-+@@ -31,13 +31,15 @@ static inline void prom_putchar_wait(void __iomem *reg, u32 mask, u32 val)
-+ 	} while (1);
-+ }
-+ 
-++#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
-++
-+ static void prom_putchar_ar71xx(unsigned char ch)
-+ {
-+ 	void __iomem *base = (void __iomem *)(KSEG1ADDR(AR71XX_UART_BASE));
-+ 
-+-	prom_putchar_wait(base + UART_LSR * 4, UART_LSR_THRE, UART_LSR_THRE);
-++	prom_putchar_wait(base + UART_LSR * 4, BOTH_EMPTY, BOTH_EMPTY);
-+ 	__raw_writel(ch, base + UART_TX * 4);
-+-	prom_putchar_wait(base + UART_LSR * 4, UART_LSR_THRE, UART_LSR_THRE);
-++	prom_putchar_wait(base + UART_LSR * 4, BOTH_EMPTY, BOTH_EMPTY);
-+ }
-+ 
-+ static void prom_putchar_ar933x(unsigned char ch)
-+-- 
-+2.7.4
-+
-
diff --git a/build_patches/openwrt/0006-ar71xx-Add-TL-WR841N-ND-v11-support.patch b/build_patches/openwrt/0006-ar71xx-Add-TL-WR841N-ND-v11-support.patch
deleted file mode 100644
index 7b0bc61..0000000
--- a/build_patches/openwrt/0006-ar71xx-Add-TL-WR841N-ND-v11-support.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From d71d620ac7d5a496bc7be16f9f1046d9c6133d14 Mon Sep 17 00:00:00 2001
-From: blogic <blogic at 3c298f89-4303-0410-b956-a3cf2f4a3e73>
-Date: Fri, 1 Apr 2016 07:11:23 +0000
-Subject: [PATCH] ar71xx: Add TL-WR841N/ND v11 support
-
-This patch adds support for the TP-Link TL-WR841N/ND to trunk. It is
-similar to the already supported v10 - see [1]. I have added support
-based on that topic; in the meantime it has been confirmed working
-(see the forum thread, and also [2]).
-
-Signed-off by Stijn Segers <francesco.borromini at inventati.org>
-
-[1]: https://forum.openwrt.org/viewtopic.php?id=61309
-[2]: https://forum.openwrt.org/viewtopic.php?id=63657
-
-git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49099 3c298f89-4303-0410-b956-a3cf2f4a3e73
----
- target/linux/ar71xx/image/Makefile | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git target/linux/ar71xx/image/Makefile target/linux/ar71xx/image/Makefile
-index 0cc142d..2526ae5 100644
---- target/linux/ar71xx/image/Makefile
-+++ target/linux/ar71xx/image/Makefile
-@@ -577,6 +577,13 @@ define Device/tl-wr841n-v10
-     TPLINK_HWID := 0x08410010
- endef
- 
-+define Device/tl-wr841n-v11
-+    $(Device/tplink-4mlzma)
-+    BOARDNAME := TL-WR841N-v9
-+    DEVICE_PROFILE := TLWR841
-+    TPLINK_HWID := 0x08410011
-+endef
-+
- define Device/tl-wr842n-v2
-     $(Device/tplink-8mlzma)
-     BOARDNAME := TL-WR842N-v2
-@@ -597,7 +604,7 @@ define Device/tl-wr847n-v8
-     DEVICE_PROFILE := TLWR841
-     TPLINK_HWID := 0x08470008
- endef
--TARGET_DEVICES += tl-wr841n-v8 tl-wr841n-v9 tl-wr841n-v10 tl-wr842n-v2 tl-wr843nd-v1 tl-wr847n-v8
-+TARGET_DEVICES += tl-wr841n-v8 tl-wr841n-v9 tl-wr841n-v10 tl-wr841n-v11 tl-wr842n-v2 tl-wr843nd-v1 tl-wr847n-v8
- 
- define Device/tl-wr941nd-v5
-     $(Device/tplink-4mlzma)
diff --git a/buildscript b/buildscript
index 7d7d1e3..7e16687 100755
--- a/buildscript
+++ b/buildscript
@@ -13,7 +13,7 @@
 
 builddir=./build
 
-OPENWRTREV="c75367d20240da182fcbdb68c8cce64eabd71ac5"
+OPENWRTREV="eadf19c0b43d2f75f196ea8d875a08c7c348530c"
 OPENWRTURL="git://git.openwrt.org/15.05/openwrt.git"
 PACKAGEREV="ee0bb7b9df86cec0f1d7c27046c50b1fc45b7c4f"
 PACKAGEURL="https://github.com/openwrt/packages.git"
-- 
2.1.4




Mehr Informationen über die Mailingliste franken-dev