From patchwork Fri Apr 22 15:22:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/3] upgrades openwrt revision to ba0cac0 From: Tobias Klaus X-Patchwork-Id: 85 Message-Id: <1461338538-4439-2-git-send-email-tk+ff@meskal.net> To: franken-dev@freifunk.net Cc: Tobias Klaus , Tobias Klaus Date: Fri, 22 Apr 2016 17:22:16 +0200 From: Tobias Klaus Mainly bcm53xx fixes have been introduced But also two main changes for us: * Image names of WR841 models are unified now, omitting the confusing n and nd suffixes -> we need an transition path for sysupgrade, not included in this patch * The fix for Nanostation/Picostation is now mainline Signed-off-by: Tobias Klaus Reviewed-by: Jan Kraus --- bsp/board_ar71xx.bsp | 8 +- ...e-bootconsole-wait-for-both-THRE-and-TEMT.patch | 86 ---------------------- buildscript | 2 +- 3 files changed, 5 insertions(+), 91 deletions(-) delete mode 100644 build_patches/openwrt/0005-ar71xx-make-bootconsole-wait-for-both-THRE-and-TEMT.patch diff --git a/bsp/board_ar71xx.bsp b/bsp/board_ar71xx.bsp index 4c406ca..ea94acd 100644 --- a/bsp/board_ar71xx.bsp +++ b/bsp/board_ar71xx.bsp @@ -6,10 +6,10 @@ images=("openwrt-ar71xx-generic-ubnt-nano-m-squashfs-sysupgrade.bin" "openwrt-ar71xx-generic-tl-wr740n-v4-squashfs-sysupgrade.bin" "openwrt-ar71xx-generic-tl-wr741nd-v2-squashfs-sysupgrade.bin" "openwrt-ar71xx-generic-tl-wr741nd-v4-squashfs-sysupgrade.bin" - "openwrt-ar71xx-generic-tl-wr841nd-v7-squashfs-sysupgrade.bin" - "openwrt-ar71xx-generic-tl-wr841n-v8-squashfs-sysupgrade.bin" - "openwrt-ar71xx-generic-tl-wr841n-v9-squashfs-sysupgrade.bin" - "openwrt-ar71xx-generic-tl-wr841n-v10-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-tl-wr841-v7-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-tl-wr841-v8-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-tl-wr841-v9-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-tl-wr841-v10-squashfs-sysupgrade.bin" "openwrt-ar71xx-generic-tl-wr842n-v2-squashfs-sysupgrade.bin" "openwrt-ar71xx-generic-tl-wr1043nd-v1-squashfs-sysupgrade.bin" "openwrt-ar71xx-generic-tl-wr1043nd-v2-squashfs-sysupgrade.bin" 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 -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: -+From: Matthias Schiffer -+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: -+Signed-off-by: Matthias Schiffer -+--- -+ 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/buildscript b/buildscript index 7d7d1e3..de09dbf 100755 --- a/buildscript +++ b/buildscript @@ -13,7 +13,7 @@ builddir=./build -OPENWRTREV="c75367d20240da182fcbdb68c8cce64eabd71ac5" +OPENWRTREV="ba0cac08164150e74567787251e44b4d0d0dc140" OPENWRTURL="git://git.openwrt.org/15.05/openwrt.git" PACKAGEREV="ee0bb7b9df86cec0f1d7c27046c50b1fc45b7c4f" PACKAGEURL="https://github.com/openwrt/packages.git"