Support Orange Pi 5 Pro

.gitignore

@@ -43,6 +43,7 @@ external/cache/sources/ffmpeg_kodi*
 external/cache/sources/orangepi-test
 external/cache/sources/rk3588_packages*
 external/cache/sources/rk356x_packages
+external/cache/sources/rk35xx_packages
 external/cache/sources/rk-rootfs-build*
 external/cache/sources/orangepi-firmware*
 external/cache/sources/wiringOP

external/config/boards/orangepi5pro.conf

@@ -0,0 +1,16 @@
+# Rockchip RK3588 SoC
+BOARD_NAME="Orange Pi 5 Pro"
+BOARDFAMILY="rockchip-rk3588"
+BOOTCONFIG="orangepi_5_pro_defconfig"
+MODULES="sprdbt_tty sprdwl_ng"
+MODULES_BLACKLIST_LEGACY="bcmdhd"
+KERNEL_TARGET="legacy"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-orangepi-5-pro.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"

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

@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.110 Kernel Configuration
+# Linux/arm64 5.10.160 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.3.0-1ubuntu1~22.04.1) 11.3.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=110300
+CONFIG_GCC_VERSION=110400
 CONFIG_LD_VERSION=238000000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
@@ -12,6 +12,7 @@ CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
@@ -22,6 +23,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_WERROR is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -342,6 +344,7 @@ CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARM64_ERRATUM_819472 is not set
 # CONFIG_ARM64_ERRATUM_832075 is not set
 CONFIG_ARM64_ERRATUM_834220=y
+CONFIG_ARM64_ERRATUM_1742098=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_1024718=y
@@ -359,6 +362,8 @@ CONFIG_ARM64_ERRATUM_1508412=y
 CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y
 CONFIG_ARM64_ERRATUM_2054223=y
 CONFIG_ARM64_ERRATUM_2067961=y
+# CONFIG_ARM64_ERRATUM_2454944 is not set
+CONFIG_ARM64_ERRATUM_2457168=y
 # CONFIG_CAVIUM_ERRATUM_22375 is not set
 # CONFIG_CAVIUM_ERRATUM_23154 is not set
 CONFIG_CAVIUM_ERRATUM_27456=y
@@ -467,7 +472,6 @@ CONFIG_ARM64_TLB_RANGE=y
 #
 CONFIG_AS_HAS_ARMV8_5=y
 CONFIG_ARM64_BTI=y
-CONFIG_ARM64_BTI_KERNEL=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
 CONFIG_ARM64_E0PD=y
 CONFIG_ARCH_RANDOM=y
@@ -576,7 +580,6 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 # CPU frequency scaling drivers
 #
 CONFIG_CPUFREQ_DT=y
-CONFIG_CPUFREQ_DT_PLATDEV=y
 # CONFIG_CPUFREQ_DUMMY is not set
 CONFIG_ARM_ROCKCHIP_CPUFREQ=y
 # CONFIG_ARM_SCMI_CPUFREQ is not set
@@ -1029,6 +1032,7 @@ CONFIG_INET_ESP=m
 # CONFIG_INET_ESP_OFFLOAD is not set
 # CONFIG_INET_ESPINTCP is not set
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_TABLE_PERTURB_ORDER=16
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -1929,6 +1933,7 @@ CONFIG_PCIE_DW_HOST=y
 CONFIG_PCIE_DW_ROCKCHIP=y
 CONFIG_PCIE_RK_THREADED_INIT=y
 # CONFIG_PCIE_DW_DMATEST is not set
+# CONFIG_PCIE_DW_ROCKCHIP_EP is not set
 # CONFIG_PCI_HISI is not set
 # CONFIG_PCIE_KIRIN is not set
 # CONFIG_PCI_MESON is not set
@@ -2110,6 +2115,7 @@ CONFIG_MTD_NAND_BBT_USING_FLASH=y
 
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+# CONFIG_MTD_SPI_NOR_MISC is not set
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_LIMIT=20
@@ -2173,6 +2179,8 @@ CONFIG_BLK_DEV_NVME=y
 # Misc devices
 #
 # CONFIG_RK803 is not set
+# CONFIG_PCIE_FUNC_RKEP is not set
+# CONFIG_LT7911D_FB_NOTIFIER is not set
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_DUMMY_IRQ is not set
 # CONFIG_PHANTOM is not set
@@ -2608,6 +2616,7 @@ CONFIG_NET_VENDOR_SOCIONEXT=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=y
 # CONFIG_STMMAC_SELFTESTS is not set
+# CONFIG_STMMAC_UIO is not set
 CONFIG_STMMAC_ETHTOOL=y
 CONFIG_STMMAC_FULL=y
 CONFIG_STMMAC_PLATFORM=y
@@ -2933,6 +2942,7 @@ CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/ap6275p/nvram.txt"
 # CONFIG_INFINEON_DHD is not set
 CONFIG_RTL8852BE=m
 # CONFIG_RTL8852BU is not set
+# CONFIG_SPARD_WLAN_SUPPORT is not set
 # CONFIG_MAC80211_HWSIM is not set
 CONFIG_USB_NET_RNDIS_WLAN=y
 # CONFIG_VIRT_WIFI is not set
