qjyu
/
OrangePi_CM5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for Orange Pi 5 v1.1.2 and support Orange Pi 5B

This commit is contained in:
orangepi-xunlong 2023-02-16 19:40:07 +08:00
parent 4c6d1752db
commit e1d680aa29
11 changed files with 88 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/config/boards/orangepi5.conf vendored
View File

@ -12,4 +12,4 @@ BOOT_SUPPORT_SPI="yes"
SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes
DISTRIB_TYPE_LEGACY="bullseye focal jammy" DISTRIB_TYPE_LEGACY="bullseye focal jammy"
BOOTFS_TYPE="fat" BOOTFS_TYPE="fat"
REVISION="1.1.0" REVISION="1.1.2"

14
external/config/boards/orangepi5b.conf vendored Normal file
View File

@ -0,0 +1,14 @@
# Rockchip RK3588s SoC
BOARD_NAME="Orange Pi 5B"
BOARDFAMILY="rockchip-rk3588"
BOOTCONFIG="orangepi_5b_defconfig"
KERNEL_TARGET="legacy"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3588s-orangepi-5b.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 focal jammy"
BOOTFS_TYPE="fat"
REVISION="1.0.0"

1
external/config/desktop/focal/environments/xfce/config_base/packages vendored
View File

@ -143,6 +143,7 @@ xdg-user-dirs
xdg-user-dirs-gtk xdg-user-dirs-gtk
xfce4 xfce4
xfce4-notifyd xfce4-notifyd
xfce4-power-manager
xfce4-screenshooter xfce4-screenshooter
xfce4-terminal xfce4-terminal
xfonts-100dpi xfonts-100dpi

71
external/config/kernel/linux-rockchip-rk3588-legacy.config vendored
View File

