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

Update for RK3399

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
external/cache/debs/extra/jammy-utils/wpasupplicant_2.10-6ubuntu1_arm64.deb vendored Normal file
View File

Binary file not shown.

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

473
external/packages/blobs/asound.state/asound.state.orangepi800-next vendored Normal file
View File

@ -0,0 +1,473 @@
state.rockchipes8316c {
control.1 {
iface MIXER
name 'Headphone Playback Volume'
value.0 3
value.1 3
comment {
access 'read write'
type INTEGER
count 2
range '0 - 3'
dbmin -4800
dbmax 0
dbvalue.0 0
dbvalue.1 0
}
}
control.2 {
iface MIXER
name 'Headphone Mixer Volume'
value.0 0
value.1 0
comment {
access 'read write'
type INTEGER
count 2
range '0 - 11'
dbmin -1200
dbmax 0
dbvalue.0 -1200
dbvalue.1 -1200
}
}
control.3 {
iface MIXER
name 'Playback Polarity'
value Normal
comment {
access 'read write'
type ENUMERATED
count 1
item.0 Normal
item.1 'R Invert'
item.2 'L Invert'
item.3 'L + R Invert'
}
}
control.4 {
iface MIXER
name 'DAC Playback Volume'
value.0 152
value.1 152
comment {
access 'read write'
type INTEGER
count 2
range '0 - 192'
dbmin -9999999
dbmax 0
dbvalue.0 -2000
dbvalue.1 -2000
}
}
control.5 {
iface MIXER
name 'DAC Soft Ramp Switch'
value false
comment {
access 'read write'
type BOOLEAN
count 1
}
}
control.6 {
iface MIXER
name 'DAC Soft Ramp Rate'
value 4
comment {
access 'read write'
type INTEGER
count 1
range '0 - 4'
}
}
control.7 {
iface MIXER
name 'DAC Notch Filter Switch'
value false
comment {
access 'read write'
type BOOLEAN
count 1
}
}
control.8 {
iface MIXER
name 'DAC Double Fs Switch'
value false
comment {
access 'read write'
type BOOLEAN
count 1
}
}
control.9 {
iface MIXER
name 'DAC Stereo Enhancement'
value 0
comment {
access 'read write'
type INTEGER
count 1
range '0 - 7'
}
}
control.10 {
iface MIXER
name 'DAC Mono Mix Switch'
value false
comment {
access 'read write'
type BOOLEAN
count 1
}
}
control.11 {
iface MIXER
name 'Capture Polarity'
value Normal
comment {
access 'read write'
type ENUMERATED
count 1
item.0 Normal
item.1 Invert
}
}
control.12 {
iface MIXER
name 'Mic Boost Switch'
value true
comment {
access 'read write'
type BOOLEAN
count 1
}
}
control.13 {
iface MIXER
name 'ADC Capture Volume'
value 192
comment {
access 'read write'
type INTEGER
count 1
range '0 - 192'
dbmin -9999999
dbmax 0
dbvalue.0 0
}
}
control.14 {
iface MIXER
name 'ADC PGA Gain Volume'
value 0
comment {
access 'read write'
type INTEGER
count 1
range '0 - 10'
dbmin -350
dbmax 2400
dbvalue.0 -350
}
}
control.15 {
iface MIXER
name 'ADC Soft Ramp Switch'
value true
comment {
access 'read write'
type BOOLEAN
count 1
}
}
control.16 {
iface MIXER
name 'ADC Double Fs Switch'
value false
comment {
access 'read write'
type BOOLEAN
count 1
}
}
control.17 {
iface MIXER
name 'ALC Capture Switch'
value false
comment {
access 'read write'
type BOOLEAN
count 1
}
}
control.18 {
iface MIXER
name 'ALC Capture Max Volume'
value 28
comment {
access 'read write'
type INTEGER
count 1
range '0 - 28'
dbmin -650
dbmax 3550
dbvalue.0 3550
}
}
control.19 {
iface MIXER
name 'ALC Capture Min Volume'
value 0
comment {
access 'read write'
type INTEGER
count 1
range '0 - 28'
dbmin -1200
dbmax 3000
dbvalue.0 -1200
}
}
control.20 {
iface MIXER
name 'ALC Capture Target Volume'
value 11
comment {
access 'read write'
type INTEGER
count 1
range '0 - 10'
dbmin -1650
dbmax -150
dbvalue.0 0
}
}
control.21 {
iface MIXER
name 'ALC Capture Hold Time'
value 0
comment {
access 'read write'
type INTEGER
count 1
range '0 - 10'
}
}
control.22 {
iface MIXER
name 'ALC Capture Decay Time'
value 3
comment {
access 'read write'
type INTEGER
count 1
range '0 - 10'
}
}
control.23 {
iface MIXER
name 'ALC Capture Attack Time'
value 2
comment {
access 'read write'
type INTEGER
count 1
range '0 - 10'
}
}
control.24 {
iface MIXER
name 'ALC Capture Noise Gate Switch'
value false
comment {
access 'read write'
type BOOLEAN
count 1
}
}
control.25 {
iface MIXER
name 'ALC Capture Noise Gate Threshold'
value 0
comment {
access 'read write'
type INTEGER
count 1
range '0 - 31'
}
}
control.26 {
iface MIXER
name 'ALC Capture Noise Gate Type'
value 'Constant PGA Gain'
comment {
access 'read write'
type ENUMERATED
count 1
item.0 'Constant PGA Gain'
item.1 'Mute ADC Output'
}
}
control.27 {
iface MIXER
name 'Differential Mux'
value lin2-rin2
comment {
access 'read write'
type ENUMERATED
count 1
item.0 lin1-rin1
item.1 lin2-rin2
item.2 'lin1-rin1 with 20db Boost'
item.3 'lin2-rin2 with 20db Boost'
}
}
control.28 {
iface MIXER
name 'Digital Mic Mux'
value 'dmic disable'
comment {
access 'read write'
type ENUMERATED
count 1
item.0 'dmic disable'
item.1 'dmic data at high level'
item.2 'dmic data at low level'
}
}
control.29 {
iface MIXER
name 'DAC Source Mux'
value 'LDATA TO LDAC, RDATA TO RDAC'
comment {
access 'read write'
type ENUMERATED
count 1
item.0 'LDATA TO LDAC, RDATA TO RDAC'
item.1 'LDATA TO LDAC, LDATA TO RDAC'
item.2 'RDATA TO LDAC, RDATA TO RDAC'
item.3 'RDATA TO LDAC, LDATA TO RDAC'
}
}
control.30 {
iface MIXER
name 'Left Headphone Mux'
value lin1-rin1
comment {
access 'read write'
type ENUMERATED
count 1
item.0 lin1-rin1
item.1 lin2-rin2
item.2 'lin-rin with Boost'
item.3 'lin-rin with Boost and PGA'
}
}
control.31 {
iface MIXER
name 'Right Headphone Mux'
value lin1-rin1
comment {
access 'read write'
type ENUMERATED
count 1
item.0 lin1-rin1
item.1 lin2-rin2
item.2 'lin-rin with Boost'
item.3 'lin-rin with Boost and PGA'
}
}
control.32 {
iface MIXER
name 'Left Headphone Mixer LLIN Switch'
value false
comment {
access 'read write'
type BOOLEAN
count 1
}
}
control.33 {
iface MIXER
name 'Left Headphone Mixer Left DAC Switch'
value true
comment {
access 'read write'
type BOOLEAN
count 1
}
}
control.34 {
iface MIXER
name 'Right Headphone Mixer RLIN Switch'
value false
comment {
access 'read write'
type BOOLEAN
count 1
}
}
control.35 {
iface MIXER
name 'Right Headphone Mixer Right DAC Switch'
value true
comment {
access 'read write'
type BOOLEAN
count 1
}
}
}
state.hdmisound {
control.1 {
iface PCM
name 'Playback Channel Map'
value.0 0
value.1 0
value.2 0
value.3 0
value.4 0
value.5 0
value.6 0
value.7 0
comment {
access read
type INTEGER
count 8
range '0 - 36'
}
}
control.2 {
iface PCM
name 'IEC958 Playback Mask'
value ffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
comment {
access read
type IEC958
count 1
}
}
control.3 {
iface PCM
name 'IEC958 Playback Default'
value '0400000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
comment {
access 'read write'
type IEC958
count 1
}
}
control.4 {
iface PCM
name ELD
value '100008006c1000010000000000000000410c1000323450464c333534332f5433090701000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
comment {
access 'read volatile'
type BYTES
count 128
}
}
}

