fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source
This commit is contained in:
CN_SZTL 2020-07-22 17:54:15 +08:00
commit 4e21b6e0eb
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
14 changed files with 68 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/linux/apm821xx/image/Makefile
View File

@ -87,6 +87,7 @@ define Device/Default
KERNEL_ENTRY := 0x00000000
KERNEL_LOADADDR := 0x00000000
DEVICE_DTS_DIR := ../dts
DEVICE_DTS = $(subst _,-,$(1))
SUPPORTED_DEVICES = $(subst _,$(comma),$(1))
endef

5
target/linux/apm821xx/image/nand.mk
View File

@ -29,7 +29,6 @@ define Device/meraki_mr24
DEVICE_MODEL := MR24
DEVICE_PACKAGES := kmod-spi-gpio -swconfig
BOARD_NAME := mr24
DEVICE_DTS := meraki-mr24
IMAGES := sysupgrade.bin
DTB_SIZE := 64512
IMAGE_SIZE := 8191k
@ -47,7 +46,6 @@ define Device/meraki_mx60
DEVICE_PACKAGES := kmod-spi-gpio kmod-usb-ledtrig-usbport kmod-usb-dwc2 \
kmod-usb-storage block-mount
BOARD_NAME := mx60
DEVICE_DTS := meraki-mx60
BLOCKSIZE := 63k
IMAGES := sysupgrade.bin
DTB_SIZE := 64512
@ -80,14 +78,12 @@ endef
define Device/netgear_wndap620
$(Device/netgear_wndap6x0)
DEVICE_MODEL := WNDAP620 (Premium Wireless-N)
DEVICE_DTS := netgear-wndap620
endef
TARGET_DEVICES += netgear_wndap620
define Device/netgear_wndap660
$(Device/netgear_wndap6x0)
DEVICE_MODEL := WNDAP660 (Dual Radio Dual Band Wireless-N)
DEVICE_DTS := netgear-wndap660
endef
TARGET_DEVICES += netgear_wndap660
@ -100,7 +96,6 @@ define Device/netgear_wndr4700
kmod-nls-utf8 kmod-usb3 kmod-usb-dwc2 kmod-usb-storage \
partx-utils
BOARD_NAME := wndr4700
DEVICE_DTS := netgear-wndr4700
PAGESIZE := 2048
SUBPAGESIZE := 512
BLOCKSIZE := 128k

1
target/linux/apm821xx/image/sata.mk
View File

@ -7,7 +7,6 @@ define Device/wd_mybooklive
DEVICE_VENDOR := Western Digital
DEVICE_MODEL := My Book Live Series (Single + Duo)
DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-basic
DEVICE_DTS := wd-mybooklive
SUPPORTED_DEVICES += mbl wd,mybooklive-duo
BLOCKSIZE := 1k
DTB_SIZE := 16384

11
target/linux/ath79/dts/ar9341_tplink.dtsi
View File

