aio-3399b/ImmortalWrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source
This commit is contained in:
CN_SZTL 2020-07-14 01:06:18 +08:00
commit 058e91126c
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
16 changed files with 170 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/network/services/wireguard/Makefile
View File

@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=wireguard
PKG_VERSION:=1.0.20200623
PKG_VERSION:=1.0.20200712
PKG_RELEASE:=1
PKG_SOURCE:=wireguard-linux-compat-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-linux-compat/snapshot/
PKG_HASH:=130937724515799edf05ff8216bc837df8acda879428f3a7f96a3287758f9445
PKG_HASH:=e15b3d4eb2cf186920a6ed13685187d6b846e59eb383c291913628682965ac95
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING

6
package/system/procd/Makefile
View File

@ -12,9 +12,9 @@ PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
PKG_SOURCE_DATE:=2020-07-11
PKG_SOURCE_VERSION:=3034eaf5ceebc3b8d8461680a2cd3c61e796fc7d
PKG_MIRROR_HASH:=2f8f84c273bda817dcb0513c0d3304af98662c3eb26c9bf266da4508db04011d
PKG_SOURCE_DATE:=2020-07-13
PKG_SOURCE_VERSION:=dacab12b301085eac00e84a94e42096de70886e8
PKG_MIRROR_HASH:=e9c49884ea1dd6554ce057c8ca7fb23bc980939b92e11f43d37b930c29f63dbd
CMAKE_INSTALL:=1
PKG_LICENSE:=GPL-2.0

2
scripts/env
View File

