Exnyos DMC slow mem workaround (#2073) (#2076)

disable DMC for XU4 as workaround 
[AR-337]

VERSION

@@ -1 +1 @@
-20.08.0-trunk
+20.05.7

config/kernel/linux-odroidxu4-current.config

@@ -5334,7 +5334,7 @@ CONFIG_DDR=y
 # CONFIG_ARM_PL172_MPMC is not set
 CONFIG_PL353_SMC=y
 CONFIG_SAMSUNG_MC=y
-CONFIG_EXYNOS5422_DMC=y
+CONFIG_EXYNOS5422_DMC=n
 CONFIG_EXYNOS_SROM=y
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y

config/kernel/linux-odroidxu4-dev.config

@@ -5416,7 +5416,7 @@ CONFIG_DDR=y
 # CONFIG_ARM_PL172_MPMC is not set
 CONFIG_PL353_SMC=y
 CONFIG_SAMSUNG_MC=y
-CONFIG_EXYNOS5422_DMC=y
+CONFIG_EXYNOS5422_DMC=n
 CONFIG_EXYNOS_SROM=y
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y

config/kernel/linux-sunxi-current.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.4.43 Kernel Configuration
+# Linux/arm 5.4.45 Kernel Configuration
 #
 
 #
@@ -3943,7 +3943,7 @@ CONFIG_REGULATOR_WM8350=m
 CONFIG_REGULATOR_WM8400=m
 CONFIG_REGULATOR_WM8994=m
 CONFIG_REGULATOR_TP65185X=m
-CONFIG_CEC_CORE=y
+CONFIG_CEC_CORE=m
 CONFIG_CEC_NOTIFIER=y
 CONFIG_CEC_PIN=y
 CONFIG_RC_CORE=m
@@ -4717,14 +4717,14 @@ CONFIG_DRM_VKMS=m
 CONFIG_DRM_ATMEL_HLCDC=m
 CONFIG_DRM_RCAR_DW_HDMI=m
 # CONFIG_DRM_RCAR_LVDS is not set
-CONFIG_DRM_SUN4I=y
-CONFIG_DRM_SUN4I_HDMI=y
+CONFIG_DRM_SUN4I=m
+CONFIG_DRM_SUN4I_HDMI=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y
-CONFIG_DRM_SUN4I_BACKEND=y
+CONFIG_DRM_SUN4I_BACKEND=m
 CONFIG_DRM_SUN6I_DSI=m
-CONFIG_DRM_SUN8I_DW_HDMI=y
-CONFIG_DRM_SUN8I_MIXER=y
-CONFIG_DRM_SUN8I_TCON_TOP=y
+CONFIG_DRM_SUN8I_DW_HDMI=m
+CONFIG_DRM_SUN8I_MIXER=m
+CONFIG_DRM_SUN8I_TCON_TOP=m
 # CONFIG_DRM_OMAP is not set
 # CONFIG_DRM_TILCDC is not set
 CONFIG_DRM_VIRTIO_GPU=m
@@ -4800,7 +4800,7 @@ CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_ANALOGIX_ANX6345=m
 CONFIG_DRM_ANALOGIX_DP=m
 # CONFIG_DRM_I2C_ADV7511 is not set
-CONFIG_DRM_DW_HDMI=y
+CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m

config/kernel/linux-sunxi-dev.config

@@ -3614,7 +3614,7 @@ CONFIG_REGULATOR_SY8824X=m
 # CONFIG_REGULATOR_TPS6524X is not set
 # CONFIG_REGULATOR_VCTRL is not set
 # CONFIG_REGULATOR_TP65185X is not set
-CONFIG_CEC_CORE=y
+CONFIG_CEC_CORE=m
 CONFIG_CEC_NOTIFIER=y
 CONFIG_CEC_PIN=y
 CONFIG_RC_CORE=y
@@ -4380,14 +4380,14 @@ CONFIG_DRM_VKMS=m
 # CONFIG_DRM_ARMADA is not set
 CONFIG_DRM_RCAR_DW_HDMI=m
 # CONFIG_DRM_RCAR_LVDS is not set
-CONFIG_DRM_SUN4I=y
-CONFIG_DRM_SUN4I_HDMI=y
+CONFIG_DRM_SUN4I=m
+CONFIG_DRM_SUN4I_HDMI=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y
-CONFIG_DRM_SUN4I_BACKEND=y
+CONFIG_DRM_SUN4I_BACKEND=m
 CONFIG_DRM_SUN6I_DSI=m
-CONFIG_DRM_SUN8I_DW_HDMI=y
-CONFIG_DRM_SUN8I_MIXER=y
-CONFIG_DRM_SUN8I_TCON_TOP=y
+CONFIG_DRM_SUN8I_DW_HDMI=m
+CONFIG_DRM_SUN8I_MIXER=m
+CONFIG_DRM_SUN8I_TCON_TOP=m
 # CONFIG_DRM_OMAP is not set
 # CONFIG_DRM_TILCDC is not set
 CONFIG_DRM_VIRTIO_GPU=m
@@ -4468,7 +4468,7 @@ CONFIG_DRM_ANALOGIX_ANX6345=m
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
 CONFIG_DRM_ANALOGIX_DP=m
 # CONFIG_DRM_I2C_ADV7511 is not set
-CONFIG_DRM_DW_HDMI=y
+CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m

config/kernel/linux-sunxi-legacy.config

@@ -3363,7 +3363,7 @@ CONFIG_REGULATOR_SY8106A=m
 # CONFIG_REGULATOR_TPS65132 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 # CONFIG_REGULATOR_VCTRL is not set
-CONFIG_CEC_CORE=y
+CONFIG_CEC_CORE=m
 CONFIG_CEC_NOTIFIER=y
 CONFIG_CEC_PIN=y
 CONFIG_RC_CORE=y
@@ -4095,14 +4095,14 @@ CONFIG_DRM_VKMS=m
 # CONFIG_DRM_ARMADA is not set
 CONFIG_DRM_RCAR_DW_HDMI=m
 # CONFIG_DRM_RCAR_LVDS is not set
-CONFIG_DRM_SUN4I=y
-CONFIG_DRM_SUN4I_HDMI=y
+CONFIG_DRM_SUN4I=m
+CONFIG_DRM_SUN4I_HDMI=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y
-CONFIG_DRM_SUN4I_BACKEND=y
+CONFIG_DRM_SUN4I_BACKEND=m
 CONFIG_DRM_SUN6I_DSI=m
-CONFIG_DRM_SUN8I_DW_HDMI=y
-CONFIG_DRM_SUN8I_MIXER=y
-CONFIG_DRM_SUN8I_TCON_TOP=y
+CONFIG_DRM_SUN8I_DW_HDMI=m
+CONFIG_DRM_SUN8I_MIXER=m
+CONFIG_DRM_SUN8I_TCON_TOP=m
 # CONFIG_DRM_OMAP is not set
 # CONFIG_DRM_TILCDC is not set
 # CONFIG_DRM_FSL_DCU is not set
@@ -4154,7 +4154,7 @@ CONFIG_DRM_ANALOGIX_DP_I2C=m
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
 CONFIG_DRM_ANALOGIX_ANX6345=m
 # CONFIG_DRM_I2C_ADV7511 is not set
-CONFIG_DRM_DW_HDMI=y
+CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m

config/kernel/linux-sunxi64-current.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.43 Kernel Configuration
+# Linux/arm64 5.4.45 Kernel Configuration
 #
 
 #
@@ -3982,7 +3982,7 @@ CONFIG_REGULATOR_WM8350=m
 CONFIG_REGULATOR_WM8400=m
 CONFIG_REGULATOR_WM8994=m
 CONFIG_REGULATOR_TP65185X=m
-CONFIG_CEC_CORE=y
+CONFIG_CEC_CORE=m
 CONFIG_CEC_NOTIFIER=y
 CONFIG_CEC_PIN=y
 CONFIG_RC_CORE=m
@@ -4686,14 +4686,14 @@ CONFIG_DRM_VKMS=m
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 CONFIG_DRM_RCAR_LVDS=m
 CONFIG_DRM_RCAR_WRITEBACK=y
-CONFIG_DRM_SUN4I=y
-CONFIG_DRM_SUN4I_HDMI=y
+CONFIG_DRM_SUN4I=m
+CONFIG_DRM_SUN4I_HDMI=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y
-CONFIG_DRM_SUN4I_BACKEND=y
+CONFIG_DRM_SUN4I_BACKEND=m
 CONFIG_DRM_SUN6I_DSI=m
-CONFIG_DRM_SUN8I_DW_HDMI=y
-CONFIG_DRM_SUN8I_MIXER=y
-CONFIG_DRM_SUN8I_TCON_TOP=y
+CONFIG_DRM_SUN8I_DW_HDMI=m
+CONFIG_DRM_SUN8I_MIXER=m
+CONFIG_DRM_SUN8I_TCON_TOP=m
 # CONFIG_DRM_VIRTIO_GPU is not set
 CONFIG_DRM_PANEL=y
 
@@ -4765,7 +4765,7 @@ CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_ANALOGIX_ANX6345=m
 CONFIG_DRM_ANALOGIX_DP=m
 # CONFIG_DRM_I2C_ADV7511 is not set
-CONFIG_DRM_DW_HDMI=y
+CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m

config/kernel/linux-sunxi64-dev.config

@@ -3565,7 +3565,7 @@ CONFIG_REGULATOR_SY8824X=m
 # CONFIG_REGULATOR_TPS6524X is not set
 # CONFIG_REGULATOR_VCTRL is not set
 CONFIG_REGULATOR_TP65185X=m
-CONFIG_CEC_CORE=y
+CONFIG_CEC_CORE=m
 CONFIG_CEC_NOTIFIER=y
 CONFIG_CEC_PIN=y
 CONFIG_RC_CORE=m
@@ -4155,14 +4155,14 @@ CONFIG_DRM_VKMS=m
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 CONFIG_DRM_RCAR_LVDS=m
 CONFIG_DRM_RCAR_WRITEBACK=y
-CONFIG_DRM_SUN4I=y
-CONFIG_DRM_SUN4I_HDMI=y
+CONFIG_DRM_SUN4I=m
+CONFIG_DRM_SUN4I_HDMI=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y
-CONFIG_DRM_SUN4I_BACKEND=y
+CONFIG_DRM_SUN4I_BACKEND=m
 CONFIG_DRM_SUN6I_DSI=m
-CONFIG_DRM_SUN8I_DW_HDMI=y
-CONFIG_DRM_SUN8I_MIXER=y
-CONFIG_DRM_SUN8I_TCON_TOP=y
+CONFIG_DRM_SUN8I_DW_HDMI=m
+CONFIG_DRM_SUN8I_MIXER=m
+CONFIG_DRM_SUN8I_TCON_TOP=m
 # CONFIG_DRM_VIRTIO_GPU is not set
 CONFIG_DRM_PANEL=y
 
@@ -4239,7 +4239,7 @@ CONFIG_DRM_ANALOGIX_ANX6345=m
 CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_ANALOGIX_DP=m
 # CONFIG_DRM_I2C_ADV7511 is not set
-CONFIG_DRM_DW_HDMI=y
+CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m

config/kernel/linux-sunxi64-legacy.config

@@ -3292,7 +3292,7 @@ CONFIG_REGULATOR_SY8106A=m
 # CONFIG_REGULATOR_TPS65132 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 # CONFIG_REGULATOR_VCTRL is not set
-CONFIG_CEC_CORE=y
+CONFIG_CEC_CORE=m
 CONFIG_CEC_NOTIFIER=y
 CONFIG_CEC_PIN=y
 CONFIG_RC_CORE=m
@@ -3846,14 +3846,14 @@ CONFIG_DRM_VKMS=m
 # CONFIG_DRM_UDL is not set
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 CONFIG_DRM_RCAR_LVDS=m
-CONFIG_DRM_SUN4I=y
-CONFIG_DRM_SUN4I_HDMI=y
+CONFIG_DRM_SUN4I=m
+CONFIG_DRM_SUN4I_HDMI=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y
-CONFIG_DRM_SUN4I_BACKEND=y
+CONFIG_DRM_SUN4I_BACKEND=m
 CONFIG_DRM_SUN6I_DSI=m
-CONFIG_DRM_SUN8I_DW_HDMI=y
-CONFIG_DRM_SUN8I_MIXER=y
-CONFIG_DRM_SUN8I_TCON_TOP=y
+CONFIG_DRM_SUN8I_DW_HDMI=m
+CONFIG_DRM_SUN8I_MIXER=m
+CONFIG_DRM_SUN8I_TCON_TOP=m
 # CONFIG_DRM_VIRTIO_GPU is not set
 CONFIG_DRM_PANEL=y
 
@@ -3902,7 +3902,7 @@ CONFIG_DRM_ANALOGIX_DP_I2C=m
 CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_ANALOGIX_ANX6345=m
 # CONFIG_DRM_I2C_ADV7511 is not set
-CONFIG_DRM_DW_HDMI=y
+CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m

config/sources/families/include/rockchip64_common.inc

@@ -30,7 +30,7 @@ elif [[ $BOARD == rockpi-4* ]]; then
 
 	BOOT_USE_BLOBS=yes
 	BOOT_SOC=rk3399
-	DDR_BLOB='rk33/rk3399_ddr_933MHz_v1.24.bin'
+	DDR_BLOB='rk33/rk3399_ddr_933MHz_v1.20.bin' # 1GB model does not boot with later versions
 	MINILOADER_BLOB='rk33/rk3399_miniloader_v1.19.bin'
 	BL31_BLOB='rk33/rk3399_bl31_v1.30.elf'
 

lib/distributions.sh

@@ -501,6 +501,9 @@ install_distribution_specific()
 		;;
 	bionic|eoan|focal)
 
