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

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2024-04-19 16:31:38 +08:00
commit 68ccc7e8a7
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
10 changed files with 110 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -14,6 +14,7 @@
/feeds
/feeds.conf
/files
/target/linux/feeds
/overlay
/package/feeds
/package/openwrt-packages

14
config/Config-kernel.in
View File

@ -1364,3 +1364,17 @@ config KERNEL_UBIFS_FS_SECURITY
config KERNEL_JFFS2_FS_SECURITY
bool "JFFS2 Security Labels"
config KERNEL_WERROR
bool "Compile the kernel with warnings as errors"
help
A kernel build should not cause any compiler warnings, and this
enables the '-Werror' (for C) and '-Dwarnings' (for Rust) flags
to enforce that rule by default. Certain warnings from other tools
such as the linker may be upgraded to errors with this option as
well.
However, if you have a new (or very old) compiler or linker with odd
and unusual warnings, or you have some architecture with problems,
you may need to disable this config option in order to
successfully build the kernel.

34
package/kernel/linux/modules/leds.mk
View File

@ -245,3 +245,37 @@ define KernelPackage/input-leds/description
endef
$(eval $(call KernelPackage,input-leds))
define KernelPackage/leds-lp55xx-common
SUBMENU:=$(LEDS_MENU)
TITLE:=LED common driver for LP5521/LP5523/LP55231/LP5562 controllers
DEPENDS:=+kmod-i2c-core
KCONFIG:=CONFIG_LEDS_LP55XX_COMMON
FILES:=$(LINUX_DIR)/drivers/leds/leds-lp55xx-common.ko
AUTOLOAD:=$(call AutoLoad,60,leds-lp55xx-common,1)
endef
define KernelPackage/leds-lp55xx-common/description
This option enables support for Texas Instruments
LP5521/LP5523/LP55231/LP5562 common driver.
endef
$(eval $(call KernelPackage,leds-lp55xx-common))
define KernelPackage/leds-lp5562
SUBMENU:=$(LEDS_MENU)
TITLE:=LED driver for LP5562 controllers
DEPENDS:=+kmod-i2c-core +kmod-leds-lp55xx-common
KCONFIG:=CONFIG_LEDS_LP5562
FILES:=$(LINUX_DIR)/drivers/leds/leds-lp5562.ko
AUTOLOAD:=$(call AutoLoad,60,leds-lp5562,1)
endef
define KernelPackage/leds-lp5562/description
This option enables support for Texas Instruments LP5562
LED controllers.
endef
$(eval $(call KernelPackage,leds-lp5562))

2
package/network/config/netifd/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=netifd
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git

2
package/network/config/netifd/files/usr/libexec/network/packet-steering.sh
View File

@ -29,7 +29,7 @@ set_hex_val() {
local val="$2"
val="$(printf %x "$val")"
[ -n "$DEBUG" ] && echo "$file = $val"
echo "$val" > "$file"
echo "$val" > "$file" 2>/dev/null
}
packet_steering="$(uci -q get "network.@globals[0].packet_steering")"

2
scripts/package-metadata.pl
View File

@ -675,6 +675,7 @@ sub gen_image_cyclonedxsbom() {
license => "GPL-2.0",
cpe_id => "cpe:/o:linux:linux_kernel",
name => "kernel",
category => "operating-system",
};
my %abimap;
@ -703,6 +704,7 @@ sub gen_image_cyclonedxsbom() {
if ($pkg->{category}) {
my $category = $pkg->{category};
my %cat_type = (
"operating-system" => "operating-system",
"Firmware" => "firmware",
"Libraries" => "library"
);

2
target/linux/bcm27xx/patches-5.15/950-0312-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
View File

@ -49,7 +49,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
.phy_id = PHY_ID_BCM5461,
.phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5461",
@@ -975,7 +983,8 @@ module_phy_driver(broadcom_drivers);
@@ -977,7 +985,8 @@ module_phy_driver(broadcom_drivers);
static struct mdio_device_id __maybe_unused broadcom_tbl[] = {
{ PHY_ID_BCM5411, 0xfffffff0 },
{ PHY_ID_BCM5421, 0xfffffff0 },

5
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts
View File

@ -488,7 +488,6 @@
qcom,coexist-support = <1>;
qcom,coexist-gpio-pin = <0x34>;
ieee80211-freq-limit = <2401000 2473000>;
qcom,ath10k-calibration-variant = "linksys-whw03v2";
nvmem-cell-names = "pre-calibration", "mac-address";
@ -499,7 +498,7 @@
&wifi1 {
status = "okay";
ieee80211-freq-limit = <5170000 5250000>;
ieee80211-freq-limit = <5170000 5330000>;
qcom,ath10k-calibration-variant = "linksys-whw03v2";
nvmem-cell-names = "pre-calibration", "mac-address";
@ -510,7 +509,7 @@
&wifi2 {
status = "okay";
ieee80211-freq-limit = <5735000 5835000>;
ieee80211-freq-limit = <5490000 5835000>;
qcom,ath10k-calibration-variant = "linksys-whw03v2";
nvmem-cell-names = "pre-calibration", "mac-address";

49
target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts
View File

@ -21,6 +21,10 @@
ethernet2 = &dp3;
ethernet3 = &dp2;
label-mac-device = &dp6_syn;
led-boot = &led_system_blue;
led-failsafe = &led_system_red;
led-running = &led_system_green;
led-upgrade = &led_system_blue;
};
chosen {
@ -78,6 +82,13 @@
bias-pull-up;
};
};
i2c_3_pins: i2c-3-state {
pins = "gpio46", "gpio47";
function = "blsp2_i2c";
drive-strength = <8>;
bias-disable;
};
};
&blsp1_uart5 {
@ -306,3 +317,41 @@
qcom,ath11k-calibration-variant = "prpl-Haze";
};
&blsp1_i2c3{
pinctrl-0 = <&i2c_3_pins>;
pinctrl-names = "default";
status = "okay";
led-controller@30 {
compatible = "ti,lp5562";
reg = <0x30>;
clock-mode = /bits/ 8 <2>;
#address-cells = <1>;
#size-cells = <0>;
led_system_red: chan@0 {
chan-name = "red";
led-cur = /bits/ 8 <0x20>;
max-cur = /bits/ 8 <0x60>;
color = <LED_COLOR_ID_RED>;
reg = <0>;
};
led_system_green: chan@1 {
chan-name = "green";
led-cur = /bits/ 8 <0x20>;
max-cur = /bits/ 8 <0x60>;
color = <LED_COLOR_ID_GREEN>;
reg = <1>;
};
led_system_blue: chan@2 {
chan-name = "blue";
led-cur = /bits/ 8 <0x20>;
max-cur = /bits/ 8 <0x60>;
color = <LED_COLOR_ID_BLUE>;
reg = <2>;
};
};
};

5
toolchain/gcc/Config.version
View File

@ -11,3 +11,8 @@ config GCC_VERSION
default "11.3.0" if GCC_VERSION_11
default "13.1.0" if GCC_VERSION_13
default "12.3.0"
config GCC_USE_DEFAULT_VERSION
bool
default y if !TOOLCHAINOPTS || GCC_USE_VERSION_12
# imply KERNEL_WERROR