@ -57,7 +57,7 @@ env_init() {
if [ -z "$CREATE" ]; then
[ -d "$ENVDIR" ] || exit 0
fi
command -v git || error "Git is not installed"
command -v git >/dev/null || error "Git is not installed"
mkdir -p "$ENVDIR" || error "Failed to create the environment directory"
cd "$ENVDIR" || error "Failed to switch to the environment directory"
[ -d .git ] || {

20
target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
View File

@ -60,19 +60,18 @@
linux,default-trigger = "phy0tpt";
};
};
};
dsa {
compatible = "marvell,dsa";
#address-cells = <1>;
#size-cells = <0>;
&mdio0 {
status = "okay";
dsa,mii-bus = <&mdio0>;
dsa,ethernet = <&eth0>;
switch@0 {
compatible = "marvell,mv88e6060";
reg = <0>;
switch@0 {
ports {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
port@0 {
reg = <0>;
@ -102,6 +101,7 @@
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&eth0>;
};
};
};
@ -145,10 +145,6 @@
};
};
&mdio0 {
status = "okay";
};
&eth0 {
status = "okay";

4
target/linux/ath79/dts/ar9344_qihoo_c301.dts
View File

@ -52,13 +52,12 @@
gpio = <&gpio 18 GPIO_ACTIVE_LOW>;
};
reg_usb_vbus {
usb_vbus: reg_usb_vbus {
compatible = "regulator-fixed";
regulator-name = "usb_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
regulator-always-on;
gpio = <&gpio 19 GPIO_ACTIVE_HIGH>;
};
};
@ -202,6 +201,7 @@
&usb_phy {
status = "okay";
phy-supply = <&usb_vbus>;
};
&pcie {

2
target/linux/ath79/image/tiny-tp-link.mk
View File

@ -443,7 +443,7 @@ define Device/tplink_tl-wr941-v2
TPLINK_HWREV := 2
SUPPORTED_DEVICES += tl-wr941nd
endef
#TARGET_DEVICES += tplink_tl-wr941-v2
TARGET_DEVICES += tplink_tl-wr941-v2
define Device/tplink_tl-wr941-v4
$(Device/tplink-4m)

1
target/linux/bcm47xx/image/mips74k.mk
View File

@ -156,6 +156,7 @@ define Device/linksys-wrt160n-v3
$(Device/linksys)
DEVICE_ID := N150
VERSION := 3.0.3
DEFAULT := n
endef
TARGET_DEVICES += linksys-wrt160n-v3

133
target/linux/ramips/dts/mt7628an_netgear_r6020.dts
View File

@ -1,10 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/;
#include "mt7628an.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include "mt7628an_netgear_r6xxx.dtsi"
/ {
compatible = "netgear,r6020", "mediatek,mt7628an-soc";
@ -17,16 +14,6 @@
led-upgrade = &led_power;
};
keys {
compatible = "gpio-keys";
reset {
label = "reset";
gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};
};
leds {
compatible = "gpio-leds";
@ -65,101 +52,47 @@
&state_default {
gpio {
groups = "p0led_an", "p1led_an", "p2led_an",
"p3led_an", "p4led_an", "wdt",
"wled_an";
groups = "p0led_an", "p1led_an", "p2led_an", "p3led_an",
"p4led_an", "wdt", "wled_an";
function = "gpio";
};
};
&spi0 {
status = "okay";
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <86000000>;
m25p,fast-read;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x0 0x40000>;
read-only;
};
factory: partition@40000 {
label = "factory";
reg = <0x40000 0x20000>;
read-only;
};
partition@60000 {
label = "nvram";
reg = <0x60000 0x30000>;
read-only;
};
partition@90000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x90000 0x6f0000>;
};
partition@780000 {
label = "ML";
reg = <0x780000 0x20000>;
read-only;
};
partition@7a0000 {
label = "ML1";
reg = <0x7a0000 0x20000>;
read-only;
};
partition@7c0000 {
label = "ML2";
reg = <0x7c0000 0x20000>;
read-only;
};
partition@7e0000 {
label = "POT";
reg = <0x7e0000 0x10000>;
read-only;
};
partition@7f0000 {
label = "reserved";
reg = <0x7f0000 0x10000>;
read-only;
};
};
&partitions {
partition@90000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x90000 0x6f0000>;
};
};
&wmac {
status = "okay";
};
partition@780000 {
label = "ML";
reg = <0x780000 0x20000>;
read-only;
};
&ethernet {
mtd-mac-address = <&factory 0x4>;
};
partition@7a0000 {
label = "ML1";
reg = <0x7a0000 0x20000>;
read-only;
};
&pcie {
status = "okay";
};
partition@7c0000 {
label = "ML2";
reg = <0x7c0000 0x20000>;
read-only;
};
&pcie0 {
wifi@0,0 {
reg = <0x0000 0 0 0 0>;
mediatek,mtd-eeprom = <&factory 0x8000>;
ieee80211-freq-limit = <5000000 6000000>;
partition@7e0000 {
label = "POT";
reg = <0x7e0000 0x10000>;
read-only;
};
partition@7f0000 {
label = "reserved";
reg = <0x7f0000 0x10000>;
read-only;
};
};

86
target/linux/ramips/dts/mt7628an_netgear_r6080.dts
View File

@ -1,10 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/;
#include "mt7628an.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include "mt7628an_netgear_r6xxx.dtsi"
/ {
compatible = "netgear,r6080", "mediatek,mt7628an-soc";
@ -18,16 +15,6 @@
label-mac-device = &ethernet;
};
keys {
compatible = "gpio-keys";
reset {
label = "reset";
gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};
};
leds {
compatible = "gpio-leds";
@ -72,70 +59,17 @@
};
};
&spi0 {
status = "okay";
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <86000000>;
m25p,fast-read;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x0 0x40000>;
read-only;
};
factory: partition@40000 {
label = "factory";
reg = <0x40000 0x20000>;
read-only;
};
partition@60000 {
label = "nvram";
reg = <0x60000 0x30000>;
read-only;
};
partition@90000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x90000 0x760000>;
};
partition@7f0000 {
label = "reserved";
reg = <0x7f0000 0x10000>;
read-only;
};
};
&partitions {
partition@90000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x90000 0x760000>;
};
};
&wmac {
status = "okay";
};
&ethernet {
mtd-mac-address = <&factory 0x4>;
};
&pcie {
status = "okay";
};
&pcie0 {
wifi@0,0 {
reg = <0x0000 0 0 0 0>;
mediatek,mtd-eeprom = <&factory 0x8000>;
ieee80211-freq-limit = <5000000 6000000>;
partition@7f0000 {
label = "reserved";
reg = <0x7f0000 0x10000>;
read-only;
};
};

93
target/linux/ramips/dts/mt7628an_netgear_r6120.dts
View File

@ -1,9 +1,6 @@
/dts-v1/;
#include "mt7628an.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include "mt7628an_netgear_r6xxx.dtsi"
/ {
compatible = "netgear,r6120", "mediatek,mt7628an-soc";
@ -17,16 +14,6 @@
label-mac-device = &ethernet;
};
keys {
compatible = "gpio-keys";
reset {
label = "reset";
gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};
};
leds {
compatible = "gpio-leds";
@ -77,77 +64,27 @@
&state_default {
gpio {
groups = "p0led_an", "p1led_an", "p2led_an",
"p3led_an", "p4led_an", "wdt",
"wled_an", "uart1";
groups = "p0led_an", "p1led_an", "p2led_an", "p3led_an",
"p4led_an", "wdt", "wled_an", "uart1";
function = "gpio";
};
};
&spi0 {
status = "okay";
&partitions {
partition@90000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x90000 0xf60000>;
};
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <10000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x0 0x40000>;
read-only;
};
factory: partition@40000 {
label = "factory";
reg = <0x40000 0x20000>;
read-only;
};
partition@60000 {
label = "nvram";
reg = <0x60000 0x30000>;
read-only;
};
partition@90000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x90000 0xf60000>;
};
partition@ff0000 {
label = "reserved";
reg = <0xff0000 0x10000>;
read-only;
};
};
partition@ff0000 {
label = "reserved";
reg = <0xff0000 0x10000>;
read-only;
};
};
&wmac {
status = "okay";
};
&ethernet {
&wifi5 {
mtd-mac-address = <&factory 0x4>;
};
&pcie {
status = "okay";
};
&pcie0 {
wifi@0,0 {
reg = <0x0000 0 0 0 0>;
mediatek,mtd-eeprom = <&factory 0x8000>;
ieee80211-freq-limit = <5000000 6000000>;
mtd-mac-address = <&factory 0x4>;
mtd-mac-address-increment = <(2)>;
};
mtd-mac-address-increment = <(2)>;
};

73
target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi Normal file
View File

@ -0,0 +1,73 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "mt7628an.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
/ {
keys {
compatible = "gpio-keys";
reset {
label = "reset";
gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};
};
};
&spi0 {
status = "okay";
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <86000000>;
m25p,fast-read;
partitions: partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x0 0x40000>;
read-only;
};
factory: partition@40000 {
label = "factory";
reg = <0x40000 0x20000>;
read-only;
};
partition@60000 {
label = "nvram";
reg = <0x60000 0x30000>;
read-only;
};
};
};
};
&wmac {
status = "okay";
};
&ethernet {
mtd-mac-address = <&factory 0x4>;
};
&pcie {
status = "okay";
};
&pcie0 {
wifi5: wifi@0,0 {
reg = <0x0000 0 0 0 0>;
mediatek,mtd-eeprom = <&factory 0x8000>;
ieee80211-freq-limit = <5000000 6000000>;
};
};

