Commit Graph

53090 Commits

Author SHA1 Message Date
Saxon
bee427aee7
luci-app-unblockmusic: remove outdated music provider
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-19 17:58:15 +08:00
dwj0
8c2fa3cbf6
n2n_v2: add n2n auto-nat
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-19 17:58:15 +08:00
Beginner
9003b97de7
UnblockNeteaseMusic-Go: Update to 0.2.9
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-19 17:58:15 +08:00
Tianling Shen
85a4b221f8
luci-theme-argon: bump to 2.2.7
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-19 17:50:58 +08:00
Mattraks
d8640a8a5b
luci-app-ssr-plus: fix arguments for ss-rust
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-19 17:40:32 +08:00
Tianling Shen
02f6a22ece
tmate: remove upstreamed pacakge
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-19 17:25:55 +08:00
Tianling Shen
3acf35913b
msgpack-c: remove upstreamed pacakge
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-19 17:25:54 +08:00
AmadeusGhost
4d31a22feb csstidy: remove duplicate packages 2021-03-18 23:39:42 +08:00
AmadeusGhost
5726bab29c Merge Official Source 2021-03-18 23:36:35 +08:00
Felix Fietkau
9ac47ee469 build: use -nostdinc and -isystem in NOSTDINC_FLAGS for out-of-tree kernel modules
This resolves issues uncovered by musl updates

Signed-off-by: Felix Fietkau <nbd@nbd.name>
2021-03-18 10:53:26 +01:00
Felix Fietkau
acb8c17ecc mt76: update to the latest version
0b6c9a043f78 mt76: move de-amsdu buffer per-phy
48a905e23791 mt76: mt7615: fix CSA event format
fbef8bba038f mt76: mt7921: remove duplicated macros in mcu.h

Signed-off-by: Felix Fietkau <nbd@nbd.name>
2021-03-18 10:53:26 +01:00
xiaorouji
11914aa353
luci-app-passwall: bug fixes
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-18 16:19:06 +08:00
tty228
2ac386b24a
luci-app-serverchan: bump to 1.81
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-18 16:17:53 +08:00
maple's sky
353666137d
luci-app-jd-dailybonus: sync with upstream source
Co-authored-by: xujianjie1213 <35050408+xujianjie1213@users.noreply.github.com>
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-18 16:14:13 +08:00
Beginner
f58201e378
v2ray-plugin: update to 4.36.2
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-18 13:44:21 +08:00
Daniel Golle
81edc842f6
uboot-mediatek: don't rely in 'lzma' cmdline
Use 'xz --format=lzma' instead.
Fixes build for mt7629.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-03-18 04:19:48 +00:00
David Bauer
42d943f40a mediatek: fix broken UniFi 6 LR image
Ubiquiti's own bootloader expects the configuration mode to be present
with a "@" instead of a "-" for the sperator character. Otherwise
booting of the image fails.

Signed-off-by: David Bauer <mail@david-bauer.net>
2021-03-18 00:56:33 +01:00
David Bauer
ac5675ec8f ramips: fix broken UniFi 6 Lite image
Ubiquiti's own bootloader expects the configuration mode to be present
with a "@" instead of a "-" for the sperator character. Otherwise
booting of the image fails.

Signed-off-by: David Bauer <mail@david-bauer.net>
2021-03-18 00:54:25 +01:00
Hauke Mehrtens
0e3f6fbe10 mediatek: Fix writing U-Boot env on Buffalo WSR-2533DHP2
This fixes writing to the U-Boot environment by making the partition
writable and setting the correct flash sector size of 128K.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2021-03-17 22:39:59 +00:00
Daniel Golle
a29f71c380 uboot-mediatek: fix default environment of bpi-r64 emmc
The emmc variant used the default environment of the sdmmc variant.
Fix that.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-03-17 22:36:58 +00:00
Daniel Golle
41af8735d4 uboot-mediatek: bpi-r64: make use of FIT configuration selection
Allow selecting either SATA or PCIE functionality using uImage.FIT
configurations and device-tree overlays.
By default, PCIE1 is selected (as it has been before this change).
To select SATA instead, you can do this now:

fw_setenv bootconf config-mt7622-bananapi-bpi-r64-sata