4
scripts/general.sh
View File

@ -823,9 +823,13 @@ function distro_menu ()
DISTRIB_TYPE="${DISTRIB_TYPE_CURRENT}"
[[ -z "${DISTRIB_TYPE_CURRENT}" ]] && DISTRIB_TYPE="bullseye bookworm focal jammy"
elif [[ "${BRANCH}" == "next" ]]; then
if [[ -n "${DISTRIB_TYPE_NEXT}" ]]; then
DISTRIB_TYPE="${DISTRIB_TYPE_NEXT}"
else
DISTRIB_TYPE="${DISTRIB_TYPE_CURRENT}"
[[ -z "${DISTRIB_TYPE_CURRENT}" ]] && DISTRIB_TYPE="bullseye bookworm focal jammy"
fi
fi
if [[ "${DISTRIB_TYPE}" =~ "${distro_codename}" ]]; then
options+=("${distro_codename}" "${distro_fullname} ${expert_infos}")

2
scripts/image-helpers.sh
View File

@ -237,8 +237,10 @@ dpkg_install_deb_chroot()
display_alert "Installing${desc}" "${name/\/root\//}"
package_name=$(echo $(basename "${package}") | cut -d "_" -f1)
# when building in bulk from remote, lets make sure we have up2date index
chroot "${SDCARD}" /bin/bash -c "dpkg -i $name" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
chroot "${SDCARD}" /bin/bash -c "apt-mark hold $package_name" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
[[ $? -ne 0 ]] && exit_with_error "Installation of $name failed" "${BOARD} ${RELEASE} ${BUILD_DESKTOP} ${LINUXFAMILY}"
}

2
scripts/main.sh
View File

@ -228,8 +228,8 @@ if [[ -z $BOARD ]]; then
#options+=("orangepizero2-lts" "Allwinner H616 quad core 1.5GB RAM WiFi/BT GBE SPI")
#options+=("orangepi400" "Allwinner H616 quad core 4GB RAM WiFi/BT GBE eMMC VGA")
options+=("orangepi4" "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+=("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+=("orangepir1plus" "Rockchip RK3328 quad core 1GB RAM 2xGBE USB2 SPI")
menustr="Please choose a Board."