+			# by using default lz4 initrd compression leads to corruption, go back to proven method
+			sed -i "s/^COMPRESS=.*/COMPRESS=gzip/" $SDCARD/etc/initramfs-tools/initramfs.conf
+
 			# remove doubled uname from motd
 			[[ -f $SDCARD/etc/update-motd.d/10-uname ]] && rm "${SDCARD}"/etc/update-motd.d/10-uname
 

lib/makeboarddeb.sh

@@ -75,6 +75,9 @@ create_board_package()
 
 	fi
 
+	# fixing ramdisk corruption when using lz4 compression method
+	sed -i "s/^COMPRESS=.*/COMPRESS=gzip/" /etc/initramfs-tools/initramfs.conf
+
 	# swap
 	grep -q vm.swappiness /etc/sysctl.conf
 	case \$? in

patch/kernel/rk3399-legacy/xunlong-orangepi4.patch

@@ -243,11 +243,11 @@ index 00000000..17010305
 +	};
 +
 +	hdmi_sound: hdmi-sound {
-+		status = "disable";
++		status = "okay";
 +		compatible = "simple-audio-card";
 +		simple-audio-card,format = "i2s";
 +		simple-audio-card,mclk-fs = <256>;
-+		simple-audio-card,name = "rockchip,hdmi";
++		simple-audio-card,name = "hdmi-sound";
 +
 +		simple-audio-card,cpu {
 +			sound-dai = <&i2s2>;

patch/kernel/rockchip64-current/add-board-orangepi-4.patch

@@ -15,7 +15,7 @@ new file mode 100644
 index 000000000..1e1747ceb
 --- /dev/null
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi-4.dts
-@@ -0,0 +1,1134 @@
+@@ -0,0 +1,1123 @@
 +/*
 + * SPDX-License-Identifier: (GPL-2.0+ or MIT)
 + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
@@ -218,18 +218,7 @@ index 000000000..1e1747ceb
 +	};
 +
 +	hdmi_sound: hdmi-sound {
-+		status = "disable";
-+		compatible = "simple-audio-card";
-+		simple-audio-card,format = "i2s";
-+		simple-audio-card,mclk-fs = <256>;
-+		simple-audio-card,name = "rockchip,hdmi";
-+
-+		simple-audio-card,cpu {
-+			sound-dai = <&i2s2>;
-+		};
-+		simple-audio-card,codec {
-+			sound-dai = <&hdmi>;
-+		};
++		status = "okay";
 +	};
 +
 +        hdmi_dp_sound: hdmi-dp-sound {

patch/kernel/rockchip64-dev/add-board-orangepi-4.patch

@@ -15,7 +15,7 @@ new file mode 100644
 index 000000000..1e1747ceb
 --- /dev/null
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi-4.dts
-@@ -0,0 +1,1134 @@
+@@ -0,0 +1,1123 @@
 +/*
 + * SPDX-License-Identifier: (GPL-2.0+ or MIT)
 + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
@@ -218,18 +218,7 @@ index 000000000..1e1747ceb
 +	};
 +
 +	hdmi_sound: hdmi-sound {
-+		status = "disable";
-+		compatible = "simple-audio-card";
-+		simple-audio-card,format = "i2s";
-+		simple-audio-card,mclk-fs = <256>;
-+		simple-audio-card,name = "rockchip,hdmi";
-+
-+		simple-audio-card,cpu {
-+			sound-dai = <&i2s2>;
-+		};
-+		simple-audio-card,codec {
-+			sound-dai = <&hdmi>;
-+		};
++		status = "okay";
 +	};
 +
 +        hdmi_dp_sound: hdmi-dp-sound {

patch/u-boot/u-boot-rockchip64-mainline/rk3399-disable-hdmi.patch

@@ -0,0 +1,124 @@
+diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig
+index 607a00db..9ea9b115 100644
+--- a/configs/nanopc-t4-rk3399_defconfig
++++ b/configs/nanopc-t4-rk3399_defconfig
+@@ -52,12 +52,5 @@ CONFIG_USB_ETHER_ASIX88179=y
+ CONFIG_USB_ETHER_MCS7830=y
+ CONFIG_USB_ETHER_RTL8152=y
+ CONFIG_USB_ETHER_SMSC95XX=y
+-CONFIG_USB_KEYBOARD=y
+ CONFIG_SPL_TINY_MEMSET=y
+ CONFIG_ERRNO_STR=y
+-CONFIG_DM_VIDEO=y
+-CONFIG_VIDEO_BPP16=y
+-CONFIG_VIDEO_BPP32=y
+-CONFIG_DISPLAY=y
+-CONFIG_VIDEO_ROCKCHIP=y
+-CONFIG_DISPLAY_ROCKCHIP_HDMI=y
+diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig
+index 3fcb7ac2..ad0e808b 100644
+--- a/configs/nanopi-m4-rk3399_defconfig
++++ b/configs/nanopi-m4-rk3399_defconfig
+@@ -52,12 +52,5 @@ CONFIG_USB_ETHER_ASIX88179=y
+ CONFIG_USB_ETHER_MCS7830=y
+ CONFIG_USB_ETHER_RTL8152=y
+ CONFIG_USB_ETHER_SMSC95XX=y
+-CONFIG_USB_KEYBOARD=y
+ CONFIG_SPL_TINY_MEMSET=y
+ CONFIG_ERRNO_STR=y
+-CONFIG_DM_VIDEO=y
+-CONFIG_VIDEO_BPP16=y
+-CONFIG_VIDEO_BPP32=y
+-CONFIG_DISPLAY=y
+-CONFIG_VIDEO_ROCKCHIP=y
+-CONFIG_DISPLAY_ROCKCHIP_HDMI=y
+diff --git a/configs/nanopi-m4v2-rk3399_defconfig b/configs/nanopi-m4v2-rk3399_defconfig
+index 0b7077ca..45d05078 100644
+--- a/configs/nanopi-m4v2-rk3399_defconfig
++++ b/configs/nanopi-m4v2-rk3399_defconfig
+@@ -55,15 +55,8 @@ CONFIG_USB_ETHER_ASIX88179=y
+ CONFIG_USB_ETHER_MCS7830=y
+ CONFIG_USB_ETHER_RTL8152=y
+ CONFIG_USB_ETHER_SMSC95XX=y
+-CONFIG_USB_KEYBOARD=y
+ CONFIG_SPL_TINY_MEMSET=y
+ CONFIG_ERRNO_STR=y
+-CONFIG_DM_VIDEO=y
+-CONFIG_VIDEO_BPP16=y
+-CONFIG_VIDEO_BPP32=y
+-CONFIG_DISPLAY=y
+-CONFIG_VIDEO_ROCKCHIP=y
+-CONFIG_DISPLAY_ROCKCHIP_HDMI=y
+ CONFIG_LOG=y
+ CONFIG_LOG_CONSOLE=y
+ CONFIG_SPL_LOG=y
+diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig
+index b9ea535e..d038a8ca 100644
+--- a/configs/nanopi-neo4-rk3399_defconfig
++++ b/configs/nanopi-neo4-rk3399_defconfig
+@@ -52,12 +52,5 @@ CONFIG_USB_ETHER_ASIX88179=y
+ CONFIG_USB_ETHER_MCS7830=y
+ CONFIG_USB_ETHER_RTL8152=y
+ CONFIG_USB_ETHER_SMSC95XX=y
+-CONFIG_USB_KEYBOARD=y
+ CONFIG_SPL_TINY_MEMSET=y
+ CONFIG_ERRNO_STR=y
+-CONFIG_DM_VIDEO=y
+-CONFIG_VIDEO_BPP16=y
+-CONFIG_VIDEO_BPP32=y
+-CONFIG_DISPLAY=y
+-CONFIG_VIDEO_ROCKCHIP=y
+-CONFIG_DISPLAY_ROCKCHIP_HDMI=y
+diff --git a/configs/orangepi-4-rk3399_defconfig b/configs/orangepi-4-rk3399_defconfig
+index 18ec369f..a0cb7628 100644
+--- a/configs/orangepi-4-rk3399_defconfig
++++ b/configs/orangepi-4-rk3399_defconfig
+@@ -55,15 +55,8 @@ CONFIG_USB_ETHER_ASIX88179=y
+ CONFIG_USB_ETHER_MCS7830=y
+ CONFIG_USB_ETHER_RTL8152=y
+ CONFIG_USB_ETHER_SMSC95XX=y
+-CONFIG_USB_KEYBOARD=y
+ CONFIG_SPL_TINY_MEMSET=y
+ CONFIG_ERRNO_STR=y
+-CONFIG_DM_VIDEO=y
+-CONFIG_VIDEO_BPP16=y
+-CONFIG_VIDEO_BPP32=y
+-CONFIG_DISPLAY=y
+-CONFIG_VIDEO_ROCKCHIP=y
+-CONFIG_DISPLAY_ROCKCHIP_HDMI=y
+ CONFIG_LOG=y
+ CONFIG_LOG_CONSOLE=y
+ CONFIG_SPL_LOG=y
+diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig
+index be76524c..659c67a0 100644
+--- a/configs/roc-pc-rk3399_defconfig
++++ b/configs/roc-pc-rk3399_defconfig
+@@ -56,12 +56,5 @@ CONFIG_USB_ETHER_ASIX88179=y
+ CONFIG_USB_ETHER_MCS7830=y
+ CONFIG_USB_ETHER_RTL8152=y
+ CONFIG_USB_ETHER_SMSC95XX=y
+-CONFIG_USB_KEYBOARD=y
+ CONFIG_SPL_TINY_MEMSET=y
+ CONFIG_ERRNO_STR=y
+-CONFIG_DM_VIDEO=y
+-CONFIG_VIDEO_BPP16=y
+-CONFIG_VIDEO_BPP32=y
+-CONFIG_DISPLAY=y
+-CONFIG_VIDEO_ROCKCHIP=y
+-CONFIG_DISPLAY_ROCKCHIP_HDMI=y
+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)