From d05e22fc84eeee2c7723f8ea241714d98c51869a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 22 Aug 2020 18:18:06 +0200 Subject: [PATCH] modules: update OpenWrt 0c25ece262 x86: Add CONFIG_EFI_CUSTOM_SSDT_OVERLAYS 2628ec9b37 ar71xx: fix ZyXEL NBG6616 wifi switch 95dc2f5257 tools/cmake: fix typo in parallel make patch 3667693830 uboot-envtools: ar71xx: add ZyXEL NBG6616 uboot env support 5af87620af ar71xx: change u-boot-env to read-write for ZyXEL NBG6616 f9ffdf8825 kernel: update kernel 4.9 to version 4.9.232 35e9edc3df kernel: Update kernel 4.14 to version 4.14.193 Compile-tested: ar71xx-generic, ipq40xx --- modules | 2 +- patches/openwrt/0009-build-add-mkrasimage.patch | 4 ++-- .../0023-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules b/modules index 3cd19c27..55da5509 100644 --- a/modules +++ b/modules @@ -2,7 +2,7 @@ GLUON_FEEDS='packages routing luci gluon' OPENWRT_REPO=https://git.openwrt.org/openwrt/openwrt.git OPENWRT_BRANCH=openwrt-18.06 -OPENWRT_COMMIT=b18e3eae94bbde412ee577cc9cd0aa7fc2723dc6 +OPENWRT_COMMIT=0c25ece262e8ec44d7414d472afa8d8e5858edfa PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-18.06 diff --git a/patches/openwrt/0009-build-add-mkrasimage.patch b/patches/openwrt/0009-build-add-mkrasimage.patch index cd5ab7eb..ed4234b0 100644 --- a/patches/openwrt/0009-build-add-mkrasimage.patch +++ b/patches/openwrt/0009-build-add-mkrasimage.patch @@ -249,12 +249,12 @@ index ccddaa0016b0c926d4737abb5757e7212b0a1157..00000000000000000000000000000000 - -rm -rf "$tmpdir" diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk -index 640557532c8a02f37bc6f84ade8cb34e7172162d..4568b656219419e9ca1156c6716bd2124074cb32 100644 +index ba5f9d90a639c8102d8a380d57a491b0206bd588..a494fa6b0be07b3b1f99f6fbb29e11d77df1dfd1 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -1086,8 +1086,12 @@ define Device/NBG6616 IMAGE_SIZE := 15323k - MTDPARTS := spi0.0:192k(u-boot)ro,64k(env)ro,64k(RFdata)ro,384k(zyxel_rfsd),384k(romd),64k(header),2048k(kernel),13184k(rootfs),15232k@0x120000(firmware) + MTDPARTS := spi0.0:192k(u-boot)ro,64k(env),64k(RFdata)ro,384k(zyxel_rfsd),384k(romd),64k(header),2048k(kernel),13184k(rootfs),15232k@0x120000(firmware) CMDLINE += mem=128M - IMAGES := sysupgrade.bin + RAS_BOARD := NBG6616 diff --git a/patches/openwrt/0023-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch b/patches/openwrt/0023-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch index c8242b12..ace622d2 100644 --- a/patches/openwrt/0023-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch +++ b/patches/openwrt/0023-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch @@ -77,7 +77,7 @@ index a61c781b28177ece36e6c2a63f921d15c39b6c2a..7e96ab2b2a0b026ac063cc0f30ab8f4b name="cpe505n" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -index 8558fde3fef9738220a1598a3e4135836c8279f4..f7bb7dbbcd2606cdcbf2c76aa30a96831a232617 100755 +index 1ac0613c7bc4cf189cfafc306bd66e1aa434d9ad..5ebc775e8e0015bc62a63e7126e8247db8932428 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -587,7 +587,8 @@ platform_check_image() {