Update for opicm5

external/config/kernel/linux-rockchip-rk356x-legacy.config

@@ -4530,7 +4530,7 @@ CONFIG_VIDEO_RK_IRCUT=y
 CONFIG_VIDEO_GC8034=y
 # CONFIG_VIDEO_HI556 is not set
 # CONFIG_VIDEO_IMX214 is not set
-# CONFIG_VIDEO_IMX219 is not set
+CONFIG_VIDEO_IMX219=y
 # CONFIG_VIDEO_IMX258 is not set
 # CONFIG_VIDEO_IMX274 is not set
 # CONFIG_VIDEO_IMX290 is not set

external/config/kernel/linux-rockchip-rk3588-legacy.config

@@ -4643,7 +4643,7 @@ CONFIG_VIDEO_GC5035=y
 CONFIG_VIDEO_GC8034=y
 # CONFIG_VIDEO_HI556 is not set
 # CONFIG_VIDEO_IMX214 is not set
-# CONFIG_VIDEO_IMX219 is not set
+CONFIG_VIDEO_IMX219=y
 # CONFIG_VIDEO_IMX258 is not set
 # CONFIG_VIDEO_IMX274 is not set
 # CONFIG_VIDEO_IMX290 is not set

external/config/sources/families/include/rockchip64_common.inc

@@ -62,7 +62,7 @@ elif [[ $BOARDFAMILY == "rockchip-rk3588" ]]; then
 
 	BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}"
 
-	if [[ "${BOARD}x" =~ orangepi5maxx|orangepi5prox ]]; then
+	if [[ "${BOARD}x" =~ orangepi5maxx|orangepi5prox|orangepi5plusx|orangepi5x ]]; then
 		DDR_BLOB="${DDR_BLOB:=rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin}"
 		BL31_BLOB='rk35/rk3588_bl31_v1.45_20240422.elf'
 	else

external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization

@@ -98,7 +98,30 @@ prepare_board() {
 			BOARDFAMILY=rk3399
 			;;
 		orangepi5|orangepicm5|orangepicm5-tablet|orangepi5b|orangepi5plus|orangepi5pro|orangepi5max|orangepitab|orangepi900)
-			[[ $BOARD =~ orangepi5|orangepi5b|orangepicm5 ]] && echo host > /sys/kernel/debug/usb/fc000000.usb/mode
+			[[ $BOARD =~ orangepi5|orangepi5b ]] && echo host > /sys/kernel/debug/usb/fc000000.usb/mode
+			if [[ $BOARD =~ orangepicm5 ]]; then
+				while true; do
+				        echo "set host!"
+				        echo host > /sys/kernel/debug/usb/fc000000.usb/mode
+				        sleep 0.5
+
+				        count=0
+				        for i in {1..3}; do
+				                sleep 0.5
+				                echo "check"
+				                if [[ "$(cat /sys/kernel/debug/usb/fc000000.usb/mode)" == "host" ]]; then
+				                        ((count++))
+				                else
+				                        break
+				                fi
+				                echo "check host $count"
+				        done
+
+				        [[ $count -eq 3 ]] && break
+				        echo "fail"
+				done
+			fi
+
 
 			if [[ ${BOARD}x == orangepicm5-tabletx ]]; then
 				tinymix -D 2 aw87xxx_profile_switch_0 Music
@@ -108,9 +131,9 @@ prepare_board() {
 			if [[ ${BOARD}x == orangepicm5x ]]; then
 
 				declare -A led_map=(
-					["lan2"]="end|eth"
+					["wan"]="end|eth"
-					["lan1"]="enP3"
+					["lan1"]="enP4"
-					["wan"]="enP4"
+					["lan2"]="enP3"
 				)
 
 				for led in "${!led_map[@]}"; do

external/packages/bsp/rk3588/usr/local/bin/test_camera.sh

@@ -8,16 +8,18 @@ echo "Start MIPI CSI Camera Preview!"
 
 export XDG_RUNTIME_DIR=/run/user/1000
 
+patterns="rkisp0-vir0 rkisp0-vir1 rkisp0-vir2 rkisp1-vir0 rkisp1-vir1 rkisp1-vir2"
 
-if [[ -c /dev/video51 ]]; then
+devices_info=$(v4l2-ctl --list-devices)
-	gst-launch-1.0 v4l2src device=/dev/video33 io-mode=4 ! video/x-raw,format=NV12,width=720,height=576,framerate=15/1 ! xvimagesink > /dev/null 2>&1 &
+#devices_id=("/dev/video44" "/dev/video53" "/dev/video62" "/dev/video71")
-	gst-launch-1.0 v4l2src device=/dev/video42 io-mode=4 ! video/x-raw,format=NV12,width=720,height=576,framerate=15/1 ! xvimagesink > /dev/null 2>&1 &
+
-	gst-launch-1.0 v4l2src device=/dev/video51 io-mode=4 ! video/x-raw,format=NV12,width=720,height=576,framerate=15/1 ! xvimagesink > /dev/null 2>&1
+for pattern in $patterns; do
-elif [[ -c /dev/video31 ]]; then
+	devices_id+=("$(echo "$devices_info" | awk -v pattern="$pattern" '$0 ~ pattern {getline; print $NF}')")
-	gst-launch-1.0 v4l2src device=/dev/video22 io-mode=4 ! video/x-raw,format=NV12,width=720,height=576,framerate=15/1 ! xvimagesink > /dev/null 2>&1 &
+done
-	gst-launch-1.0 v4l2src device=/dev/video31 io-mode=4 ! video/x-raw,format=NV12,width=720,height=576,framerate=15/1 ! xvimagesink > /dev/null 2>&1
+
-elif [[ -c /dev/video11 ]]; then
+for device_id in "${devices_id[@]}"; do
-	gst-launch-1.0 v4l2src device=/dev/video11 io-mode=4 ! video/x-raw,format=NV12,width=720,height=576,framerate=15/1 ! xvimagesink > /dev/null 2>&1
+	if [[ -c "$device_id" ]]; then
-else
+		gst-launch-1.0 v4l2src device=$device_id io-mode=4 ! \
-	echo "Can not find camera!!!"
+			video/x-raw,format=NV12,width=720,height=576,framerate=15/1 ! xvimagesink > /dev/null 2>&1 &
-fi
+	fi
+done

scripts/main.sh

@@ -505,7 +505,7 @@ if [[ ${IGNORE_UPDATES} != yes ]]; then
 
 	if [[ ${BOARDFAMILY} == "rockchip-rk3588" ]]; then
 		local rkbin_url="https://github.com/orangepi-xunlong/rk-rootfs-build/raw/rkbin/rk35"
-		wget -qnc -P ${EXTER}/cache/sources/rkbin-tools/rk35/ ${rkbin_url}/rk3588_bl31_v1.45_20240422.elf
+		wget -nc -P ${EXTER}/cache/sources/rkbin-tools/rk35/ ${rkbin_url}/rk3588_bl31_v1.45_20240422.elf
 	fi
 
 fi