From 0997342f24a001af2638e6b740eb24c965ae073a Mon Sep 17 00:00:00 2001 From: Chuanhong Guo Date: Sun, 12 Jul 2020 15:39:18 +0800 Subject: [PATCH 1/9] ath79: qihoo,c301: use phy-supply for usb vbus Linux phy subsystem provides support for a phy regulator defined via phy-supply property. Use it to turn on usb power only when usb is probed. Signed-off-by: Chuanhong Guo --- target/linux/ath79/dts/ar9344_qihoo_c301.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ath79/dts/ar9344_qihoo_c301.dts b/target/linux/ath79/dts/ar9344_qihoo_c301.dts index 2d5b5b3ab2..2b5d920b8b 100644 --- a/target/linux/ath79/dts/ar9344_qihoo_c301.dts +++ b/target/linux/ath79/dts/ar9344_qihoo_c301.dts @@ -52,13 +52,12 @@ gpio = <&gpio 18 GPIO_ACTIVE_LOW>; }; - reg_usb_vbus { + usb_vbus: reg_usb_vbus { compatible = "regulator-fixed"; regulator-name = "usb_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; enable-active-high; - regulator-always-on; gpio = <&gpio 19 GPIO_ACTIVE_HIGH>; }; }; @@ -202,6 +201,7 @@ &usb_phy { status = "okay"; + phy-supply = <&usb_vbus>; }; &pcie { From 28893f5878a2afbfe91b5dd6027488d35bf43ed1 Mon Sep 17 00:00:00 2001 From: Chuanhong Guo Date: Sun, 12 Jul 2020 16:14:45 +0800 Subject: [PATCH 2/9] ath79: fix dsa binding for TP-Link TL-WR941ND v2 upstream changed dt-bindings for marvell 88e6060 to use mdio-device and dropped support for legacy bindings. fix it in our local dts. Fixes: FS#2524 Signed-off-by: Chuanhong Guo --- .../ath79/dts/ar9132_tplink_tl-wr941-v2.dts | 20 ++++++++----------- target/linux/ath79/image/tiny-tp-link.mk | 2 +- 2 files changed, 9 insertions(+), 13 deletions(-) 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 1be4d6183a..11de522ae2 100644 --- a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts +++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts @@ -60,19 +60,18 @@ linux,default-trigger = "phy0tpt"; }; }; +}; - dsa { - compatible = "marvell,dsa"; - #address-cells = <1>; - #size-cells = <0>; +&mdio0 { + status = "okay"; - dsa,mii-bus = <&mdio0>; - dsa,ethernet = <ð0>; + switch@0 { + compatible = "marvell,mv88e6060"; + reg = <0>; - switch@0 { + ports { #address-cells = <1>; #size-cells = <0>; - reg = <0>; port@0 { reg = <0>; @@ -102,6 +101,7 @@ port@5 { reg = <5>; label = "cpu"; + ethernet = <ð0>; }; }; }; @@ -145,10 +145,6 @@ }; }; -&mdio0 { - status = "okay"; -}; - ð0 { status = "okay"; diff --git a/target/linux/ath79/image/tiny-tp-link.mk b/target/linux/ath79/image/tiny-tp-link.mk index 128ed9882e..0da712c5d4 100644 --- a/target/linux/ath79/image/tiny-tp-link.mk +++ b/target/linux/ath79/image/tiny-tp-link.mk @@ -443,7 +443,7 @@ define Device/tplink_tl-wr941-v2 TPLINK_HWREV := 2 SUPPORTED_DEVICES += tl-wr941nd endef -#TARGET_DEVICES += tplink_tl-wr941-v2 +TARGET_DEVICES += tplink_tl-wr941-v2 define Device/tplink_tl-wr941-v4 $(Device/tplink-4m) From 8242c6de29951fbb549355770cd685ffe3ac9c54 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Sun, 12 Jul 2020 13:25:39 +0100 Subject: [PATCH 3/9] scripts/env: Fix 56f813674a scripts/env: use command -v instead of which We don't need to see how git will be executed and it produces non silent output on 'scripts/env diff' commands when there are no differences unlike before. Re-introduce original silent behaviour. Signed-off-by: Kevin Darbyshire-Bryant --- scripts/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/env b/scripts/env index 726a354b57..df8b486bfe 100755 --- a/scripts/env +++ b/scripts/env @@ -57,7 +57,7 @@ env_init() { if [ -z "$CREATE" ]; then [ -d "$ENVDIR" ] || exit 0 fi - command -v git || error "Git is not installed" + command -v git >/dev/null || error "Git is not installed" mkdir -p "$ENVDIR" || error "Failed to create the environment directory" cd "$ENVDIR" || error "Failed to switch to the environment directory" [ -d .git ] || { From ad81e2da0888a0c346c9ceeeaf0481386838f846 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sun, 12 Jul 2020 21:37:11 -0600 Subject: [PATCH 4/9] wireguard: bump to 1.0.20200712 This release brings parity with the commits Linus released a few hours ago into 5.8-rc5. * receive: account for napi_gro_receive never returning GRO_DROP The napi_gro_receive function no longer returns GRO_DROP ever, making handling GRO_DROP dead code. This commit removes that dead code. Further, it's not even clear that device drivers have any business in taking action after passing off received packets; that's arguably out of their hands. * device: implement header_ops->parse_protocol for AF_PACKET WireGuard uses skb->protocol to determine packet type, and bails out if it's not set or set to something it's not expecting. For AF_PACKET injection, we need to support its call chain of: packet_sendmsg -> packet_snd -> packet_parse_headers -> dev_parse_header_protocol -> parse_protocol Without a valid parse_protocol, this returns zero, and wireguard then rejects the skb. So, this wires up the ip_tunnel handler for layer 3 packets for that case. * queueing: make use of ip_tunnel_parse_protocol Now that wg_examine_packet_protocol has been added for general consumption as ip_tunnel_parse_protocol, it's possible to remove wg_examine_packet_protocol and simply use the new ip_tunnel_parse_protocol function directly. * compat: backport ip_tunnel_parse_protocol and ip_tunnel_header_ops These are required for moving wg_examine_packet_protocol out of wireguard and into upstream. Signed-off-by: Jason A. Donenfeld --- package/network/services/wireguard/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile index b7adf27ec1..19aea4bb09 100644 --- a/package/network/services/wireguard/Makefile +++ b/package/network/services/wireguard/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard -PKG_VERSION:=1.0.20200623 +PKG_VERSION:=1.0.20200712 PKG_RELEASE:=1 PKG_SOURCE:=wireguard-linux-compat-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-linux-compat/snapshot/ -PKG_HASH:=130937724515799edf05ff8216bc837df8acda879428f3a7f96a3287758f9445 +PKG_HASH:=e15b3d4eb2cf186920a6ed13685187d6b846e59eb383c291913628682965ac95 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING From 11478524a28498b8698779370e4575a42251c429 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 10 Jul 2020 12:00:08 +0200 Subject: [PATCH 5/9] ramips: consolidate Netgear devices for mt7628 This creates a common DTSI and shared image definition for the relatively similar Netgear devices for mt7628 platform. As a side effect, this raises SPI flash frequency for the R6120, as it's expected to work there as well if it works for R6080 and R6020. Based on the data from the other devices, it also seems probable the 5g MAC address for R6120 could be extracted from the caldata, and the mtd-mac-address there could be dropped. Signed-off-by: Adrian Schmutzler --- .../ramips/dts/mt7628an_netgear_r6020.dts | 133 +++++------------- .../ramips/dts/mt7628an_netgear_r6080.dts | 86 ++--------- .../ramips/dts/mt7628an_netgear_r6120.dts | 93 ++---------- .../ramips/dts/mt7628an_netgear_r6xxx.dtsi | 73 ++++++++++ target/linux/ramips/image/Makefile | 2 +- target/linux/ramips/image/mt7621.mk | 2 +- target/linux/ramips/image/mt76x8.mk | 45 +++--- 7 files changed, 151 insertions(+), 283 deletions(-) create mode 100644 target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6020.dts b/target/linux/ramips/dts/mt7628an_netgear_r6020.dts index 83a751c2f7..b0be381eca 100644 --- a/target/linux/ramips/dts/mt7628an_netgear_r6020.dts +++ b/target/linux/ramips/dts/mt7628an_netgear_r6020.dts @@ -1,10 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "mt7628an.dtsi" - -#include -#include +#include "mt7628an_netgear_r6xxx.dtsi" / { compatible = "netgear,r6020", "mediatek,mt7628an-soc"; @@ -17,16 +14,6 @@ led-upgrade = &led_power; }; - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&gpio 38 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; - leds { compatible = "gpio-leds"; @@ -65,101 +52,47 @@ &state_default { gpio { - groups = "p0led_an", "p1led_an", "p2led_an", - "p3led_an", "p4led_an", "wdt", - "wled_an"; + groups = "p0led_an", "p1led_an", "p2led_an", "p3led_an", + "p4led_an", "wdt", "wled_an"; function = "gpio"; }; }; -&spi0 { - status = "okay"; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <86000000>; - m25p,fast-read; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x40000>; - read-only; - }; - - factory: partition@40000 { - label = "factory"; - reg = <0x40000 0x20000>; - read-only; - }; - - partition@60000 { - label = "nvram"; - reg = <0x60000 0x30000>; - read-only; - }; - - partition@90000 { - compatible = "denx,uimage"; - label = "firmware"; - reg = <0x90000 0x6f0000>; - }; - - partition@780000 { - label = "ML"; - reg = <0x780000 0x20000>; - read-only; - }; - - partition@7a0000 { - label = "ML1"; - reg = <0x7a0000 0x20000>; - read-only; - }; - - partition@7c0000 { - label = "ML2"; - reg = <0x7c0000 0x20000>; - read-only; - }; - - partition@7e0000 { - label = "POT"; - reg = <0x7e0000 0x10000>; - read-only; - }; - - partition@7f0000 { - label = "reserved"; - reg = <0x7f0000 0x10000>; - read-only; - }; - }; +&partitions { + partition@90000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x90000 0x6f0000>; }; -}; -&wmac { - status = "okay"; -}; + partition@780000 { + label = "ML"; + reg = <0x780000 0x20000>; + read-only; + }; -ðernet { - mtd-mac-address = <&factory 0x4>; -}; + partition@7a0000 { + label = "ML1"; + reg = <0x7a0000 0x20000>; + read-only; + }; -&pcie { - status = "okay"; -}; + partition@7c0000 { + label = "ML2"; + reg = <0x7c0000 0x20000>; + read-only; + }; -&pcie0 { - wifi@0,0 { - reg = <0x0000 0 0 0 0>; - mediatek,mtd-eeprom = <&factory 0x8000>; - ieee80211-freq-limit = <5000000 6000000>; + partition@7e0000 { + label = "POT"; + reg = <0x7e0000 0x10000>; + read-only; + }; + + partition@7f0000 { + label = "reserved"; + reg = <0x7f0000 0x10000>; + read-only; }; }; diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6080.dts b/target/linux/ramips/dts/mt7628an_netgear_r6080.dts index 5bca023c71..b56bab8b41 100644 --- a/target/linux/ramips/dts/mt7628an_netgear_r6080.dts +++ b/target/linux/ramips/dts/mt7628an_netgear_r6080.dts @@ -1,10 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "mt7628an.dtsi" - -#include -#include +#include "mt7628an_netgear_r6xxx.dtsi" / { compatible = "netgear,r6080", "mediatek,mt7628an-soc"; @@ -18,16 +15,6 @@ label-mac-device = ðernet; }; - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&gpio 38 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; - leds { compatible = "gpio-leds"; @@ -72,70 +59,17 @@ }; }; -&spi0 { - status = "okay"; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <86000000>; - m25p,fast-read; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x40000>; - read-only; - }; - - factory: partition@40000 { - label = "factory"; - reg = <0x40000 0x20000>; - read-only; - }; - - partition@60000 { - label = "nvram"; - reg = <0x60000 0x30000>; - read-only; - }; - - partition@90000 { - compatible = "denx,uimage"; - label = "firmware"; - reg = <0x90000 0x760000>; - }; - - partition@7f0000 { - label = "reserved"; - reg = <0x7f0000 0x10000>; - read-only; - }; - }; +&partitions { + partition@90000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x90000 0x760000>; }; -}; -&wmac { - status = "okay"; -}; - -ðernet { - mtd-mac-address = <&factory 0x4>; -}; - -&pcie { - status = "okay"; -}; - -&pcie0 { - wifi@0,0 { - reg = <0x0000 0 0 0 0>; - mediatek,mtd-eeprom = <&factory 0x8000>; - ieee80211-freq-limit = <5000000 6000000>; + partition@7f0000 { + label = "reserved"; + reg = <0x7f0000 0x10000>; + read-only; }; }; diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts index 191538100c..51e51db3ec 100644 --- a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts +++ b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts @@ -1,9 +1,6 @@ /dts-v1/; -#include "mt7628an.dtsi" - -#include -#include +#include "mt7628an_netgear_r6xxx.dtsi" / { compatible = "netgear,r6120", "mediatek,mt7628an-soc"; @@ -17,16 +14,6 @@ label-mac-device = ðernet; }; - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&gpio 38 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; - leds { compatible = "gpio-leds"; @@ -77,77 +64,27 @@ &state_default { gpio { - groups = "p0led_an", "p1led_an", "p2led_an", - "p3led_an", "p4led_an", "wdt", - "wled_an", "uart1"; + groups = "p0led_an", "p1led_an", "p2led_an", "p3led_an", + "p4led_an", "wdt", "wled_an", "uart1"; function = "gpio"; }; }; -&spi0 { - status = "okay"; +&partitions { + partition@90000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x90000 0xf60000>; + }; - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <10000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x40000>; - read-only; - }; - - factory: partition@40000 { - label = "factory"; - reg = <0x40000 0x20000>; - read-only; - }; - - partition@60000 { - label = "nvram"; - reg = <0x60000 0x30000>; - read-only; - }; - - partition@90000 { - compatible = "denx,uimage"; - label = "firmware"; - reg = <0x90000 0xf60000>; - }; - - partition@ff0000 { - label = "reserved"; - reg = <0xff0000 0x10000>; - read-only; - }; - }; + partition@ff0000 { + label = "reserved"; + reg = <0xff0000 0x10000>; + read-only; }; }; -&wmac { - status = "okay"; -}; - -ðernet { +&wifi5 { mtd-mac-address = <&factory 0x4>; -}; - -&pcie { - status = "okay"; -}; - -&pcie0 { - wifi@0,0 { - reg = <0x0000 0 0 0 0>; - mediatek,mtd-eeprom = <&factory 0x8000>; - ieee80211-freq-limit = <5000000 6000000>; - mtd-mac-address = <&factory 0x4>; - mtd-mac-address-increment = <(2)>; - }; + mtd-mac-address-increment = <(2)>; }; diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi b/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi new file mode 100644 index 0000000000..640591c316 --- /dev/null +++ b/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi @@ -0,0 +1,73 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "mt7628an.dtsi" + +#include +#include + +/ { + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio 38 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&spi0 { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <86000000>; + m25p,fast-read; + + partitions: partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x40000>; + read-only; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x20000>; + read-only; + }; + + partition@60000 { + label = "nvram"; + reg = <0x60000 0x30000>; + read-only; + }; + }; + }; +}; + +&wmac { + status = "okay"; +}; + +ðernet { + mtd-mac-address = <&factory 0x4>; +}; + +&pcie { + status = "okay"; +}; + +&pcie0 { + wifi5: wifi@0,0 { + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x8000>; + ieee80211-freq-limit = <5000000 6000000>; + }; +}; diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 3ee9828a64..d72d937ab8 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -11,7 +11,7 @@ DEVICE_VARS += LOADER_TYPE DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID DEVICE_VARS += BUFFALO_TAG_PLATFORM BUFFALO_TAG_VERSION BUFFALO_TAG_MINOR DEVICE_VARS += SEAMA_SIGNATURE SEAMA_MTDBLOCK -DEVICE_VARS += SERCOMM_HWID SERCOMM_HWVER SERCOMM_SWVER +DEVICE_VARS += SERCOMM_HWNAME SERCOMM_HWID SERCOMM_HWVER SERCOMM_SWVER DEVICE_VARS += JCG_MAXSIZE loadaddr-y := 0x80000000 diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 25de2fa597..9e5bd811b0 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -7,7 +7,7 @@ include ./common-tp-link.mk DEFAULT_SOC := mt7621 KERNEL_DTB += -d21 -DEVICE_VARS += UIMAGE_MAGIC SERCOMM_HWNAME +DEVICE_VARS += UIMAGE_MAGIC # The OEM webinterface expects an kernel with initramfs which has the uImage # header field ih_name. diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index de92c982cc..4b2255bd6a 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -189,60 +189,51 @@ define Device/mercury_mac1200r-v2 endef TARGET_DEVICES += mercury_mac1200r-v2 -define Device/netgear_r6020 +define Device/netgear_r6xxx BLOCKSIZE := 64k - IMAGE_SIZE := 7104k DEVICE_VENDOR := NETGEAR - DEVICE_MODEL := R6020 - DEVICE_PACKAGES := kmod-mt76x2 - SERCOMM_HWID := CFR - SERCOMM_HWVER := A001 - SERCOMM_SWVER := 0x0040 IMAGES += factory.img IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ pad-rootfs IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size IMAGE/factory.img := pad-extra 576k | $$(IMAGE/default) | \ - pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | zip R6020.bin | \ - sercom-seal + pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | \ + zip $$$$(SERCOMM_HWNAME).bin | sercom-seal +endef + +define Device/netgear_r6020 + $(Device/netgear_r6xxx) + IMAGE_SIZE := 7104k + DEVICE_MODEL := R6020 + DEVICE_PACKAGES := kmod-mt76x2 + SERCOMM_HWNAME := R6020 + SERCOMM_HWID := CFR + SERCOMM_HWVER := A001 + SERCOMM_SWVER := 0x0040 endef TARGET_DEVICES += netgear_r6020 define Device/netgear_r6080 - BLOCKSIZE := 64k + $(Device/netgear_r6xxx) IMAGE_SIZE := 7552k - DEVICE_VENDOR := NETGEAR DEVICE_MODEL := R6080 DEVICE_PACKAGES := kmod-mt76x2 + SERCOMM_HWNAME := R6080 SERCOMM_HWID := CFR SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x0040 - IMAGES += factory.img - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ - pad-rootfs - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size - IMAGE/factory.img := pad-extra 576k | $$(IMAGE/default) | \ - pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | zip R6080.bin | \ - sercom-seal endef TARGET_DEVICES += netgear_r6080 define Device/netgear_r6120 - BLOCKSIZE := 64k + $(Device/netgear_r6xxx) IMAGE_SIZE := 15744k - DEVICE_VENDOR := NETGEAR DEVICE_MODEL := R6120 DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci + SERCOMM_HWNAME := R6120 SERCOMM_HWID := CGQ SERCOMM_HWVER := A001 SERCOMM_SWVER := 0x0040 - IMAGES += factory.img - IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \ - pad-rootfs - IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size - IMAGE/factory.img := pad-extra 576k | $$(IMAGE/default) | \ - pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | zip R6120.bin | \ - sercom-seal endef TARGET_DEVICES += netgear_r6120 From eb15b0e0c95a647930b84b8fc50645c05df51f01 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 8 Jul 2020 14:32:31 +0200 Subject: [PATCH 6/9] bcm47xx: disable image for Linksys WRT160n v3 The device can only hold 3.6 MB, but newer images (since 18.06) are bigger, so flashing a new version fails. This disables default build for this device based on the bug report referenced below. Fixes: FS#1963 Signed-off-by: Adrian Schmutzler --- target/linux/bcm47xx/image/mips74k.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/bcm47xx/image/mips74k.mk b/target/linux/bcm47xx/image/mips74k.mk index 3f4fe5005d..6ca4d21e1f 100644 --- a/target/linux/bcm47xx/image/mips74k.mk +++ b/target/linux/bcm47xx/image/mips74k.mk @@ -156,6 +156,7 @@ define Device/linksys-wrt160n-v3 $(Device/linksys) DEVICE_ID := N150 VERSION := 3.0.3 + DEFAULT := n endef TARGET_DEVICES += linksys-wrt160n-v3 From 79fd87ef9d12c178649648744429ff9ba7a7f0c7 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 13 Jul 2020 12:19:08 +0100 Subject: [PATCH 7/9] procd: update to git HEAD aed7fb3 procd: fix compilation with uClibc-ng 9d0f831 jail: fix segfault with len(uidmap/gidmap) > 1 42a6217 jail: consider PATH for argv in OCI container 83f4b72 jail: actually chdir into OCI defined CWD fc9f614 jail: parse and run OCI hooks 02eec92 jail: memory allocation fixes 71e75f4 jail: refactor mount support to cover OCI spec b586e7d jail: don't make mount source read-only dacab12 uxc: fix 'stop' command Signed-off-by: Daniel Golle --- package/system/procd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 3b88c76144..cbdd38d197 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git -PKG_SOURCE_DATE:=2020-07-11 -PKG_SOURCE_VERSION:=3034eaf5ceebc3b8d8461680a2cd3c61e796fc7d -PKG_MIRROR_HASH:=2f8f84c273bda817dcb0513c0d3304af98662c3eb26c9bf266da4508db04011d +PKG_SOURCE_DATE:=2020-07-13 +PKG_SOURCE_VERSION:=dacab12b301085eac00e84a94e42096de70886e8 +PKG_MIRROR_HASH:=e9c49884ea1dd6554ce057c8ca7fb23bc980939b92e11f43d37b930c29f63dbd CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 From 875a04478c177808e86a6a615f0ae0cfe541f2c2 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Mon, 13 Jul 2020 17:44:07 +0200 Subject: [PATCH 8/9] rockchip: use downstream GPIO button implementation Use the OpenWrt netlink GPIO button implementation to forward button presses to procd. This is necessary to make failsafe-mode access using a button possible. Signed-off-by: David Bauer --- target/linux/rockchip/Makefile | 2 +- target/linux/rockchip/armv8/config-5.4 | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/target/linux/rockchip/Makefile b/target/linux/rockchip/Makefile index 41f0560bac..8daaad34a7 100644 --- a/target/linux/rockchip/Makefile +++ b/target/linux/rockchip/Makefile @@ -17,7 +17,7 @@ endef include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs +DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug KERNELNAME:=Image dtbs diff --git a/target/linux/rockchip/armv8/config-5.4 b/target/linux/rockchip/armv8/config-5.4 index 48b05b432b..2d2342e34f 100644 --- a/target/linux/rockchip/armv8/config-5.4 +++ b/target/linux/rockchip/armv8/config-5.4 @@ -221,7 +221,6 @@ CONFIG_KALLSYMS=y CONFIG_KEXEC_CORE=y CONFIG_KEXEC_FILE=y # CONFIG_KEXEC_SIG is not set -CONFIG_KEYBOARD_GPIO=y CONFIG_KSM=y # CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set CONFIG_LEDS_GPIO=y From 0485fb3925ff02f321a64cf60c8e073435ae01d1 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Mon, 13 Jul 2020 17:44:22 +0200 Subject: [PATCH 9/9] rockchip: don't disable timer LED trigger The timer LED trigger is enabled in all targets (except for lantiq xway-legacy). It's necessary for the OpenWrt preinit LED pattern to work. Signed-off-by: David Bauer --- target/linux/rockchip/armv8/config-5.4 | 1 - 1 file changed, 1 deletion(-) diff --git a/target/linux/rockchip/armv8/config-5.4 b/target/linux/rockchip/armv8/config-5.4 index 2d2342e34f..4f29204dd2 100644 --- a/target/linux/rockchip/armv8/config-5.4 +++ b/target/linux/rockchip/armv8/config-5.4 @@ -229,7 +229,6 @@ CONFIG_LEDS_SYSCON=y CONFIG_LEDS_TRIGGER_CPU=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_PANIC=y -# CONFIG_LEDS_TRIGGER_TIMER is not set CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=16 CONFIG_LIBCRC32C=y