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

Update for Orange Pi 3B v1.0.4

This commit is contained in:
baiywt 2023-10-26 13:34:11 +08:00
parent ed4ced31b6
commit a0a0aeaaa6
10 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
external/cache/debs/arm64/wiringpi_2.51.deb vendored
View File

Binary file not shown.

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

@ -11,4 +11,4 @@ DISTRIB_TYPE_LEGACY="focal jammy bullseye bookworm raspi"
BOOTFS_TYPE="fat"
IMAGE_PARTITION_TABLE="gpt"
BOOT_FDT_FILE="rockchip/rk3566-orangepi-3b.dtb"
REVISION="1.0.2"
REVISION="1.0.4"

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

@ -1,10 +1,10 @@
rk35xx_gpu_vpu_tweaks()
{
if [[ ${SELECTED_CONFIGURATION} == desktop && ${DESKTOP_ENVIRONMENT} =~ xfce|kde-plasma ]]; then
if [[ ${SELECTED_CONFIGURATION} == desktop ]]; then
debs_dir="$EXTER/cache/sources/rk35xx_packages"
debs_common_list+=("rga2" "mpp" "rktoolkit" "rkaiq")
debs_common_list+=("rga2" "mpp" "rktoolkit")
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")
@ -12,17 +12,31 @@ rk35xx_gpu_vpu_tweaks()
chroot $SDCARD /bin/bash -c "rm -rf /etc/mpv/mpv.conf"
[[ ${RELEASE} == raspi ]] && chroot $SDCARD /bin/bash -c "apt remove -y chromium-browser rpi-chromium-mods libwidevinecdm0"
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})
if [[ ${RELEASE} == raspi ]]; then
[[ ${dir} == "libdrm" ]] && continue
dir=$(find "${debs_dir}/bullseye" -type d -name ${dir})
else
dir=$(find "${debs_dir}/${RELEASE}" -type d -name ${dir})
fi
[[ -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"
if [[ $BOARDFAMILY == "rockchip-rk3588" ]]; then
dpkg_install_deb_chroot "${debs_dir}/common/libmali/libmali-valhall-g610-g13p0-x11-gbm_1.9-1_arm64.deb"
dpkg_install_deb_chroot "${debs_dir}/common/rkaiq/camera-engine-rkaiq_rk3588_arm64.deb"
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/rkaiq/camera_engine_rkaiq_rk3568_arm64.deb"
fi
cp ${EXTER}/packages/bsp/rk3588/etc/mpv/mpv.conf $SDCARD/etc/mpv/
# The chromium using fixed pathes for libv4l2.so
@ -53,5 +67,7 @@ rk35xx_gpu_vpu_tweaks()
if [[ ${RELEASE} == bullseye ]]; then
apply_common_operations
fi
[[ ${RELEASE} == raspi ]] && chroot $SDCARD /bin/bash -c "sed -i '5aexport LD_PRELOAD=libdrm-cursor.so.1' /usr/bin/X"
fi
}

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

@ -265,7 +265,7 @@ family_tweaks()
[[ "$BRANCH" =~ legacy|current ]] && rk3399_gpu_vpu_tweaks
[[ "$BRANCH" =~ legacy && $BOARDFAMILY == "rockchip-rk3588" ]] && rk35xx_gpu_vpu_tweaks
[[ "$BRANCH" == legacy && $BOARDFAMILY == "rockchip-rk356x" ]] && rk356x_gpu_vpu_tweaks
[[ "$BRANCH" == legacy && $BOARDFAMILY == "rockchip-rk356x" ]] && rk35xx_gpu_vpu_tweaks
#if [[ ${BOARD} == orangepi800 && ${SELECTED_CONFIGURATION} == desktop && ${RELEASE} =~ bullseye|bookworm ]]; then

9
external/config/sources/families/rockchip-rk356x.conf vendored
View File

@ -38,7 +38,7 @@ install_balenaEtcher(){
family_tweaks_bsp()
{
:
install -m 755 $EXTER/packages/bsp/adb/adbd-${ARCH} ${destination}/usr/bin/adbd
}
family_tweaks_s() {
@ -47,6 +47,13 @@ family_tweaks_s() {
chroot $SDCARD /bin/bash -c "apt-get -y -qq install dnsmasq v4l-utils cheese swig python3-dev python3-setuptools bluez libncurses-dev" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
[[ ${RELEASE} == jammy ]] && rm ${SDCARD}/etc/profile.d/orangepi-ssh-title.sh # for adbd
chroot "${SDCARD}" /bin/bash -c "systemctl --no-reload enable usbdevice.service >/dev/null 2>&1"
if [[ -f "${SDCARD}"/etc/profile.d/im-config_wayland.sh && ${DESKTOP_ENVIRONMENT} =~ xfce|kde-plasma ]]; then
chroot $SDCARD /bin/bash -c "rm /etc/profile.d/im-config_wayland.sh" # for adbd
fi
install_docker
install_balenaEtcher
install_wiringop

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

@ -18,6 +18,11 @@ case $BRANCH in
KERNELPATCHDIR='rockchip-rk3588-legacy'
LINUXCONFIG="linux-rockchip-rk3588-legacy"
if [[ "${build_rt_image}" =~ yes ]]; then
KERNELBRANCH='branch:orange-pi-5.10-rk35xx-rt'
LINUXCONFIG="linux-rockchip-rk3588-legacy-rt"
fi
KERNEL_USE_GCC='> 10.0'
;;

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

@ -298,6 +298,7 @@ prepare_board() {
/usr/bin/hciattach_opi -n -s 1500000 /dev/ttyBT0 sprd &
;;
orangepicm4|orangepi3b)
echo host > /sys/devices/platform/fe8a0000.usb2-phy/otg_mode
if [[ -c /dev/mpp_service ]]; then
chmod 666 /dev/mpp_service

2
external/packages/bsp/rk356x/usr/local/bin/set_device.sh vendored
View File

@ -1,4 +1,4 @@
#!/bin/bash
sudo bash -c "echo device > /sys/kernel/debug/usb/fc000000.usb/mode"
sudo bash -c "echo peripheral > /sys/devices/platform/fe8a0000.usb2-phy/otg_mode"
sudo systemctl restart usbdevice

2
scripts/distributions.sh
View File

@ -961,7 +961,7 @@ install_opi_specific()
case ${BOARDFAMILY} in
"rockchip-rk356x")
rk356x_gpu_vpu_tweaks_for_raspios
rk35xx_gpu_vpu_tweaks
esac
[[ ! -d "${SDCARD}/lib/firmware" ]] && mkdir -p "${SDCARD}/lib/firmware"

2
scripts/image-helpers.sh
View File

@ -302,7 +302,7 @@ dpkg_install_debs_chroot()
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
chroot $SDCARD /bin/bash -c "apt-get update; apt-get -y -qq install ${unsatisfied_dependencies[*]}" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
fi
local names=""