Skip to content
This repository was archived by the owner on Jan 30, 2026. It is now read-only.

Commit 4df69e9

Browse files
paolosabatinoSquishy123
authored andcommitted
Bump rockchip64-edge kernel to 6.17 (armbian#8703)
* bump rockchip64 edge kernel to 6.17 * update rockchip64 edge kernel config to 6.17 * Fixes for wireless drivers for rockchip64-edge 6.17 Patches for: * uwe5622 * rtl8723ds * rtl8852bs * update rtl8852bs and rtl8723ds repository commit hashes
1 parent c388308 commit 4df69e9

File tree

294 files changed

+3403
-19301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

294 files changed

+3403
-19301
lines changed

config/kernel/linux-rockchip64-edge.config

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -239,18 +239,22 @@ CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
239239
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
240240
CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
241241
CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
242+
CONFIG_NETFILTER_XT_TARGET_CT=m
242243
CONFIG_NETFILTER_XT_TARGET_DSCP=m
244+
CONFIG_NETFILTER_XT_TARGET_HL=m
243245
CONFIG_NETFILTER_XT_TARGET_HMARK=m
244246
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
245247
CONFIG_NETFILTER_XT_TARGET_LED=m
246248
CONFIG_NETFILTER_XT_TARGET_LOG=m
247249
CONFIG_NETFILTER_XT_TARGET_MARK=m
250+
CONFIG_NETFILTER_XT_NAT=m
251+
CONFIG_NETFILTER_XT_TARGET_NETMAP=m
248252
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
249253
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
250-
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
254+
CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
255+
CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
251256
CONFIG_NETFILTER_XT_TARGET_TEE=m
252257
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
253-
CONFIG_NETFILTER_XT_TARGET_TRACE=m
254258
CONFIG_NETFILTER_XT_TARGET_SECMARK=m
255259
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
256260
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
@@ -347,19 +351,9 @@ CONFIG_IP_NF_MATCH_AH=m
347351
CONFIG_IP_NF_MATCH_ECN=m
348352
CONFIG_IP_NF_MATCH_RPFILTER=m
349353
CONFIG_IP_NF_MATCH_TTL=m
350-
CONFIG_IP_NF_FILTER=m
351354
CONFIG_IP_NF_TARGET_REJECT=m
352355
CONFIG_IP_NF_TARGET_SYNPROXY=m
353-
CONFIG_IP_NF_NAT=m
354-
CONFIG_IP_NF_TARGET_MASQUERADE=m
355-
CONFIG_IP_NF_TARGET_NETMAP=m
356-
CONFIG_IP_NF_TARGET_REDIRECT=m
357-
CONFIG_IP_NF_MANGLE=m
358356
CONFIG_IP_NF_TARGET_ECN=m
359-
CONFIG_IP_NF_TARGET_TTL=m
360-
CONFIG_IP_NF_RAW=m
361-
CONFIG_IP_NF_SECURITY=m
362-
CONFIG_IP_NF_ARPFILTER=m
363357
CONFIG_IP_NF_ARP_MANGLE=m
364358
CONFIG_NFT_DUP_IPV6=m
365359
CONFIG_NFT_FIB_IPV6=m
@@ -374,24 +368,14 @@ CONFIG_IP6_NF_MATCH_MH=m
374368
CONFIG_IP6_NF_MATCH_RPFILTER=m
375369
CONFIG_IP6_NF_MATCH_RT=m
376370
CONFIG_IP6_NF_MATCH_SRH=m
377-
CONFIG_IP6_NF_TARGET_HL=m
378-
CONFIG_IP6_NF_FILTER=m
379371
CONFIG_IP6_NF_TARGET_REJECT=m
380372
CONFIG_IP6_NF_TARGET_SYNPROXY=m
381-
CONFIG_IP6_NF_MANGLE=m
382-
CONFIG_IP6_NF_RAW=m
383-
CONFIG_IP6_NF_SECURITY=m
384-
CONFIG_IP6_NF_NAT=m
385-
CONFIG_IP6_NF_TARGET_MASQUERADE=m
386373
CONFIG_IP6_NF_TARGET_NPT=m
387374
CONFIG_NF_TABLES_BRIDGE=m
388375
CONFIG_NFT_BRIDGE_META=m
389376
CONFIG_NFT_BRIDGE_REJECT=m
390377
CONFIG_NF_CONNTRACK_BRIDGE=m
391378
CONFIG_BRIDGE_NF_EBTABLES=m
392-
CONFIG_BRIDGE_EBT_BROUTE=m
393-
CONFIG_BRIDGE_EBT_T_FILTER=m
394-
CONFIG_BRIDGE_EBT_T_NAT=m
395379
CONFIG_BRIDGE_EBT_802_3=m
396380
CONFIG_BRIDGE_EBT_AMONG=m
397381
CONFIG_BRIDGE_EBT_ARP=m
@@ -1097,8 +1081,10 @@ CONFIG_RTW88_8821CS=m
10971081
CONFIG_RTW88_8821CU=m
10981082
CONFIG_RTW89=m
10991083
CONFIG_RTW89_8851BE=m
1084+
CONFIG_RTW89_8851BU=m
11001085
CONFIG_RTW89_8852AE=m
11011086
CONFIG_RTW89_8852BE=m
1087+
CONFIG_RTW89_8852BU=m
11021088
CONFIG_RTW89_8852BTE=m
11031089
CONFIG_RTW89_8852CE=m
11041090
CONFIG_RTW89_8922AE=m
@@ -1701,7 +1687,6 @@ CONFIG_MFD_QCOM_PM8008=m
17011687
CONFIG_RAVE_SP_CORE=m
17021688
CONFIG_MFD_RSMU_I2C=m
17031689
CONFIG_MFD_RSMU_SPI=m
1704-
CONFIG_REGULATOR=y
17051690
CONFIG_REGULATOR_FIXED_VOLTAGE=y
17061691
CONFIG_REGULATOR_88PG86X=m
17071692
CONFIG_REGULATOR_ACT8865=y
@@ -1977,10 +1962,7 @@ CONFIG_VIDEO_S5K5BAF=m
19771962
CONFIG_VIDEO_S5K6A3=m
19781963
CONFIG_VIDEO_CCS=m
19791964
CONFIG_VIDEO_ET8EK8=m
1980-
CONFIG_VIDEO_AD5820=m
1981-
CONFIG_VIDEO_AK7375=m
1982-
CONFIG_VIDEO_DW9714=m
1983-
CONFIG_VIDEO_DW9807_VCM=m
1965+
# CONFIG_VIDEO_CAMERA_LENS is not set
19841966
CONFIG_VIDEO_ADP1653=m
19851967
CONFIG_VIDEO_LM3560=m
19861968
CONFIG_VIDEO_LM3646=m
@@ -2111,7 +2093,6 @@ CONFIG_DRM_TIDSS=m
21112093
CONFIG_DRM_GUD=m
21122094
CONFIG_FB=y
21132095
CONFIG_FB_UVESA=m
2114-
CONFIG_FIRMWARE_EDID=y
21152096
CONFIG_LCD_CLASS_DEVICE=m
21162097
CONFIG_LCD_OTM3225A=m
21172098
CONFIG_BACKLIGHT_LM3533=m
@@ -2164,7 +2145,6 @@ CONFIG_SND_USB_TONEPORT=m
21642145
CONFIG_SND_USB_VARIAX=m
21652146
CONFIG_SND_SOC=y
21662147
CONFIG_SND_SOC_UTILS_KUNIT_TEST=m
2167-
CONFIG_SND_SOC_ADI=m
21682148
CONFIG_SND_SOC_ADI_AXI_I2S=m
21692149
CONFIG_SND_SOC_ADI_AXI_SPDIF=m
21702150
CONFIG_SND_AMD_ACP_CONFIG=m
@@ -2173,14 +2153,12 @@ CONFIG_SND_DESIGNWARE_I2S=m
21732153
CONFIG_SND_SOC_FSL_AUDMIX=m
21742154
CONFIG_SND_SOC_FSL_MICFIL=m
21752155
CONFIG_SND_SOC_FSL_XCVR=m
2176-
CONFIG_SND_SOC_ROCKCHIP=y
21772156
CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=y
21782157
CONFIG_SND_SOC_ROCKCHIP_PDM=y
21792158
CONFIG_SND_SOC_ROCKCHIP_SAI=y
21802159
CONFIG_SND_SOC_ROCKCHIP_SPDIF=y
21812160
CONFIG_SND_SOC_ROCKCHIP_MAX98090=y
21822161
CONFIG_SND_SOC_ROCKCHIP_RT5645=y
2183-
CONFIG_SND_SOC_ROCKCHIP_RT5651=y
21842162
CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m
21852163
CONFIG_SND_SOC_RK3399_GRU_SOUND=m
21862164
CONFIG_SND_SOC_XILINX_I2S=m
@@ -2691,7 +2669,6 @@ CONFIG_RTC_DRV_RK808=m
26912669
CONFIG_RTC_DRV_ISL12026=m
26922670
CONFIG_RTC_DRV_X1205=m
26932671
CONFIG_RTC_DRV_PCF8523=m
2694-
CONFIG_RTC_DRV_PCF85063=m
26952672
CONFIG_RTC_DRV_PCF85363=m
26962673
CONFIG_RTC_DRV_PCF8563=m
26972674
CONFIG_RTC_DRV_PCF8583=m
@@ -2726,6 +2703,7 @@ CONFIG_RTC_DRV_PCF2123=m
27262703
CONFIG_RTC_DRV_MCP795=m
27272704
CONFIG_RTC_DRV_DS3232=m
27282705
CONFIG_RTC_DRV_PCF2127=m
2706+
CONFIG_RTC_DRV_PCF85063=m
27292707
CONFIG_RTC_DRV_RV3029C2=m
27302708
CONFIG_RTC_DRV_RX6110=m
27312709
CONFIG_RTC_DRV_EFI=y
@@ -3150,7 +3128,6 @@ CONFIG_XFS_FS=m
31503128
# CONFIG_XFS_SUPPORT_ASCII_CI is not set
31513129
CONFIG_XFS_QUOTA=y
31523130
CONFIG_XFS_POSIX_ACL=y
3153-
CONFIG_XFS_RT=y
31543131
CONFIG_GFS2_FS=m
31553132
CONFIG_GFS2_FS_LOCKING_DLM=y
31563133
CONFIG_OCFS2_FS=m
@@ -3400,9 +3377,6 @@ CONFIG_CRYPTO_USER_API_RNG=m
34003377
CONFIG_CRYPTO_USER_API_AEAD=m
34013378
CONFIG_CRYPTO_NHPOLY1305_NEON=m
34023379
CONFIG_CRYPTO_GHASH_ARM64_CE=y
3403-
CONFIG_CRYPTO_SHA1_ARM64_CE=y
3404-
CONFIG_CRYPTO_SHA512_ARM64=y
3405-
CONFIG_CRYPTO_SHA512_ARM64_CE=m
34063380
CONFIG_CRYPTO_SHA3_ARM64=m
34073381
CONFIG_CRYPTO_SM3_NEON=m
34083382
CONFIG_CRYPTO_SM3_ARM64_CE=m
@@ -3451,6 +3425,7 @@ CONFIG_MAGIC_SYSRQ=y
34513425
CONFIG_DEBUG_MEMORY_INIT=y
34523426
CONFIG_TEST_LOCKUP=m
34533427
CONFIG_RCU_CPU_STALL_TIMEOUT=60
3428+
# CONFIG_TRACEFS_AUTOMOUNT_DEPRECATED is not set
34543429
CONFIG_FTRACE_SYSCALLS=y
34553430
CONFIG_BPF_KPROBE_OVERRIDE=y
34563431
CONFIG_KUNIT=m

config/sources/families/include/rockchip64_common.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ case $BRANCH in
3333
;;
3434

3535
edge)
36-
declare -g KERNEL_MAJOR_MINOR="6.16"
36+
declare -g KERNEL_MAJOR_MINOR="6.17"
3737
declare -g LINUXFAMILY=rockchip64
3838
declare -g LINUXCONFIG='linux-rockchip64-'$BRANCH
3939
;;

lib/functions/compilation/patch/drivers_network.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ driver_rtl8852bs() {
373373
if linux-version compare "${version}" ge 6.1 && [[ "${LINUXFAMILY}" == spacemit || "${LINUXFAMILY}" == rk35xx || "${LINUXFAMILY}" == rockchip64 ]]; then
374374

375375
# Attach to specific commit
376-
local rtl8852bs_ver='commit:1515f70506fb4d916323addaf5b410d14ed962e9' # Commit date: Sept 8, 2025 (please update when updating commit ref)
376+
local rtl8852bs_ver='commit:15811ffdf575baabbd1cd46a306e9544a7f02846' # Commit date: Oct 2, 2025 (please update when updating commit ref)
377377

378378
display_alert "Adding" "Wireless drivers for Realtek 8852BS SDIO chipset ${rtl8852bs_ver}" "info"
379379

@@ -559,6 +559,11 @@ driver_uwe5622() {
559559
if linux-version compare "${version}" ge 6.16; then
560560
process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-v6.16.patch" "applying"
561561
fi
562+
563+
if linux-version compare "${version}" ge 6.17; then
564+
process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-v6.17.patch" "applying"
565+
fi
566+
562567
fi
563568
}
564569

@@ -660,7 +665,7 @@ driver_rtl8723DS() {
660665
if linux-version compare "${version}" ge 5.0; then
661666

662667
# Attach to specific commit (was "branch:master")
663-
local rtl8723dsver='commit:09a2b3e94d14cc2a0012d5b74101c6acf1ef0872' # Commit date: 2025-06-28 (please update when updating commit ref)
668+
local rtl8723dsver='commit:39d0eedf4eaedfcf6e133413a389c5f8a70a7d1f' # Commit date: 2025-10-02 (please update when updating commit ref)
664669

665670
display_alert "Adding" "Wireless drivers for Realtek 8723DS chipsets ${rtl8723dsver}" "info"
666671

patch/kernel/archive/rockchip64-6.16/general-v4l2-rkvdec-00-fixes.disabled

Lines changed: 0 additions & 157 deletions
This file was deleted.

0 commit comments

Comments
 (0)