@@ -2949,7 +2959,6 @@ CONFIG_USB_NET_RNDIS_WLAN=y
 # CONFIG_NETDEVSIM is not set
 # CONFIG_NET_FAILOVER is not set
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -3080,6 +3089,7 @@ CONFIG_TOUCHSCREEN_FTS=y
 # CONFIG_TOUCHSCREEN_FUJITSU is not set
 CONFIG_TOUCHSCREEN_GOODIX=y
 CONFIG_TOUCHSCREEN_GSL3673=y
+# CONFIG_TOUCHSCREEN_GSL3673_800X1280 is not set
 # CONFIG_TOUCHSCREEN_GSLX680_PAD is not set
 CONFIG_TOUCHSCREEN_GT1X=y
 # CONFIG_TOUCHSCREEN_HIDEEP is not set
@@ -3102,6 +3112,7 @@ CONFIG_TOUCHSCREEN_ELAN=y
 # CONFIG_TOUCHSCREEN_MK712 is not set
 # CONFIG_TOUCHSCREEN_PENMOUNT is not set
 # CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
+# CONFIG_TOUCHSCREEN_RASPITS_FT5426 is not set
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 # CONFIG_TOUCHSCREEN_PIXCIR is not set
@@ -3370,10 +3381,9 @@ CONFIG_TCG_TIS_I2C_INFINEON=y
 # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 # CONFIG_XILLYBUS is not set
-# end of Character devices
-
 # CONFIG_RANDOM_TRUST_CPU is not set
 # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+# end of Character devices
 
 #
 # I2C support
@@ -3959,6 +3969,7 @@ CONFIG_DEVFREQ_THERMAL=y
 # CONFIG_THERMAL_EMULATION is not set
 # CONFIG_THERMAL_MMIO is not set
 CONFIG_ROCKCHIP_THERMAL=y
+# CONFIG_RK_VIRTUAL_THERMAL is not set
 # CONFIG_GENERIC_ADC_THERMAL is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
@@ -4053,9 +4064,7 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
 # CONFIG_MFD_MAX96745 is not set
-# CONFIG_MFD_MAX96752F is not set
 # CONFIG_MFD_MAX96755F is not set
-# CONFIG_MFD_MAX96776 is not set
 # CONFIG_MFD_MT6360 is not set
 # CONFIG_MFD_MT6397 is not set
 # CONFIG_MFD_MENF21BMC is not set
@@ -4503,6 +4512,7 @@ CONFIG_VIDEO_WM8775=m
 # CONFIG_VIDEO_KS0127 is not set
 # CONFIG_VIDEO_IT6616 is not set
 CONFIG_VIDEO_LT6911UXC=y
+# CONFIG_VIDEO_LT6911UXE is not set
 CONFIG_VIDEO_LT7911D=y
 # CONFIG_VIDEO_LT7911UXC is not set
 # CONFIG_VIDEO_LT8619C is not set
@@ -4518,6 +4528,7 @@ CONFIG_VIDEO_RK628_BT1120=y
 CONFIG_VIDEO_SAA711X=m
 # CONFIG_VIDEO_TC358743 is not set
 CONFIG_VIDEO_TC35874X=y
+# CONFIG_VIDEO_TECHPOINT is not set
 # CONFIG_VIDEO_THCV244 is not set
 # CONFIG_VIDEO_TVP514X is not set
 # CONFIG_VIDEO_TVP5150 is not set
@@ -4528,6 +4539,7 @@ CONFIG_VIDEO_TC35874X=y
 # CONFIG_VIDEO_TW9910 is not set
 # CONFIG_VIDEO_VPX3220 is not set
 # CONFIG_VIDEO_MAX9286 is not set
+# CONFIG_VIDEO_MAX96712 is not set
 # CONFIG_VIDEO_MAX96714 is not set
 # CONFIG_VIDEO_MAX96722 is not set
 
@@ -4587,12 +4599,15 @@ CONFIG_VIDEO_RK_IRCUT=y
 # Camera sensor devices
 #
 # CONFIG_VIDEO_AR0230 is not set
+# CONFIG_VIDEO_AR0822 is not set
 # CONFIG_VIDEO_GC02M2 is not set
 # CONFIG_VIDEO_GC08A3 is not set
+# CONFIG_VIDEO_GC1084 is not set
 # CONFIG_VIDEO_GC2053 is not set
 # CONFIG_VIDEO_GC2093 is not set
 # CONFIG_VIDEO_GC2145 is not set
 # CONFIG_VIDEO_GC2385 is not set
+# CONFIG_VIDEO_GC3003 is not set
 # CONFIG_VIDEO_GC4023 is not set
 # CONFIG_VIDEO_GC4653 is not set
 # CONFIG_VIDEO_GC4663 is not set
@@ -4617,6 +4632,7 @@ CONFIG_VIDEO_GC8034=y
 # CONFIG_VIDEO_IMX378 is not set
 CONFIG_VIDEO_IMX415=y
 CONFIG_VIDEO_IMX464=y
+# CONFIG_VIDEO_IMX492 is not set
 # CONFIG_VIDEO_IMX355 is not set
 # CONFIG_VIDEO_IMX577 is not set
 # CONFIG_VIDEO_IMX586 is not set
