From ff9846dbb94342b8b3e07ad54ec2e9a7a48e3f3e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 27 Jan 2021 13:26:23 +0100 Subject: [PATCH 01/13] ramips: use lzma-loader on zbtlink devices Fixes boot loader LZMA decompression issues Signed-off-by: Felix Fietkau --- target/linux/ramips/image/mt7621.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 005a9bdc55..ec34e61268 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -1353,6 +1353,7 @@ TARGET_DEVICES += youku_yk-l2 define Device/zbtlink_zbt-we1326 $(Device/dsa-migration) + $(Device/uimage-lzma-loader) IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE1326 @@ -1363,6 +1364,7 @@ TARGET_DEVICES += zbtlink_zbt-we1326 define Device/zbtlink_zbt-we3526 $(Device/dsa-migration) + $(Device/uimage-lzma-loader) IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WE3526 @@ -1373,6 +1375,7 @@ TARGET_DEVICES += zbtlink_zbt-we3526 define Device/zbtlink_zbt-wg2626 $(Device/dsa-migration) + $(Device/uimage-lzma-loader) IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink DEVICE_MODEL := ZBT-WG2626 From ddc75ff70416459127afec167f949e5d3db06d7a Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 27 Jan 2021 20:54:34 +0100 Subject: [PATCH 02/13] mt76: update to the latest version 65abbcd9f6fb mt76: usb: process URBs with status EPROTO properly 3199ef5fa35e mt76: mt7615: set mcu country code in mt7615_mcu_set_channel_domain() 5c86d5bb079b mt76: mt7915: Remove unneeded semicolon 3f546330b59d mt76: mt7915: support TxBF for DBDC 032ad7e02545 mt76: mt7615: unify init work cc3f23d1e654 mt76: mt7915: bring up the WA event rx queue for band1 fa3d334a0e22 mt76: fix crash on tearing down ext phy c4c9c402d14a mt76: mt7915: fix vif sta index for DBDC eca2f0ec0d4c mt76: mt7915: fix command id for txbf action c828124ef9a5 mt76: mt7915: add support for using a secondary PCIe link for gen1 dbaf0f4679f3 mt76: mt7915: make vif index per adapter instead of per band fb3e5ce1eb00 mt76: move vif_mask back from mt76_phy to mt76_dev be2bea66d6e3 mt76: mt7915: detect wrong nss eeprom parameter on dbdc cards 8dc5d4a0da7c Revert "mt76: mt7915: fix vif sta index for DBDC" 8c796a33781c mt76: mt7915: only set int1 when using the second hif 4eb5caaf6cc1 mt76: reduce q->lock hold time 0714890bf0fd mt76: mt7615: reduce VHT maximum MPDU length 2f85aa5cbc62 mt76: mt7915: avoid writes to MT_PCIE_RECOG_ID when not using gen1 devices 8696919d9aae mt76: dma: fix a possible memory leak in mt76_add_fragment() Signed-off-by: Felix Fietkau --- package/kernel/mt76/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index ff03632beb..05d710387c 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -8,9 +8,9 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/openwrt/mt76 PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2021-01-14 -PKG_SOURCE_VERSION:=4c8a09cc45d03897a473c270fede699a0420a483 -PKG_MIRROR_HASH:=5b708e288484eaf735b9135faf9d45453cef56568032bea53d0238c281e6111c +PKG_SOURCE_DATE:=2021-01-27 +PKG_SOURCE_VERSION:=8696919d9aae9b673f916bca41c5e1671eec5b0e +PKG_MIRROR_HASH:=82675e11f537eaa2fe2c1029880f7993ed4401d0d59b12faf6dbe96ac3eb8308 PKG_MAINTAINER:=Felix Fietkau PKG_BUILD_PARALLEL:=1 From 9b5e9b65cfad4af514411ace3526a663c2dad890 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 21 Jan 2021 20:37:55 +0100 Subject: [PATCH 03/13] ath79: remove generic profiles On a platform with many very different devices, like found on ath79, the generic profiles seem like remnants of the past that do not have a real use anymore. Remove them to have one thing less to maintain. Signed-off-by: Adrian Schmutzler Acked-by: Paul Spooren --- .../linux/ath79/generic/profiles/00-default.mk | 16 ---------------- .../ath79/mikrotik/profiles/00-default.mk | 18 ------------------ target/linux/ath79/nand/profiles/00-default.mk | 18 ------------------ target/linux/ath79/tiny/profiles/00-default.mk | 9 --------- 4 files changed, 61 deletions(-) delete mode 100644 target/linux/ath79/generic/profiles/00-default.mk delete mode 100644 target/linux/ath79/mikrotik/profiles/00-default.mk delete mode 100644 target/linux/ath79/nand/profiles/00-default.mk delete mode 100644 target/linux/ath79/tiny/profiles/00-default.mk diff --git a/target/linux/ath79/generic/profiles/00-default.mk b/target/linux/ath79/generic/profiles/00-default.mk deleted file mode 100644 index 83b39e4418..0000000000 --- a/target/linux/ath79/generic/profiles/00-default.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Default - NAME:=Default Profile (all drivers) - PRIORITY := 1 -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) diff --git a/target/linux/ath79/mikrotik/profiles/00-default.mk b/target/linux/ath79/mikrotik/profiles/00-default.mk deleted file mode 100644 index 14712da593..0000000000 --- a/target/linux/ath79/mikrotik/profiles/00-default.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2020 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Default - NAME:=Default Profile (all drivers) - PACKAGES:= \ - kmod-usb-ohci kmod-usb2 nand-utils - PRIORITY := 1 -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) diff --git a/target/linux/ath79/nand/profiles/00-default.mk b/target/linux/ath79/nand/profiles/00-default.mk deleted file mode 100644 index 6e618113a5..0000000000 --- a/target/linux/ath79/nand/profiles/00-default.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Default - NAME:=Default Profile - PACKAGES:= \ - kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport - PRIORITY := 1 -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) diff --git a/target/linux/ath79/tiny/profiles/00-default.mk b/target/linux/ath79/tiny/profiles/00-default.mk deleted file mode 100644 index aa8e1195f8..0000000000 --- a/target/linux/ath79/tiny/profiles/00-default.mk +++ /dev/null @@ -1,9 +0,0 @@ -define Profile/Default - NAME:=Default Profile (all drivers) - PRIORITY := 1 -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) From 703fd8aef4b33cccbc3af5a1cb92209a8e201754 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 22 Jan 2021 11:45:03 +0100 Subject: [PATCH 04/13] ramips: remove generic profiles On a platform with many very different devices, like found on ramips, the generic profiles seem like remnants of the past that do not have a real use anymore. Remove them to have one thing less to maintain. Actually, rt288x didn't have a default profile in the first place. Signed-off-by: Adrian Schmutzler Acked-by: Paul Spooren --- .../ramips/mt7620/profiles/00-default.mk | 17 ----------------- .../ramips/mt7621/profiles/00-default.mk | 19 ------------------- .../ramips/mt76x8/profiles/00-default.mk | 17 ----------------- .../ramips/rt305x/profiles/00-default.mk | 19 ------------------- .../ramips/rt3883/profiles/00-default.mk | 17 ----------------- 5 files changed, 89 deletions(-) delete mode 100644 target/linux/ramips/mt7620/profiles/00-default.mk delete mode 100644 target/linux/ramips/mt7621/profiles/00-default.mk delete mode 100644 target/linux/ramips/mt76x8/profiles/00-default.mk delete mode 100644 target/linux/ramips/rt305x/profiles/00-default.mk delete mode 100644 target/linux/ramips/rt3883/profiles/00-default.mk diff --git a/target/linux/ramips/mt7620/profiles/00-default.mk b/target/linux/ramips/mt7620/profiles/00-default.mk deleted file mode 100644 index 736a628195..0000000000 --- a/target/linux/ramips/mt7620/profiles/00-default.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Default - NAME:=Default Profile - PACKAGES:= kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport - PRIORITY:=1 -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) diff --git a/target/linux/ramips/mt7621/profiles/00-default.mk b/target/linux/ramips/mt7621/profiles/00-default.mk deleted file mode 100644 index dbfd26ed79..0000000000 --- a/target/linux/ramips/mt7621/profiles/00-default.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Default - NAME:=Default Profile - PRIORITY:=1 - PACKAGES:=\ - kmod-usb3 \ - kmod-usb-ledtrig-usbport -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) diff --git a/target/linux/ramips/mt76x8/profiles/00-default.mk b/target/linux/ramips/mt76x8/profiles/00-default.mk deleted file mode 100644 index 83886eee53..0000000000 --- a/target/linux/ramips/mt76x8/profiles/00-default.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Default - NAME:=Default Profile - PRIORITY:=1 - PACKAGES:= kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) diff --git a/target/linux/ramips/rt305x/profiles/00-default.mk b/target/linux/ramips/rt305x/profiles/00-default.mk deleted file mode 100644 index cc777a8fe4..0000000000 --- a/target/linux/ramips/rt305x/profiles/00-default.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Default - NAME:=Default Profile - PRIORITY:=1 - PACKAGES:=\ - kmod-usb-dwc2 \ - kmod-usb-ledtrig-usbport -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) diff --git a/target/linux/ramips/rt3883/profiles/00-default.mk b/target/linux/ramips/rt3883/profiles/00-default.mk deleted file mode 100644 index 468344198c..0000000000 --- a/target/linux/ramips/rt3883/profiles/00-default.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Default - NAME:=Default Profile - PRIORITY:=1 - PACKAGES:=kmod-usb-ohci kmod-usb2 -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) From 5697915a18b4fec82534966be435ea0d1e448c9a Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 22 Jan 2021 11:46:33 +0100 Subject: [PATCH 05/13] ipq40xx: remove generic profile On a platform with many very different devices, like found on ipq40xx, the generic profile seems like a remnant of the past that does not have a real use anymore. Remove it to have one thing less to maintain. Signed-off-by: Adrian Schmutzler Acked-by: Paul Spooren --- target/linux/ipq40xx/profiles/00-default.mk | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 target/linux/ipq40xx/profiles/00-default.mk diff --git a/target/linux/ipq40xx/profiles/00-default.mk b/target/linux/ipq40xx/profiles/00-default.mk deleted file mode 100644 index f6ded85440..0000000000 --- a/target/linux/ipq40xx/profiles/00-default.mk +++ /dev/null @@ -1,9 +0,0 @@ -define Profile/Default - NAME:=Default Profile - PRIORITY:=1 -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) From 5b0644b71d063ecc68ed6b9fbe6f36c5daa81918 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 22 Jan 2021 11:47:35 +0100 Subject: [PATCH 06/13] ipq806x: remove generic profile On a platform with many very different devices, like found on ipq806x, the generic profile seems like a remnant of the past that does not have a real use anymore. Remove it to have one thing less to maintain. Signed-off-by: Adrian Schmutzler Acked-by: Paul Spooren --- target/linux/ipq806x/profiles/00-default.mk | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 target/linux/ipq806x/profiles/00-default.mk diff --git a/target/linux/ipq806x/profiles/00-default.mk b/target/linux/ipq806x/profiles/00-default.mk deleted file mode 100644 index ce746c608e..0000000000 --- a/target/linux/ipq806x/profiles/00-default.mk +++ /dev/null @@ -1,10 +0,0 @@ -define Profile/Default - NAME:=Default Profile - PRIORITY:=1 - PACKAGES:=ath10k-firmware-qca99x0-ct ath10k-firmware-qca988x-ct ath10k-firmware-qca9984-ct -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) From a7904c6b7f53026f31397fbd2ad518c32d3070eb Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 22 Jan 2021 11:48:12 +0100 Subject: [PATCH 07/13] kirkwood: remove generic profile On a platform with many very different devices, like found on kirkwood, the generic profile seems like a remnant of the past that does not have a real use anymore. Remove it to have one thing less to maintain. Signed-off-by: Adrian Schmutzler Acked-by: Paul Spooren --- target/linux/kirkwood/profiles/00-default.mk | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 target/linux/kirkwood/profiles/00-default.mk diff --git a/target/linux/kirkwood/profiles/00-default.mk b/target/linux/kirkwood/profiles/00-default.mk deleted file mode 100644 index 4bad7d6681..0000000000 --- a/target/linux/kirkwood/profiles/00-default.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Default - NAME:=Default Profile - PACKAGES:=kmod-mwl8k wpad-basic-wolfssl - PRIORITY:=1 -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) From 44f2d71eddd1bdf51bfcfff8b1a63b822dcc2d39 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 22 Jan 2021 11:51:19 +0100 Subject: [PATCH 08/13] mediatek: remove generic profiles We have support for reference boards available on this target, so support for an additional generic profile does not make much sense. Remove it to have one thing less to maintain. Signed-off-by: Adrian Schmutzler Acked-by: Paul Spooren --- target/linux/mediatek/mt7622/profiles/default.mk | 15 --------------- target/linux/mediatek/mt7623/profiles/default.mk | 15 --------------- target/linux/mediatek/mt7629/profiles/default.mk | 15 --------------- 3 files changed, 45 deletions(-) delete mode 100644 target/linux/mediatek/mt7622/profiles/default.mk delete mode 100644 target/linux/mediatek/mt7623/profiles/default.mk delete mode 100644 target/linux/mediatek/mt7629/profiles/default.mk diff --git a/target/linux/mediatek/mt7622/profiles/default.mk b/target/linux/mediatek/mt7622/profiles/default.mk deleted file mode 100644 index 2ef570ba66..0000000000 --- a/target/linux/mediatek/mt7622/profiles/default.mk +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (C) 2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Default - NAME:=Default Profile (minimum package set) -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) diff --git a/target/linux/mediatek/mt7623/profiles/default.mk b/target/linux/mediatek/mt7623/profiles/default.mk deleted file mode 100644 index 2ef570ba66..0000000000 --- a/target/linux/mediatek/mt7623/profiles/default.mk +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (C) 2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Default - NAME:=Default Profile (minimum package set) -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) diff --git a/target/linux/mediatek/mt7629/profiles/default.mk b/target/linux/mediatek/mt7629/profiles/default.mk deleted file mode 100644 index 2ef570ba66..0000000000 --- a/target/linux/mediatek/mt7629/profiles/default.mk +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (C) 2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Default - NAME:=Default Profile (minimum package set) -endef - -define Profile/Default/Description - Default package set compatible with most boards. -endef -$(eval $(call Profile,Default)) From 30651e6834972d97c164d5ea2d0b3061e1bb9aa5 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 23 Jan 2021 13:24:28 +0100 Subject: [PATCH 09/13] bcm4908: sort and wrap build recipes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This sorts the Build recipes alphabetically, wraps some long lines and moves the DEVICE_VARS to the top like common on several other targets. Cc: Rafał Miłecki Signed-off-by: Adrian Schmutzler --- target/linux/bcm4908/image/Makefile | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/target/linux/bcm4908/image/Makefile b/target/linux/bcm4908/image/Makefile index b744839e5b..8a40a1e6a9 100644 --- a/target/linux/bcm4908/image/Makefile +++ b/target/linux/bcm4908/image/Makefile @@ -3,14 +3,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -define Build/bcm4908lzma - $(STAGING_DIR_HOST)/bin/lzma e -lc1 -lp2 -pb2 -d22 $@ $@.new - mv $@.new $@ -endef +DEVICE_VARS += ASUS_PRODUCTID ASUS_BUILD_NO ASUS_FW_REV ASUS_EXT_NO -define Build/bcm4908kernel - $(STAGING_DIR_HOST)/bin/bcm4908kernel -i $@ -o $@.new - mv $@.new $@ +define Build/bcm4908asus + $(STAGING_DIR_HOST)/bin/bcm4908asus create -i $@ \ + -p $(ASUS_PRODUCTID) -b $(ASUS_BUILD_NO) -f $(ASUS_FW_REV) \ + -e $(ASUS_EXT_NO) endef define Build/bcm4908img @@ -22,16 +20,22 @@ define Build/bcm4908img cp $(KDIR)/bcm63xx-cfe/$(subst _,$(comma),$(DEVICE_NAME))/cferam.000 $@-bootfs/ cp $(IMAGE_KERNEL) $@-bootfs/vmlinux.lz - $(STAGING_DIR_HOST)/bin/mkfs.jffs2 --pad --little-endian --squash-uids -v -e 128KiB -o $@-bootfs.jffs2 -d $@-bootfs -m none -n - $(STAGING_DIR_HOST)/bin/bcm4908img create $@.new -f $@-bootfs.jffs2 -a 0x20000 -f $@ + $(STAGING_DIR_HOST)/bin/mkfs.jffs2 --pad --little-endian --squash-uids \ + -v -e 128KiB -o $@-bootfs.jffs2 -d $@-bootfs -m none -n + $(STAGING_DIR_HOST)/bin/bcm4908img create $@.new -f $@-bootfs.jffs2 \ + -a 0x20000 -f $@ mv $@.new $@ endef -define Build/bcm4908asus - $(STAGING_DIR_HOST)/bin/bcm4908asus create -i $@ -p $(ASUS_PRODUCTID) -b $(ASUS_BUILD_NO) -f $(ASUS_FW_REV) -e $(ASUS_EXT_NO) +define Build/bcm4908kernel + $(STAGING_DIR_HOST)/bin/bcm4908kernel -i $@ -o $@.new + mv $@.new $@ endef -DEVICE_VARS += ASUS_PRODUCTID ASUS_BUILD_NO ASUS_FW_REV ASUS_EXT_NO +define Build/bcm4908lzma + $(STAGING_DIR_HOST)/bin/lzma e -lc1 -lp2 -pb2 -d22 $@ $@.new + mv $@.new $@ +endef define Device/Default KERNEL := kernel-bin | bcm4908lzma | bcm4908kernel From 9c29165a4cc1ab4a341ec93c60239d01535305b3 Mon Sep 17 00:00:00 2001 From: Marty Jones Date: Mon, 25 Jan 2021 12:37:56 -0500 Subject: [PATCH 10/13] rockchip: fix SUPPORTED_DEVICES for Radxa ROCK Pi 4 This sets SUPPORTED_DEVICES to match the compatible in the DTS. While at it, synchronize the capitalization in DEVICE_MODEL and DTS model. Signed-off-by: Marty Jones [commit title/message facelift, move variable in armv8.mk] Signed-off-by: Adrian Schmutzler --- target/linux/rockchip/image/armv8.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index 4a46cb7336..dbabce97bf 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -26,8 +26,9 @@ TARGET_DEVICES += pine64_rockpro64 define Device/radxa_rock-pi-4 DEVICE_VENDOR := Radxa - DEVICE_MODEL := Rock Pi 4 + DEVICE_MODEL := ROCK Pi 4 SOC := rk3399 + SUPPORTED_DEVICES := radxa,rockpi4 UBOOT_DEVICE_NAME := rock-pi-4-rk3399 IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata endef From 799fca7602fffd17bedea972c3fa8f0e6141c265 Mon Sep 17 00:00:00 2001 From: Jiang Yongquan Date: Mon, 11 Jan 2021 23:09:23 +0800 Subject: [PATCH 11/13] sunxi: add support for linksprite pcDuino3 nano board Specifications: - SoC: Allwinner A20 @ 1Ghz - DRAM: 1GiB DDR3 @ 408MHz (K4B4G1646Q-HYK0) - NAND: 4GB MLC NAND (H27UBG8T2BTR-BC) - Ethernet: 10/100/1000Mbps Ethernet (Realtek RTL8211E) Flash instructions: dd if=openwrt-sunxi-cortexa7-linksprite_pcduino3-nano-ext4-sdcard.img of=/dev/sdX Signed-off-by: Jiang Yongquan [Remove CONFIG_REALTEK_PHY from sunxi/cortexa53 config] Signed-off-by: Hauke Mehrtens --- package/boot/uboot-sunxi/Makefile | 7 +++++++ target/linux/sunxi/config-5.4 | 1 + target/linux/sunxi/cortexa53/config-5.4 | 1 - target/linux/sunxi/image/cortexa7.mk | 8 ++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile index 859a06019b..38147339a4 100644 --- a/package/boot/uboot-sunxi/Makefile +++ b/package/boot/uboot-sunxi/Makefile @@ -142,6 +142,12 @@ define U-Boot/Linksprite_pcDuino3 BUILD_DEVICES:=linksprite_pcduino3 endef +define U-Boot/Linksprite_pcDuino3_Nano + BUILD_SUBTARGET:=cortexa7 + NAME:=Linksprite pcDuino3 Nano + BUILD_DEVICES:=linksprite_pcduino3-nano +endef + define U-Boot/Lamobo_R1 BUILD_SUBTARGET:=cortexa7 NAME:=Lamobo R1 @@ -317,6 +323,7 @@ UBOOT_TARGETS := \ OLIMEX_A13_SOM \ Linksprite_pcDuino \ Linksprite_pcDuino3 \ + Linksprite_pcDuino3_Nano \ Lamobo_R1 \ nanopi_m1_plus \ zeropi \ diff --git a/target/linux/sunxi/config-5.4 b/target/linux/sunxi/config-5.4 index 7318d5a3e9..fba86b86ee 100644 --- a/target/linux/sunxi/config-5.4 +++ b/target/linux/sunxi/config-5.4 @@ -443,6 +443,7 @@ CONFIG_PWM_SYSFS=y CONFIG_RATIONAL=y CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_RCU_STALL_COMMON=y +CONFIG_REALTEK_PHY=y CONFIG_REFCOUNT_FULL=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y diff --git a/target/linux/sunxi/cortexa53/config-5.4 b/target/linux/sunxi/cortexa53/config-5.4 index 6e1ef22129..203ab9fa38 100644 --- a/target/linux/sunxi/cortexa53/config-5.4 +++ b/target/linux/sunxi/cortexa53/config-5.4 @@ -134,7 +134,6 @@ CONFIG_PINCTRL_SUN50I_H6=y CONFIG_PINCTRL_SUN50I_H6_R=y CONFIG_QUEUED_RWLOCKS=y CONFIG_QUEUED_SPINLOCKS=y -CONFIG_REALTEK_PHY=y CONFIG_RODATA_FULL_DEFAULT_ENABLED=y # CONFIG_SND_SUN50I_CODEC_ANALOG is not set CONFIG_SOUND_OSS_CORE_PRECLAIM=y diff --git a/target/linux/sunxi/image/cortexa7.mk b/target/linux/sunxi/image/cortexa7.mk index d491dbc338..baa3e56b44 100644 --- a/target/linux/sunxi/image/cortexa7.mk +++ b/target/linux/sunxi/image/cortexa7.mk @@ -107,6 +107,14 @@ define Device/linksprite_pcduino3 endef TARGET_DEVICES += linksprite_pcduino3 +define Device/linksprite_pcduino3-nano + DEVICE_VENDOR := LinkSprite + DEVICE_MODEL := pcDuino3 Nano + DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-sunxi + SOC := sun7i-a20 +endef +TARGET_DEVICES += linksprite_pcduino3-nano + define Device/mele_m9 DEVICE_VENDOR := Mele DEVICE_MODEL := M9 From 7521aedff46f731036c09f44859262085c00d303 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Tue, 26 Jan 2021 18:13:28 -1000 Subject: [PATCH 12/13] scripts: sources CDN as fallback in download.pl In case the default sources for a package fail use the CDN rather than our own mirror. In case the CDN fails, fallback to our mirror. Also remove mirror1 which isn't available anymore. Signed-off-by: Paul Spooren --- scripts/download.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/download.pl b/scripts/download.pl index 84d10dbe5f..61af0a0429 100755 --- a/scripts/download.pl +++ b/scripts/download.pl @@ -258,7 +258,7 @@ foreach my $mirror (@ARGV) { } } -#push @mirrors, 'https://mirror1.openwrt.org'; +push @mirrors, 'https://sources.cdn.openwrt.org'; push @mirrors, 'https://sources.openwrt.org'; push @mirrors, 'https://mirror2.openwrt.org/sources'; From 7d12f29ae1d7337e4289baf9e6b4bf79445b0d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Thu, 28 Jan 2021 11:49:16 +0100 Subject: [PATCH 13/13] bcm63xx: fix bcm63xx ethernet kernel panics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Calling netdev_reset_queue() from _stop() functions is causing sporadic kernel panics on bcm63xx, which happen mainly on BCM6318 and BCM6328. This reverts to the previous behaviour, which called netdev_reset_queue() from _open() functions. Tested on Comtrend AR-5315u (BCM6318). Fixes: 1d6f422e346b ("bcm63xx: sync ethernet driver with net-next") Signed-off-by: Álvaro Fernández Rojas --- .../047-bcm63xx_enet-fix-kernel-panic.patch | 35 +++++++++++++++++++ ...402_bcm63xx_enet_vlan_incoming_fixed.patch | 2 +- ...-move-phy_-dis-connect-into-probe-re.patch | 14 ++++---- ...enable-rgmii-clock-on-external-ports.patch | 2 +- .../423-bcm63xx_enet_add_b53_support.patch | 12 +++---- ...4-bcm63xx_enet_no_request_mem_region.patch | 2 +- .../428-bcm63xx_enet-rgmii-ctrl-fix.patch | 2 +- 7 files changed, 52 insertions(+), 17 deletions(-) create mode 100644 target/linux/bcm63xx/patches-5.4/047-bcm63xx_enet-fix-kernel-panic.patch diff --git a/target/linux/bcm63xx/patches-5.4/047-bcm63xx_enet-fix-kernel-panic.patch b/target/linux/bcm63xx/patches-5.4/047-bcm63xx_enet-fix-kernel-panic.patch new file mode 100644 index 0000000000..466a64cae1 --- /dev/null +++ b/target/linux/bcm63xx/patches-5.4/047-bcm63xx_enet-fix-kernel-panic.patch @@ -0,0 +1,35 @@ +--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c ++++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c +@@ -1105,6 +1105,8 @@ static int bcm_enet_open(struct net_devi + else + bcm_enet_adjust_link(dev); + ++ netdev_reset_queue(dev); ++ + netif_start_queue(dev); + return 0; + +@@ -1193,7 +1195,6 @@ static int bcm_enet_stop(struct net_devi + kdev = &priv->pdev->dev; + + netif_stop_queue(dev); +- netdev_reset_queue(dev); + napi_disable(&priv->napi); + if (priv->has_phy) + phy_stop(dev->phydev); +@@ -2267,6 +2268,7 @@ static int bcm_enetsw_open(struct net_de + enet_dmac_writel(priv, ENETDMAC_IR_PKTDONE_MASK, + ENETDMAC_IRMASK, priv->tx_chan); + ++ netdev_reset_queue(dev); + netif_carrier_on(dev); + netif_start_queue(dev); + +@@ -2348,7 +2350,6 @@ static int bcm_enetsw_stop(struct net_de + + del_timer_sync(&priv->swphy_poll); + netif_stop_queue(dev); +- netdev_reset_queue(dev); + napi_disable(&priv->napi); + del_timer_sync(&priv->rx_timeout); + diff --git a/target/linux/bcm63xx/patches-5.4/402_bcm63xx_enet_vlan_incoming_fixed.patch b/target/linux/bcm63xx/patches-5.4/402_bcm63xx_enet_vlan_incoming_fixed.patch index 949fb8d293..bd0c4cfc3f 100644 --- a/target/linux/bcm63xx/patches-5.4/402_bcm63xx_enet_vlan_incoming_fixed.patch +++ b/target/linux/bcm63xx/patches-5.4/402_bcm63xx_enet_vlan_incoming_fixed.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -1629,7 +1629,7 @@ static int bcm_enet_change_mtu(struct ne +@@ -1630,7 +1630,7 @@ static int bcm_enet_change_mtu(struct ne return -EBUSY; /* add ethernet header + vlan tag size */ diff --git a/target/linux/bcm63xx/patches-5.4/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch b/target/linux/bcm63xx/patches-5.4/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch index d9e49727da..a389f642ad 100644 --- a/target/linux/bcm63xx/patches-5.4/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch +++ b/target/linux/bcm63xx/patches-5.4/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch @@ -79,7 +79,7 @@ Signed-off-by: Jonas Gorski else bcm_enet_adjust_link(dev); -@@ -1131,10 +1108,6 @@ out_freeirq_rx: +@@ -1133,10 +1110,6 @@ out_freeirq_rx: out_freeirq: free_irq(dev->irq, dev); @@ -90,7 +90,7 @@ Signed-off-by: Jonas Gorski return ret; } -@@ -1228,10 +1201,6 @@ static int bcm_enet_stop(struct net_devi +@@ -1229,10 +1202,6 @@ static int bcm_enet_stop(struct net_devi free_irq(priv->irq_rx, dev); free_irq(dev->irq, dev); @@ -101,7 +101,7 @@ Signed-off-by: Jonas Gorski return 0; } -@@ -1800,14 +1769,47 @@ static int bcm_enet_probe(struct platfor +@@ -1801,14 +1770,47 @@ static int bcm_enet_probe(struct platfor /* do minimal hardware init to be able to probe mii bus */ bcm_enet_hw_preinit(priv); @@ -150,7 +150,7 @@ Signed-off-by: Jonas Gorski } bus = priv->mii_bus; -@@ -1831,6 +1833,26 @@ static int bcm_enet_probe(struct platfor +@@ -1832,6 +1834,26 @@ static int bcm_enet_probe(struct platfor dev_err(&pdev->dev, "unable to register mdio bus\n"); goto out_free_mdio; } @@ -177,7 +177,7 @@ Signed-off-by: Jonas Gorski } else { /* run platform code to initialize PHY device */ -@@ -1838,45 +1860,16 @@ static int bcm_enet_probe(struct platfor +@@ -1839,45 +1861,16 @@ static int bcm_enet_probe(struct platfor pd->mii_config(dev, 1, bcm_enet_mdio_read_mii, bcm_enet_mdio_write_mii)) { dev_err(&pdev->dev, "unable to configure mdio bus\n"); @@ -227,7 +227,7 @@ Signed-off-by: Jonas Gorski if (priv->mii_bus) mdiobus_unregister(priv->mii_bus); -@@ -1884,6 +1877,9 @@ out_free_mdio: +@@ -1885,6 +1878,9 @@ out_free_mdio: if (priv->mii_bus) mdiobus_free(priv->mii_bus); @@ -237,7 +237,7 @@ Signed-off-by: Jonas Gorski out_uninit_hw: /* turn off mdc clock */ enet_writel(priv, 0, ENET_MIISC_REG); -@@ -1914,6 +1910,7 @@ static int bcm_enet_remove(struct platfo +@@ -1915,6 +1911,7 @@ static int bcm_enet_remove(struct platfo enet_writel(priv, 0, ENET_MIISC_REG); if (priv->has_phy) { diff --git a/target/linux/bcm63xx/patches-5.4/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch b/target/linux/bcm63xx/patches-5.4/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch index d4a22c99f2..772e40b2b5 100644 --- a/target/linux/bcm63xx/patches-5.4/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch +++ b/target/linux/bcm63xx/patches-5.4/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch @@ -32,7 +32,7 @@ Subject: [PATCH 54/81] bcm63xx_enet: enable rgmii clock on external ports #define ENETSW_MDIOC_EXT_MASK (1 << 16) --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -2183,6 +2183,18 @@ static int bcm_enetsw_open(struct net_de +@@ -2184,6 +2184,18 @@ static int bcm_enetsw_open(struct net_de priv->sw_port_link[i] = 0; } diff --git a/target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch b/target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch index 92dc05f909..961f34ce78 100644 --- a/target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch +++ b/target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch @@ -20,7 +20,7 @@ #include #include "bcm63xx_enet.h" -@@ -1930,7 +1931,8 @@ static int bcm_enet_remove(struct platfo +@@ -1931,7 +1932,8 @@ static int bcm_enet_remove(struct platfo return 0; } @@ -30,7 +30,7 @@ .probe = bcm_enet_probe, .remove = bcm_enet_remove, .driver = { -@@ -1939,6 +1941,42 @@ struct platform_driver bcm63xx_enet_driv +@@ -1940,6 +1942,42 @@ struct platform_driver bcm63xx_enet_driv }, }; @@ -73,7 +73,7 @@ /* * switch mii access callbacks */ -@@ -2195,29 +2233,6 @@ static int bcm_enetsw_open(struct net_de +@@ -2196,29 +2234,6 @@ static int bcm_enetsw_open(struct net_de enetsw_writeb(priv, rgmii_ctrl, ENETSW_RGMII_CTRL_REG(i)); } @@ -103,7 +103,7 @@ /* initialize flow control buffer allocation */ enet_dma_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0, ENETDMA_BUFALLOC_REG(priv->rx_chan)); -@@ -2651,6 +2666,9 @@ static int bcm_enetsw_probe(struct platf +@@ -2652,6 +2667,9 @@ static int bcm_enetsw_probe(struct platf struct bcm63xx_enetsw_platform_data *pd; struct resource *res_mem; int ret, irq_rx, irq_tx; @@ -113,7 +113,7 @@ if (!bcm_enet_shared_base[0]) return -EPROBE_DEFER; -@@ -2731,6 +2749,43 @@ static int bcm_enetsw_probe(struct platf +@@ -2732,6 +2750,43 @@ static int bcm_enetsw_probe(struct platf priv->pdev = pdev; priv->net_dev = dev; @@ -157,7 +157,7 @@ return 0; out_disable_clk: -@@ -2752,6 +2807,9 @@ static int bcm_enetsw_remove(struct plat +@@ -2753,6 +2808,9 @@ static int bcm_enetsw_remove(struct plat priv = netdev_priv(dev); unregister_netdev(dev); diff --git a/target/linux/bcm63xx/patches-5.4/424-bcm63xx_enet_no_request_mem_region.patch b/target/linux/bcm63xx/patches-5.4/424-bcm63xx_enet_no_request_mem_region.patch index 240525083c..6c002a7b5f 100644 --- a/target/linux/bcm63xx/patches-5.4/424-bcm63xx_enet_no_request_mem_region.patch +++ b/target/linux/bcm63xx/patches-5.4/424-bcm63xx_enet_no_request_mem_region.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -2710,9 +2710,9 @@ static int bcm_enetsw_probe(struct platf +@@ -2711,9 +2711,9 @@ static int bcm_enetsw_probe(struct platf if (ret) goto out; diff --git a/target/linux/bcm63xx/patches-5.4/428-bcm63xx_enet-rgmii-ctrl-fix.patch b/target/linux/bcm63xx/patches-5.4/428-bcm63xx_enet-rgmii-ctrl-fix.patch index 3c4fa8ffad..52740b9a5b 100644 --- a/target/linux/bcm63xx/patches-5.4/428-bcm63xx_enet-rgmii-ctrl-fix.patch +++ b/target/linux/bcm63xx/patches-5.4/428-bcm63xx_enet-rgmii-ctrl-fix.patch @@ -12,7 +12,7 @@ --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -2230,6 +2230,10 @@ static int bcm_enetsw_open(struct net_de +@@ -2231,6 +2231,10 @@ static int bcm_enetsw_open(struct net_de rgmii_ctrl = enetsw_readb(priv, ENETSW_RGMII_CTRL_REG(i)); rgmii_ctrl |= ENETSW_RGMII_CTRL_GMII_CLK_EN;