Update for Orange Pi 4 Pro

external/config/boards/orangepi4pro.conf

@@ -1,4 +1,4 @@
-# Allwinner T736 quad core 2GB/4GB RAM
+# Allwinner A733 quad core 2GB/4GB/8GB/16GB RAM
 BOARD_NAME="Orange Pi 4 Pro"
 BOARDFAMILY="sun60iw2"
 BOOTCONFIG="sun60iw2p1_t736_defconfig"
@@ -7,4 +7,4 @@ MODULES="aic8800_fdrv aic8800_btlpm"
 KERNEL_TARGET="current"
 DISTRIB_TYPE_CURRENT="bookworm jammy bullseye"
 SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
-REVISION="1.0.0"
+REVISION="1.0.4"

external/config/bootscripts/boot-sun60iw2.cmd

@@ -31,6 +31,10 @@ else
 	setenv consoleargs "splash=verbose ${consoleargs}"
 fi
 
+part uuid ${devtype} ${devnum}:1 partuuid
+
+if test -z "${rootdev}"; then rootdev=PARTUUID="${partuuid}"; fi
+
 setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} clk_ignore_unused swiotlb=65536 usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
 
 if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory swapaccount=1"; fi

external/config/sources/families/sun60iw2.conf

@@ -13,6 +13,7 @@ case $BRANCH in
 	current)
 		if [[ $GITEE_SERVER == yes ]]; then
 			KERNELSOURCE="https://gitee.com/orangepi-xunlong/orange-pi-5.15-sun60iw2.git"
+			MAINLINE_UBOOT_SOURCE='https://gitee.com/orangepi-xunlong/u-boot-orangepi.git'
 		fi
 
 		OVERLAY_PREFIX='sun60i-t736'
@@ -57,7 +58,7 @@ family_tweaks_s()
 
 	rsync -a --chown=root:root "${EXTER}"/packages/bsp/overlays_arm64/* ${SDCARD}/
 
-	chroot $SDCARD /bin/bash -c "apt-get -y -qq install mtd-utils rfkill bluetooth bluez bluez-tools ir-keytable tree lirc v4l-utils dnsmasq" >/dev/null 2>&1
+	chroot $SDCARD /bin/bash -c "apt-get -y -qq install libopencv-dev mtd-utils rfkill bluetooth bluez bluez-tools ir-keytable tree lirc v4l-utils dnsmasq" >/dev/null 2>&1
 
 	if [[ $BUILD_DESKTOP == yes ]]; then
 
@@ -144,7 +145,7 @@ uboot_custom_postprocess()
 write_uboot_platform_mtd()
 {
 	if [[ -b /dev/mtdblock0 ]]; then
-		flash_erase /dev/mtd0 0 10
+		flash_erase /dev/mtd0 0 50
 		size=$(stat --format="%s" $1/boot0_spinor_a733.fex)
 		mtd_debug write /dev/mtd0 0 $size $1/boot0_spinor_a733.fex
 		size=$(stat --format="%s" $1/boot_package.fex)

external/packages/bsp/sun60iw2/etc/adb_conf.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+echo usb_device > /sys/devices/platform/soc@3000000/10.usbc0/otg_role
+
 disable_udc="/etc/.disable_udc"
 udc_config=/sys/kernel/config/usb_gadget/g1/UDC