and reboot.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-03-17 19:55:38 +00:00
Daniel Golle
b40f707f71 mediatek: bpi-r64: use dt-overlay to select SATA or PCIE1
The Bananapi BPi-R64 got a SATA interface which cannot be used at the
same time as the second mPCIe slot. The decission is made by hogging
GPIO 90.
Embed two addtional DT overlay blobs into the image to allow bootloader
selection of either SATA or PCIE1 feature.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-03-17 19:12:19 +00:00
Daniel Golle
6890f6fe13 include/image*: add support for device-tree overlays
Add new target feature 'dt-overlay' which makes DTC keep the symbol
names in the generated dtb.
Make sure additional DT overlay sources specified by the new device
variable DEVICE_DTS_OVERLAY get compiled together with the main DTS
(currently overlays got to be in the same folder). Let Build/fit pass
the generated DT overlay blobs to mkits.sh.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-03-17 17:45:34 +00:00
Daniel Golle
4e6de4f093 scripts/mkits.sh: add support for adding DT overlay blobs to image
Allow adding multiple device tree overlay blobs to an image and
generate configurations for each of them.
This is useful on boards with modern U-Boot which allow e.g. user-
configurable peripherals ("shields") in that way.
Note that currently, each generated configuration adds exactly one
overlay on top of the base image, ie. adding multiple overlays at the
same time is not yet supported.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-03-17 17:41:24 +00:00
Daniel Golle
53a7d5d614 ath79: fix RS-485 on Teltonika RUT-955
DTR GPIO isn't actually needed and triggers boot warning.
TX pin was off by one (GPIO 19 instead of GPIO 18).

Reported-by: @tophirsch
Fixes: d1130ad265 ("ath79: add support for Teltonika RUT955")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-03-17 17:41:24 +00:00
Tony Ambardar
6eca2e40e7 malta: prune subtarget configs
Drop autogenerated kernel config options. These aren't needed to build and
can obscure options relevant to the subtarget.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2021-03-17 15:35:33 +01:00
Tony Ambardar
fd1c285040 malta: update kernel 5.10 configs
Update generic config to add missing options that prompt during builds. Run
"make kernel_oldconfig" to refresh malta target config.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2021-03-17 15:35:33 +01:00
Tony Ambardar
3e2f42a802 malta: support kernel 5.10
Add linux 5.10 as testing kernel and copy generic config from 5.4.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2021-03-17 15:35:33 +01:00
Bjørn Mork
963b2ae702 realtek: enable SerDes NWAY and SGMII negotiation
This allows copper SFPs to negotiate speeds lower than 1gig.

Acked-by: Birger Koblitz <mail@birger-koblitz.de>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
2021-03-17 10:01:21 +01:00
Bjørn Mork
07bf5aaa4c realtek: enabled Marvell and Realtek PHYs
The rtl83xx-phy driver is necessary for proper configuration of the
PHYs if U-Boot hasn't done that.

1000Base-T SFPs often contains a Marvell 88E1111 and will not work
without this driver. Include it by default to support copper SFPs.

Signed-off-by: Bjørn Mork <bjorn@mork.no>
2021-03-17 10:01:21 +01:00
Bjørn Mork
2a912fb63a realtek: enable HWMON for SFP sensors
This adds SFP sensors as a hwmon device, allowing readout of
temperatures, DOM and other sensor readings available from the
SFP.  Example from a ZyXEL GS1900-10HP with a DOM capable
1000Base-SX SFP:

