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

Update for opi4lts

This commit is contained in:
baiywt 2024-01-05 11:58:21 +08:00
parent 25231a73b7
commit 2563495460
6 changed files with 2302 additions and 1020 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
external/config/boards/orangepi4-lts.conf vendored
View File

@ -8,5 +8,6 @@ MODULES_BLACKLIST_LEGACY="bcmdhd"
BOOT_LOGO="desktop" BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3399-orangepi-4-lts.dtb" BOOT_FDT_FILE="rockchip/rk3399-orangepi-4-lts.dtb"
DISTRIB_TYPE_LEGACY="buster" DISTRIB_TYPE_LEGACY="buster"
DISTRIB_TYPE_CURRENT="bullseye focal" DISTRIB_TYPE_CURRENT="bookworm jammy bullseye focal"
DISTRIB_TYPE_NEXT="jammy" DISTRIB_TYPE_NEXT="jammy"
REVISION="3.1.0"

3292
external/config/kernel/linux-5.10-rk3399.config vendored
View File

File diff suppressed because it is too large Load Diff

10
external/config/sources/families/include/rk35xx_gpu_vpu.inc vendored
View File

@ -1,6 +1,6 @@
rk35xx_gpu_vpu_tweaks() rk35xx_gpu_vpu_tweaks()
{ {
if [[ ${SELECTED_CONFIGURATION} == desktop ]]; then if [[ ${SELECTED_CONFIGURATION} == desktop && ${DESKTOP_ENVIRONMENT} != gnome ]]; then
debs_dir="$EXTER/cache/sources/rk35xx_packages" debs_dir="$EXTER/cache/sources/rk35xx_packages"
@ -8,11 +8,14 @@ rk35xx_gpu_vpu_tweaks()
debs_list+=("gstreamer" "gst-plugins-base1.0" "gst-plugins-good1.0" "gst-plugins-bad1.0" "gst-plugins-ugly1.0" "gstreamer-rockchip") 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+=("xserver" "glmark2" "libdrm" "libdrm-cursor")
debs_list+=("libv4l" "libv4l-rkmpp" "chromium") debs_list+=("libv4l" "libv4l-rkmpp" "chromium")
debs_list+=("ffmpeg" "mpv" "cheese" "gst-rkmpp") debs_list+=("ffmpeg" "cheese" "mpv" "gst-rkmpp")
chroot $SDCARD /bin/bash -c "rm -rf /etc/mpv/mpv.conf" chroot $SDCARD /bin/bash -c "rm -rf /etc/mpv/mpv.conf"
chroot $SDCARD /bin/bash -c "apt-get update" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
[[ ${RELEASE} == raspi ]] && chroot $SDCARD /bin/bash -c "apt remove -y chromium-browser rpi-chromium-mods libwidevinecdm0" [[ ${RELEASE} == raspi ]] && chroot $SDCARD /bin/bash -c "apt remove -y chromium-browser rpi-chromium-mods libwidevinecdm0"
[[ "$BOARDFAMILY" == "rk3399" ]] && chroot $SDCARD /bin/bash -c "apt install -y libqt5quick5" \
>> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
for dir in ${debs_common_list[@]}; do for dir in ${debs_common_list[@]}; do
dir=$(find "${debs_dir}/common" -type d -name ${dir}) dir=$(find "${debs_dir}/common" -type d -name ${dir})
@ -35,6 +38,9 @@ rk35xx_gpu_vpu_tweaks()
elif [[ $BOARDFAMILY == "rockchip-rk356x" ]]; then elif [[ $BOARDFAMILY == "rockchip-rk356x" ]]; then
dpkg_install_deb_chroot "${debs_dir}/common/libmali/libmali-bifrost-g52-g13p0-x11-gbm_1.9-1_arm64.deb" dpkg_install_deb_chroot "${debs_dir}/common/libmali/libmali-bifrost-g52-g13p0-x11-gbm_1.9-1_arm64.deb"
dpkg_install_deb_chroot "${debs_dir}/common/rkaiq/camera_engine_rkaiq_rk3568_arm64.deb" dpkg_install_deb_chroot "${debs_dir}/common/rkaiq/camera_engine_rkaiq_rk3568_arm64.deb"
elif [[ $BOARDFAMILY == "rk3399" ]]; then
dpkg_install_deb_chroot "${debs_dir}/common/libmali/libmali-midgard-t86x-r18p0-x11-gbm_1.9-1_arm64.deb"
dpkg_install_deb_chroot "${debs_dir}/common/rkisp/camera_engine_rkisp_v2.3.0_arm64.deb"
fi fi
cp ${EXTER}/packages/bsp/rk3588/etc/mpv/mpv.conf $SDCARD/etc/mpv/ cp ${EXTER}/packages/bsp/rk3588/etc/mpv/mpv.conf $SDCARD/etc/mpv/

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

@ -171,6 +171,8 @@ uboot_custom_postprocess()
elif [[ $BOOT_SCENARIO == "spl-blobs" || $BOOT_SCENARIO == "tpl-blob-atf-mainline" ]]; then elif [[ $BOOT_SCENARIO == "spl-blobs" || $BOOT_SCENARIO == "tpl-blob-atf-mainline" ]]; then
if [[ $BOARD =~ orangepicm4|orangepi3b ]]; then if [[ $BOARD =~ orangepicm4|orangepi3b ]]; then
tools/mkimage -n rk3568 -T rksd -d $RKBIN_DIR/$DDR_BLOB:spl/u-boot-spl.bin idbloader.img tools/mkimage -n rk3568 -T rksd -d $RKBIN_DIR/$DDR_BLOB:spl/u-boot-spl.bin idbloader.img
elif [[ $BOARD =~ orangepi4-lts|orangepi800 ]]; then
tools/mkimage -n rk3399 -T rksd -d $RKBIN_DIR/$DDR_BLOB:spl/u-boot-spl.bin idbloader.img
fi fi
: :
@ -263,7 +265,8 @@ family_tweaks()
# execute specific tweaks function if present # execute specific tweaks function if present
[[ $(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 ]] && rk3399_gpu_vpu_tweaks
[[ "$BRANCH" =~ current && $BOARDFAMILY == "rk3399" ]] && rk35xx_gpu_vpu_tweaks
[[ "$BRANCH" =~ legacy && $BOARDFAMILY == "rockchip-rk3588" ]] && rk35xx_gpu_vpu_tweaks [[ "$BRANCH" =~ legacy && $BOARDFAMILY == "rockchip-rk3588" ]] && rk35xx_gpu_vpu_tweaks
[[ "$BRANCH" == legacy && $BOARDFAMILY == "rockchip-rk356x" ]] && rk35xx_gpu_vpu_tweaks [[ "$BRANCH" == legacy && $BOARDFAMILY == "rockchip-rk356x" ]] && rk35xx_gpu_vpu_tweaks

10
external/config/sources/families/rk3399.conf vendored
View File

@ -7,6 +7,7 @@ ASOUND_STATE="asound.state.rk3399"
BOOTBRANCH="branch:v2020.04-rockchip64" BOOTBRANCH="branch:v2020.04-rockchip64"
LINUXCONFIG='linux-rk3399-'$BRANCH LINUXCONFIG='linux-rk3399-'$BRANCH
LINUXFAMILY=rk3399 LINUXFAMILY=rk3399
OVERLAY_PREFIX="rk3399"
case $BRANCH in case $BRANCH in
@ -43,8 +44,8 @@ case $BRANCH in
current) current)
BOOTBRANCH="branch:v2020.10-rockchip64" BOOTBRANCH="branch:v2017.09-rk3588"
KERNELBRANCH='branch:orange-pi-5.10-rk3399' KERNELBRANCH='branch:orange-pi-5.10-rk35xx'
LINUXCONFIG='linux-5.10-rk3399' LINUXCONFIG='linux-5.10-rk3399'
[[ ${BOARD} == orangepi4-lts ]] && ASOUND_STATE='asound.state.orangepi4-es8316' [[ ${BOARD} == orangepi4-lts ]] && ASOUND_STATE='asound.state.orangepi4-es8316'
[[ ${BOARD} == orangepi800 ]] && ASOUND_STATE='asound.state.orangepi800-es8316' [[ ${BOARD} == orangepi800 ]] && ASOUND_STATE='asound.state.orangepi800-es8316'
@ -62,11 +63,10 @@ esac
if [[ $BOARD =~ orangepi4|orangepi4-lts|orangepi800 ]]; then if [[ $BOARD =~ orangepi4|orangepi4-lts|orangepi800 ]]; then
BOOT_USE_BLOBS=yes BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}"
DDR_BLOB='rk33/rk3399_ddr_933MHz_v1.24.bin' DDR_BLOB='rk33/rk3399_ddr_933MHz_v1.24.bin'
MINILOADER_BLOB='rk33/rk3399_miniloader_v1.19.bin'
BL31_BLOB='rk33/rk3399_bl31_v1.30.elf' BL31_BLOB='rk33/rk3399_bl31_v1.30.elf'
BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}"
else else
BOOT_USE_BLOBS=yes BOOT_USE_BLOBS=yes

2
scripts/image-helpers.sh
View File

@ -302,7 +302,7 @@ dpkg_install_debs_chroot()
if [[ ! -z "${unsatisfied_dependencies[*]}" ]]; then if [[ ! -z "${unsatisfied_dependencies[*]}" ]]; then
display_alert "Installing Dependencies" "${unsatisfied_dependencies[*]}" display_alert "Installing Dependencies" "${unsatisfied_dependencies[*]}"
chroot $SDCARD /bin/bash -c "apt-get update; apt-get -y -qq install ${unsatisfied_dependencies[*]}" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 chroot $SDCARD /bin/bash -c "apt-get -y -qq install ${unsatisfied_dependencies[*]}" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
fi fi
local names="" local names=""