@@ -4628,6 +4644,8 @@ CONFIG_VIDEO_OS04A10=y
 # CONFIG_VIDEO_OS08A20 is not set
 # CONFIG_VIDEO_OV02B10 is not set
 # CONFIG_VIDEO_OV02K10 is not set
+# CONFIG_VIDEO_OV16A10 is not set
+# CONFIG_VIDEO_OV16A1Q is not set
 # CONFIG_VIDEO_OV2640 is not set
 # CONFIG_VIDEO_OV2659 is not set
 # CONFIG_VIDEO_OV2680 is not set
@@ -4675,8 +4693,10 @@ CONFIG_VIDEO_OV13855=y
 # CONFIG_VIDEO_SC210IOT is not set
 # CONFIG_VIDEO_SC2232 is not set
 # CONFIG_VIDEO_SC2239 is not set
+# CONFIG_VIDEO_SC223A is not set
 # CONFIG_VIDEO_SC230AI is not set
 # CONFIG_VIDEO_SC2310 is not set
+# CONFIG_VIDEO_SC2336 is not set
 # CONFIG_VIDEO_SC301IOT is not set
 # CONFIG_VIDEO_SC3336 is not set
 # CONFIG_VIDEO_SC3338 is not set
@@ -4686,7 +4706,9 @@ CONFIG_VIDEO_OV13855=y
 # CONFIG_VIDEO_SC430CS is not set
 # CONFIG_VIDEO_SC4336 is not set
 # CONFIG_VIDEO_SC500AI is not set
+# CONFIG_VIDEO_SC501AI is not set
 # CONFIG_VIDEO_SC530AI is not set
+# CONFIG_VIDEO_SC850SL is not set
 # CONFIG_VIDEO_SENSOR_ADAPTER is not set
 # CONFIG_VIDEO_SR030PC30 is not set
 # CONFIG_VIDEO_NOON010PC30 is not set
@@ -4713,6 +4735,7 @@ CONFIG_VIDEO_AK7375=m
 CONFIG_VIDEO_AW8601=m
 CONFIG_VIDEO_CN3927V=m
 CONFIG_VIDEO_DW9714=m
+# CONFIG_VIDEO_DW9763 is not set
 CONFIG_VIDEO_DW9768=m
 CONFIG_VIDEO_DW9800W=m
 CONFIG_VIDEO_DW9807_VCM=m
@@ -5002,13 +5025,13 @@ CONFIG_DRM_GEM_CMA_HELPER=y
 # CONFIG_DRM_VGEM is not set
 # CONFIG_DRM_VKMS is not set
 CONFIG_DRM_ROCKCHIP=y
-# CONFIG_ROCKCHIP_DRM_CUBIC_LUT is not set
 # CONFIG_ROCKCHIP_DRM_DEBUG is not set
 # CONFIG_ROCKCHIP_DRM_DIRECT_SHOW is not set
 CONFIG_ROCKCHIP_VOP=y
 CONFIG_ROCKCHIP_VOP2=y
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_CDN_DP=y
+# CONFIG_ROCKCHIP_DRM_TVE is not set
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_DW_DP=y
@@ -5054,7 +5077,7 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
-# CONFIG_DRM_PANEL_MAXIM_DESERIALIZER is not set
+# CONFIG_DRM_PANEL_MAXIM_MAX96752F is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
 # CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
 # CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
@@ -5100,9 +5123,7 @@ CONFIG_DRM_DISPLAY_CONNECTOR=y
 # CONFIG_DRM_LONTIUM_LT9611 is not set
 # CONFIG_DRM_LVDS_CODEC is not set
 # CONFIG_DRM_MAXIM_MAX96745 is not set
-# CONFIG_DRM_MAXIM_MAX96752F is not set
 # CONFIG_DRM_MAXIM_MAX96755F is not set
-# CONFIG_DRM_MAXIM_MAX96776 is not set
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 # CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
@@ -5190,6 +5211,7 @@ CONFIG_MALI_PWRSOFT_765=y
 CONFIG_MALI_BIFROST=y
 CONFIG_MALI_PLATFORM_NAME="rk"
 CONFIG_MALI_REAL_HW=y
+# CONFIG_MALI_BIFROST_NO_MALI is not set
 
 #
 # Platform specific options
@@ -5198,23 +5220,21 @@ CONFIG_MALI_CSF_SUPPORT=y
 CONFIG_MALI_BIFROST_DEVFREQ=y
 CONFIG_MALI_BIFROST_GATOR_SUPPORT=y
 CONFIG_MALI_BIFROST_ENABLE_TRACE=y
-# CONFIG_MALI_BIFROST_DMA_FENCE is not set
 # CONFIG_MALI_DMA_BUF_MAP_ON_DEMAND is not set
 # CONFIG_MALI_DMA_BUF_LEGACY_COMPAT is not set
+# CONFIG_MALI_CORESIGHT is not set
 CONFIG_MALI_BIFROST_EXPERT=y
-# CONFIG_MALI_2MB_ALLOC is not set
+# CONFIG_LARGE_PAGE_ALLOC_OVERRIDE is not set
+# CONFIG_LARGE_PAGE_ALLOC is not set
 # CONFIG_MALI_MEMORY_FULLY_BACKED is not set
 
 #
 # Platform options
 #
