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
2023-07-27 04:29:01 +08:00
parent 60e6e250cb 13e7a2d19f
commit 1b62fa461c
17 changed files with 261 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -14,6 +14,7 @@
/feeds
/feeds.conf
/files
/target/linux/feeds
/overlay
/package/feeds
/package/openwrt-packages

4
include/kernel-6.1
View File

@@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .40
LINUX_KERNEL_HASH-6.1.40 = 43eafc2197a07dcdcff7a7ef79ac7502061f7c564744e51626bf5fa2e22587f0
LINUX_VERSION-6.1 = .41
LINUX_KERNEL_HASH-6.1.41 = 312809a78eea052a08a6580f47b2ed8dd28e5633461d6731febaf3cb1e570bb7

2
package/kernel/linux/modules/block.mk
View File

@@ -505,7 +505,7 @@ define KernelPackage/nvme
FILES:= \
$(LINUX_DIR)/drivers/nvme/host/nvme-core.ko \
$(LINUX_DIR)/drivers/nvme/host/nvme.ko
AUTOLOAD:=$(call AutoLoad,30,nvme-core nvme)
AUTOLOAD:=$(call AutoLoad,30,nvme-core nvme,1)
endef
define KernelPackage/nvme/description

2
package/kernel/mac80211/broadcom.mk
View File

@@ -430,8 +430,8 @@ define KernelPackage/brcmfmac/config
config BRCMFMAC_SDIO
bool "Enable SDIO bus interface support"
default y if TARGET_bcm27xx
default y if TARGET_rockchip
default y if TARGET_imx_cortexa7
default y if TARGET_rockchip
default y if TARGET_sunxi
default n
help

6
package/kernel/mt76/Makefile
View File

@@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
PKG_SOURCE_URL:=https://github.com/openwrt/mt76
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2023-07-14
PKG_SOURCE_VERSION:=bb3937d5c3e0b13c0d08747ec0fc9726fb4fd870
PKG_MIRROR_HASH:=498d9cfdafe06572d0668d49e89f1014715100fa59c4f89b8495cd869c8c9b0b
PKG_SOURCE_DATE:=2023-07-26
PKG_SOURCE_VERSION:=cd3dfe39276905307cc028ac8edf2c06963cda23
PKG_MIRROR_HASH:=413d2d0faa81d834ba13cb9e503e1e3a61e3e071014da6b525a123e5da053f90
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_USE_NINJA:=0

4
package/libs/openssl/Makefile
View File

@@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openssl
PKG_VERSION:=3.0.9
PKG_RELEASE:=2
PKG_BUILD_FLAGS:=no-mips16 gc-sections
PKG_RELEASE:=3
PKG_BUILD_FLAGS:=no-mips16 gc-sections no-lto
PKG_BUILD_PARALLEL:=1

5
package/network/services/dropbear/files/dropbear.failsafe
View File

@@ -1,8 +1,9 @@
#!/bin/sh
failsafe_dropbear () {
dropbearkey -t rsa -s 1024 -f /tmp/dropbear_failsafe_host_key
dropbear -r /tmp/dropbear_failsafe_host_key <> /dev/null 2>&1
dropbearkey -t rsa -s 1024 -f /tmp/dropbear_rsa_failsafe_host_key
dropbearkey -t ed25519 -f /tmp/dropbear_ed25519_failsafe_host_key
dropbear -r /tmp/dropbear_rsa_failsafe_host_key -r /tmp/dropbear_ed25519_failsafe_host_key <> /dev/null 2>&1
}
boot_hook_add failsafe failsafe_dropbear

6
package/utils/ugps/Makefile
View File

@@ -12,9 +12,9 @@ PKG_RELEASE:=2
PKG_SOURCE_URL=$(PROJECT_GIT)/project/ugps.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2021-06-08
PKG_SOURCE_VERSION:=5e88403fc0d39ae8a270d2c6c6e9c8a4d5232cf3
PKG_MIRROR_HASH:=a3dfc2cc6def3b634d8b7cda9139926be3d876cf2faa5251c4821987954442a5
PKG_SOURCE_DATE:=2023-01-27
PKG_SOURCE_VERSION:=a8171a07193351a9125024d5c759c0ebd6a6895c
PKG_MIRROR_HASH:=9116c9698c15744bb2e36a7cfd0a73f1609b6932f32ca07da57238aea8a2d5cf
PKG_MAINTAINER:=John Crispin <john@phrozen.org>
PKG_LICENSE:=GPL-2.0+

2
package/utils/ugps/files/ugps.init
View File

