From 812e92cbde7357ecb5efffc308165b9109058fb6 Mon Sep 17 00:00:00 2001
From: j1nx
Date: Sat, 4 Sep 2021 15:42:24 +0200
Subject: [PATCH] Get the sj201 in line / Sound system architecture changes
---
.../configs/rpi4_64-gui_defconfig | 2 -
.../app_xvf3510_int_spi_boot_v4_1_0.bin | Bin 0 -> 196608 bytes
.../package/vocalfusion/vocalfusion.mk | 7 +
.../package/vocalfusion/xvf3510-flash | 209 ++++++++++++++++++
.../rootfs-overlay/etc/asound.conf | 14 --
.../etc/pulse/mycroft-sj201-daemon.conf | 4 -
.../etc/pulse/mycroft-sj201-default.pa | 77 -------
.../etc/pulse/pulseaudio-daemon.conf | 1 -
.../rootfs-overlay/usr/bin/tas5806-init | 2 +-
.../rootfs-overlay/usr/libexec/ovos-i2csound | 45 +---
10 files changed, 223 insertions(+), 138 deletions(-)
create mode 100644 buildroot-external/package/vocalfusion/app_xvf3510_int_spi_boot_v4_1_0.bin
create mode 100644 buildroot-external/package/vocalfusion/xvf3510-flash
delete mode 100644 buildroot-external/rootfs-overlay/etc/asound.conf
delete mode 100644 buildroot-external/rootfs-overlay/etc/pulse/mycroft-sj201-default.pa
diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig
index 0e4b93c7..c0db087c 100644
--- a/buildroot-external/configs/rpi4_64-gui_defconfig
+++ b/buildroot-external/configs/rpi4_64-gui_defconfig
@@ -612,7 +612,6 @@ BR2_PACKAGE_USERLAND_TOOLS=y
BR2_PACKAGE_VOCALFUSION=y
BR2_PACKAGE_WIFI_CONNECT=y
BR2_PACKAGE_WIRINGPI2=y
-BR2_PACKAGE_XVF3510=y
BR2_PACKAGE_PYTHON_ADAPT_PARSER=y
BR2_PACKAGE_PYTHON_ASTRAL=y
BR2_PACKAGE_PYTHON_CLICK_DEFAULT_GROUP=y
@@ -701,7 +700,6 @@ BR2_PACKAGE_MYCROFT_SKILL_IP=y
BR2_PACKAGE_MYCROFT_SKILL_JOKE=y
BR2_PACKAGE_MYCROFT_SKILL_NAPTIME=y
BR2_PACKAGE_MYCROFT_SKILL_NEWS=y
-BR2_PACKAGE_MYCROFT_SKILL_OSM=y
BR2_PACKAGE_MYCROFT_SKILL_OVOS_COMMON_PLAY=y
BR2_PACKAGE_MYCROFT_SKILL_OVOS_ENCLOSURE=y
BR2_PACKAGE_MYCROFT_SKILL_OVOS_HOMESCREEN=y
diff --git a/buildroot-external/package/vocalfusion/app_xvf3510_int_spi_boot_v4_1_0.bin b/buildroot-external/package/vocalfusion/app_xvf3510_int_spi_boot_v4_1_0.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7a9ef5f68b737fd226be0c9efd02ed3476f304c1
GIT binary patch
literal 196608
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