diff --git a/config/kernel/linux-rockchip64-edge.config b/config/kernel/linux-rockchip64-edge.config
index 1cac18c746..cef7d5b936 100644
--- a/config/kernel/linux-rockchip64-edge.config
+++ b/config/kernel/linux-rockchip64-edge.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.1 Kernel Configuration
+# Linux/arm64 5.15.2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
 CONFIG_CC_IS_GCC=y
@@ -5541,7 +5541,7 @@ CONFIG_DVB_DUMMY_FE=m
 #
 CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_DRM=m
+CONFIG_DRM=y
 CONFIG_DRM_MIPI_DBI=m
 CONFIG_DRM_MIPI_DSI=y
 CONFIG_DRM_DP_AUX_BUS=m
@@ -5584,15 +5584,15 @@ CONFIG_DRM_KOMEDA=m
 # CONFIG_DRM_NOUVEAU is not set
 # CONFIG_DRM_VGEM is not set
 # CONFIG_DRM_VKMS is not set
-CONFIG_DRM_ROCKCHIP=m
+CONFIG_DRM_ROCKCHIP=y
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
-# CONFIG_ROCKCHIP_RGB is not set
-# CONFIG_ROCKCHIP_RK3066_HDMI is not set
+CONFIG_ROCKCHIP_RGB=y
+CONFIG_ROCKCHIP_RK3066_HDMI=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_FBCON is not set
 # CONFIG_DRM_UDL is not set
diff --git a/patch/u-boot/u-boot-rockchip64/rk3399-disable-hdmi-roc-pc.patch b/patch/u-boot/u-boot-rockchip64/rk3399-disable-hdmi-roc-pc.patch
new file mode 100644
index 0000000000..634e139109
--- /dev/null
+++ b/patch/u-boot/u-boot-rockchip64/rk3399-disable-hdmi-roc-pc.patch
@@ -0,0 +1,14 @@
+--- a/include/configs/roc-pc-rk3399.h
++++ b/include/configs/roc-pc-rk3399.h
+@@ -6,10 +6,6 @@
+ #ifndef __ROC_PC_RK3399_H
+ #define __ROC_PC_RK3399_H
+ 
+-#define ROCKCHIP_DEVICE_SETTINGS \
+-		"stdin=serial,usbkbd\0" \
+-		"stdout=serial,vidconsole\0" \
+-		"stderr=serial,vidconsole\0"
+ 
+ #include <configs/rk3399_common.h>
+ 
+
diff --git a/patch/u-boot/u-boot-rockchip64/rk3399-disable-hdmi.patch b/patch/u-boot/u-boot-rockchip64/rk3399-disable-hdmi.patch
new file mode 100644
index 0000000000..f15873007d
--- /dev/null
+++ b/patch/u-boot/u-boot-rockchip64/rk3399-disable-hdmi.patch
@@ -0,0 +1,16 @@
+diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h
+index 2d3db228..c0b03588 100644
+--- a/include/configs/evb_rk3399.h
++++ b/include/configs/evb_rk3399.h
+@@ -6,11 +6,6 @@
+ #ifndef __EVB_RK3399_H
+ #define __EVB_RK3399_H
+ 
+-#define ROCKCHIP_DEVICE_SETTINGS \
+-		"stdin=serial,usbkbd\0" \
+-		"stdout=serial,vidconsole\0" \
+-		"stderr=serial,vidconsole\0"
+-
+ #include <configs/rk3399_common.h>
+ 
+ #if defined(CONFIG_ENV_IS_IN_MMC)