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 2019-11-09 09:42:33 +08:00
commit 1a9f64765b
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
15 changed files with 313 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/network/config/swconfig/Makefile
View File

@ -23,6 +23,9 @@ define Package/swconfig
TITLE:=Switch configuration utility
endef
TARGET_CFLAGS += -flto
TARGET_LDFLAGS += -flto=jobserver
TARGET_CPPFLAGS := \
-D_GNU_SOURCE \
-I$(STAGING_DIR)/usr/include/libnl-tiny \

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

@ -126,8 +126,8 @@ endef
Package/dnsmasq-dhcpv6/conffiles = $(Package/dnsmasq/conffiles)
Package/dnsmasq-full/conffiles = $(Package/dnsmasq/conffiles)
TARGET_CFLAGS += -ffunction-sections -fdata-sections
TARGET_LDFLAGS += -Wl,--gc-sections
TARGET_CFLAGS += -flto
TARGET_LDFLAGS += -flto=jobserver
COPTS = -DHAVE_UBUS \
$(if $(CONFIG_IPV6),,-DNO_IPV6)

3
package/system/mtd/Makefile
View File

@ -36,7 +36,8 @@ endef
target=$(firstword $(subst -, ,$(BOARD)))
MAKE_FLAGS += TARGET="$(target)"
TARGET_CFLAGS := $(TARGET_CFLAGS) -Dtarget_$(target)=1 -Wall
TARGET_CFLAGS += -Dtarget_$(target)=1 -Wall -flto
TARGET_LDFLAGS += -flto=jobserver
ifdef CONFIG_MTD_REDBOOT_PARTS
MAKE_FLAGS += FIS_SUPPORT=1

6
package/system/uci/Makefile
View File

@ -13,9 +13,9 @@ PKG_RELEASE:=3
PKG_SOURCE_URL=$(PROJECT_GIT)/project/uci.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE=2019-09-01
PKG_SOURCE_VERSION:=415f9e48436d29f612348f58f546b3ad8d74ac38
PKG_MIRROR_HASH:=06f2801b103c359129c1675cbe5045c2cd04d756c2ab1efd2160608f34a27a8f
PKG_SOURCE_DATE=2019-11-08
PKG_SOURCE_VERSION:=fc417e808087f96466d9ce18819e16476af9527b
PKG_MIRROR_HASH:=9d9f4756633e4b011ae68138793723c6443d0d81c7f626580881dc0cae77eceb
PKG_LICENSE:=LGPL-2.1
PKG_LICENSE_FILES:=

3
package/system/usign/Makefile
View File

@ -30,6 +30,9 @@ define Package/usign
TITLE:=OpenWrt signature verification utility
endef
TARGET_CFLAGS += -flto
TARGET_LDFLAGS += -flto=jobserver
CMAKE_OPTIONS += \
-DUSE_LIBUBOX=on

2
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
View File

@ -499,7 +499,7 @@ platform_check_image() {
local magic_ver="0100"
case "$board" in
tl-wdr6500-v2)
tl-wdr3320-v2|tl-wdr6500-v2)
magic_ver="0200"
;;
esac

109
target/linux/ramips/dts/mt7620a_netgear_ex2700.dts
View File

@ -10,10 +10,7 @@
/dts-v1/;
#include "mt7620a.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include "mt7620a_netgear_ex2700_wn3000rp-v3.dtsi"
/ {
compatible = "netgear,ex2700", "ralink,mt7620a-soc";
@ -26,10 +23,6 @@
led-upgrade = &led_power_green;
};
chosen {
bootargs = "console=ttyS0,57600";
};
leds {
compatible = "gpio-leds";
@ -69,86 +62,30 @@
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
};
};
keys {
compatible = "gpio-keys";
&partitions {
partition@0 {
label = "u-boot";
reg = <0x0 0x30000>;
read-only;
};
reset {
label = "reset";
gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};
partition@30000 {
label = "u-boot-env";
reg = <0x30000 0x10000>;
read-only;
};
wps {
label = "wps";
gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WPS_BUTTON>;
};
};
};
&gpio0 {
status = "okay";
};
&gpio1 {
status = "okay";
};
&spi0 {
status = "okay";
m25p80@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 0x30000>;
read-only;
};
partition@30000 {
label = "u-boot-env";
reg = <0x30000 0x10000>;
read-only;
};
partition@40000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x40000 0x3b0000>;
};
art: partition@3f0000 {
label = "art";
reg = <0x3f0000 0x10000>;
read-only;
};
};
};
};
&ethernet {
mtd-mac-address = <&art 0x0>;
};
&wmac {
mtd-mac-address = <&art 0x6>;
ralink,mtd-eeprom = <&art 0x1000>;
};
&pinctrl {
state_default: pinctrl0 {
default {
ralink,group = "i2c", "uartf", "spi refclk";
ralink,function = "gpio";
};
partition@40000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x40000 0x3b0000>;
};
art: partition@3f0000 {
label = "art";
reg = <0x3f0000 0x10000>;
read-only;
};
};