-# CONFIG_MALI_BIFROST_NO_MALI is not set
-# CONFIG_MALI_GEM5_BUILD is not set
 
 #
 # Debug options
 #
-# CONFIG_MALI_FW_CORE_DUMP is not set
 CONFIG_MALI_BIFROST_DEBUG=y
 CONFIG_MALI_BIFROST_FENCE_DEBUG=y
 CONFIG_MALI_BIFROST_SYSTEM_TRACE=y
@@ -5354,6 +5374,7 @@ CONFIG_ROCKCHIP_MPP_VEPU2=y
 CONFIG_ROCKCHIP_MPP_IEP2=y
 CONFIG_ROCKCHIP_MPP_JPGDEC=y
 CONFIG_ROCKCHIP_MPP_AV1DEC=y
+# CONFIG_ROCKCHIP_MPP_VDPP is not set
 # CONFIG_ROCKCHIP_DVBM is not set
 # end of Rockchip Misc Video driver
 
@@ -5467,6 +5488,7 @@ CONFIG_SND_SOC_ROCKCHIP_I2S=y
 CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=y
 # CONFIG_SND_SOC_ROCKCHIP_MULTI_DAIS is not set
 CONFIG_SND_SOC_ROCKCHIP_PDM=y
+# CONFIG_SND_SOC_ROCKCHIP_SAI is not set
 CONFIG_SND_SOC_ROCKCHIP_SPDIF=y
 CONFIG_SND_SOC_ROCKCHIP_SPDIFRX=y
 # CONFIG_SND_SOC_ROCKCHIP_VAD is not set
@@ -5579,8 +5601,11 @@ CONFIG_SND_SOC_MAX98090=y
 # CONFIG_SND_SOC_RK3228 is not set
 CONFIG_SND_SOC_RK3308=y
 CONFIG_SND_SOC_RK3328=y
+# CONFIG_SND_SOC_RK3528 is not set
+# CONFIG_SND_SOC_RK730 is not set
 CONFIG_SND_SOC_RK817=y
 CONFIG_SND_SOC_RK_CODEC_DIGITAL=y
+# CONFIG_SND_SOC_RK_DSM is not set
 CONFIG_SND_SOC_RL6231=y
 CONFIG_SND_SOC_RT5616=y
 # CONFIG_SND_SOC_RT5631 is not set
@@ -6198,7 +6223,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
 # CONFIG_MMC_USHC is not set
 # CONFIG_MMC_USDHI6ROL0 is not set
 CONFIG_MMC_CQHCI=y
-# CONFIG_MMC_HSQ is not set
+CONFIG_MMC_HSQ=y
 # CONFIG_MMC_TOSHIBA_PCI is not set
 # CONFIG_MMC_MTK is not set
 # CONFIG_MMC_SDHCI_XENON is not set
@@ -6445,8 +6470,8 @@ CONFIG_PL330_DMA=y
 # DMABUF options
 #
 CONFIG_DMABUF_CACHE=y
-CONFIG_DMABUF_DEBUG=y
-# CONFIG_DMABUF_DEBUG_ADVANCED is not set
+# CONFIG_RK_DMABUF_DEBUG is not set
+CONFIG_DMABUF_PARTIAL=y
 CONFIG_SYNC_FILE=y
 CONFIG_SW_SYNC=y
 CONFIG_SW_SYNC_DEBUG=y
@@ -6459,6 +6484,7 @@ CONFIG_DMABUF_HEAPS_DEFERRED_FREE=y
 CONFIG_DMABUF_HEAPS_PAGE_POOL=y
 CONFIG_DMABUF_HEAPS_SYSTEM=y
 CONFIG_DMABUF_HEAPS_CMA=y
+# CONFIG_DMABUF_HEAPS_SRAM is not set
 # CONFIG_DMABUF_HEAPS_ROCKCHIP is not set
 # end of DMABUF options
 
@@ -6569,14 +6595,6 @@ CONFIG_STAGING=y
 CONFIG_ASHMEM=y
 # CONFIG_DEBUG_KINFO is not set
 # CONFIG_ION is not set
-CONFIG_FIQ_DEBUGGER=y
-CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
-# CONFIG_FIQ_DEBUGGER_WAKEUP_IRQ_ALWAYS_ON is not set
-CONFIG_FIQ_DEBUGGER_CONSOLE=y
-CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y
-CONFIG_FIQ_DEBUGGER_TRUST_ZONE=y
-# CONFIG_FIQ_DEBUGGER_UART_OVERLAY is not set
-CONFIG_RK_CONSOLE_THREAD=y
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
@@ -6676,9 +6694,9 @@ CONFIG_CLK_RK3588=y
 CONFIG_ROCKCHIP_CLK_LINK=y
 CONFIG_ROCKCHIP_CLK_BOOST=y
 CONFIG_ROCKCHIP_CLK_INV=y
+CONFIG_ROCKCHIP_CLK_OUT=y
 CONFIG_ROCKCHIP_CLK_PVTM=y
 CONFIG_ROCKCHIP_DDRCLK=y
-# CONFIG_ROCKCHIP_DDRCLK_SCPI is not set
 CONFIG_ROCKCHIP_DDRCLK_SIP=y
 CONFIG_ROCKCHIP_DDRCLK_SIP_V2=y
 # CONFIG_ROCKCHIP_PLL_RK3066 is not set