@@ -12,6 +12,7 @@ service_triggers() {
start_service() {
local tty="$(uci get gps.@gps[-1].tty)"
local baudrate="$(uci get gps.@gps[-1].baudrate || echo 0)"
local atime="$(uci get gps.@gps[-1].adjust_time)"
local disabled="$(uci get gps.@gps[-1].disabled || echo 0)"
@@ -29,6 +30,7 @@ start_service() {
procd_open_instance
procd_set_param command "$PROG"
[ "$baudrate" -eq 0 ] || procd_append_param command "-b ${baudrate}"
[ "$atime" -eq 0 ] || procd_append_param command "-a"
procd_append_param command "$tty"
procd_set_param respawn

1
target/linux/ipq40xx/base-files/etc/board.d/02_network
View File

@@ -24,6 +24,7 @@ ipq40xx_setup_interfaces()
p2w,r619ac-64m|\
p2w,r619ac-128m|\
pakedge,wr-1|\
teltonika,rutx50|\
zyxel,nbg6617)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
;;

6
target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View File

@@ -131,7 +131,8 @@ case "$FIRMWARE" in
caldata_extract "0:ART" 0x1000 0x2f20
ath10k_patch_mac $(macaddr_add $(get_mac_label) 2)
;;
teltonika,rutx10)
teltonika,rutx10|\
teltonika,rutx50)
caldata_extract "0:ART" 0x1000 0x2f20
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary "0:CONFIG" 0x0) 2)
;;
@@ -227,7 +228,8 @@ case "$FIRMWARE" in
caldata_extract "0:ART" 0x5000 0x2f20
ath10k_patch_mac $(macaddr_add $(get_mac_label) 4)
;;
teltonika,rutx10)
teltonika,rutx10|\
teltonika,rutx50)
caldata_extract "0:ART" 0x5000 0x2f20
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary "0:CONFIG" 0x0) 3)
;;

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

@@ -207,6 +207,7 @@ platform_do_upgrade() {
sony_emmc_do_upgrade "$1"
;;
teltonika,rutx10 |\
teltonika,rutx50 |\
zte,mf18a |\
zte,mf286d |\
zte,mf287plus |\

37
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-rutx.dtsi
View File

@@ -44,43 +44,6 @@
linux,code = <KEY_RESTART>;
};
};
gpio_export {
compatible = "gpio-export";
#size-cells = <0>;
gpio_out {
gpio-export,name = "gpio_out";
gpio-export,output = <0>;
gpio-export,direction_may_change = <0>;
gpios = <&stm32_io 23 GPIO_ACTIVE_HIGH>;
};
gpio_in {
gpio-export,name = "gpio_in";
gpio-export,input = <0>;
gpio-export,direction_may_change = <0>;
gpios = <&stm32_io 24 GPIO_ACTIVE_LOW>;
};
};
};
};
&blsp1_i2c3 {
status = "okay";
pinctrl-0 = <&i2c_0_pins>;
pinctrl-names = "default";
clock-frequency = <400000>;
stm32_io: stm32@74 {
compatible = "tlt,stm32v1";
#gpio-cells = <2>;
#interrupt-cells = <2>;
gpio-controller;
interrupt-controller;
interrupt-parent = <&tlmm>;
interrupts = <5 2>;
reg = <0x74>;
};
};

37
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-rutx10.dts
View File

@@ -22,6 +22,43 @@
linux,default-trigger = "phy1tpt";
};
};
gpio_export {
compatible = "gpio-export";
#size-cells = <0>;
gpio_out {
gpio-export,name = "gpio_out";
gpio-export,output = <0>;
gpio-export,direction_may_change = <0>;
gpios = <&stm32_io 23 GPIO_ACTIVE_HIGH>;
};
gpio_in {
gpio-export,name = "gpio_in";
gpio-export,input = <0>;
gpio-export,direction_may_change = <0>;
gpios = <&stm32_io 24 GPIO_ACTIVE_LOW>;
};
};
};
};
&blsp1_i2c3 {
status = "okay";
pinctrl-0 = <&i2c_0_pins>;
pinctrl-names = "default";
clock-frequency = <400000>;
stm32_io: stm32@74 {
compatible = "tlt,stm32v1";
#gpio-cells = <2>;
#interrupt-cells = <2>;
gpio-controller;
interrupt-controller;
interrupt-parent = <&tlmm>;
interrupts = <5 2>;
reg = <0x74>;
};
};

181
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-rutx50.dts Normal file
View File

