Nanako/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
2024-10-13 13:57:33 +08:00
parent 3b4705e359 1efcdb2446
commit cc8175de16
10 changed files with 326 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package/boot/uboot-envtools/files/ramips
View File

@@ -79,6 +79,7 @@ jcg,q20-pb-boot|\
linksys,e7350|\
netgear,eax12|\
netgear,wax202|\
netis,n6|\
zyxel,wsm20)
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x20000"
;;

5
target/linux/ramips/dts/mt7620a_tplink_re2x0-v1.dtsi
View File

@@ -4,6 +4,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/mtd/partitions/uimage.h>
/ {
aliases {
@@ -51,9 +52,11 @@
};
partition@20000 {
compatible = "tplink,firmware";
compatible = "openwrt,uimage", "denx,uimage";
label = "firmware";
reg = <0x20000 0x7c0000>;
openwrt,offset = <0x1000>;
openwrt,ih-magic = <IH_MAGIC_OKLI>;
};
partition@7e0000 {

229
target/linux/ramips/dts/mt7621_netis_n6.dts Normal file
View File

@@ -0,0 +1,229 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "mt7621.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/leds/common.h>
/ {
compatible = "netis,n6", "mediatek,mt7621-soc";
model = "netis N6";
aliases {
label-mac-device = &gmac0;
led-boot = &led_power_green;
led-failsafe = &led_system_green;
led-running = &led_power_green;
led-upgrade = &led_system_green;
};
chosen {
bootargs = "console=ttyS0,115200";
};
keys {
compatible = "gpio-keys";
key-0 {
label = "wps";
gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WPS_BUTTON>;
debounce-interval = <60>;
};
key-1 {
label = "reset";
gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
debounce-interval = <60>;
};
};
leds {
compatible = "gpio-leds";
led-0 {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_USB;
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
trigger-sources = <&xhci_ehci_port1>;
linux,default-trigger = "usbport";
};
led-1 {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_WPS;
gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
};
led_system_green: led-2 {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_INDICATOR;
gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
};
led-3 {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_WAN;
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
led_power_green: led-4 {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_POWER;
gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
};
};
};
&gmac0 {
nvmem-cells = <&macaddr_factory_7ef20 0>;
nvmem-cell-names = "mac-address";
};
&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;
nvmem-cells = <&macaddr_factory_7ef26 0>;
nvmem-cell-names = "mac-address";
};
&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};
&nand {
status = "okay";
mediatek,nmbm;
mediatek,bmt-remap-range = <0x000000 0x580000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x0 0x80000>;
read-only;
};
partition@80000 {
label = "Config";
reg = <0x80000 0x80000>;
};
partition@100000 {
label = "Factory";
reg = <0x100000 0x80000>;
read-only;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
eeprom_factory_0: eeprom@0 {
reg = <0x0 0xe00>;
};
macaddr_factory_7ef20: macaddr@7ef20 {
reg = <0x7ef20 0x6>;
};
macaddr_factory_7ef26: macaddr@7ef26 {
reg = <0x7ef26 0x6>;
};
};
};
partition@180000 {
label = "firmware";
reg = <0x180000 0x7680000>;
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "kernel";
reg = <0x0 0x400000>;
};
partition@400000 {
label = "ubi";
reg = <0x400000 0x7280000>;
};
};
};
};
&pcie {
status = "okay";
};
&pcie1 {
wifi@0,0 {
compatible = "mediatek,mt76";
reg = <0x0000 0 0 0 0>;
/*
* *** The code block below is commented out ***
* Reason: Probably, original Netis N6 EEPROM has wrong
* MT_EE_WIFI_CONF value 0xd2. As a result 2.4 GHz
* doesn't start with mt76 driver. Other routers
* with the same WLAN chips (e.g., Routerich
* AX1800) have MT_EE_WIFI_CONF = 0x92.
* Workaround: Extract EEPROM to a file at the first time
* boot and change MT_EE_WIFI_CONF (offset
* 0x190) value from 0xd2 to 0x92. See
* /etc/hotplug.d/firmware/11-mt76-caldata for
* details.
*/
/*
nvmem-cells = <&eeprom_factory_0>;
nvmem-cell-names = "eeprom";
*/
mediatek,disable-radar-background;
};
};
&state_default {
gpio {
groups = "i2c", "jtag", "wdt";
function = "gpio";
};
};
&switch0 {
ports {
port@0 {
status = "okay";
label = "lan4";
};
port@1 {
status = "okay";
label = "lan3";
};
port@2 {
status = "okay";
label = "lan2";
};
port@3 {
status = "okay";
label = "lan1";
};
};
};