@@ -6788,6 +6806,10 @@ CONFIG_ARM_SMMU_V3=y
 CONFIG_QCOM_QMI_HELPERS=m
 # end of Qualcomm SoC drivers
 
+#
+# Rockchip SoC drivers
+#
+
 #
 # Rockchip CPU selection
 #
@@ -6797,12 +6819,15 @@ CONFIG_CPU_RK1808=y
 CONFIG_CPU_RK3328=y
 # CONFIG_CPU_RK3368 is not set
 CONFIG_CPU_RK3399=y
+# CONFIG_CPU_RK3528 is not set
+# CONFIG_CPU_RK3562 is not set
 CONFIG_CPU_RK3568=y
 CONFIG_CPU_RK3588=y
 # end of Rockchip CPU selection
 
 CONFIG_NO_GKI=y
 # CONFIG_ROCKCHIP_AMP is not set
+# CONFIG_ROCKCHIP_ARM64_ALIGN_FAULT_FIX is not set
 CONFIG_ROCKCHIP_CPUINFO=y
 CONFIG_ROCKCHIP_GRF=y
 # CONFIG_ROCKCHIP_HW_DECOMPRESS is not set
@@ -6821,8 +6846,23 @@ CONFIG_ROCKCHIP_SYSTEM_MONITOR=y
 CONFIG_ROCKCHIP_VENDOR_STORAGE=y
 CONFIG_ROCKCHIP_MMC_VENDOR_STORAGE=y
 CONFIG_ROCKCHIP_MTD_VENDOR_STORAGE=y
+# CONFIG_ROCKCHIP_RAM_VENDOR_STORAGE is not set
 CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER=y
+
+#
+# FIQ Debugger
+#
+CONFIG_FIQ_DEBUGGER=y
+CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
+# CONFIG_FIQ_DEBUGGER_WAKEUP_IRQ_ALWAYS_ON is not set
+CONFIG_FIQ_DEBUGGER_CONSOLE=y
+CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y
+CONFIG_FIQ_DEBUGGER_TRUST_ZONE=y
+# CONFIG_FIQ_DEBUGGER_UART_OVERLAY is not set
+CONFIG_RK_CONSOLE_THREAD=y
 CONFIG_ROCKCHIP_FIQ_DEBUGGER=y
+# end of FIQ Debugger
+
 CONFIG_ROCKCHIP_DEBUG=y
 # CONFIG_ROCKCHIP_MINI_KERNEL is not set
 # CONFIG_ROCKCHIP_THUNDER_BOOT is not set
@@ -6830,6 +6870,14 @@ CONFIG_ROCKCHIP_DEBUG=y
 # CONFIG_RK_CMA_PROCFS is not set
 CONFIG_RK_DMABUF_PROCFS=y
 # CONFIG_RK_MEMBLOCK_PROCFS is not set
+
+#
+# Rockchip Minidump drivers
+#
+# CONFIG_ROCKCHIP_MINIDUMP is not set
+# end of Rockchip Minidump drivers
+# end of Rockchip SoC drivers
+
 # CONFIG_SOC_TI is not set
 
 #
@@ -7332,6 +7380,7 @@ CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_DEBUG is not set
 # CONFIG_PWM_FSL_FTM is not set
+# CONFIG_PWM_GPIO is not set
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWM_ROCKCHIP=y
 # CONFIG_PWM_ROCKCHIP_ONESHOT is not set
@@ -7439,6 +7488,7 @@ CONFIG_NVMEM_SYSFS=y
 # CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_ROCKCHIP_EFUSE=y
 CONFIG_ROCKCHIP_OTP=y
+# CONFIG_NVMEM_ROCKCHIP_SEC_OTP is not set
 
 #
 # HW tracing support
@@ -8047,25 +8097,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=y
 # CONFIG_CRYPTO_USER_API_AEAD is not set
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=y
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=y
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
 # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
@@ -8123,6 +8154,27 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 # CONFIG_INDIRECT_PIO is not set
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=y
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
+CONFIG_LIB_MEMNEQ=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y

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