@@ -0,0 +1,181 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "qcom-ipq4018-rutx.dtsi"
/ {
model = "Teltonika RUTX50";
compatible = "teltonika,rutx50";
aliases {
led-boot = &led_rssi0;
led-failsafe = &led_rssi0;
led-running = &led_rssi0;
led-upgrade = &led_rssi0;
label-mac-device = &gmac;
};
soc {
gpio-export {
compatible = "gpio-export";
#size-cells = <0>;
gpio_modem_reset {
gpio-export,name = "modem_reset";
gpio-export,output = <0>;
gpios = <&shift_io 8 GPIO_ACTIVE_HIGH>;
};
gpio_modem_power {
gpio-export,name = "modem_power";
gpio-export,output = <0>;
gpios = <&shift_io 9 GPIO_ACTIVE_HIGH>;
};
gpio_out_1 {
gpio-export,name = "sim-select";
/* 0 = SIM1 ; 1 = SIM2 */
gpio-export,output = <0>;
gpios = <&shift_io 10 GPIO_ACTIVE_HIGH>;
};
gpio_in_1 {
gpio-export,name = "sim-detect";
gpio-export,input = <0>;
gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>;
};
};
leds {
compatible = "gpio-leds";
led-0 {
label = "green:sim1";
gpios = <&shift_io 14 GPIO_ACTIVE_HIGH>;
};
led-1 {
label = "green:sim2";
gpios = <&shift_io 15 GPIO_ACTIVE_HIGH>;
};
led-2 {
label = "green:eth";
gpios = <&shift_io 6 GPIO_ACTIVE_HIGH>;
};
led-3 {
label = "green:wifi";
gpios = <&shift_io 7 GPIO_ACTIVE_HIGH>;
};
led-4 {
label = "green:3g";
gpios = <&shift_io 5 GPIO_ACTIVE_HIGH>;
};
led-5 {
label = "green:4g";
gpios = <&shift_io 4 GPIO_ACTIVE_HIGH>;
};
led-6 {
label = "green:5g";
gpios = <&shift_io 3 GPIO_ACTIVE_HIGH>;
};
led_rssi0: led-7 {
label = "green:rssi0";
gpios = <&shift_io 0 GPIO_ACTIVE_HIGH>;
};
led-8 {
label = "green:rssi1";
gpios = <&shift_io 1 GPIO_ACTIVE_HIGH>;
};
led-9 {
label = "green:rssi2";
gpios = <&shift_io 2 GPIO_ACTIVE_HIGH>;
};
led-10 {
label = "green:wifi2g";
gpios = <&shift_io 12 GPIO_ACTIVE_HIGH>;
};
led-11 {
label = "green:wifi5g";
gpios = <&shift_io 13 GPIO_ACTIVE_HIGH>;
};
};
spi-gpio {
compatible = "spi-gpio";
#address-cells = <1>;
#size-cells = <0>;
gpio-sck = <&tlmm 1 GPIO_ACTIVE_HIGH>;
gpio-mosi = <&tlmm 3 GPIO_ACTIVE_HIGH>;
cs-gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>;
num-chipselects = <1>;
shift_io: shift_io@0 {
compatible = "fairchild,74hc595";
reg = <0>;
gpio-controller;
#gpio-cells = <2>;
/* Attn: This is specific to RUTX50 in Teltonika GPL */
registers-number = <2>;
spi-max-frequency = <10000000>;
};
};
};
};
&wifi0 {
status = "okay";
qcom,ath10k-calibration-variant = "Teltonika-RUTX10";
};
&wifi1 {
status = "okay";
qcom,ath10k-calibration-variant = "Teltonika-RUTX10";
};
&gmac {
status = "okay";
};
&switch {
status = "okay";
};
&swport1 {
status = "okay";
label = "lan1";
};
&swport2 {
status = "okay";
label = "lan2";
};
&swport3 {
status = "okay";
label = "lan3";
};
&swport4 {
status = "okay";
label = "lan4";
};
&swport5 {
status = "okay";
label = "wan";
};

3
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-3000.dts
View File

@@ -121,6 +121,9 @@
status = "okay";
nand@0 {
/delete-property/ nand-ecc-strength;
/delete-property/ nand-ecc-step-size;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;

16
target/linux/ipq40xx/image/generic.mk
View File

@@ -1076,6 +1076,22 @@ endef
# Missing DSA Setup
#TARGET_DEVICES += teltonika_rutx10
define Device/teltonika_rutx50
$(call Device/FitImage)
$(call Device/UbiFit)
DEVICE_VENDOR := Teltonika
DEVICE_MODEL := RUTX50
SOC := qcom-ipq4018
DEVICE_DTS_CONFIG := config@5
KERNEL_INSTALL := 1
BLOCKSIZE := 128k
PAGESIZE := 2048
FILESYSTEMS := squashfs
IMAGE/factory.ubi := append-ubi
DEVICE_PACKAGES := ipq-wifi-teltonika_rutx kmod-usb-net-qmi-wwan kmod-usb-serial-option uqmi
endef
TARGET_DEVICES += teltonika_rutx50
define Device/tel_x1pro
$(call Device/FitImage)
DEVICE_VENDOR := Telco