drholy/orangepi-build
1
0
Fork 0
mirror of https://github.com/DrHo1y/orangepi-build.git synced 2026-11-06 07:47:21 +07:00
Code Issues Packages Projects Releases Wiki Activity

Update for RK3399

Browse Source
This commit is contained in:
orangepi-xunlong
2022-05-31 09:32:14 +08:00
parent 9ac00a9ca6
commit defa4456d4
12 changed files with 10221 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,10 +2,11 @@
BOARD_NAME="OPI 4 LTS"
BOARDFAMILY="rk3399"
BOOTCONFIG="orangepi-4-rk3399_defconfig"
KERNEL_TARGET="legacy current"
KERNEL_TARGET="legacy current next"
MODULES="sprdbt_tty sprdwl_ng"
MODULES_BLACKLIST_LEGACY="bcmdhd"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3399-orangepi-4-lts.dtb"
DISTRIB_TYPE_LEGACY="buster"
DISTRIB_TYPE_CURRENT="bullseye focal"
DISTRIB_TYPE_NEXT="jammy"

4
external/config/boards/orangepi800.conf vendored
View File

@@ -2,10 +2,10 @@
BOARD_NAME="OPI 800"
BOARDFAMILY="rk3399"
BOOTCONFIG="orangepi-800-rk3399_defconfig"
KERNEL_TARGET="current"
KERNEL_TARGET="current next"
MODULES="sprdbt_tty sprdwl_ng"
MODULES_BLACKLIST_LEGACY="bcmdhd"
BOOT_LOGO="desktop"
DISTRIB_TYPE_LEGACY="buster"
DISTRIB_TYPE_CURRENT="bullseye focal jammy"
#DISTRIB_TYPE_CURRENT="bullseye bookworm focal jammy"
DISTRIB_TYPE_NEXT="bullseye focal jammy"

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

@@ -2435,7 +2435,16 @@ CONFIG_RTL_CARDS=m
# CONFIG_RTL8821AE is not set
# CONFIG_RTL8192CU is not set
# CONFIG_RTL8XXXU is not set
# CONFIG_RTW88 is not set
CONFIG_RTW88=m
CONFIG_RTW88_CORE=m
CONFIG_RTW88_PCI=m
CONFIG_RTW88_8822B=m
CONFIG_RTW88_8822BE=m
# CONFIG_RTW88_8822CE is not set
# CONFIG_RTW88_8723DE is not set
# CONFIG_RTW88_8821CE is not set
# CONFIG_RTW88_DEBUG is not set
# CONFIG_RTW88_DEBUGFS is not set
CONFIG_WLAN_VENDOR_RSI=y
# CONFIG_RSI_91X is not set
CONFIG_WLAN_VENDOR_ST=y

9676
external/config/kernel/linux-rockchip64-edge.config vendored Normal file
View File

File diff suppressed because it is too large Load Diff

4
external/config/sources/families/include/rk3399_gpu_vpu.inc vendored
View File