root@gs1900-10hp:~# grep . /sys/class/hwmon/hwmon0/*
/sys/class/hwmon/hwmon0/curr1_crit:90
/sys/class/hwmon/hwmon0/curr1_crit_alarm:0
/sys/class/hwmon/hwmon0/curr1_input:4
/sys/class/hwmon/hwmon0/curr1_label:bias
/sys/class/hwmon/hwmon0/curr1_lcrit:0
/sys/class/hwmon/hwmon0/curr1_lcrit_alarm:0
/sys/class/hwmon/hwmon0/curr1_max:85
/sys/class/hwmon/hwmon0/curr1_max_alarm:0
/sys/class/hwmon/hwmon0/curr1_min:0
/sys/class/hwmon/hwmon0/curr1_min_alarm:0
/sys/class/hwmon/hwmon0/in0_crit:3795
/sys/class/hwmon/hwmon0/in0_crit_alarm:0
/sys/class/hwmon/hwmon0/in0_input:3317
/sys/class/hwmon/hwmon0/in0_label:VCC
/sys/class/hwmon/hwmon0/in0_lcrit:2805
/sys/class/hwmon/hwmon0/in0_lcrit_alarm:0
/sys/class/hwmon/hwmon0/in0_max:3465
/sys/class/hwmon/hwmon0/in0_max_alarm:0
/sys/class/hwmon/hwmon0/in0_min:3135
/sys/class/hwmon/hwmon0/in0_min_alarm:0
/sys/class/hwmon/hwmon0/name:sfp_p10
/sys/class/hwmon/hwmon0/power1_crit:708
/sys/class/hwmon/hwmon0/power1_crit_alarm:0
/sys/class/hwmon/hwmon0/power1_input:259
/sys/class/hwmon/hwmon0/power1_label:TX_power
/sys/class/hwmon/hwmon0/power1_lcrit:89
/sys/class/hwmon/hwmon0/power1_lcrit_alarm:0
/sys/class/hwmon/hwmon0/power1_max:501
/sys/class/hwmon/hwmon0/power1_max_alarm:0
/sys/class/hwmon/hwmon0/power1_min:126
/sys/class/hwmon/hwmon0/power1_min_alarm:0
/sys/class/hwmon/hwmon0/power2_crit:1259
/sys/class/hwmon/hwmon0/power2_crit_alarm:0
/sys/class/hwmon/hwmon0/power2_input:404
/sys/class/hwmon/hwmon0/power2_label:RX_power
/sys/class/hwmon/hwmon0/power2_lcrit:6
/sys/class/hwmon/hwmon0/power2_lcrit_alarm:0
/sys/class/hwmon/hwmon0/power2_max:794
/sys/class/hwmon/hwmon0/power2_max_alarm:0
/sys/class/hwmon/hwmon0/power2_min:10
/sys/class/hwmon/hwmon0/power2_min_alarm:0
/sys/class/hwmon/hwmon0/temp1_crit:100000
/sys/class/hwmon/hwmon0/temp1_crit_alarm:0
/sys/class/hwmon/hwmon0/temp1_input:22547
/sys/class/hwmon/hwmon0/temp1_label:temperature
/sys/class/hwmon/hwmon0/temp1_lcrit:-50000
/sys/class/hwmon/hwmon0/temp1_lcrit_alarm:0
/sys/class/hwmon/hwmon0/temp1_max:85000
/sys/class/hwmon/hwmon0/temp1_max_alarm:0
/sys/class/hwmon/hwmon0/temp1_min:-40000
/sys/class/hwmon/hwmon0/temp1_min_alarm:0
/sys/class/hwmon/hwmon0/uevent:OF_NAME=sfp-p10
/sys/class/hwmon/hwmon0/uevent:OF_FULLNAME=/sfp-p10
/sys/class/hwmon/hwmon0/uevent:OF_COMPATIBLE_0=sff,sfp
/sys/class/hwmon/hwmon0/uevent:OF_COMPATIBLE_N=1

Tested-by: Birger Koblitz <mail@birger-koblitz.de>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
2021-03-17 10:01:21 +01:00
Bjørn Mork
e8d391bd46 realtek: re-enable sfp driver for ZyXEL GS1900-10HP
There is no need to define a static link or a phy for the sfp
ports.  Using phy-mode and managed properties to  describe the
link to the sfp phy.

We have to keep the now unconnected virtual "phys" because the
switch  driver uses their "phy-is-integrated" property to figure
out which ports to enable as fibre ports.

Acked-by: Birger Koblitz <mail@birger-koblitz.de>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
2021-03-17 10:01:21 +01:00
Bjørn Mork
785d830e88 realtek: need to handle PHY_INTERFACE_MODE_NA for sfps
From the validate docs in include/linux/phylink.h:

 When state->interface is PHY_INTERFACE_MODE_NA, phylink expects the
 MAC driver to return all supported link modes.

Tested-by: Birger Koblitz <mail@birger-koblitz.de>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
2021-03-17 10:01:21 +01:00
Bjørn Mork
b8e473d18c realtek: fix link-state interrupt
This bug was the root cause for the failing sfp driver.

Acked-by: Birger Koblitz <mail@birger-koblitz.de>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
2021-03-17 10:01:21 +01:00
Álvaro Fernández Rojas
b3f4197139 mtd: fix imagetag compilation
Commit b5b0796a13 added an uint32_t to mtd.h without including stdint, which
results in a compilation error for those files not including stdint.h.

In file included from imagetag.c:36:
mtd.h:15:8: error: unknown type name 'uint32_t'
 extern uint32_t opt_trxmagic;
        ^~~~~~~~