2
target/linux/ramips/image/Makefile
View File

@ -11,7 +11,7 @@ DEVICE_VARS += LOADER_TYPE
DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
DEVICE_VARS += BUFFALO_TAG_PLATFORM BUFFALO_TAG_VERSION BUFFALO_TAG_MINOR
DEVICE_VARS += SEAMA_SIGNATURE SEAMA_MTDBLOCK
DEVICE_VARS += SERCOMM_HWID SERCOMM_HWVER SERCOMM_SWVER
DEVICE_VARS += SERCOMM_HWNAME SERCOMM_HWID SERCOMM_HWVER SERCOMM_SWVER
DEVICE_VARS += JCG_MAXSIZE
loadaddr-y := 0x80000000

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

@ -7,7 +7,7 @@ include ./common-tp-link.mk
DEFAULT_SOC := mt7621
KERNEL_DTB += -d21
DEVICE_VARS += UIMAGE_MAGIC SERCOMM_HWNAME
DEVICE_VARS += UIMAGE_MAGIC
# The OEM webinterface expects an kernel with initramfs which has the uImage
# header field ih_name.

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

@ -189,60 +189,51 @@ define Device/mercury_mac1200r-v2
endef
TARGET_DEVICES += mercury_mac1200r-v2
define Device/netgear_r6020
define Device/netgear_r6xxx
BLOCKSIZE := 64k
IMAGE_SIZE := 7104k
DEVICE_VENDOR := NETGEAR
DEVICE_MODEL := R6020
DEVICE_PACKAGES := kmod-mt76x2
SERCOMM_HWID := CFR
SERCOMM_HWVER := A001
SERCOMM_SWVER := 0x0040
IMAGES += factory.img
IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \
pad-rootfs
IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size
IMAGE/factory.img := pad-extra 576k | $$(IMAGE/default) | \
pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | zip R6020.bin | \
sercom-seal
pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | \
zip $$$$(SERCOMM_HWNAME).bin | sercom-seal
endef
define Device/netgear_r6020
$(Device/netgear_r6xxx)
IMAGE_SIZE := 7104k
DEVICE_MODEL := R6020
DEVICE_PACKAGES := kmod-mt76x2
SERCOMM_HWNAME := R6020
SERCOMM_HWID := CFR
SERCOMM_HWVER := A001
SERCOMM_SWVER := 0x0040
endef
TARGET_DEVICES += netgear_r6020
define Device/netgear_r6080
BLOCKSIZE := 64k
$(Device/netgear_r6xxx)
IMAGE_SIZE := 7552k
DEVICE_VENDOR := NETGEAR
DEVICE_MODEL := R6080
DEVICE_PACKAGES := kmod-mt76x2
SERCOMM_HWNAME := R6080
SERCOMM_HWID := CFR
SERCOMM_HWVER := A001
SERCOMM_SWVER := 0x0040
IMAGES += factory.img
IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \
pad-rootfs
IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size
IMAGE/factory.img := pad-extra 576k | $$(IMAGE/default) | \
pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | zip R6080.bin | \
sercom-seal
endef
TARGET_DEVICES += netgear_r6080
define Device/netgear_r6120
BLOCKSIZE := 64k
$(Device/netgear_r6xxx)
IMAGE_SIZE := 15744k
DEVICE_VENDOR := NETGEAR
DEVICE_MODEL := R6120
DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
SERCOMM_HWNAME := R6120
SERCOMM_HWID := CGQ
SERCOMM_HWVER := A001
SERCOMM_SWVER := 0x0040
IMAGES += factory.img
IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \
pad-rootfs
IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size
IMAGE/factory.img := pad-extra 576k | $$(IMAGE/default) | \
pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | zip R6120.bin | \
sercom-seal
endef
TARGET_DEVICES += netgear_r6120

2
target/linux/rockchip/Makefile
View File

@ -17,7 +17,7 @@ endef
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs
DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug
KERNELNAME:=Image dtbs

2
target/linux/rockchip/armv8/config-5.4
View File

@ -221,7 +221,6 @@ CONFIG_KALLSYMS=y
CONFIG_KEXEC_CORE=y
CONFIG_KEXEC_FILE=y
# CONFIG_KEXEC_SIG is not set
CONFIG_KEYBOARD_GPIO=y
CONFIG_KSM=y
# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
CONFIG_LEDS_GPIO=y
@ -230,7 +229,6 @@ CONFIG_LEDS_SYSCON=y
CONFIG_LEDS_TRIGGER_CPU=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_PANIC=y
# CONFIG_LEDS_TRIGGER_TIMER is not set
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=16
CONFIG_LIBCRC32C=y