Backups/immortalwrt-mt798x
1
0
Fork 0
mirror of https://github.com/hanwckf/immortalwrt-mt798x.git synced 2025-01-08 10:23:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source
This commit is contained in:
CN_SZTL 2020-10-04 22:23:18 +08:00
commit 0f6392c262
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
15 changed files with 132 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/boot/uboot-omap/Makefile
View File

@ -8,10 +8,10 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_VERSION:=2019.10
PKG_VERSION:=2020.04
PKG_RELEASE:=1
PKG_HASH:=8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014
PKG_HASH:=fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372
include $(INCLUDE_DIR)/u-boot.mk
include $(INCLUDE_DIR)/package.mk

11
package/boot/uboot-rockchip/Makefile
View File

@ -38,6 +38,16 @@ endef
# RK3399 boards
define U-Boot/rock-pi-4-rk3399
BUILD_SUBTARGET:=armv8
NAME:=Rock Pi 4
BUILD_DEVICES:= \
radxa_rock-pi-4
DEPENDS:=+PACKAGE_u-boot-rock-pi-4-rk3399:arm-trusted-firmware-rockchip
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
ATF:=rk3399_bl31.elf
endef
define U-Boot/rockpro64-rk3399
BUILD_SUBTARGET:=armv8
NAME:=RockPro64
@ -49,6 +59,7 @@ define U-Boot/rockpro64-rk3399
endef
UBOOT_TARGETS := \
rock-pi-4-rk3399 \
rockpro64-rk3399 \
nanopi-r2s-rk3328

6
package/firmware/linux-firmware/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=linux-firmware
PKG_VERSION:=20200817
PKG_RELEASE:=2
PKG_VERSION:=20200918
PKG_RELEASE:=1
PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_HASH:=76d05d5f1eff268d3b80675245fa596f557bd55ee2e16ddd54d18ffeae943887
PKG_HASH:=e2787907e0892e0b1a3c06f1def6fd3cdc0eff850b0919c7f21b5bda7563d2d8
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>

6
target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts
View File

@ -8,6 +8,12 @@
};
&partitions {
partition@620000 {
label = "partition-table";
reg = <0x620000 0x010000>;
read-only;
};
partition@630000 {
label = "tplink";
reg = <0x630000 0x1b0000>;

10
target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-eu.dts → target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.0-eu.dts
View File

@ -3,11 +3,17 @@
#include "qca9563_tplink_tl-wpa8630p-v2.dtsi"
/ {
compatible = "tplink,tl-wpa8630p-v2-eu", "qca,qca9563";
model = "TP-Link WPA8630P v2 (EU)";
compatible = "tplink,tl-wpa8630p-v2.0-eu", "qca,qca9563";
model = "TP-Link WPA8630P v2.0 (EU)";
};
&partitions {
partition@620000 {
label = "partition-table";
reg = <0x620000 0x010000>;
read-only;
};
info: partition@630000 {
label = "info";
reg = <0x630000 0x010000>;

30
target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.1-eu.dts Normal file
View File

@ -0,0 +1,30 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "qca9563_tplink_tl-wpa8630p-v2.dtsi"
/ {
compatible = "tplink,tl-wpa8630p-v2.1-eu", "qca,qca9563";
model = "TP-Link WPA8630P v2.1 (EU)";
};
&partitions {
/* 0x620000 to 0x680000 is empty in OEM partitioning */
partition@680000 {
label = "tplink";
reg = <0x680000 0x160000>;
read-only;
};
info: partition@7e0000 {
label = "info";
reg = <0x7e0000 0x010000>;
read-only;
};
art: partition@7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
};
};

6
target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi
View File

@ -26,12 +26,6 @@
label = "firmware";
reg = <0x040000 0x5e0000>;
};
partition@620000 {
label = "partition-table";
reg = <0x620000 0x010000>;
read-only;
};
};
&eth0 {

5
target/linux/ath79/generic/base-files/etc/board.d/01_leds
View File

@ -323,8 +323,9 @@ tplink,tl-mr6400-v1)
ucidef_set_led_netdev "4g" "4G" "white:4g" "usb0"
;;
tplink,tl-wpa8630-v1|\
tplink,tl-wpa8630p-v2-eu|\
tplink,tl-wpa8630p-v2-int)
tplink,tl-wpa8630p-v2-int|\
tplink,tl-wpa8630p-v2.0-eu|\
tplink,tl-wpa8630p-v2.1-eu)
ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x3c"
;;
tplink,tl-wr842n-v2)

5
target/linux/ath79/generic/base-files/etc/board.d/02_network
View File

@ -324,8 +324,9 @@ ath79_setup_interfaces()
"0@eth0" "1:lan:1" "2:lan:3" "3:lan:2"
;;
tplink,tl-wpa8630-v1|\
tplink,tl-wpa8630p-v2-eu|\
tplink,tl-wpa8630p-v2-int)
tplink,tl-wpa8630p-v2-int|\
tplink,tl-wpa8630p-v2.0-eu|\
tplink,tl-wpa8630p-v2.1-eu)
# port 5 (internal) is the power-line port
ucidef_add_switch "switch0" \
"0@eth0" "2:lan:3" "3:lan:2" "4:lan:1" "5:lan:4"