imagetag.c: In function 'trx_fixup':
imagetag.c:180:10: warning: unused variable 'res' [-Wunused-variable]
  ssize_t res;
          ^~~
imagetag.c:177:14: warning: unused variable 'scan' [-Wunused-variable]
  void *ptr, *scan;
              ^~~~
imagetag.c: In function 'trx_check':
imagetag.c:246:27: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
     struct bcm_tag *tag = (const struct bcm_tag *) buf;
                           ^
make[3]: *** [<builtin>: imagetag.o] Error 1

Fixes: b5b0796a13 ("mtd: add option for TRX magic to fixtrx")
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
2021-03-17 08:42:05 +01:00
Rafał Miłecki
e1b4fd52a8 bcm4908: backport recent bcm_sf2 changes
One 5.12 link fix and 5.13 crossbar support.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2021-03-17 08:10:54 +01:00
Tianling Shen
d639503929
luci-app-ssr-plus: drop ipt2socks-alt from the dependencies
Signed-off-by: Tianling Shen <cnsztl@gmail.com>
2021-03-17 14:05:15 +08:00
maple's sky
ccf1b5a564
luci-app-jd-dailybonus: sync with upstream source
Co-authored-by: Mattraks <16359027+Mattraks@users.noreply.github.com>
Co-authored-by: jerrykuku <jerrykuku@qq.com>
Signed-off-by: Tianling Shen <cnsztl@gmail.com>
2021-03-17 13:53:34 +08:00
Tianling Shen
9b735afe3e
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@gmail.com>
2021-03-17 13:45:26 +08:00
xiaorouji
8047352160
luci-app-passwall: sync with upstream source
Co-authored-by: badgv <45598380+badgv@users.noreply.github.com>
Signed-off-by: Tianling Shen <cnsztl@gmail.com>
2021-03-17 13:45:13 +08:00
Rafał Miłecki
7091e31230 bcm4908: backport recent bcm4908_enet changes
This includes 5.12 fix and 5.13 improvements.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2021-03-16 23:57:52 +01:00
Paul Spooren
0f7cd97f81 build,ib: add STRIP_ABI option for manifest
The ImageBuilder `make manifest` prints all installed packages. This
function can be used to create a list of package and corresponding
package versions before attempting image creation.

When called with `--strip-abi` OPKG can automatically strip attached
ABIVersions from package names. Make this function accessible for the
ImageBuilder by adding a `STRIP_ABI` variable.

Signed-off-by: Paul Spooren <mail@aparcar.org>
2021-03-16 11:00:08 -10:00
Magnus Kroken
dbde2bcf60 mbedtls: update to 2.16.10
This release of Mbed TLS provides bug fixes and minor enhancements. This
release includes fixes for security issues.

Security fixes:
* Fix a buffer overflow in mbedtls_mpi_sub_abs()
* Fix an errorneous estimation for an internal buffer in
mbedtls_pk_write_key_pem()
* Fix a stack buffer overflow with mbedtls_net_poll() and
mbedtls_net_recv_timeout()
* Guard against strong local side channel attack against base64 tables
by making access aceess to them use constant flow code

Full release announcement:
https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.10

Signed-off-by: Magnus Kroken <mkroken@gmail.com>
2021-03-16 21:17:02 +01:00
Álvaro Fernández Rojas
34f898ec29 bmips: backport bcm6368-mdio-mux support
This patch has been accepted for linux v5.13.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
2021-03-16 20:06:00 +01:00
Álvaro Fernández Rojas
7ec9d95567 bmips: enable CONFIG_B53_MDIO_DRIVER
Some devices have external switches connected by MDIO.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
2021-03-16 20:00:51 +01:00
Álvaro Fernández Rojas
b434c524b1 bmips: backport b53 spi device tree patch
This patch has been accepted for linux v5.13.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
2021-03-16 20:00:51 +01:00
Álvaro Fernández Rojas
be16951494 bmips: dgnd3700-v2: fix ethernet
This is a temporary workaround to get the ethernet working, since external
switch is connected by MDIO and it needs additional work.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
2021-03-16 20:00:51 +01:00
Tianling Shen
fad8da597e
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-16 23:59:03 +08:00
Beginner
5d8cc6fa52
v2ray: update to 4.36.2
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-16 23:57:51 +08:00
Beginner
684bc8300a
v2ray: update to 4.36.1
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-16 23:57:51 +08:00