@ -2,15 +2,16 @@
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.10.110 Kernel Configuration # Linux/arm64 5.10.110 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 9.2-2019.12 (arm-9.10)) 9.2.1 20191025" CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (GNU Toolchain for the Arm Architecture 11.2-2022.02 (arm-11.14)) 11.2.1 20220111"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=90201 CONFIG_GCC_VERSION=110201
CONFIG_LD_VERSION=233010000 CONFIG_LD_VERSION=202438220000
CONFIG_CLANG_VERSION=0 CONFIG_CLANG_VERSION=0
CONFIG_LLD_VERSION=0 CONFIG_LLD_VERSION=0
CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_IRQ_WORK=y CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_BUILDTIME_TABLE_SORT=y
@ -97,7 +98,8 @@ CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASK_IO_ACCOUNTING=y
# CONFIG_PSI is not set CONFIG_PSI=y
# CONFIG_PSI_DEFAULT_DISABLED is not set
# end of CPU/Task time and stats accounting # end of CPU/Task time and stats accounting
CONFIG_CPU_ISOLATION=y CONFIG_CPU_ISOLATION=y
@ -465,6 +467,7 @@ CONFIG_ARM64_TLB_RANGE=y
# #
CONFIG_AS_HAS_ARMV8_5=y CONFIG_AS_HAS_ARMV8_5=y
CONFIG_ARM64_BTI=y CONFIG_ARM64_BTI=y
CONFIG_ARM64_BTI_KERNEL=y
CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
CONFIG_ARM64_E0PD=y CONFIG_ARM64_E0PD=y
CONFIG_ARCH_RANDOM=y CONFIG_ARCH_RANDOM=y
@ -1796,7 +1799,11 @@ CONFIG_BT_MTKSDIO=m
CONFIG_BT_HCIBTUSB_RTLBTUSB=m CONFIG_BT_HCIBTUSB_RTLBTUSB=m
# end of Bluetooth device drivers # end of Bluetooth device drivers
# CONFIG_AF_RXRPC is not set CONFIG_AF_RXRPC=m
# CONFIG_AF_RXRPC_IPV6 is not set
# CONFIG_AF_RXRPC_INJECT_LOSS is not set
# CONFIG_AF_RXRPC_DEBUG is not set
# CONFIG_RXKAD is not set
# CONFIG_AF_KCM is not set # CONFIG_AF_KCM is not set
CONFIG_STREAM_PARSER=y CONFIG_STREAM_PARSER=y
CONFIG_FIB_RULES=y CONFIG_FIB_RULES=y
@ -5610,7 +5617,7 @@ CONFIG_HID_GENERIC=y
# CONFIG_HID_ITE is not set # CONFIG_HID_ITE is not set
# CONFIG_HID_JABRA is not set # CONFIG_HID_JABRA is not set
# CONFIG_HID_TWINHAN is not set # CONFIG_HID_TWINHAN is not set
CONFIG_HID_KENSINGTON=y CONFIG_HID_KENSINGTON=m
# CONFIG_HID_LCPOWER is not set # CONFIG_HID_LCPOWER is not set
# CONFIG_HID_LED is not set # CONFIG_HID_LED is not set
# CONFIG_HID_LENOVO is not set # CONFIG_HID_LENOVO is not set
@ -5619,10 +5626,10 @@ CONFIG_HID_KENSINGTON=y
# CONFIG_HID_MALTRON is not set # CONFIG_HID_MALTRON is not set
# CONFIG_HID_MAYFLASH is not set # CONFIG_HID_MAYFLASH is not set
# CONFIG_HID_REDRAGON is not set # CONFIG_HID_REDRAGON is not set
# CONFIG_HID_MICROSOFT is not set CONFIG_HID_MICROSOFT=m
# CONFIG_HID_MONTEREY is not set # CONFIG_HID_MONTEREY is not set
CONFIG_HID_MULTITOUCH=y CONFIG_HID_MULTITOUCH=m
# CONFIG_HID_NINTENDO is not set CONFIG_HID_NINTENDO=m
# CONFIG_HID_NTI is not set # CONFIG_HID_NTI is not set
# CONFIG_HID_NTRIG is not set # CONFIG_HID_NTRIG is not set
# CONFIG_HID_ORTEK is not set # CONFIG_HID_ORTEK is not set
@ -5631,16 +5638,18 @@ CONFIG_HID_MULTITOUCH=y
# CONFIG_HID_PETALYNX is not set # CONFIG_HID_PETALYNX is not set
# CONFIG_HID_PICOLCD is not set # CONFIG_HID_PICOLCD is not set
# CONFIG_HID_PLANTRONICS is not set # CONFIG_HID_PLANTRONICS is not set
# CONFIG_HID_PLAYSTATION is not set CONFIG_HID_PLAYSTATION=m
# CONFIG_PLAYSTATION_FF is not set
# CONFIG_HID_PRIMAX is not set # CONFIG_HID_PRIMAX is not set
# CONFIG_HID_RETRODE is not set # CONFIG_HID_RETRODE is not set
# CONFIG_HID_ROCCAT is not set CONFIG_HID_ROCCAT=m
# CONFIG_HID_SAITEK is not set CONFIG_HID_SAITEK=m
# CONFIG_HID_SAMSUNG is not set # CONFIG_HID_SAMSUNG is not set
# CONFIG_HID_SONY is not set CONFIG_HID_SONY=m
# CONFIG_SONY_FF is not set
# CONFIG_HID_SPEEDLINK is not set # CONFIG_HID_SPEEDLINK is not set
# CONFIG_HID_STEAM is not set CONFIG_HID_STEAM=m
# CONFIG_HID_STEELSERIES is not set CONFIG_HID_STEELSERIES=m
# CONFIG_HID_SUNPLUS is not set # CONFIG_HID_SUNPLUS is not set
# CONFIG_HID_RMI is not set # CONFIG_HID_RMI is not set
# CONFIG_HID_GREENASIA is not set # CONFIG_HID_GREENASIA is not set
@ -5652,7 +5661,7 @@ CONFIG_HID_MULTITOUCH=y
# CONFIG_HID_UDRAW_PS3 is not set # CONFIG_HID_UDRAW_PS3 is not set
# CONFIG_HID_U2FZERO is not set # CONFIG_HID_U2FZERO is not set
# CONFIG_HID_WACOM is not set # CONFIG_HID_WACOM is not set
# CONFIG_HID_WIIMOTE is not set CONFIG_HID_WIIMOTE=m
# CONFIG_HID_XINMO is not set # CONFIG_HID_XINMO is not set
# CONFIG_HID_ZEROPLUS is not set # CONFIG_HID_ZEROPLUS is not set
# CONFIG_HID_ZYDACRON is not set # CONFIG_HID_ZYDACRON is not set
@ -7315,7 +7324,7 @@ CONFIG_ARM_PMU=y
CONFIG_ANDROID=y CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDER_IPC=y
CONFIG_ANDROID_BINDERFS=y CONFIG_ANDROID_BINDERFS=y
CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder" CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder,anbox-binder,anbox-hwbinder,anbox-vndbinder"
# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
# CONFIG_ANDROID_DEBUG_SYMBOLS is not set # CONFIG_ANDROID_DEBUG_SYMBOLS is not set
# CONFIG_ANDROID_VENDOR_HOOKS is not set # CONFIG_ANDROID_VENDOR_HOOKS is not set
@ -7447,7 +7456,7 @@ CONFIG_F2FS_FS_SECURITY=y
# CONFIG_FS_DAX is not set # CONFIG_FS_DAX is not set
CONFIG_FS_POSIX_ACL=y CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=y CONFIG_EXPORTFS=y
# CONFIG_EXPORTFS_BLOCK_OPS is not set CONFIG_EXPORTFS_BLOCK_OPS=y
CONFIG_FILE_LOCKING=y CONFIG_FILE_LOCKING=y
CONFIG_MANDATORY_FILE_LOCKING=y CONFIG_MANDATORY_FILE_LOCKING=y
# CONFIG_FS_ENCRYPTION is not set # CONFIG_FS_ENCRYPTION is not set
@ -7616,20 +7625,20 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
CONFIG_NFS_V4_1_MIGRATION=y CONFIG_NFS_V4_1_MIGRATION=y
CONFIG_NFS_V4_SECURITY_LABEL=y CONFIG_NFS_V4_SECURITY_LABEL=y
CONFIG_ROOT_NFS=y CONFIG_ROOT_NFS=y
# CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_LEGACY_DNS=y
CONFIG_NFS_USE_KERNEL_DNS=y
CONFIG_NFS_DISABLE_UDP_SUPPORT=y CONFIG_NFS_DISABLE_UDP_SUPPORT=y
# CONFIG_NFS_V4_2_READ_PLUS is not set CONFIG_NFS_V4_2_READ_PLUS=y
CONFIG_NFSD=m CONFIG_NFSD=y
CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y CONFIG_NFSD_V4=y
# CONFIG_NFSD_BLOCKLAYOUT is not set CONFIG_NFSD_PNFS=y
# CONFIG_NFSD_SCSILAYOUT is not set CONFIG_NFSD_BLOCKLAYOUT=y
# CONFIG_NFSD_FLEXFILELAYOUT is not set CONFIG_NFSD_SCSILAYOUT=y
# CONFIG_NFSD_V4_2_INTER_SSC is not set CONFIG_NFSD_FLEXFILELAYOUT=y
# CONFIG_NFSD_V4_SECURITY_LABEL is not set CONFIG_NFSD_V4_2_INTER_SSC=y
CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_GRACE_PERIOD=y CONFIG_GRACE_PERIOD=y
CONFIG_LOCKD=y CONFIG_LOCKD=y
CONFIG_LOCKD_V4=y CONFIG_LOCKD_V4=y
@ -7652,8 +7661,10 @@ CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DEBUG is not set
CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_DFS_UPCALL=y
# CONFIG_CODA_FS is not set CONFIG_CODA_FS=m
# CONFIG_AFS_FS is not set CONFIG_AFS_FS=m
# CONFIG_AFS_DEBUG is not set
# CONFIG_AFS_DEBUG_CURSOR is not set
CONFIG_NLS=y CONFIG_NLS=y
CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_DEFAULT="utf8"
CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_437=y
@ -8179,6 +8190,7 @@ CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set # CONFIG_KGDB is not set
CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
# CONFIG_UBSAN is not set # CONFIG_UBSAN is not set
CONFIG_HAVE_KCSAN_COMPILER=y
# end of Generic Kernel Debugging Instruments # end of Generic Kernel Debugging Instruments
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
@ -8217,6 +8229,7 @@ CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y
CONFIG_HAVE_ARCH_KASAN_VMALLOC=y CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_CC_HAS_KASAN_GENERIC=y
CONFIG_CC_HAS_KASAN_SW_TAGS=y
CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
# CONFIG_KASAN is not set # CONFIG_KASAN is not set
CONFIG_HAVE_ARCH_KFENCE=y CONFIG_HAVE_ARCH_KFENCE=y

