Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Openwrt 23.05 #88

Merged
merged 13 commits into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -239,12 +239,12 @@
+&eth {
+ status = "okay";
+ mediatek,gmac-id = <0>;
+ phy-mode = "sgmii";
+ phy-mode = "2500base-x";
+ mediatek,switch = "mt7531";
+ reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
+
+ fixed-link {
+ speed = <1000>;
+ speed = <2500>;
+ full-duplex;
+ };
+};
Expand Down
20 changes: 11 additions & 9 deletions package/kernel/linux/modules/other.mk
Original file line number Diff line number Diff line change
Expand Up @@ -1013,31 +1013,33 @@ define KernelPackage/zram/description
endef

define KernelPackage/zram/config
choice
prompt "ZRAM Default compressor"
default ZRAM_DEF_COMP_LZORLE
if PACKAGE_kmod-zram
choice
prompt "ZRAM Default compressor"
default ZRAM_DEF_COMP_LZORLE

config ZRAM_DEF_COMP_LZORLE
config ZRAM_DEF_COMP_LZORLE
bool "lzo-rle"
select PACKAGE_kmod-lib-lzo

config ZRAM_DEF_COMP_LZO
config ZRAM_DEF_COMP_LZO
bool "lzo"
select PACKAGE_kmod-lib-lzo

config ZRAM_DEF_COMP_LZ4
config ZRAM_DEF_COMP_LZ4
bool "lz4"
select PACKAGE_kmod-lib-lz4

config ZRAM_DEF_COMP_LZ4HC
config ZRAM_DEF_COMP_LZ4HC
bool "lz4-hc"
select PACKAGE_kmod-lib-lz4hc

config ZRAM_DEF_COMP_ZSTD
config ZRAM_DEF_COMP_ZSTD
bool "zstd"
select PACKAGE_kmod-lib-zstd

endchoice
endchoice
endif
endef

$(eval $(call KernelPackage,zram))
Expand Down
2 changes: 2 additions & 0 deletions package/libs/libselinux/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=Thomas Petazzoni <[email protected]>
PKG_CPE_ID:=cpe:/a:selinuxproject:libselinux

PKG_BUILD_FLAGS:=no-lto

HOST_BUILD_DEPENDS:=libsepol/host musl-fts/host pcre2/host

include $(INCLUDE_DIR)/package.mk
Expand Down
2 changes: 2 additions & 0 deletions package/libs/libsepol/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ PKG_HASH:=78fdaf69924db780bac78546e43d9c44074bad798c2c415d0b9bb96d065ee8a2
PKG_MAINTAINER:=Thomas Petazzoni <[email protected]>
PKG_CPE_ID:=cpe:/a:selinuxproject:libsepol

PKG_BUILD_FLAGS:=no-lto

include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk

Expand Down
4 changes: 2 additions & 2 deletions package/network/services/hostapd/files/hostapd.uc
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ function iface_load_config(filename)

