diff --git a/package/base-files/files/etc/build_version b/package/base-files/files/etc/build_version index a8b2a34c886139..718024efbb03a7 100644 --- a/package/base-files/files/etc/build_version +++ b/package/base-files/files/etc/build_version @@ -1 +1 @@ -24.10.08 +24.11.14-m diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index df454112e02d36..00ea901658ff45 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -377,7 +377,7 @@ define Device/kooiot_tlink-r4x kmod-can kmod-can-rockchip-canfd \ kmod-ata-ahci kmod-ata-ahci-dwc \ luci-app-freeioe luci-proto-qmi luci-proto-3g \ - tlink-r7-firmware wpad-basic-mbedtls \ + tlink-r4x-firmware wpad-basic-mbedtls \ tinc-freeioe-tunnel iperf3 \ uqmi fdisk usbutils freeioe wwanleds \ blockd kmod-eeprom-at24 fdisk diff --git a/thingslink/tlink_r4x_defconfig b/thingslink/tlink_r4x_defconfig index f3bd473f629b76..142b4bfc9db9bd 100644 --- a/thingslink/tlink_r4x_defconfig +++ b/thingslink/tlink_r4x_defconfig @@ -95,8 +95,6 @@ CONFIG_PACKAGE_rt2800-usb-firmware=y CONFIG_PACKAGE_shellinabox=y CONFIG_PACKAGE_siridb-server=y CONFIG_PACKAGE_tio=y -CONFIG_PACKAGE_tlink-r4x-firmware=y -# CONFIG_PACKAGE_tlink-r7-firmware is not set CONFIG_PACKAGE_yajl=y CONFIG_TARGET_KERNEL_PARTSIZE=30 CONFIG_TARGET_ROOTFS_PARTSIZE=256 diff --git a/thingslink/tlink_r7_defconfig b/thingslink/tlink_r7_defconfig index 7477b12af0a136..834b5220de3b4c 100644 --- a/thingslink/tlink_r7_defconfig +++ b/thingslink/tlink_r7_defconfig @@ -2,16 +2,13 @@ CONFIG_TARGET_rockchip=y CONFIG_TARGET_rockchip_armv8=y CONFIG_TARGET_rockchip_armv8_DEVICE_kooiot_tlink-r7=y CONFIG_ATH_USER_REGD=y -CONFIG_BRCMFMAC_SDIO=y CONFIG_DRIVER_11AX_SUPPORT=y CONFIG_KERNEL_PAGE_POOL=y -CONFIG_LINUX_6_1=y CONFIG_LUCI_LANG_zh_Hans=y CONFIG_PACKAGE_ATH_DFS=y CONFIG_PACKAGE_MAC80211_DEBUGFS=y CONFIG_PACKAGE_MAC80211_MESH=y CONFIG_PACKAGE_canutils=y -CONFIG_PACKAGE_canutils-can-calc-bit-timing=y CONFIG_PACKAGE_canutils-candump=y CONFIG_PACKAGE_canutils-canfdtest=y CONFIG_PACKAGE_canutils-cangen=y @@ -34,6 +31,7 @@ CONFIG_PACKAGE_kmod-crypto-ccm=y CONFIG_PACKAGE_kmod-crypto-cmac=y CONFIG_PACKAGE_kmod-crypto-ctr=y CONFIG_PACKAGE_kmod-crypto-gcm=y +CONFIG_PACKAGE_kmod-crypto-geniv=y CONFIG_PACKAGE_kmod-crypto-gf128=y CONFIG_PACKAGE_kmod-crypto-ghash=y CONFIG_PACKAGE_kmod-crypto-hmac=y @@ -41,6 +39,7 @@ CONFIG_PACKAGE_kmod-crypto-manager=y CONFIG_PACKAGE_kmod-crypto-null=y CONFIG_PACKAGE_kmod-crypto-rng=y CONFIG_PACKAGE_kmod-crypto-seqiv=y +CONFIG_PACKAGE_kmod-crypto-sha3=y CONFIG_PACKAGE_kmod-crypto-sha512=y CONFIG_PACKAGE_kmod-hwmon-core=y CONFIG_PACKAGE_kmod-lib-cordic=y @@ -59,8 +58,9 @@ CONFIG_PACKAGE_kmod-mt76x2u=y CONFIG_PACKAGE_kmod-mt7921-common=y CONFIG_PACKAGE_kmod-mt7921-firmware=y CONFIG_PACKAGE_kmod-mt7921u=y +CONFIG_PACKAGE_kmod-mt792x-common=y +CONFIG_PACKAGE_kmod-mt792x-usb=y CONFIG_PACKAGE_kmod-phy-realtek=y -CONFIG_PACKAGE_kmod-phylink=y CONFIG_PACKAGE_kmod-r8169=y CONFIG_PACKAGE_kmod-rt2800-lib=y CONFIG_PACKAGE_kmod-rt2800-usb=y @@ -76,6 +76,7 @@ CONFIG_PACKAGE_libcleri=y CONFIG_PACKAGE_libelf=y CONFIG_PACKAGE_libgd=y CONFIG_PACKAGE_libiconv-full-full=m +CONFIG_PACKAGE_libinih=y CONFIG_PACKAGE_libjpeg-turbo=y CONFIG_PACKAGE_libkmod=y CONFIG_PACKAGE_libpci=y @@ -87,7 +88,7 @@ CONFIG_PACKAGE_libwebp=y CONFIG_PACKAGE_luci-i18n-base-zh-cn=y CONFIG_PACKAGE_luci-i18n-firewall-zh-cn=y CONFIG_PACKAGE_luci-i18n-freeioe-zh-cn=y -CONFIG_PACKAGE_luci-i18n-opkg-zh-cn=y +CONFIG_PACKAGE_luci-i18n-package-manager-zh-cn=y CONFIG_PACKAGE_luci-proto-ncm=y CONFIG_PACKAGE_minicom=y CONFIG_PACKAGE_mt7601u-firmware=y @@ -102,5 +103,3 @@ CONFIG_PACKAGE_tio=y CONFIG_PACKAGE_yajl=y CONFIG_TARGET_KERNEL_PARTSIZE=30 CONFIG_TARGET_ROOTFS_PARTSIZE=256 -CONFIG_TESTING_KERNEL=y -CONFIG_WPA_MBO_SUPPORT=y