38
external/config/sources/families/include/rk3588_gpu_vpu.inc vendored
View File

@ -1,6 +1,6 @@
rk3588_gpu_vpu_tweaks() rk3588_gpu_vpu_tweaks()
{ {
if [[ ${BOARD} =~ orangepi5 && ${SELECTED_CONFIGURATION} == desktop && ${RELEASE} == bullseye ]]; then if [[ ${BOARD} =~ orangepi5|orangepi5b && ${SELECTED_CONFIGURATION} == desktop && ${RELEASE} == bullseye ]]; then
chroot $SDCARD /bin/bash -c "chmod o+x /usr/lib/dbus-1.0/dbus-daemon-launch-helper" chroot $SDCARD /bin/bash -c "chmod o+x /usr/lib/dbus-1.0/dbus-daemon-launch-helper"
@ -125,13 +125,13 @@ rk3588_gpu_vpu_tweaks()
fi fi
if [[ ${BOARD} =~ orangepi5 && ${SELECTED_CONFIGURATION} == desktop && ${RELEASE} == jammy ]]; then if [[ ${BOARD} =~ orangepi5|orangepi5b && ${SELECTED_CONFIGURATION} == desktop && ${RELEASE} == jammy ]]; then
chroot $SDCARD /bin/bash -c "chmod o+x /usr/lib/dbus-1.0/dbus-daemon-launch-helper" chroot $SDCARD /bin/bash -c "chmod o+x /usr/lib/dbus-1.0/dbus-daemon-launch-helper"
#chroot $SDCARD /bin/bash -c "apt-get update" #chroot $SDCARD /bin/bash -c "apt-get update"
#chroot $SDCARD /bin/bash -c "apt-get upgrade -y" > /dev/null #chroot $SDCARD /bin/bash -c "apt-get upgrade -y" > /dev/null
chroot $SDCARD /bin/bash -c "apt-get install -y libgraphene-1.0-0" > /dev/null chroot $SDCARD /bin/bash -c "apt-get install -y libgraphene-1.0-0 libqt5waylandclient5" > /dev/null
dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/rkaiq/camera-engine-rkaiq_rk3588_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/rkaiq/camera-engine-rkaiq_rk3588_arm64.deb"
cp "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rkaiq/rkaiq_3A_server" $SDCARD/usr/bin/ -f cp "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rkaiq/rkaiq_3A_server" $SDCARD/usr/bin/ -f
@ -161,23 +161,21 @@ rk3588_gpu_vpu_tweaks()
dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-base1.0/libgstreamer-plugins-base1.0-0_1.20.3-1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-base1.0/libgstreamer-plugins-base1.0-0_1.20.3-1_arm64.deb"
dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-base1.0/libgstreamer-plugins-base1.0-dev_1.20.3-1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-base1.0/libgstreamer-plugins-base1.0-dev_1.20.3-1_arm64.deb"
#dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/libgstreamer-plugins-bad1.0-0_1.18.5-1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/libgstreamer-plugins-bad1.0-0_1.20.3-0ubuntu1_arm64.deb"
#dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/gir1.2-gst-plugins-bad-1.0_1.18.5-1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/gir1.2-gst-plugins-bad-1.0_1.20.3-0ubuntu1_arm64.deb"
#dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/libgstreamer-opencv1.0-0_1.18.5-1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/libgstreamer-opencv1.0-0_1.20.3-0ubuntu1_arm64.deb"
#dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/gstreamer1.0-opencv_1.18.5-1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/gstreamer1.0-opencv_1.20.3-0ubuntu1_arm64.deb"
#dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/gstreamer1.0-plugins-bad_1.18.5-1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/gstreamer1.0-plugins-bad_1.20.3-0ubuntu1_arm64.deb"
#dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/gstreamer1.0-plugins-bad-apps_1.18.5-1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/gstreamer1.0-plugins-bad-apps_1.20.3-0ubuntu1_arm64.deb"
#dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/gstreamer1.0-wpe_1.18.5-1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/gstreamer1.0-wpe_1.20.3-0ubuntu1_arm64.deb"
#dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/libgstreamer-plugins-bad1.0-dev_1.18.5-1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/libgstreamer-plugins-bad1.0-dev_1.20.3-0ubuntu1_arm64.deb"
#dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-good1.0/gstreamer1.0-gtk3_1.18.5-1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-good1.0/gstreamer1.0-gtk3_1.20.3-0ubuntu1_arm64.deb"
#dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-good1.0/gstreamer1.0-plugins-good_1.18.5-1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-good1.0/gstreamer1.0-plugins-good_1.20.3-0ubuntu1_arm64.deb"
#dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-good1.0/gstreamer1.0-pulseaudio_1.18.5-1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-good1.0/gstreamer1.0-pulseaudio_1.20.3-0ubuntu1_arm64.deb"
#dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-good1.0/gstreamer1.0-qt5_1.18.5-1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-good1.0/gstreamer1.0-qt5_1.20.3-0ubuntu1_arm64.deb"
dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-good1.0/libgstreamer-plugins-good1.0-0_1.20.3-0ubuntu1_arm64.deb"
#dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-ugly1.0/gstreamer1.0-plugins-ugly_1.18.5-1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-good1.0/libgstreamer-plugins-good1.0-dev_1.20.3-0ubuntu1_arm64.deb"
#dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-libav1.0/gstreamer1.0-plugins-ugly_1.18.5-1_arm64.deb"
dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/libdvbv5-0_1.22.1-2build1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/libdvbv5-0_1.22.1-2build1_arm64.deb"
dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/dvb-tools_1.22.1-2build1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/dvb-tools_1.22.1-2build1_arm64.deb"
@ -252,7 +250,7 @@ rk3588_gpu_vpu_tweaks()
fi fi
if [[ ${BOARD} =~ orangepi5 && ${SELECTED_CONFIGURATION} == desktop && ${RELEASE} == focal ]]; then if [[ ${BOARD} =~ orangepi5|orangepi5b && ${SELECTED_CONFIGURATION} == desktop && ${RELEASE} == focal ]]; then
chroot $SDCARD /bin/bash -c "chmod o+x /usr/lib/dbus-1.0/dbus-daemon-launch-helper" chroot $SDCARD /bin/bash -c "chmod o+x /usr/lib/dbus-1.0/dbus-daemon-launch-helper"

6
external/config/sources/families/include/rockchip64_common.inc vendored
View File

@ -57,7 +57,7 @@ if [[ $BOARD =~ orangepir1plus|orangepir1plus-lts ]]; then
MINILOADER_BLOB='rk33/rk322xh_miniloader_v2.50.bin' MINILOADER_BLOB='rk33/rk322xh_miniloader_v2.50.bin'
BL31_BLOB='rk33/rk322xh_bl31_v1.44.elf' BL31_BLOB='rk33/rk322xh_bl31_v1.44.elf'
elif [[ $BOARD == orangepi5 ]]; then elif [[ $BOARD =~ orangepi5|orangepi5b ]]; then
BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}" BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}"
DDR_BLOB="${DDR_BLOB:=rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.08.bin}" DDR_BLOB="${DDR_BLOB:=rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.08.bin}"
@ -113,7 +113,7 @@ uboot_custom_postprocess()
if [[ $BOOT_SUPPORT_SPI == yes ]]; then if [[ $BOOT_SUPPORT_SPI == yes ]]; then
if [[ $BOARD == "orangepi5" ]]; then if [[ $BOARD =~ orangepi5|orangepi5b ]]; then
tools/mkimage -n rk3588 -T rksd -d $RKBIN_DIR/$DDR_BLOB:spl/u-boot-spl.bin idbloader.img tools/mkimage -n rk3588 -T rksd -d $RKBIN_DIR/$DDR_BLOB:spl/u-boot-spl.bin idbloader.img
dd if=/dev/zero of=rkspi_loader.img bs=1M count=0 seek=16 dd if=/dev/zero of=rkspi_loader.img bs=1M count=0 seek=16
@ -241,7 +241,7 @@ family_tweaks()
[[ $(type -t family_tweaks_s) == function ]] && family_tweaks_s [[ $(type -t family_tweaks_s) == function ]] && family_tweaks_s
[[ "$BRANCH" =~ legacy|current ]] && rk3399_gpu_vpu_tweaks [[ "$BRANCH" =~ legacy|current ]] && rk3399_gpu_vpu_tweaks
[[ "$BRANCH" =~ legacy && "$BOARD" =~ orangepi5 ]] && rk3588_gpu_vpu_tweaks [[ "$BRANCH" =~ legacy && "$BOARD" =~ orangepi5|orangepi5b ]] && rk3588_gpu_vpu_tweaks
#if [[ ${BOARD} == orangepi800 && ${SELECTED_CONFIGURATION} == desktop && ${RELEASE} =~ bullseye|bookworm ]]; then #if [[ ${BOARD} == orangepi800 && ${SELECTED_CONFIGURATION} == desktop && ${RELEASE} =~ bullseye|bookworm ]]; then

3
external/config/sources/families/rockchip-rk3588.conf vendored
View File

@ -16,6 +16,7 @@ case $BRANCH in
KERNELBRANCH='branch:orange-pi-5.10-rk3588' KERNELBRANCH='branch:orange-pi-5.10-rk3588'
KERNELPATCHDIR='rockchip-rk3588-legacy' KERNELPATCHDIR='rockchip-rk3588-legacy'
KERNEL_USE_GCC='> 10.0'
;; ;;
@ -61,7 +62,7 @@ family_tweaks_s() {
chroot "${SDCARD}" /bin/bash -c "ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime" chroot "${SDCARD}" /bin/bash -c "ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime"
chroot "${SDCARD}" /bin/bash -c "dpkg-reconfigure -f noninteractive tzdata" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 chroot "${SDCARD}" /bin/bash -c "dpkg-reconfigure -f noninteractive tzdata" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
chroot $SDCARD /bin/bash -c "apt-get -y -qq install lm-sensors usb-modeswitch tree dnsmasq swig python3-dev python3-setuptools" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 chroot $SDCARD /bin/bash -c "apt-get -y -qq install lm-sensors usb-modeswitch tree dnsmasq v4l-utils swig python3-dev python3-setuptools bluez" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
install_wiringop install_wiringop
install_docker install_docker

2
external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization vendored
View File

@ -97,7 +97,7 @@ prepare_board() {
rockpro64|renegade-elite|pinebook-pro|station-p1) rockpro64|renegade-elite|pinebook-pro|station-p1)
BOARDFAMILY=rk3399 BOARDFAMILY=rk3399
;; ;;
orangepi5) orangepi5|orangepi5b)
echo host > /sys/kernel/debug/usb/fc000000.usb/mode echo host > /sys/kernel/debug/usb/fc000000.usb/mode
if [[ -c /dev/mpp_service ]]; then if [[ -c /dev/mpp_service ]]; then

