From 15d1f55f20e6e86d7a6bdafdecc80f9d4fda7380 Mon Sep 17 00:00:00 2001 From: Michele Zuccala Date: Thu, 9 May 2024 21:29:34 +0200 Subject: [PATCH 1/2] uboot_helper: RK3399: Add Radxa ROCK 4C+ Added Radxa ROCK 4C+ which is officially supported by uboot and kernel. --- projects/Rockchip/devices/RK3399/README.md | 1 + scripts/uboot_helper | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/projects/Rockchip/devices/RK3399/README.md b/projects/Rockchip/devices/RK3399/README.md index 7481eb6d72..741202eb1e 100644 --- a/projects/Rockchip/devices/RK3399/README.md +++ b/projects/Rockchip/devices/RK3399/README.md @@ -12,6 +12,7 @@ This is a SoC device for RK3399 * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=rock960 make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=rock-pi-4 make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=rock-pi-4-plus make image` +* `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=rock-4c-plus make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=rock-pi-n10 make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=rockpro64 make image` * `PROJECT=Rockchip DEVICE=RK3399 ARCH=aarch64 UBOOT_SYSTEM=roc-pc make image` diff --git a/scripts/uboot_helper b/scripts/uboot_helper index a68bb30a02..cd9a94b768 100755 --- a/scripts/uboot_helper +++ b/scripts/uboot_helper @@ -332,6 +332,10 @@ devices = \ 'dtb': 'rk3399-rock-pi-4b-plus.dtb', 'config': 'rock-pi-4-rk3399_defconfig' }, + 'rock-4c-plus': { + 'dtb': 'rk3399-rock-4c-plus.dtb', + 'config': 'rock-4c-plus-rk3399_defconfig' + }, 'rock-pi-n10': { 'dtb': 'rk3399pro-rock-pi-n10.dtb', 'config': 'rock-pi-n10-rk3399pro_defconfig' From 76f7bddf14705060c6382d1bbccaeba40882d0fa Mon Sep 17 00:00:00 2001 From: Michele Zuccala Date: Fri, 10 May 2024 17:23:06 +0200 Subject: [PATCH 2/2] linux (Rockchip RK3399): Enabled driver for Cadence DisplayPort TX controller. Required to enable the Rock 4c+ DisplayPort connector --- .../Rockchip/devices/RK3399/linux/default/linux.aarch64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf index 16608d5ff5..2f307d9d90 100644 --- a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf @@ -4501,7 +4501,7 @@ CONFIG_DRM_ROCKCHIP=y CONFIG_ROCKCHIP_VOP=y # CONFIG_ROCKCHIP_VOP2 is not set # CONFIG_ROCKCHIP_ANALOGIX_DP is not set -# CONFIG_ROCKCHIP_CDN_DP is not set +CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DW_HDMI=y CONFIG_ROCKCHIP_DW_MIPI_DSI=y # CONFIG_ROCKCHIP_INNO_HDMI is not set