5
target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View File

@ -197,8 +197,9 @@ case "$FIRMWARE" in
/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
;;
tplink,eap225-wall-v2|\
tplink,tl-wpa8630p-v2-eu|\
tplink,tl-wpa8630p-v2-int)
tplink,tl-wpa8630p-v2-int|\
tplink,tl-wpa8630p-v2.0-eu|\
tplink,tl-wpa8630p-v2.1-eu)
caldata_extract "art" 0x5000 0x2f20
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +1)
ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \

22
target/linux/ath79/image/generic-tp-link.mk
View File

@ -550,13 +550,6 @@ define Device/tplink_tl-wpa8630p-v2
DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct
endef
define Device/tplink_tl-wpa8630p-v2-eu
$(Device/tplink_tl-wpa8630p-v2)
DEVICE_VARIANT := v2 (EU)
TPLINK_BOARD_ID := TL-WPA8630P-V2-EU
endef
TARGET_DEVICES += tplink_tl-wpa8630p-v2-eu
define Device/tplink_tl-wpa8630p-v2-int
$(Device/tplink_tl-wpa8630p-v2)
DEVICE_VARIANT := v2 (Int.)
@ -564,6 +557,21 @@ define Device/tplink_tl-wpa8630p-v2-int
endef
TARGET_DEVICES += tplink_tl-wpa8630p-v2-int
define Device/tplink_tl-wpa8630p-v2.0-eu
$(Device/tplink_tl-wpa8630p-v2)
DEVICE_VARIANT := v2.0 (EU)
TPLINK_BOARD_ID := TL-WPA8630P-V2.0-EU
SUPPORTED_DEVICES += tplink,tl-wpa8630p-v2-eu
endef
TARGET_DEVICES += tplink_tl-wpa8630p-v2.0-eu
define Device/tplink_tl-wpa8630p-v2.1-eu
$(Device/tplink_tl-wpa8630p-v2)
DEVICE_VARIANT := v2.1 (EU)
TPLINK_BOARD_ID := TL-WPA8630P-V2.1-EU
endef
TARGET_DEVICES += tplink_tl-wpa8630p-v2.1-eu
define Device/tplink_tl-wr1043nd-v1
$(Device/tplink-8m)
SOC := ar9132

4
target/linux/ramips/dts/rt3662_dlink_dir-645.dts
View File

@ -27,13 +27,13 @@
reset {
label = "reset";
gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};
wps {
label = "wps";
gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WPS_BUTTON>;
};
};

9
target/linux/rockchip/image/armv8.mk
View File

@ -22,3 +22,12 @@ define Device/pine64_rockpro64
UBOOT_DEVICE_NAME := rockpro64-rk3399
endef
TARGET_DEVICES += pine64_rockpro64
define Device/radxa_rock-pi-4
DEVICE_VENDOR := Radxa
DEVICE_MODEL := Rock Pi 4
SOC := rk3399
UBOOT_DEVICE_NAME := rock-pi-4-rk3399
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
endef
TARGET_DEVICES += radxa_rock-pi-4

2
tools/firmware-utils/Makefile
View File

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME := firmware-utils
PKG_RELEASE := 3
PKG_RELEASE := 4
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/kernel.mk

37
tools/firmware-utils/src/tplink-safeloader.c
View File

@ -1443,7 +1443,7 @@ static struct device_info boards[] = {
/** Firmware layout for the TL-WPA8630P v2 (EU)*/
{
.id = "TL-WPA8630P-V2-EU",
.id = "TL-WPA8630P-V2.0-EU",
.vendor = "",
.support_list =
"SupportList:\n"
@ -1513,6 +1513,41 @@ static struct device_info boards[] = {
.last_sysupgrade_partition = "file-system"
},
/** Firmware layout for the TL-WPA8630P v2.1 (EU)*/
{
.id = "TL-WPA8630P-V2.1-EU",
.vendor = "",
.support_list =
"SupportList:\n"
"{product_name:TL-WPA8630P,product_ver:2.1.0,special_id:45550000}\n",
.support_trail = '\x00',
.soft_ver = NULL,
.partitions = {
{"factory-uboot", 0x00000, 0x20000},
{"fs-uboot", 0x20000, 0x20000},
{"firmware", 0x40000, 0x5e0000},
{"extra-para", 0x680000, 0x01000},
{"product-info", 0x690000, 0x01000},
{"partition-table", 0x6a0000, 0x02000},
{"soft-version", 0x6b0000, 0x01000},
{"support-list", 0x6b1000, 0x01000},
{"profile", 0x6b2000, 0x08000},
{"user-config", 0x6c0000, 0x10000},
{"default-config", 0x6d0000, 0x10000},
{"default-nvm", 0x6e0000, 0xc0000},
{"default-pib", 0x7a0000, 0x40000},
{"default-mac", 0x7e0000, 0x00020},
{"pin", 0x7e0100, 0x00020},
{"device-id", 0x7e0200, 0x00030},
{"radio", 0x7f0000, 0x10000},
{NULL, 0, 0}
},
.first_sysupgrade_partition = "os-image",
.last_sysupgrade_partition = "file-system"
},
/** Firmware layout for the TL-WR1043 v5 */
{
.id = "TLWR1043NV5",