@@ -70,7 +70,7 @@ rk3399_gpu_vpu_tweaks()
dpkg_install_deb_chroot "$EXTER/cache/sources/rk-rootfs-build-${RELEASE}/mpp/librockchip-mpp1_1.4.0_arm64.deb"
dpkg_install_deb_chroot "$EXTER/cache/sources/rk-rootfs-build-${RELEASE}/mpp/librockchip-vpu0_1.4.0_arm64.deb"
dpkg_install_deb_chroot "$EXTER/cache/sources/rk-rootfs-build-${RELEASE}/xserver/xserver-xorg-core-rockchip_1.20.3_arm64.deb"
dpkg_install_deb_chroot "$EXTER/cache/sources/rk-rootfs-build-${RELEASE}/xserver/gl4es_1.1.5_arm64.deb"
#dpkg_install_deb_chroot "$EXTER/cache/sources/rk-rootfs-build-${RELEASE}/xserver/gl4es_1.1.5_arm64.deb"
dpkg_install_deb_chroot "$EXTER/cache/sources/rk-rootfs-build-${RELEASE}/gst/gstreamer1.0-rockchip1_2.1.10_arm64.deb"
dpkg_install_deb_chroot "$EXTER/cache/sources/rk-rootfs-build-${RELEASE}/gst/gstreamer1.0-rockchip1-extra_3-20180115_arm64.deb"
@@ -82,7 +82,7 @@ rk3399_gpu_vpu_tweaks()
cp $EXTER/packages/bsp/rk3399/02-rockchip-accel.conf ${SDCARD}/etc/X11/xorg.conf.d/
dpkg_install_deb_chroot "$EXTER/cache/sources/rk-rootfs-build-${RELEASE}/rkisp/rkisp-engine-2.2.0_arm64.deb"
dpkg_install_deb_chroot "$EXTER/cache/sources/rk-rootfs-build-${RELEASE}/rkisp/rkisp-engine_2.2.0_arm64.deb"
install -m 0755 ${EXTER}/packages/bsp/rk3399/scripts/test_camera-gst.sh ${SDCARD}/usr/local/bin/
install -m 0755 ${EXTER}/packages/bsp/rk3399/scripts/test_camera-dual.sh ${SDCARD}/usr/local/bin/
install -m 0755 ${EXTER}/packages/bsp/rk3399/scripts/io ${SDCARD}/usr/local/bin/

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

