Nanako/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@gmail.com>
This commit is contained in:
Tianling Shen
2024-03-15 14:46:40 +08:00
parent a6953b26fd e40471e923
commit 54d15151ac
7 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/firmware/intel-microcode/Makefile
View File

@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=intel-microcode
PKG_VERSION:=20231114
PKG_VERSION:=20240312
PKG_RELEASE:=1
PKG_SOURCE:=intel-microcode_3.$(PKG_VERSION).1.tar.xz
PKG_SOURCE_URL:=@DEBIAN/pool/non-free-firmware/i/intel-microcode/
PKG_HASH:=637ac30d3fc36eb51d3ed71909f09f7408797f4527c20e58d3b0ad4eafc20869
PKG_HASH:=25f53bab1bf0c84aba927a77a97a9f1147c94199fa95b5187d874f839f022808
PKG_BUILD_DIR:=$(BUILD_DIR)/intel-microcode-3.$(PKG_VERSION).1
PKG_CPE_ID:=cpe:/a:intel:microcode

9
package/kernel/linux/modules/can.mk
View File

@@ -13,6 +13,7 @@ define KernelPackage/can
KCONFIG:=\
CONFIG_CAN=m \
CONFIG_CAN_DEV \
CONFIG_CAN_NETLINK=y \
CONFIG_CAN_CALC_BITTIMING=y \
CONFIG_CAN_LEDS=y \
CONFIG_CAN_AT91=n \
@@ -119,7 +120,9 @@ $(eval $(call KernelPackage,can-c-can-platform))
define KernelPackage/can-flexcan
TITLE:=Support for Freescale FLEXCAN based chips
KCONFIG:=CONFIG_CAN_FLEXCAN
FILES:=$(LINUX_DIR)/drivers/net/can/flexcan.ko
FILES:= \
$(LINUX_DIR)/drivers/net/can/flexcan.ko@lt5.17 \
$(LINUX_DIR)/drivers/net/can/flexcan/flexcan.ko@ge5.17
AUTOLOAD:=$(call AutoProbe,flexcan)
$(call AddDepends/can,@TARGET_imx)
endef
@@ -182,7 +185,9 @@ $(eval $(call KernelPackage,can-raw))
define KernelPackage/can-slcan
TITLE:=Serial / USB serial CAN Adaptors (slcan)
KCONFIG:=CONFIG_CAN_SLCAN
FILES:=$(LINUX_DIR)/drivers/net/can/slcan.ko
FILES:= \
$(LINUX_DIR)/drivers/net/can/slcan.ko@lt6.0 \
$(LINUX_DIR)/drivers/net/can/slcan/slcan.ko@ge6.0
AUTOLOAD:=$(call AutoProbe,slcan)
$(call AddDepends/can)
endef

10
package/kernel/linux/modules/crypto.mk
View File

@@ -290,8 +290,12 @@ $(eval $(call KernelPackage,crypto-xcbc))
define KernelPackage/crypto-gf128
TITLE:=GF(2^128) multiplication functions CryptoAPI module
KCONFIG:=CONFIG_CRYPTO_GF128MUL
FILES:=$(LINUX_DIR)/crypto/gf128mul.ko
KCONFIG:= \
CONFIG_CRYPTO_GF128MUL \
CONFIG_CRYPTO_LIB_GF128MUL
FILES:= \
$(LINUX_DIR)/crypto/gf128mul.ko@lt6.2 \
$(LINUX_DIR)/lib/crypto/gf128mul.ko@ge6.2
AUTOLOAD:=$(call AutoLoad,09,gf128mul)
$(call AddDepends/crypto)
endef
@@ -1119,7 +1123,7 @@ $(eval $(call KernelPackage,crypto-test))
define KernelPackage/crypto-user
TITLE:=CryptoAPI userspace interface
DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager
DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager +LINUX_6_6:kmod-crypto-rng
KCONFIG:= \
CONFIG_CRYPTO_USER \
CONFIG_CRYPTO_USER_API \

2
package/kernel/linux/modules/hwmon.mk
View File

@@ -82,7 +82,7 @@ define KernelPackage/hwmon-coretemp
KCONFIG:=CONFIG_SENSORS_CORETEMP
FILES:=$(LINUX_DIR)/drivers/hwmon/coretemp.ko
AUTOLOAD:=$(call AutoProbe,coretemp)
$(call AddDepends/hwmon,)
$(call AddDepends/hwmon,@TARGET_x86)
endef
define KernelPackage/hwmon-coretemp/description

2
package/kernel/linux/modules/video.mk
View File

@@ -599,7 +599,7 @@ $(eval $(call KernelPackage,video-videobuf2))
define KernelPackage/video-cpia2
TITLE:=CPIA2 video driver
DEPENDS:=@USB_SUPPORT +kmod-usb-core
DEPENDS:=@USB_SUPPORT +kmod-usb-core @LINUX_5_15
KCONFIG:=CONFIG_VIDEO_CPIA2
FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/cpia2/cpia2.ko
AUTOLOAD:=$(call AutoProbe,cpia2)

2
target/linux/generic/config-6.1
View File

@@ -4381,7 +4381,7 @@ CONFIG_NET_VENDOR_CHELSIO=y
CONFIG_NET_VENDOR_CIRRUS=y
CONFIG_NET_VENDOR_CISCO=y
CONFIG_NET_VENDOR_CORTINA=y
# CONFIG_NET_VENDOR_DAVICOM is not set
CONFIG_NET_VENDOR_DAVICOM=y
CONFIG_NET_VENDOR_DEC=y
CONFIG_NET_VENDOR_DLINK=y
CONFIG_NET_VENDOR_EMULEX=y

3
target/linux/generic/config-6.6
View File

@@ -898,6 +898,7 @@ CONFIG_CACHE_L2X0_PMU=y
# CONFIG_CAN_DEV is not set
# CONFIG_CAN_ESD_USB is not set
# CONFIG_CAN_ETAS_ES58X is not set
# CONFIG_CAN_F81604 is not set
# CONFIG_CAN_GS_USB is not set
# CONFIG_CAN_GW is not set
# CONFIG_CAN_HI311X is not set
@@ -4476,7 +4477,7 @@ CONFIG_NET_VENDOR_CHELSIO=y
CONFIG_NET_VENDOR_CIRRUS=y
CONFIG_NET_VENDOR_CISCO=y
CONFIG_NET_VENDOR_CORTINA=y
# CONFIG_NET_VENDOR_DAVICOM is not set
CONFIG_NET_VENDOR_DAVICOM=y
CONFIG_NET_VENDOR_DEC=y
CONFIG_NET_VENDOR_DLINK=y
CONFIG_NET_VENDOR_EMULEX=y