64
target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi Executable file
View File

@ -0,0 +1,64 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include "mt7620a.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,57600";
};
keys {
compatible = "gpio-keys";
reset {
label = "reset";
gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};
wps {
label = "wps";
gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WPS_BUTTON>;
};
};
};
&gpio1 {
status = "okay";
};
&spi0 {
status = "okay";
m25p80@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <10000000>;
partitions: partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
};
};
};
&ethernet {
mtd-mac-address = <&art 0x0>;
};
&wmac {
ralink,mtd-eeprom = <&art 0x1000>;
mtd-mac-address = <&art 0x6>;
};
&pinctrl {
state_default: pinctrl0 {
default {
ralink,group = "i2c", "uartf", "spi refclk";
ralink,function = "gpio";
};
};
};

114
target/linux/ramips/dts/mt7620a_netgear_ex3700.dts
View File

@ -2,10 +2,7 @@
/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include "mt7620a.dtsi"
#include "mt7620a_netgear_ex3700_ex6130.dtsi"
/ {
compatible = "netgear,ex3700", "ralink,mt7620a-soc";
@ -18,10 +15,6 @@
led-upgrade = &led_power_green;
};
chosen {
bootargs = "console=ttyS0,57600";
};
leds {
compatible = "gpio-leds";
@ -61,109 +54,4 @@
gpios = <&gpio2 27 GPIO_ACTIVE_LOW>;
};
};
keys {
compatible = "gpio-keys";
reset {
label = "reset";
gpios = <&gpio2 26 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};
wps {
label = "wps";
gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WPS_BUTTON>;
};
};
};
&gpio0 {
status = "okay";
};
&gpio2 {
status = "okay";
};
&spi0 {
status = "okay";
m25p80@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 0x30000>;
read-only;
};
partition@30000 {
label = "config";
reg = <0x30000 0x10000>;
read-only;
};
factory: partition@40000 {
label = "factory";
reg = <0x40000 0x10000>;
read-only;
};
partition@50000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x50000 0x790000>;
};
partition@7e0000 {
label = "board_data";
reg = <0x7e0000 0x10000>;
read-only;
};
partition@7f0000 {
label = "nvram";
reg = <0x7f0000 0x10000>;
read-only;
};
};
};
};
&pcie {
status = "okay";
};
&pcie0 {
mt76@0,0 {
reg = <0x0000 0 0 0 0 >;
mediatek,mtd-eeprom = <&factory 0x8000>;
ieee80211-freq-limit = <5000000 6000000>;
};
};
&ethernet {
mtd-mac-address = <&factory 0x28>;
};
&wmac {
ralink,mtd-eeprom = <&factory 0x0>;
};
&pinctrl {
state_default: pinctrl0 {
default {
ralink,group = "i2c", "rgmii2", "spi refclk";
ralink,function = "gpio";
};
};
};

115
target/linux/ramips/dts/mt7620a_netgear_ex3700_ex6130.dtsi Normal file
View File

@ -0,0 +1,115 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include "mt7620a.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,57600";
};
keys {
compatible = "gpio-keys";
reset {
label = "reset";
gpios = <&gpio2 26 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};
wps {
label = "wps";
gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WPS_BUTTON>;
};
};
};
&gpio0 {
status = "okay";
};
&gpio2 {
status = "okay";
};
&spi0 {
status = "okay";
m25p80@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <50000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x0 0x30000>;
read-only;
};
partition@30000 {
label = "config";
reg = <0x30000 0x10000>;
read-only;
};
factory: partition@40000 {
label = "factory";
reg = <0x40000 0x10000>;
read-only;
};
partition@50000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x50000 0x790000>;
};
partition@7e0000 {
label = "board_data";
reg = <0x7e0000 0x10000>;
read-only;
};
partition@7f0000 {
label = "nvram";
reg = <0x7f0000 0x10000>;
read-only;
};
};
};
};
&pcie {
status = "okay";
};
&pcie0 {
mt76@0,0 {
reg = <0x0000 0 0 0 0>;
mediatek,mtd-eeprom = <&factory 0x8000>;
ieee80211-freq-limit = <5000000 6000000>;
};
};
&ethernet {
mtd-mac-address = <&factory 0x28>;
};
&wmac {
ralink,mtd-eeprom = <&factory 0x0>;
};
&pinctrl {
state_default: pinctrl0 {
default {
ralink,group = "i2c", "rgmii2", "spi refclk";
ralink,function = "gpio";
};
};
};

57
target/linux/ramips/dts/mt7620a_netgear_ex6130.dts Normal file
View File