2
scripts/distributions.sh
View File

@ -393,7 +393,7 @@ POST_INSTALL_KERNEL_DEBS
fi fi
# install plymouth-theme-orangepi # install plymouth-theme-orangepi
if [[ $PLYMOUTH == yes ]]; then if [[ $PLYMOUTH == yes && $BUILD_DESKTOP == yes && $RELEASE != buster ]]; then
if [[ "${REPOSITORY_INSTALL}" != *plymouth-theme-orangepi* ]]; then if [[ "${REPOSITORY_INSTALL}" != *plymouth-theme-orangepi* ]]; then
install_deb_chroot "${DEB_STORAGE}/orangepi-plymouth-theme_${REVISION}_all.deb" install_deb_chroot "${DEB_STORAGE}/orangepi-plymouth-theme_${REVISION}_all.deb"
else else

6
scripts/general.sh
View File

@ -786,7 +786,7 @@ display_alert "Building kernel splash logo" "$RELEASE" "info"
--blob "${SDCARD}"/tmp/throbber73.rgb \ --blob "${SDCARD}"/tmp/throbber73.rgb \
--blob "${SDCARD}"/tmp/throbber74.rgb \ --blob "${SDCARD}"/tmp/throbber74.rgb \
"${SDCARD}"/lib/firmware/bootsplash.orangepi >/dev/null 2>&1 "${SDCARD}"/lib/firmware/bootsplash.orangepi >/dev/null 2>&1
if [[ $BOOT_LOGO == yes || $BOOT_LOGO == desktop && $BUILD_DESKTOP == yes ]]; then if [[ $BOOT_LOGO == yes || $BOOT_LOGO == desktop && $BUILD_DESKTOP == yes && $RELEASE != buster ]]; then
[[ -f "${SDCARD}"/boot/orangepiEnv.txt ]] && grep -q '^bootlogo' "${SDCARD}"/boot/orangepiEnv.txt && \ [[ -f "${SDCARD}"/boot/orangepiEnv.txt ]] && grep -q '^bootlogo' "${SDCARD}"/boot/orangepiEnv.txt && \
sed -i 's/^bootlogo.*/bootlogo=true/' "${SDCARD}"/boot/orangepiEnv.txt || echo 'bootlogo=true' >> "${SDCARD}"/boot/orangepiEnv.txt sed -i 's/^bootlogo.*/bootlogo=true/' "${SDCARD}"/boot/orangepiEnv.txt || echo 'bootlogo=true' >> "${SDCARD}"/boot/orangepiEnv.txt
[[ -f "${SDCARD}"/boot/boot.ini ]] && sed -i 's/^setenv bootlogo.*/setenv bootlogo "true"/' "${SDCARD}"/boot/boot.ini [[ -f "${SDCARD}"/boot/boot.ini ]] && sed -i 's/^setenv bootlogo.*/setenv bootlogo "true"/' "${SDCARD}"/boot/boot.ini
@ -1518,6 +1518,8 @@ prepare_host()
"gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz" "gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz"
"gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz" "gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz"
"gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz" "gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz"
"gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf.tar.xz"
"gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu.tar.xz"
) )
USE_TORRENT_STATUS=${USE_TORRENT} USE_TORRENT_STATUS=${USE_TORRENT}
@ -1816,7 +1818,7 @@ show_checklist_variables ()
install_wiringop() install_wiringop()
{ {
install_deb_chroot "$EXTER/cache/debs/arm64/wiringpi_2.46.deb" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 install_deb_chroot "$EXTER/cache/debs/arm64/wiringpi_2.47.deb"
chroot "${SDCARD}" /bin/bash -c "apt-mark hold wiringpi" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 chroot "${SDCARD}" /bin/bash -c "apt-mark hold wiringpi" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
} }

1
scripts/main.sh
View File

@ -231,6 +231,7 @@ if [[ -z $BOARD ]]; then
options+=("orangepi4-lts" "Rockchip RK3399 hexa core 4GB RAM GBE eMMC USB3 USB-C WiFi/BT") 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+=("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+=("orangepi5" "Rockchip RK3588S octa core 4-16GB RAM GBE USB3 USB-C NvME")
#options+=("orangepi5b" "Rockchip RK3588S octa core 4-16GB RAM GBE USB3 USB-C WiFi/BT")
#options+=("orangepir1plus" "Rockchip RK3328 quad core 1GB RAM 2xGBE USB2 SPI") #options+=("orangepir1plus" "Rockchip RK3328 quad core 1GB RAM 2xGBE USB2 SPI")
menustr="Please choose a Board." menustr="Please choose a Board."