Nanako/xx_vv_immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2025-01-12 18:43:12 +08:00
commit dbd20310a8
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
8 changed files with 232 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
package/kernel/linux/modules/netdevices.mk
View File

@ -593,31 +593,20 @@ endef
$(eval $(call KernelPackage,dsa-mv88e6060))
define KernelPackage/dsa-tag-dsa
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Marvell DSA type DSA and EDSA taggers
DEPENDS:=+kmod-dsa
KCONFIG:= CONFIG_NET_DSA_TAG_DSA_COMMON \
CONFIG_NET_DSA_TAG_DSA \
CONFIG_NET_DSA_TAG_EDSA
FILES:=$(LINUX_DIR)/net/dsa/tag_dsa.ko
AUTOLOAD:=$(call AutoLoad,40,tag_dsa,1)
endef
define KernelPackage/dsa-tag-dsa/description
Kernel modules for Marvell DSA and EDSA tagging
endef
$(eval $(call KernelPackage,dsa-tag-dsa))
define KernelPackage/dsa-mv88e6xxx
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Marvell MV88E6XXX DSA Switch
DEPENDS:=+kmod-dsa +kmod-ptp +kmod-phy-marvell +kmod-dsa-tag-dsa
KCONFIG:=CONFIG_NET_DSA_MV88E6XXX \
DEPENDS:=+kmod-dsa +kmod-ptp +kmod-phy-marvell
KCONFIG:= \
CONFIG_NET_DSA_TAG_DSA_COMMON \
CONFIG_NET_DSA_TAG_DSA \
CONFIG_NET_DSA_TAG_EDSA \
CONFIG_NET_DSA_MV88E6XXX \
CONFIG_NET_DSA_MV88E6XXX_LEDS=y \
CONFIG_NET_DSA_MV88E6XXX_PTP=y
FILES:=$(LINUX_DIR)/drivers/net/dsa/mv88e6xxx/mv88e6xxx.ko
FILES:= \
$(LINUX_DIR)/net/dsa/tag_dsa.ko \
$(LINUX_DIR)/drivers/net/dsa/mv88e6xxx/mv88e6xxx.ko
AUTOLOAD:=$(call AutoLoad,41,mv88e6xxx,1)
endef

6
package/utils/e2fsprogs/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=e2fsprogs
PKG_VERSION:=1.47.0
PKG_RELEASE:=2
PKG_VERSION:=1.47.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
PKG_HASH:=144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db
PKG_HASH:=08242e64ca0e8194d9c1caad49762b19209a06318199b63ce74ae4ef2d74e63c
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=NOTICE

7
target/linux/apm821xx/base-files/etc/uci-defaults/05_fix-compat-version
View File

@ -2,12 +2,15 @@
case "$(board_name)" in
meraki,mx60|\
netgear,wndap620|\
netgear,wndap660|\
netgear,wndr4700)
uci set system.@system[0].compat_version="3.0"
uci commit system
;;
netgear,wndap620|\
netgear,wndap660)
uci set system.@system[0].compat_version="2.0"
uci commit system
;;
esac
exit 0

192
target/linux/ramips/dts/mt7628an_tplink_archer-mr200-v6.dts Normal file
View File