@ -0,0 +1,57 @@
/* This file is released into the public domain */
/dts-v1/;
#include "mt7620a_netgear_ex3700_ex6130.dtsi"
/ {
compatible = "netgear,ex6130", "ralink,mt7620a-soc";
model = "Netgear EX6130";
aliases {
led-boot = &led_power_green;
led-failsafe = &led_power_green;
led-running = &led_power_green;
led-upgrade = &led_power_green;
};
leds {
compatible = "gpio-leds";
led_power_green: power_g {
label = "ex6130:green:power";
gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;
default-state = "on";
};
power_a {
label = "ex6130:amber:power";
gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
};
router_g {
label = "ex6130:green:router";
gpios = <&gpio2 25 GPIO_ACTIVE_LOW>;
};
router_r {
label = "ex6130:red:router";
gpios = <&gpio2 24 GPIO_ACTIVE_LOW>;
};
device_g {
label = "ex6130:green:device";
gpios = <&gpio2 20 GPIO_ACTIVE_LOW>;
};
device_r {
label = "ex6130:red:device";
gpios = <&gpio2 21 GPIO_ACTIVE_LOW>;
};
wps {
label = "ex6130:green:wps";
gpios = <&gpio2 27 GPIO_ACTIVE_LOW>;
};
};
};

105
target/linux/ramips/dts/mt7620a_netgear_wn3000rp-v3.dts
View File

@ -2,10 +2,7 @@
/dts-v1/;
#include "mt7620a.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/gpio/gpio.h>
#include "mt7620a_netgear_ex2700_wn3000rp-v3.dtsi"
/ {
compatible = "netgear,wn3000rp-v3", "ralink,mt7620a-soc";
@ -18,10 +15,6 @@
led-upgrade = &led_power_green;
};
chosen {
bootargs = "console=ttyS0,57600";
};
leds {
compatible = "gpio-leds";
@ -71,82 +64,30 @@
gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
};
};
};
keys {
compatible = "gpio-keys";
&partitions {
partition@0 {
label = "u-boot";
reg = <0x0 0x30000>;
read-only;
};
reset {
label = "reset";
gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};
partition@30000 {
label = "u-boot-env";
reg = <0x30000 0x10000>;
read-only;
};
wps {
label = "wps";
gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WPS_BUTTON>;
};
};
};
&gpio1 {
status = "okay";
};
&spi0 {
status = "okay";
m25p80@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 0x30000>;
read-only;
};
partition@30000 {
label = "u-boot-env";
reg = <0x30000 0x10000>;
read-only;
};
partition@40000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x40000 0x7b0000>;
};
art: partition@7f0000 {
label = "art";
reg = <0x7f0000 0x10000>;
read-only;
};
};
};
};
&ethernet {
mtd-mac-address = <&art 0x0>;
};
&wmac {
mtd-mac-address = <&art 0x6>;
ralink,mtd-eeprom = <&art 0x1000>;
};
&pinctrl {
state_default: pinctrl0 {
default {
ralink,group = "i2c", "uartf", "spi refclk";
ralink,function = "gpio";
};
partition@40000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x40000 0x7b0000>;
};
art: partition@7f0000 {
label = "art";
reg = <0x7f0000 0x10000>;
read-only;
};
};

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

@ -612,6 +612,19 @@ define Device/netgear_ex3700
endef
TARGET_DEVICES += netgear_ex3700
define Device/netgear_ex6130
MTK_SOC := mt7620a
NETGEAR_BOARD_ID := U12H319T50_NETGEAR
BLOCKSIZE := 4k
IMAGE_SIZE := 7744k
IMAGES += factory.chk
IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | netgear-chk
DEVICE_PACKAGES := kmod-mt76x2
DEVICE_VENDOR := NETGEAR
DEVICE_MODEL := EX6130
endef
TARGET_DEVICES += netgear_ex6130
define Device/netgear_wn3000rp-v3
MTK_SOC := mt7620a
IMAGE_SIZE := 7872k

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

@ -155,7 +155,8 @@ netgear,ex2700|\
netgear,wn3000rp-v3)
set_wifi_led "$boardname:green:router"
;;
netgear,ex3700)
netgear,ex3700|\
netgear,ex6130)
ucidef_set_led_netdev "wlan5g" "ROUTER (green)" "$boardname:green:router" "wlan0"
ucidef_set_led_netdev "wlan2g" "DEVICE (green)" "$boardname:green:device" "wlan1"
;;

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

@ -39,6 +39,7 @@ ramips_setup_interfaces()
kimax,u25awf-h1|\
netgear,ex2700|\
netgear,ex3700|\
netgear,ex6130|\
netgear,wn3000rp-v3|\
planex,cs-qr10|\
planex,mzk-ex300np|\