@@ -0,0 +1,57 @@
+rk35xx_gpu_vpu_tweaks()
+{
+	if [[ ${SELECTED_CONFIGURATION} == desktop && ${DESKTOP_ENVIRONMENT} =~ xfce|kde-plasma ]]; then
+
+		debs_dir="$EXTER/cache/sources/rk35xx_packages"
+
+		debs_common_list+=("rga2" "mpp" "rktoolkit" "rkaiq")
+		debs_list+=("gstreamer" "gst-plugins-base1.0" "gst-plugins-good1.0" "gst-plugins-bad1.0" "gst-plugins-ugly1.0" "gstreamer-rockchip")
+		debs_list+=("xserver" "glmark2" "libdrm" "libdrm-cursor")
+		debs_list+=("libv4l" "libv4l-rkmpp" "chromium")
+		debs_list+=("ffmpeg" "mpv" "cheese" "gst-rkmpp")
+
+		chroot $SDCARD /bin/bash -c "rm -rf /etc/mpv/mpv.conf"
+
+		for dir in ${debs_common_list[@]}; do
+			dir=$(find "${debs_dir}/common" -type d -name ${dir})
+			[[ -n ${dir} ]] && dpkg_install_debs_chroot "${dir}"
+		done
+
+		for dir in ${debs_list[@]}; do
+			dir=$(find "${debs_dir}/${RELEASE}" -type d -name ${dir})
+			[[ -n ${dir} ]] && dpkg_install_debs_chroot "${dir}"
+		done
+
+		dpkg_install_deb_chroot "${debs_dir}/common/libmali/libmali-valhall-g610-g13p0-x11-gbm_1.9-1_arm64.deb"
+		cp ${EXTER}/packages/bsp/rk3588/etc/mpv/mpv.conf $SDCARD/etc/mpv/
+
+		# The chromium using fixed pathes for libv4l2.so
+		chroot $SDCARD /bin/bash -c "ln -rsf /usr/lib/*/libv4l2.so /usr/lib/"
+		chroot $SDCARD /bin/bash -c "[ -e /usr/lib/aarch64-linux-gnu/ ] && ln -Tsf lib /usr/lib64"
+		chroot $SDCARD /bin/bash -c "cd /usr/lib/aarch64-linux-gnu/dri/;cp kms_swrast_dri.so swrast_dri.so rockchip_dri.so /"
+		chroot $SDCARD /bin/bash -c "rm /usr/lib/aarch64-linux-gnu/dri/*.so;mv /*.so /usr/lib/aarch64-linux-gnu/dri/"
+
+		apply_common_operations() {
+			chroot $SDCARD /bin/bash -c "chmod o+x /usr/lib/dbus-1.0/dbus-daemon-launch-helper"
+			chroot $SDCARD /bin/bash -c "sed -i '5aexport LD_PRELOAD=libdrm-cursor.so.1' /usr/bin/X"
+		}
+
+		if [[ ${RELEASE} == focal ]]; then
+			apply_common_operations
+			cp $debs_dir/$RELEASE/chromium/libjpeg.so.62 $SDCARD/usr/lib/aarch64-linux-gnu/
+		fi
+
+		if [[ ${RELEASE} == jammy ]]; then
+			apply_common_operations
+			cp $debs_dir/$RELEASE/chromium/default $SDCARD/etc/chromium-browser/
+		fi
+
+		if [[ ${RELEASE} == bookworm ]]; then
+			cp $debs_dir/$RELEASE/chromium/default $SDCARD/etc/chromium-browser/
+		fi
+
+		if [[ ${RELEASE} == bullseye ]]; then
+			apply_common_operations
+		fi
+	fi
+}

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

@@ -1,5 +1,5 @@
 source "${BASH_SOURCE%/*}/rk3399_gpu_vpu.inc"
-source "${BASH_SOURCE%/*}/rk3588_gpu_vpu.inc"
+source "${BASH_SOURCE%/*}/rk35xx_gpu_vpu.inc"
 source "${BASH_SOURCE%/*}/rk356x_gpu_vpu.inc"
 
 enable_extension "rkbin-tools"
@@ -61,10 +61,8 @@ if [[ $BOARD =~ orangepir1plus|orangepir1plus-lts ]]; then
 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'
+        DDR_BLOB="${DDR_BLOB:=rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.13.bin}"
+        BL31_BLOB='rk35/rk3588_bl31_v1.42.elf'
 
 elif [[ $BOARD =~ orangepicm4|orangepi3b ]]; then
 
@@ -266,7 +264,7 @@ family_tweaks()
 	[[ $(type -t family_tweaks_s) == function ]] && family_tweaks_s
 
 	[[ "$BRANCH" =~ legacy|current ]] && rk3399_gpu_vpu_tweaks
-	[[ "$BRANCH" =~ legacy && $BOARDFAMILY == "rockchip-rk3588" ]] && rk3588_gpu_vpu_tweaks
+	[[ "$BRANCH" =~ legacy && $BOARDFAMILY == "rockchip-rk3588" ]] && rk35xx_gpu_vpu_tweaks
 	[[ "$BRANCH" == legacy && $BOARDFAMILY == "rockchip-rk356x" ]] && rk356x_gpu_vpu_tweaks
 
 	#if [[ ${BOARD} == orangepi800 && ${SELECTED_CONFIGURATION} == desktop && ${RELEASE} =~ bullseye|bookworm ]]; then

external/config/sources/families/rockchip-rk3588.conf

@@ -14,7 +14,7 @@ case $BRANCH in
 		UBOOT_COMPILER="aarch64-linux-gnu-"
 		UBOOT_USE_GCC='< 8.0'
 
-		KERNELBRANCH='branch:orange-pi-5.10-rk3588'
+		KERNELBRANCH='branch:orange-pi-5.10-rk35xx'
 		KERNELPATCHDIR='rockchip-rk3588-legacy'
 		LINUXCONFIG="linux-rockchip-rk3588-legacy"
 
@@ -29,6 +29,7 @@ prepare_boot_configuration
 family_tweaks_bsp() {
 
 	install -m 755 $EXTER/packages/bsp/adb/adbd-${ARCH} ${destination}/usr/bin/adbd
+	:
 }
 
 
