Support orangepi3 next branch

This commit is contained in:
orangepi-xunlong 2022-04-12 16:12:28 +08:00
parent 40d0ce6a3a
commit a022e24089
4 changed files with 9 additions and 34 deletions

View File

@ -5,7 +5,7 @@ Soc | Boards |
| Allwinner H2+ | |
| Allwinner H3 | |
| Allwinner H5 | |
| Allwinner H6 | Orange Pi 3 LTS |
| Allwinner H6 | Orange Pi 3/3 LTS |
| Allwinner H616 | Orange Pi Zero2 |
| Rockchip RK3328 | |
| Rockchip RK3399 | Orange Pi 4/4B/4 LTS |

View File

@ -2,5 +2,9 @@
BOARD_NAME="Orange Pi 3"
BOARDFAMILY="sun50iw6"
BOOTCONFIG="orangepi_3_defconfig"
KERNEL_TARGET="legacy,current"
KERNEL_TARGET="next"
MODULES_BLACKLIST_LEGACY="bcmdhd"
MODULES_BLACKLIST="btsdio"
ATFBRANCH="tag:v2.2"
DISTRIB_TYPE_LEGACY="buster focal"
DISTRIB_TYPE_CURRENT="bullseye bookworm focal jammy"

View File

@ -54,23 +54,7 @@ esac
family_tweaks_s()
{
if [[ -f $SDCARD/lib/systemd/system/ap6256-bluetooth.service ]]; then
# install and enable Bluetooth
chroot $SDCARD /bin/bash -c "apt-get -y -qq install rfkill bluetooth bluez bluez-tools >/dev/null 2>&1"
chroot $SDCARD /bin/bash -c "systemctl --no-reload enable ap6256-bluetooth.service >/dev/null 2>&1"
[[ $BRANCH == legacy ]] && chroot $SDCARD /bin/bash -c "systemctl --no-reload enable ap6256-wifi.service >/dev/null 2>&1"
fi
if [[ -f $SDCARD/lib/systemd/system/ap6255-bluetooth.service ]]; then
# install and enable Bluetooth
chroot $SDCARD /bin/bash -c "apt-get -y -qq install rfkill bluetooth bluez bluez-tools >/dev/null 2>&1"
chroot $SDCARD /bin/bash -c "systemctl --no-reload enable ap6255-bluetooth.service >/dev/null 2>&1"
[[ $BRANCH == legacy ]] && chroot $SDCARD /bin/bash -c "systemctl --no-reload enable ap6255-wifi.service >/dev/null 2>&1"
fi
if [[ $BUILD_DESKTOP == yes && $BOARD == orangepi3-lts ]]; then
if [[ $BUILD_DESKTOP == yes && $BOARD =~ orangepi3-lts|orangepi3 ]]; then
sed -i "s/auto-profiles = yes/auto-profiles = no/" ${SDCARD}/usr/share/pulseaudio/alsa-mixer/profile-sets/default.conf
echo "load-module module-alsa-sink device=hw:0,0 sink_name=AudioCodec-Playback sink_properties=\"device.description='Audio Codec'\"" >> ${SDCARD}/etc/pulse/default.pa
@ -82,18 +66,5 @@ family_tweaks_s()
family_tweaks_bsp()
{
if [[ $BOARD == orangepi3 ]]; then
install -m 755 $EXTER/packages/blobs/bt/brcm_patchram_plus/brcm_patchram_plus_$ARCH $destination/usr/bin/brcm_patchram_plus
cp $EXTER/packages/bsp/sunxi/ap6256-bluetooth.service $destination/lib/systemd/system/
[[ $BRANCH == legacy ]] && cp $EXTER/packages/bsp/sunxi/ap6256-wifi.service $destination/lib/systemd/system/
fi
if [[ $BOARD == orangepilite2 ]]; then
install -m 755 $EXTER/packages/blobs/bt/brcm_patchram_plus/brcm_patchram_plus_$ARCH $destination/usr/bin/brcm_patchram_plus
cp $EXTER/packages/bsp/sunxi/ap6255-bluetooth.service $destination/lib/systemd/system/
[[ $BRANCH == legacy ]] && cp $EXTER/packages/bsp/sunxi/ap6255-wifi.service $destination/lib/systemd/system/
fi
:
}

View File

@ -219,7 +219,7 @@ if [[ -z $BOARD ]]; then
#options+=("orangepiprime" "Allwinner H5 quad core 2GB RAM GBE WiFi/BT")
#options+=("orangepizeroplus" "Allwinner H5 quad core 512MB RAM GBE WiFi SPI")
#options+=("orangepizeroplus2h5" "Allwinner H5 quad core 512MB RAM WiFi/BT eMMC")
#options+=("orangepi3" "Allwinner H6 quad core 1GB/2GB RAM GBE WiFi/BT eMMC USB3")
options+=("orangepi3" "Allwinner H6 quad core 1GB/2GB RAM GBE WiFi/BT eMMC USB3")
options+=("orangepi3-lts" "Allwinner H6 quad core 2GB RAM GBE WiFi/BT-AW859A eMMC USB3")
#options+=("orangepilite2" "Allwinner H6 quad core 1GB RAM WiFi/BT USB3")
#options+=("orangepioneplus" "Allwinner H6 quad core 1GB RAM GBE")