@ -0,0 +1,192 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "mt7628an.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/leds/common.h>
/ {
compatible = "tplink,archer-mr200-v6", "mediatek,mt7628an-soc";
model = "TP-Link Archer MR200 v6";
aliases {
led-boot = &led_power;
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
label-mac-device = &ethernet;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";
lan {
function = LED_FUNCTION_LAN;
color = <LED_COLOR_ID_WHITE>;
gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
};
wan {
function = LED_FUNCTION_WAN;
color = <LED_COLOR_ID_WHITE>;
gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
};
led_power: power {
function = LED_FUNCTION_POWER;
color = <LED_COLOR_ID_WHITE>;
gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
};
signal1 {
label = "white:signal1";
gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
};
signal2 {
label = "white:signal2";
gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
};
signal3 {
label = "white:signal3";
gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
};
wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_WHITE>;
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
};
keys {
compatible = "gpio-keys";
reset {
label = "reset";
gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};
rfkill {
label = "rfkill";
gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RFKILL>;
};
};
};
&spi0 {
status = "okay";
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <50000000>;
m25p,fast-read;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x0 0x20000>;
read-only;
};
firmware@20000 {
compatible = "tplink,firmware";
label = "firmware";
reg = <0x20000 0xfa0000>;
};
partition@fc0000 {
label = "config";
reg = <0xfc0000 0x10000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
macaddr_config_f100: macaddr@f100 {
compatible = "mac-base";
reg = <0xf100 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
partition@fd0000 {
label = "romfile";
reg = <0xfd0000 0x10000>;
read-only;
};
partition@fe0000 {
label = "radio";
reg = <0xfe0000 0x10000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
eeprom_radio_0: eeprom@0 {
reg = <0x0 0x400>;
};
eeprom_radio_8000: eeprom@8000 {
reg = <0x8000 0x4da8>;
};
};
};
};
};
};
&state_default {
gpio {
groups = "i2c", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "uart1", "wdt";
function = "gpio";
};
};
&wmac {
nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_f100 0>;
nvmem-cell-names = "eeprom", "mac-address";
status = "okay";
};
&esw {
mediatek,portdisable = <0x30>;
};
&ethernet {
nvmem-cells = <&macaddr_config_f100 0>;
nvmem-cell-names = "mac-address";
};
&pcie {
status = "okay";
};
&pcie0 {
wifi@0,0 {
reg = <0x0000 0 0 0 0>;
ieee80211-freq-limit = <5000000 6000000>;
nvmem-cells = <&eeprom_radio_8000>, <&macaddr_config_f100 (-1)>;
nvmem-cell-names = "eeprom", "mac-address";
};
};

16
target/linux/ramips/image/mt76x8.mk
View File

@ -679,6 +679,22 @@ define Device/tplink_archer-mr200-v5
endef
TARGET_DEVICES += tplink_archer-mr200-v5
define Device/tplink_archer-mr200-v6
$(Device/tplink-v2)
IMAGE_SIZE := 15936k
DEVICE_MODEL := Archer MR200
DEVICE_VARIANT := v6
TPLINK_FLASHLAYOUT := 16Mmtk
TPLINK_HWID := 0x20000006
TPLINK_HWREV := 0x6
TPLINK_HWREVADD := 0x6
DEVICE_PACKAGES := kmod-mt76x0e uqmi kmod-usb2 kmod-usb-serial-option
KERNEL := kernel-bin | append-dtb | lzma -d22
KERNEL_INITRAMFS := kernel-bin | append-dtb
IMAGES := sysupgrade.bin
endef
TARGET_DEVICES += tplink_archer-mr200-v6
define Device/tplink_re200-v2
$(Device/tplink-safeloader)
IMAGE_SIZE := 7808k

3
target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds
View File

@ -89,7 +89,8 @@ tplink,archer-c50-v6)
ucidef_set_led_wlan "wlan2g" "wlan2g" "green:wlan2g" "phy0tpt"
ucidef_set_led_wlan "wlan5g" "wlan5g" "green:wlan5g" "phy1tpt"
;;
tplink,archer-mr200-v5)
tplink,archer-mr200-v5|\
tplink,archer-mr200-v6)
ucidef_set_led_netdev "lan" "lan" "white:lan" "eth0"
ucidef_set_led_netdev "wan" "wan" "white:wan" "wwan0"
;;

3
target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
View File

@ -166,7 +166,8 @@ ramips_setup_interfaces()
ucidef_add_switch "switch0" \
"0:wan" "1:lan" "2:lan" "3:lan" "4:lan" "6t@eth0"
;;
tplink,archer-mr200-v5)
tplink,archer-mr200-v5|\
tplink,archer-mr200-v6)
ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "3:lan" "6t@eth0"
ucidef_set_interface "wan" device "/dev/cdc-wdm0" protocol "qmi"

6
tools/e2fsprogs/Makefile
View File

@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=e2fsprogs
PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
PKG_VERSION:=1.47.0
PKG_HASH:=0b4fe723d779b0927fb83c9ae709bc7b40f66d7df36433bef143e41c54257084
PKG_VERSION:=1.47.2
PKG_HASH:=08242e64ca0e8194d9c1caad49762b19209a06318199b63ce74ae4ef2d74e63c
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
HOST_BUILD_PARALLEL:=1