let bss;
let line;
while ((line = trim(f.read("line"))) != null) {
while ((line = rtrim(f.read("line"), "\n")) != null) {
let val = split(line, "=", 2);
if (!val[0])
continue;
Expand All @@ -593,7 +593,7 @@ function iface_load_config(filename)
push(config.radio.data, line);
}

while ((line = trim(f.read("line"))) != null) {
while ((line = rtrim(f.read("line"), "\n")) != null) {
if (line == "#default_macaddr")
bss.default_macaddr = true;

Expand Down
2 changes: 1 addition & 1 deletion package/network/utils/iptables/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ PKG_FIXUP:=autoreconf
PKG_FLAGS:=nonshared

PKG_INSTALL:=1
PKG_BUILD_FLAGS:=gc-sections
PKG_BUILD_FLAGS:=gc-sections no-lto
PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=GPL-2.0
PKG_CPE_ID:=cpe:/a:netfilter_core_team:iptables
Expand Down
2 changes: 2 additions & 0 deletions package/network/utils/iwinfo/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ PKG_MIRROR_HASH:=5eddf584a1c3ed5637162d6bfc573ed1ce3691fcb38bdd55bf9f1e11e82ccc4
PKG_MAINTAINER:=Jo-Philipp Wich <[email protected]>
PKG_LICENSE:=GPL-2.0

PKG_BUILD_FLAGS:=no-lto

IWINFO_ABI_VERSION:=20230701

include $(INCLUDE_DIR)/package.mk
Expand Down
2 changes: 2 additions & 0 deletions package/utils/lua/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYRIGHT
PKG_CPE_ID:=cpe:/a:lua:lua

PKG_BUILD_FLAGS:=no-lto

HOST_PATCH_DIR := ./patches-host

include $(INCLUDE_DIR)/package.mk
Expand Down
3 changes: 2 additions & 1 deletion target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@

&keys {
rfkill {
label = "rfkill";
gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RFKILL>;
linux,input-type = <EV_SW>;
debounce-interval = <60>;
debounce-interval = <1000>;
};
};

Expand Down
4 changes: 3 additions & 1 deletion target/linux/ipq807x/image/generic.mk
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,17 @@ TARGET_DEVICES += edimax_cax1800
define Device/netgear_wax218
$(call Device/FitImage)
$(call Device/UbiFit)
ARTIFACTS := web-ui-factory.fit
DEVICE_VENDOR := Netgear
DEVICE_MODEL := WAX218
DEVICE_DTS_CONFIG := config@hk07
BLOCKSIZE := 128k
PAGESIZE := 2048
SOC := ipq8072
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
ARTIFACTS := web-ui-factory.fit
ARTIFACT/web-ui-factory.fit := append-image initramfs-uImage.itb | \
ubinize-kernel | qsdk-ipq-factory-nand
endif
DEVICE_PACKAGES := kmod-spi-gpio kmod-spi-bitbang kmod-gpio-nxp-74hc164 \
ipq-wifi-netgear_wax218
endef
Expand Down
6 changes: 5 additions & 1 deletion target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@

&ethernet {
pinctrl-names = "default";
pinctrl-0 = <&rgmii1_pins &mdio_pins>;
pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;

nvmem-cells = <&macaddr_factory_4>;
nvmem-cell-names = "mac-address";
Expand All @@ -93,6 +93,10 @@
};
};

&gsw {
mediatek,ephy-base = /bits/ 8 <12>;
};

&pcie {
status = "okay";
};
Expand Down
4 changes: 2 additions & 2 deletions target/linux/ramips/dts/mt7621_tplink_ec330-g5u-v1.dts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
function = LED_FUNCTION_WLAN;
function-enumerator = <0>;
gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy1radio";
linux,default-trigger = "phy1tpt";
};

led-6 {
Expand All @@ -82,7 +82,7 @@
function = LED_FUNCTION_WLAN;
function-enumerator = <1>;
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0radio";
linux,default-trigger = "phy0tpt";
};

led_power: led-7 {
Expand Down
2 changes: 1 addition & 1 deletion target/linux/ramips/image/mt7620.mk
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ define Device/hiwifi_hc5861
DEVICE_VENDOR := HiWiFi
DEVICE_MODEL := HC5861
DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 \
kmod-usb-ledtrig-usbport
kmod-phy-realtek kmod-usb-ledtrig-usbport
SUPPORTED_DEVICES += hc5861
endef
TARGET_DEVICES += hiwifi_hc5861
Expand Down
4 changes: 2 additions & 2 deletions target/linux/sunxi/base-files/etc/board.d/01_leds
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ board_config_update
case $board in
friendlyarm,nanopi-r1|\
friendlyarm,nanopi-r1s-h5)
ucidef_set_led_netdev "wan" "WAN" "nanopi:green:wan" "eth0"
ucidef_set_led_netdev "lan" "LAN" "nanopi:green:lan" "eth1"
ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0"
ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth1"
;;
esac

Expand Down
Loading