@@ -92,7 +93,7 @@ family_tweaks_s() {
 		rsync -a --chown=root:root "${EXTER}"/packages/bsp/rk3588/* ${SDCARD}/
 	fi
 
-	if [[ ${BOARD} =~ orangepi5plus|orangepi900 ]]; then
+	if [[ ${BOARD} =~ orangepi5plus|orangepi5pro|orangepi900 ]]; then
 
 		if [[ ${SELECTED_CONFIGURATION} == desktop && ${DESKTOP_ENVIRONMENT} == kde-plasma ]]; then
 			rsync -a --chown=root:root --exclude=etc/pulse "${EXTER}"/packages/bsp/orangepi5plus/* ${SDCARD}/
@@ -141,6 +142,12 @@ family_tweaks_s() {
 		echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmiin-sound", ENV{SOUND_DESCRIPTION}="HDMI-In Audio"' >> ${SDCARD}/etc/udev/rules.d/90-naming-audios.rules
 		echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> ${SDCARD}/etc/udev/rules.d/90-naming-audios.rules
 		echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8388-sound", ENV{SOUND_DESCRIPTION}="ES8388 Audio"' >> ${SDCARD}/etc/udev/rules.d/90-naming-audios.rules
+
+	elif [[ "${BOARD}" == orangepi5pro ]]; then
+
+		echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > ${SDCARD}/etc/udev/rules.d/90-naming-audios.rules
+		echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi1-sound", ENV{SOUND_DESCRIPTION}="HDMI1 Audio"' >> ${SDCARD}/etc/udev/rules.d/90-naming-audios.rules
+		echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8388-sound", ENV{SOUND_DESCRIPTION}="ES8388 Audio"' >> ${SDCARD}/etc/udev/rules.d/90-naming-audios.rules
 	fi
 
 	# Realtek 8811CU/8821CU usb modeswitch support

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

@@ -97,7 +97,7 @@ prepare_board() {
 		rockpro64|renegade-elite|pinebook-pro|station-p1)
 			BOARDFAMILY=rk3399
 			;;
-		orangepi5|orangepicm5|orangepi5b|orangepi5plus|orangepitab|orangepi900)
+		orangepi5|orangepicm5|orangepi5b|orangepi5plus|orangepi5pro|orangepitab|orangepi900)
 			[[ $BOARD =~ orangepi5|orangepi5b ]] && echo host > /sys/kernel/debug/usb/fc000000.usb/mode
 
 			if [[ $BOARD =~ orangepi900 ]]; then
@@ -145,6 +145,15 @@ prepare_board() {
 				brcm_patchram_plus --bd_addr_rand --enable_hci --no2bytes --use_baudrate_for_download --tosleep 200000 \
 					--baudrate 1500000 --patchram /lib/firmware/ap6275p/BCM4362A2.hcd /dev/ttyS9 &
 			fi
+
+			if [[ $BOARD =~ orangepi5pro ]]; then
+
+				es8388_card=$(aplay -l | grep "es8388" | cut -d ':' -f 1 | cut -d ' ' -f 2)
+				tinymix -D ${es8388_card} 37 1
+
+				rfkill unblock all
+				/usr/bin/hciattach_opi -n -s 1500000 /dev/ttyBT0 sprd &
+			fi
 			;;
 		orangepi3-lts)
 			#aplay /usr/share/sounds/alsa/audio.wav -D hw:0,0 > /dev/null 2>&1

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

@@ -14,36 +14,36 @@ hdmi0_card=$(aplay -l | grep "hdmi0" | cut -d ':' -f 1 | cut -d ' ' -f 2)
 
 if [[ $type == "main" ]]; then
 
-	tinymix -D $card 3 4
-	tinymix -D $card 4 2
-	tinymix -D $card 14 192
-	tinymix -D $card 16 4
-	tinymix -D $card 17 4
+	tinymix -D $card 13 4
+	tinymix -D $card 14 2
+	tinymix -D $card 24 192
+	tinymix -D $card 26 4
+	tinymix -D $card 27 4
 	if [[ ${BOARD} == orangepi900 ]]; then
-	tinymix -D $card 35 1
-	tinymix -D $card 36 1
-	tinymix -D $card 37 1
+	tinymix -D $card 45 1
+	tinymix -D $card 46 1
+	tinymix -D $card 47 1
 	else
-	tinymix -D $card 31 1
-	tinymix -D $card 32 1
-	tinymix -D $card 33 1
+	tinymix -D $card 41 1
+	tinymix -D $card 42 1
+	tinymix -D $card 43 1
 	fi
 
 else
 
-	tinymix -D $card 3 2
-	tinymix -D $card 4 1
-	tinymix -D $card 14 192
-	tinymix -D $card 16 4
-	tinymix -D $card 17 4
+	tinymix -D $card 13 2
+	tinymix -D $card 14 1
+	tinymix -D $card 24 192
+	tinymix -D $card 26 4
+	tinymix -D $card 27 4
 	if [[ ${BOARD} == orangepi900 ]]; then
-	tinymix -D $card 35 0
-	tinymix -D $card 36 0
-	tinymix -D $card 37 0
+	tinymix -D $card 45 0
+	tinymix -D $card 46 0
+	tinymix -D $card 47 0
 	else
-	tinymix -D $card 31 0
-	tinymix -D $card 32 0
-	tinymix -D $card 33 0
+	tinymix -D $card 41 0
+	tinymix -D $card 42 0
+	tinymix -D $card 43 0
 	fi
 
 fi

scripts/image-helpers.sh

@@ -244,7 +244,83 @@ dpkg_install_deb_chroot()
 
 }
 
+dpkg_install_debs_chroot()
+{
+	local deb_dir=$1
+	local unsatisfied_dependencies=()
+	local package_names=()
+	local package_dependencies=()
+
+	[ ! -d "$deb_dir" ] && return
+
+	deb_packages=($(find "${deb_dir}" -type f -name "*.deb"))
+
+	find_in_array() {
+		local target="$1"
+		local element=""
+		shift
+		for element in "$@"; do
+			[[ "$element" == "$target" ]] && return 0
+		done
+		return 1
+	}
+
+	for package in "${deb_packages[@]}"; do
+		package_names+=($(dpkg-deb -f "$package" Package))
+
+		dep_str=$(dpkg-deb -I "${package}" | grep 'Depends' | sed 's/.*: //' | sed 's/ //g' | sed 's/([^)]*)//g')
+		IFS=',' read -ra dep_array <<< "$dep_str"
+
+		if [[ ! ${#dep_array[@]} -eq 0 ]]; then
+			#dep_array[-1]="${dep_array[-1]} "
+
+			for element in "${dep_array[@]}"; do
+				if [[ $element == *"|"* ]]; then
+					#dep_array=("${dep_array[@]/$element}")
+					:
+				else
+					if ! find_in_array "$element" "${package_dependencies[@]}"; then
+						package_dependencies+=("${element}")
+					fi
+				fi
+			done
+
+		fi
+	done
+
+	for dependency in "${package_dependencies[@]}"; do
+		if ! chroot "${SDCARD}" /bin/bash -c "dpkg-query -W --showformat='\${Status}' ${dependency} \
+			| grep -q 'ok installed'" &>/dev/null; then
+
+			all=("${package_names[@]}" "${unsatisfied_dependencies[@]}")
+
+			if ! find_in_array "$dependency" "${all[@]}"; then
+				unsatisfied_dependencies+=("$dependency")
+			fi
+		fi
+	done
 
+	if [[ ! -z "${unsatisfied_dependencies[*]}" ]]; then
+		display_alert "Installing Dependencies" "${unsatisfied_dependencies[*]}"
+		chroot $SDCARD /bin/bash -c "apt-get -y -qq install ${unsatisfied_dependencies[*]}" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
+	fi
+
+	local names=""
+	for package in "${deb_packages[@]}"; do
+		name="/root/"$(basename "${package}")
+		names+=($name)
+		[[ ! -f "${SDCARD}${name}" ]] && cp "${package}" "${SDCARD}${name}"
+	done
+
+	if [[ ! -z "${names[*]}" ]]; then
+		display_alert "Installing" "$(basename $deb_dir)"
+
+		# when building in bulk from remote, lets make sure we have up2date index
+		chroot "${SDCARD}" /bin/bash -c "dpkg -i ${names[*]} " >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
+		[[ $? -ne 0 ]] && exit_with_error "Installation of $(basename $deb_dir) failed" "${BOARD} ${RELEASE} ${BUILD_DESKTOP} ${LINUXFAMILY}"
+		chroot "${SDCARD}" /bin/bash -c "apt-mark hold ${package_names[*]}" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
+	fi
+}
 
 run_on_sdcard()
 {

scripts/main.sh

@@ -239,6 +239,7 @@ if [[ -z $BOARD ]]; then
 	#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")
 	options+=("orangepi5plus"                 "Rockchip  RK3588 octa core 4-32GB RAM 2.5GBE USB3 USB-C WiFi/BT NVMe eMMC")
+	#options+=("orangepi5pro"                 "Rockchip  RK3588 octa core 4-32GB RAM 2.5GBE USB3 USB-C WiFi/BT NVMe eMMC")
 	options+=("orangepicm4"                 "Rockchip  RK3566 quad core 2-8GB RAM GBE eMMC USB3 NvMe WiFi/BT")
 	options+=("orangepi3b"                  "Rockchip  RK3566 quad core 2-8GB RAM GBE eMMC USB3 NvMe WiFi/BT")
 	#options+=("orangepir1plus"              "Rockchip  RK3328 quad core 1GB RAM 2xGBE USB2 SPI")
@@ -467,7 +468,7 @@ if [[ ${IGNORE_UPDATES} != yes ]]; then
 
 	if [[ ${BOARDFAMILY} == "rockchip-rk3588" && $RELEASE =~ bullseye|bookworm|focal|jammy|raspi ]]; then
 
-		[[ ${BUILD_OPT} == image ]] && fetch_from_repo "https://github.com/orangepi-xunlong/rk-rootfs-build.git" "${EXTER}/cache/sources/rk3588_packages_${RELEASE}" "branch:rk3588_packages_${RELEASE}"
+		[[ ${BUILD_OPT} == image ]] && fetch_from_repo "https://github.com/orangepi-xunlong/rk-rootfs-build.git" "${EXTER}/cache/sources/rk35xx_packages" "branch:rk35xx_packages"
 
 	fi