25
target/linux/ramips/image/common-tp-link.mk
View File

@@ -1,6 +1,19 @@
DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD
DEVICE_VARS += TPLINK_HVERSION TPLINK_BOARD_ID TPLINK_HEADER_VERSION
define Build/tplink-v1-okli-image
cp $(IMAGE_KERNEL) $(IMAGE_ROOTFS).$(word 2,$(1))
cat $(IMAGE_ROOTFS) >> $(IMAGE_ROOTFS).$(word 2,$(1))
-$(STAGING_DIR_HOST)/bin/mktplinkfw \
-H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) \
-N "$(VERSION_DIST)" -V $(REVISION) -m $(TPLINK_HEADER_VERSION) \
-k "$(KDIR)/loader-$(word 1,$(1)).$(LOADER_TYPE)" -E $(KERNEL_LOADADDR) \
-r $(IMAGE_ROOTFS).$(word 2,$(1)) -o $@.new -j -X 0x40000 \
-a $(call rootfs_align,$(FILESYSTEM)) $(wordlist 3,$(words $(1)),$(1)) \
$(if $(findstring sysupgrade,$(word 2,$(1))),-s) && mv $@.new $@ || rm -f $@
rm -f $(IMAGE_ROOTFS).$(word 2,$(1))
endef
define Build/uImage-tplink-c9
mkimage \
-A $(LINUX_KARCH) \
@@ -28,6 +41,18 @@ define Device/tplink-v1
append-metadata
endef
define Device/tplink-v1-okli
$(Device/tplink-v1)
LOADER_TYPE := bin
LOADER_FLASH_OFFS := 0x21000
COMPILE := loader-$(1).bin
COMPILE/loader-$(1).bin := loader-okli-compile | pad-to 64k | lzma | pad-to 3584
KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49
IMAGE/factory.bin := tplink-v1-okli-image $(1) factory -e -O
IMAGE/sysupgrade.bin := tplink-v1-okli-image $(1) sysupgrade -e -O | check-size | \
append-metadata
endef
define Device/tplink-v2
DEVICE_VENDOR := TP-Link
TPLINK_FLASHLAYOUT :=

4
target/linux/ramips/image/mt7620.mk
View File

@@ -1269,7 +1269,7 @@ endef
TARGET_DEVICES += tplink_archer-mr200
define Device/tplink_re200-v1
$(Device/tplink-v1)
$(Device/tplink-v1-okli)
SOC := mt7620a
DEVICE_MODEL := RE200
DEVICE_VARIANT := v1
@@ -1281,7 +1281,7 @@ endef
TARGET_DEVICES += tplink_re200-v1
define Device/tplink_re210-v1
$(Device/tplink-v1)
$(Device/tplink-v1-okli)
SOC := mt7620a
DEVICE_MODEL := RE210
DEVICE_VARIANT := v1

32
target/linux/ramips/image/mt7621.mk
View File