@@ -14,7 +14,7 @@ GOVERNOR="ondemand"
BOOTBRANCH="branch:v2020.10-rockchip64"
PACKAGE_LIST_FAMILY="ethtool"
PACKAGE_LIST_DESKTOP_FAMILY="fcitx fonts-wqy-zenhei"
PACKAGE_LIST_FAMILY_REMOVE="mpv"
[[ $BRANCH != "next" ]] && PACKAGE_LIST_FAMILY_REMOVE="mpv"
RKBIN_DIR="$EXTER/cache/sources/rkbin-tools"
if [ "$(uname -m)" = "aarch64" ]; then
@@ -197,21 +197,21 @@ family_tweaks()
# execute specific tweaks function if present
[[ $(type -t family_tweaks_s) == function ]] && family_tweaks_s
rk3399_gpu_vpu_tweaks
[[ "$BRANCH" =~ legacy|current ]] && rk3399_gpu_vpu_tweaks
if [[ ${BOARD} == orangepi800 && ${SELECTED_CONFIGURATION} == desktop && ${RELEASE} =~ bullseye|bookworm ]]; then
#if [[ ${BOARD} == orangepi800 && ${SELECTED_CONFIGURATION} == desktop && ${RELEASE} =~ bullseye|bookworm ]]; then
install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/xfce4-zorinmenulite-plugin_1.1.2_arm64.deb"
install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/dockbarx-common_1.0~beta+git20210222-1~ppa1_all.deb"
install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/dockbarx-dockx_1.0~beta+git20210222-1~ppa1_all.deb"
install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/dockbarx_1.0~beta+git20210222-1~ppa1_all.deb"
install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/xfce4-dockbarx-plugin_0.6+git20210221-1~ppa2~20.10_arm64.deb"
install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/dockbarx-theme-zorin_1.1.0_all.deb"
# install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/xfce4-zorinmenulite-plugin_1.1.2_arm64.deb"
# install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/dockbarx-common_1.0~beta+git20210222-1~ppa1_all.deb"
# install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/dockbarx-dockx_1.0~beta+git20210222-1~ppa1_all.deb"
# install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/dockbarx_1.0~beta+git20210222-1~ppa1_all.deb"
# install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/xfce4-dockbarx-plugin_0.6+git20210221-1~ppa2~20.10_arm64.deb"
# install_deb_chroot "$EXTER/cache/debs/extra/bullseye-desktop/dockbarx-theme-zorin_1.1.0_all.deb"
## Orange Pi Desktop layout switcher
install_deb_chroot "$EXTER/cache/debs/arm64/layout_switcher/layoutswitcher_0.2-0_all.deb"
#install_deb_chroot "$EXTER/cache/debs/arm64/layout_switcher/switcher_1.0-1_arm64.deb"
fi
# ## Orange Pi Desktop layout switcher
# install_deb_chroot "$EXTER/cache/debs/arm64/layout_switcher/layoutswitcher_0.2-0_all.deb"
# #install_deb_chroot "$EXTER/cache/debs/arm64/layout_switcher/switcher_1.0-1_arm64.deb"
#fi
if [[ $BOARD =~ orangepir1plus|orangepir1plus-lts ]]; then
@@ -233,6 +233,31 @@ family_tweaks()
chroot $SDCARD /bin/bash -c "systemctl --no-reload enable rk3399-bluetooth.service >/dev/null 2>&1"
fi
if [[ $BOARD =~ orangepi800|orangepi4-lts ]]; then
[[ $RELEASE == bookworm ]] && dpkg_install_deb_chroot "$EXTER/cache/debs/extra/${RELEASE}-utils/wpasupplicant_2.10-9_arm64.deb"
[[ $RELEASE == jammy ]] && dpkg_install_deb_chroot "$EXTER/cache/debs/extra/${RELEASE}-utils/wpasupplicant_2.10-6ubuntu1_arm64.deb"
fi
if [[ $RELEASE == jammy && $BUILD_DESKTOP == yes && $install_chromium == yes ]]; then
chromium_name="chromium-browser_101.0.4951.15-0ubuntu1~ppa1~22.04.1_arm64.deb"
chromium_extra_name="chromium-codecs-ffmpeg-extra_101.0.4951.15-0ubuntu1~ppa1~22.04.1_arm64.deb"
chromium_url="http://ppa.launchpadcontent.net/saiarcot895/chromium-beta/ubuntu/pool/main/c/chromium-browser"
chromium=${EXTER}/cache/debs/arm64/${chromium_name}
chromium_extra=${EXTER}/cache/debs/arm64/${chromium_extra_name}
if [[ ! -f $chromium_extra ]]; then
wget -P ${EXTER}/cache/debs/arm64 ${chromium_url}/${chromium_name}
wget -P ${EXTER}/cache/debs/arm64 ${chromium_url}/${chromium_extra_name}
fi
install_deb_chroot $chromium_extra
install_deb_chroot $chromium
fi
rm $SDCARD/root/*.deb >/dev/null 2>&1
}

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

@@ -38,7 +38,6 @@ case $BRANCH in
gstreamer1.0-pulseaudio libgstreamer-plugins-base1.0-dev"
fi
;;
current)
@@ -46,11 +45,18 @@ case $BRANCH in
BOOTBRANCH="branch:v2020.10-rockchip64"
KERNELBRANCH='branch:orange-pi-5.10-rk3399'
LINUXCONFIG='linux-5.10-rk3399'
#KERNELBRANCH='branch:orange-pi-5.13-rockchip64'
#LINUXCONFIG='linux-5.13-rockchip64'
[[ ${BOARD} == orangepi4-lts ]] && ASOUND_STATE='asound.state.orangepi4-es8316'
[[ ${BOARD} == orangepi800 ]] && ASOUND_STATE='asound.state.orangepi800-es8316'
;;
next)
BOOTBRANCH='branch:v2020.10-rockchip64'
KERNELBRANCH='branch:orange-pi-5.17-rockchip64'
LINUXCONFIG='linux-rockchip64-edge'
[[ ${BOARD} =~ orangepi800|orangepi4-lts ]] && ASOUND_STATE='asound.state.orangepi800-next'
;;
esac
if [[ $BOARD =~ orangepi4|orangepi4-lts|orangepi800 ]]; then