From 2dbd451489d87de055209695e354051385688fe4 Mon Sep 17 00:00:00 2001
From: orangepi-xunlong <258384131@qq.com>
Date: Mon, 25 Sep 2023 09:48:20 +0800
Subject: [PATCH] Support Orange Pi CM5

---
 external/config/boards/orangepicm5.conf            | 14 ++++++++++++++
 .../sources/families/include/rockchip64_common.inc |  2 ++
 .../config/sources/families/rockchip-rk3588.conf   |  5 +++++
 scripts/main.sh                                    |  2 +-
 4 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 external/config/boards/orangepicm5.conf

diff --git a/external/config/boards/orangepicm5.conf b/external/config/boards/orangepicm5.conf
new file mode 100644
index 0000000..1c3d464
--- /dev/null
+++ b/external/config/boards/orangepicm5.conf
@@ -0,0 +1,14 @@
+# Rockchip RK3588s SoC
+BOARD_NAME="Orange Pi CM5"
+BOARDFAMILY="rockchip-rk3588"
+BOOTCONFIG="orangepi_cm5_defconfig"
+KERNEL_TARGET="legacy"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588s-orangepi-cm5.dtb"
+BOOT_SCENARIO="spl-blobs"
+IMAGE_PARTITION_TABLE="gpt"
+BOOT_SUPPORT_SPI="yes"
+SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
+DISTRIB_TYPE_LEGACY="bullseye bookworm bionic focal jammy"
+BOOTFS_TYPE="fat"
+REVISION="1.0.0"
diff --git a/external/config/sources/families/include/rockchip64_common.inc b/external/config/sources/families/include/rockchip64_common.inc
index 8fc2103..75316af 100644
--- a/external/config/sources/families/include/rockchip64_common.inc
+++ b/external/config/sources/families/include/rockchip64_common.inc
@@ -63,6 +63,8 @@ elif [[ $BOARDFAMILY == "rockchip-rk3588" ]]; then
         BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}"
         DDR_BLOB="${DDR_BLOB:=rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.08.bin}"
         BL31_BLOB='rk35/rk3588_bl31_v1.28.elf'
+        #DDR_BLOB="${DDR_BLOB:=rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin}"
+        #BL31_BLOB='rk35/rk3588_bl31_v1.40.elf'
 
 elif [[ $BOARD =~ orangepicm4|orangepi3b ]]; then
 
diff --git a/external/config/sources/families/rockchip-rk3588.conf b/external/config/sources/families/rockchip-rk3588.conf
index f7a6695..a78c56b 100644
--- a/external/config/sources/families/rockchip-rk3588.conf
+++ b/external/config/sources/families/rockchip-rk3588.conf
@@ -102,6 +102,11 @@ family_tweaks_s() {
 		cp $EXTER/cache/sources/linuxpg "${SDCARD}"/opt/ -rfa
 	fi
 
+	if [[ ${BOARD} =~ orangepicm5 ]]; then
+
+		cp $EXTER/cache/sources/linuxpg "${SDCARD}"/opt/ -rfa
+	fi
+
 	[[ ${RELEASE} == jammy ]] && rm ${SDCARD}/etc/profile.d/orangepi-ssh-title.sh # for adbd
 
 	if [[ -f "${SDCARD}"/etc/profile.d/im-config_wayland.sh && ${DESKTOP_ENVIRONMENT} =~ xfce|kde-plasma ]]; then
diff --git a/scripts/main.sh b/scripts/main.sh
index e1abf8b..56d3990 100755
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -234,7 +234,7 @@ if [[ -z $BOARD ]]; then
 	options+=("orangepi4-lts"                 "Rockchip  RK3399 hexa core 4GB RAM GBE eMMC USB3 USB-C WiFi/BT")
 	options+=("orangepi800"                 "Rockchip  RK3399 hexa core 4GB RAM GBE eMMC USB3 USB-C WiFi/BT VGA")
 	options+=("orangepi5"                 "Rockchip  RK3588S octa core 4-16GB RAM GBE USB3 USB-C NVMe")
-	#options+=("orangepicm5"                 "Rockchip  RK3588S octa core 4-16GB RAM GBE USB3 USB-C")
+	options+=("orangepicm5"                 "Rockchip  RK3588S octa core 4-16GB RAM GBE USB3 USB-C")
 	options+=("orangepi5b"                 "Rockchip  RK3588S octa core 4-16GB RAM GBE USB3 USB-C WiFi/BT eMMC")
 	#options+=("orangepitab"                 "Rockchip  RK3588S octa core 4-16GB RAM USB-C WiFi/BT NVMe")
 	#options+=("orangepi900"                 "Rockchip  RK3588 octa core 4-16GB RAM 2.5GBE USB3 USB-C WiFi/BT NVMe")