From 68661b8c7ba7c8795aeee7335dba21663f8a5944 Mon Sep 17 00:00:00 2001
From: orangepi-xunlong <258384131@qq.com>
Date: Mon, 21 Mar 2022 20:44:34 +0800
Subject: [PATCH] Update sun50iw6.conf

---
 .../config/sources/families/sun50iw6.conf     | 77 ++++++++++---------
 1 file changed, 39 insertions(+), 38 deletions(-)

diff --git a/external/config/sources/families/sun50iw6.conf b/external/config/sources/families/sun50iw6.conf
index 052a041..ae52dbe 100644
--- a/external/config/sources/families/sun50iw6.conf
+++ b/external/config/sources/families/sun50iw6.conf
@@ -6,36 +6,38 @@ OVERLAY_PREFIX='sun50i-h6'
 GOVERNOR=ondemand
 ASOUND_STATE='asound.state.sun50iw2-current'
 
-case $BRANCH in
-        legacy)
+LINUXFAMILY=sun50iw6
 
-		LINUXFAMILY=sun50iw6
-                KERNELBRANCH="branch:orange-pi-4.9-sun50iw6"
-                KERNELPATCHDIR=${BOARDFAMILY}-${BRANCH}
+case $BRANCH in
+
+	legacy)
+	        KERNELBRANCH="branch:orange-pi-4.9-sun50iw6"
+	        KERNELPATCHDIR=${BOARDFAMILY}-${BRANCH}
 
 		BOOTCONFIG="sun50iw6p1_config"
-                BOOTBRANCH='branch:v2014.07-sun50iw6-linux4.9'
-                UBOOT_TARGET_MAP=';;u-boot.bin:u-boot.fex
+	        BOOTBRANCH='branch:v2014.07-sun50iw6-linux4.9'
+	        UBOOT_TARGET_MAP=';;u-boot.bin:u-boot.fex
 				  spl;;boot0_sdcard.bin:boot0_sdcard.fex'
-                UBOOT_COMPILER="arm-linux-gnueabi-"
-                UBOOT_USE_GCC='> 4.0'
-                BOOTENV_FILE=sun50iw6-default.txt
-                BOOTSCRIPT='boot-sun50iw6-legacy.cmd:boot.cmd'
-                PACK_UBOOT="yes"
-                OFFSET=20
-                ATFSOURCE=""
-                ATF_COMPILE="no"
-                INITRD_ARCH=arm
+	        UBOOT_COMPILER="arm-linux-gnueabi-"
+	        UBOOT_USE_GCC='> 4.0'
+	        BOOTENV_FILE=sun50iw6-default.txt
+	        BOOTSCRIPT='boot-sun50iw6-legacy.cmd:boot.cmd'
+	        PACK_UBOOT="yes"
+	        OFFSET=20
+	        ATFSOURCE=""
+	        ATF_COMPILE="no"
+	        INITRD_ARCH=arm
 		ASOUND_STATE='asound.state.sun50iw6-legacy'
 		BOOT_FDT_FILE=sunxi/sun50i-h6-orangepi-${BOARD:8}.dtb
-        ;;
+	;;
 
 	current)
 
 		if [[ ${BOARD} == orangepi3-lts ]]; then
 
-		        KERNELBRANCH="branch:orange-pi-5.10"
-		        LINUXCONFIG=linux-5.10-sunxi64-current
+			ASOUND_STATE='asound.state.sun50iw6-current'
+			KERNELBRANCH="branch:orange-pi-5.10"
+			LINUXCONFIG=linux-5.10-sunxi64-current
 		fi
 	;;
 esac
@@ -43,31 +45,30 @@ esac
 family_tweaks_s()
 {
 
-        if [[ -f $SDCARD/lib/systemd/system/ap6256-bluetooth.service ]]; then
+	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
+	        # 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
+	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
+	        # 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 ]]; then
+	if [[ $BUILD_DESKTOP == yes && $BOARD == orangepi3-lts ]]; then
 
-        #        sed -i "s/auto-profiles = yes/auto-profiles = no/" ${SDCARD}/usr/share/pulseaudio/alsa-mixer/profile-sets/default.conf
+		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
+		echo "load-module module-alsa-sink device=hw:1,0 sink_name=HDMI-Playback sink_properties=\"device.description='HDMI Audio'\"" >> ${SDCARD}/etc/pulse/default.pa
+
+	fi
 
-        #        if [[ $BRANCH == legacy ]]; then
-        #                echo "load-module module-alsa-sink device=hw:1,0 sink_name=AudioCodec-Playback sink_properties=\"device.description='Audio Codec'\"" >> ${SDCARD}/etc/pulse/default.pa
-        #                echo "load-module module-alsa-sink device=hw:0,0 sink_name=HDMI-Playback sink_properties=\"device.description='HDMI Audio'\"" >> ${SDCARD}/etc/pulse/default.pa
-        #        fi
-        #fi
 }
 
 family_tweaks_bsp()