@ -15,17 +15,6 @@
label-mac-device = &wmac;
};
keys: keys {
compatible = "gpio-keys";
rfkill {
label = "WiFi";
linux,code = <KEY_RFKILL>;
gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
debounce-interval = <60>;
};
};
leds: leds {
compatible = "gpio-leds";

23
target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
View File

@ -6,14 +6,23 @@
/ {
model = "TP-Link TL-MR3420 v2";
compatible = "tplink,tl-mr3420-v2", "qca,ar9341";
};
&keys {
reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
debounce-interval = <60>;
keys {
compatible = "gpio-keys";
rfkill {
label = "WiFi";
linux,code = <KEY_RFKILL>;
gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
debounce-interval = <60>;
};
reset {
label = "Reset/WPS";
linux,code = <KEY_RESTART>;
gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
debounce-interval = <60>;
};
};
};

24
target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts
View File

@ -6,14 +6,24 @@
/ {
model = "TP-Link TL-WR841N/ND v8";
compatible = "tplink,tl-wr841-v8", "qca,ar9341";
};
&keys {
reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
keys {
compatible = "gpio-keys";
rfkill {
label = "WiFi";
linux,code = <KEY_RFKILL>;
linux,input-type = <EV_SW>;
gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
debounce-interval = <60>;
};
reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
};
};

27
target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
View File

@ -7,6 +7,24 @@
model = "TP-Link TL-WR842N/ND v2";
compatible = "tplink,tl-wr842n-v2", "qca,ar9341";
keys {
compatible = "gpio-keys";
rfkill {
label = "WiFi";
linux,code = <KEY_RFKILL>;
gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
debounce-interval = <60>;
};
reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
};
gpio-export {
compatible = "gpio-export";
@ -18,15 +36,6 @@
};
};
&keys {
reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
};
&leds {
usb {
label = "tp-link:green:usb";

1
target/linux/bcm47xx/base-files/etc/board.d/01_network
View File

@ -171,6 +171,7 @@ configure_by_model() {
"Asus RT-N16"* | \
"Linksys E3000 V1" | \
"Linksys WRT610N V2" | \
"Netgear WNR3500 V2" | \
"Netgear WNR3500L")
ucidef_add_switch "switch0" \

4
target/linux/layerscape/image/armv8_64b.mk
View File

@ -37,8 +37,8 @@ define Device/ls1012afrdm
append-kernel | pad-to $$(BLOCKSIZE) | \
append-rootfs | pad-rootfs | check-size
IMAGE/sysupgrade.bin := append-kernel | pad-to $$(BLOCKSIZE) | \
append-rootfs | pad-rootfs | \
check-size $(LS_SYSUPGRADE_IMAGE_SIZE) | append-metadata
append-rootfs | pad-rootfs | \
check-size $(LS_SYSUPGRADE_IMAGE_SIZE) | append-metadata
KERNEL := kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb
KERNEL_INITRAMFS := kernel-bin | fit none $$(DTS_DIR)/$$(DEVICE_DTS).dtb
SUPPORTED_DEVICES := fsl,ls1012a-frdm

4
target/linux/omap/image/Makefile
View File

@ -35,6 +35,7 @@ define Device/Default
PROFILES := Default
KERNEL_NAME := zImage
KERNEL := kernel-bin
DEVICE_DTS = $(lastword $(subst _, ,$(1)))
IMAGES := sdcard.img.gz
IMAGE/sdcard.img.gz := omap-sdcard | append-metadata | gzip
SUPPORTED_DEVICES = $(subst _,$(comma),$(1))
@ -45,7 +46,6 @@ endef
define Device/ti_am335x-evm
DEVICE_VENDOR := Texas Instruments
DEVICE_MODEL := AM335x EVM
DEVICE_DTS := am335x-evm
endef
TARGET_DEVICES += ti_am335x-evm
@ -61,7 +61,6 @@ TARGET_DEVICES += ti_am335x-bone-black
define Device/ti_omap4-panda
DEVICE_VENDOR := PandaBoard.org
DEVICE_MODEL := OMAP4 TI pandaboard
DEVICE_DTS := omap4-panda
DEVICE_PACKAGES := kmod-usb-net-smsc95xx
endef
@ -70,7 +69,6 @@ TARGET_DEVICES += ti_omap4-panda
define Device/ti_omap3-beagle
DEVICE_VENDOR := BeagleBoard.org
DEVICE_MODEL := OMAP3 TI beagleboard
DEVICE_DTS := omap3-beagle
# beagleboard doesn't have a network interface, support most common usb net
DEVICE_PACKAGES := kmod-usb-net \
kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-hso \

8
target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts
View File

@ -74,23 +74,23 @@
leds {
compatible = "gpio-leds";
status {
status_amber {
label = "dir-615-d:amber:status";
gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
};
led_status_green: status2 {
led_status_green: status_green {
label = "dir-615-d:green:status";
gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
default-state = "on";
};
wan {
wan_amber {
label = "dir-615-d:amber:wan";
gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
};
wan2 {
wan_green {
label = "dir-615-d:green:wan";
gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
};

4
target/linux/ramips/mt7621/base-files/etc/board.d/02_network
View File

@ -54,10 +54,10 @@ ramips_setup_interfaces()
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 ra0 rax0" "wan"
;;
ubnt,edgerouter-x)
ucidef_set_interface_lan_wan "eth1 eth2 eth3 eth4" "eth0"
ucidef_set_interfaces_lan_wan "eth1 eth2 eth3 eth4" "eth0"
;;
ubnt,edgerouter-x-sfp)
ucidef_set_interface_lan_wan "eth1 eth2 eth3 eth4 eth5" "eth0"
ucidef_set_interfaces_lan_wan "eth1 eth2 eth3 eth4 eth5" "eth0"
;;
zyxel,wap6805)
ucidef_set_interface_lan "lan1 lan2 lan3 lan4"

5
target/linux/ramips/rt305x/base-files/etc/board.d/01_leds
View File

@ -33,7 +33,6 @@ dlink,dir-300-b7|\
dlink,dir-320-b1|\
dlink,dir-600-b1|\
dlink,dir-610-a1|\
dlink,dir-615-d|\
dlink,dir-615-h1|\
dlink,dir-620-a1|\
engenius,esr-9753|\
@ -66,6 +65,10 @@ asiarf,awapn2403)
dlink,dcs-930l-b1)
ucidef_set_led_netdev "wifi" "WiFi" "$boardname:blue:wps"
;;
dlink,dir-615-d)
ucidef_set_led_netdev "wan" "WAN (green)" "$boardname:green:wan" "eth0.2"
set_wifi_led "rt2800soc-phy0::radio"
;;
dlink,dir-620-d1|\
trendnet,tew-714tru)
set_wifi_led "$boardname:green:wifi"

4
toolchain/glibc/common.mk
View File

@ -11,8 +11,8 @@ PKG_VERSION:=2.31
PKG_SOURCE_PROTO:=git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=4e8a33a9590edc5c3a2cc5e726a3f2a73b66cdc0
PKG_MIRROR_HASH:=41f678661dd1ee644dfae9734e27b47877ed7dee87c27eaddd9055394d36fe6a
PKG_SOURCE_VERSION:=6f3459f9859a7b506c64fa1823769ab631072c6e
PKG_MIRROR_HASH:=01ed0c8131bdc32c9abd3aaaebc4fcffb2d496c2b8c363a0e845ac09d874a2ff
PKG_SOURCE_URL:=https://sourceware.org/git/glibc.git
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz