Merge remote-tracking branch 'armbian/main' into sunxi-overlay-fix-up-v2

Ryzer58 · Dec 15, 2024 · c34c52e · c34c52e
2 parents f88db25 + f588b28
commit c34c52e
Show file tree

Hide file tree

Showing 13 changed files with 36,972 additions and 902 deletions.
diff --git a/config/boards/rock-5b-plus.conf b/config/boards/rock-5b-plus.conf
@@ -4,6 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="HeyMeco fridtjof"
 BOOTCONFIG="rock-5b-plus-rk3588_defconfig"
 KERNEL_TARGET="edge,vendor"
+KERNEL_TEST_TARGET="vendor,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-radxa-rock-5b+.dtb"

diff --git a/config/kernel/linux-rk35xx-vendor.config b/config/kernel/linux-rk35xx-vendor.config
@@ -7702,7 +7702,7 @@ CONFIG_ROCKCHIP_FIQ_DEBUGGER=y
 CONFIG_ROCKCHIP_DEBUG=y
 # CONFIG_ROCKCHIP_MINI_KERNEL is not set
 # CONFIG_ROCKCHIP_THUNDER_BOOT is not set
-CONFIG_ROCKCHIP_THUNDER_BOOT_DEFER_FREE_MEMBLOCK=y
+# CONFIG_ROCKCHIP_THUNDER_BOOT_DEFER_FREE_MEMBLOCK is not set
 # CONFIG_ROCKCHIP_NPOR_POWERGOOD is not set
 # CONFIG_RK_CMA_PROCFS is not set
 CONFIG_RK_DMABUF_PROCFS=y

diff --git a/patch/kernel/archive/meson64-6.1/general-hdmi-codec-reorder-channel-allocation-list.patch b/patch/kernel/archive/meson64-6.1/general-hdmi-codec-reorder-channel-allocation-list.patch