@@ -17,6 +17,21 @@ define Build/append-dlink-covr-metadata
rm $@metadata.tmp
endef
define Build/append-netis-n6-metadata
( echo -ne '{ \
"up_model": "Netis-N6R", \
"supported_devices": ["mt7621-rfb-ax-nand"], \
"version": { \
"dist": "$(call json_quote,$(VERSION_DIST))", \
"version": "$(call json_quote,$(VERSION_NUMBER))", \
"revision": "$(call json_quote,$(REVISION))", \
"board": "$(call json_quote,$(BOARD))" \
} }' \
) > $@.metadata.tmp
fwtool -I $@.metadata.tmp $@
rm $@.metadata.tmp
endef
define Build/arcadyan-trx
echo -ne "hsqs" > $@.hsqs
$(eval trx_magic=$(word 1,$(1)))
@@ -1972,6 +1987,23 @@ define Device/netgear_wndr3700-v5
endef
TARGET_DEVICES += netgear_wndr3700-v5
define Device/netis_n6
$(Device/dsa-migration)
$(Device/nand)
IMAGE_SIZE := 121344k
DEVICE_VENDOR := netis
DEVICE_MODEL := N6
KERNEL_LOADADDR := 0x82000000
KERNEL := kernel-bin | relocate-kernel $(loadaddr-y) | lzma | \
fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
IMAGES += factory.bin
IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | \
append-ubi | check-size | append-netis-n6-metadata
DEVICE_PACKAGES += kmod-mt7915-firmware kmod-usb-ledtrig-usbport \
kmod-usb3
endef
TARGET_DEVICES += netis_n6
define Device/netis_wf2881
$(Device/nand)
$(Device/uimage-lzma-loader)

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

@@ -183,6 +183,9 @@ netgear,r7450)
netgear,wax202)
ucidef_set_led_netdev "internet" "Internet" "green:net" "wan"
;;
netis,n6)
ucidef_set_led_netdev "wan" "wan" "green:wan" "wan" "link tx rx"
;;
oraybox,x3a)
ucidef_set_led_netdev "wan" "wan link" "red:status" "wan"
ucidef_set_led_netdev "lan" "lan link" "green:status" "br-lan"

21
target/linux/ramips/mt7621/base-files/etc/hotplug.d/firmware/11-mt76-caldata Normal file
View File

@@ -0,0 +1,21 @@
#!/bin/sh
[ -e /lib/firmware/$FIRMWARE ] && exit 0
. /lib/functions/caldata.sh
board=$(board_name)
case "$FIRMWARE" in
"mediatek/mt7915_eeprom_dbdc.bin")
case "$board" in
netis,n6)
EEPROM=/lib/firmware/$FIRMWARE
head -c $((0xe00)) /dev/mtd2 > $EEPROM
printf "\x92" | \
dd of=$EEPROM seek=$((0x190)) bs=1 conv=notrunc \
2>/dev/null
;;
esac
;;
esac

8
target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
View File

@@ -140,6 +140,14 @@ case "$board" in
[ "$PHYNBR" = "0" ] && macaddr_add $hw_mac_addr 2 > /sys${DEVPATH}/macaddress
[ "$PHYNBR" = "1" ] && macaddr_add $hw_mac_addr 3 > /sys${DEVPATH}/macaddress
;;
netis,n6)
hw_mac_addr="$(mtd_get_mac_binary Factory 0x4)"
hw_mac_addr=$(macaddr_setbit $hw_mac_addr 28)
hw_mac_2g=$(macaddr_unsetbit $hw_mac_addr 26)
hw_mac_5g=$(macaddr_setbit $hw_mac_addr 27)
[ "$PHYNBR" = "0" ] && echo -n "$hw_mac_2g" > /sys${DEVPATH}/macaddress
[ "$PHYNBR" = "1" ] && echo -n "$hw_mac_5g" > /sys${DEVPATH}/macaddress
;;
mercusys,mr70x-v1|\
tplink,archer-ax23-v1)
hw_mac_addr="$(mtd_get_mac_binary config 0x8)"

1
target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
View File

@@ -103,6 +103,7 @@ platform_do_upgrade() {
netgear,wac104|\
netgear,wac124|\
netgear,wax202|\
netis,n6|\
netis,wf2881|\
raisecom,msg1500-x-00|\
rostelecom,rt-fe-1a|\