Merge branch 'develop' into feature/no-pulseaudio

buildroot-external/Config.in

@@ -1,5 +1,6 @@
-menu "Additional libraries and applications"
+menu "Additional drivers, libraries and/or applications"
 	source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/fann/Config.in"
+	source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/respeaker/Config.in"
 endmenu
 menu "Additional external python modules"
         source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-adapt-parser/Config.in"

buildroot-external/board/raspberrypi/config.txt

@@ -24,3 +24,8 @@ dtparam=audio=on
 
 # Disable rainbow color splash
 disable_splash=1
+
+# Enable some optional hardware interfaces
+dtparam=i2c_arm=on
+dtoverlay=i2s-mmap
+dtparam=i2s=on

buildroot-external/configs/mycroftos_rpi3_defconfig

@@ -171,12 +171,13 @@ BR2_PACKAGE_NANO=y
 BR2_PACKAGE_VIM=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_TARGET_ROOTFS_EXT2_SIZE="768M"
+BR2_TARGET_ROOTFS_EXT2_SIZE="1024M"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_FANN=y
+BR2_PACKAGE_RESPEAKER=y
 BR2_PACKAGE_PYTHON_ADAPT_PARSER=y
 BR2_PACKAGE_PYTHON_COVERALLS=y
 BR2_PACKAGE_PYTHON_DEPRECATED=y

buildroot-external/package/respeaker/Config.in

@@ -0,0 +1,17 @@
+config BR2_PACKAGE_RESPEAKER
+	bool "respeaker"
+	select BR2_PACKAGE_RPI_USERLAND
+	select BR2_PACKAGE_DTC
+	select BR2_PACKAGE_DTC_PROGRAMS
+	help
+	  The ReSpeaker series is a family of 
+	  development boards designed to enable 
+	  a future where voice interface is part 
+	  of everyday human-device interaction. 
+	  Designed to be easily integrated (and 
+	  customized) into products, but also to 
+	  allow other services and products to be 
+	  easily integrated into it.
+
+	  https://respeaker.io/
+

buildroot-external/package/respeaker/S16respeaker_modules

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# Load seeed-voicecard modules....
+#
+
+modprobe snd-soc-seeed-voicecard
+modprobe snd-soc-ac108
+modprobe snd-soc-wm8960

buildroot-external/package/respeaker/S60seeed_voicecard

@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# Configure seeed-voicecard....
+#
+
+echo "Starting seeed-voicecard..."
+mount -t configfs none /sys/kernel/config
+mkdir -p /boot
+mount -t vfat /dev/mmcblk0p1 /boot
+/usr/bin/seeed-voicecard
+touch /var/lock/seeed-voicecard

buildroot-external/package/respeaker/respeaker.hash

@@ -0,0 +1,2 @@
+# Locally computed
+sha256	9f38d832acbfc7f07a58f15222d2fdcc0a9215ede488ccafb5c89a3e8223883d  respeaker-be0812c70be29b0666a89f22a9d403cfb4c48fca.tar.gz

buildroot-external/package/respeaker/respeaker.mk

@@ -0,0 +1,31 @@
+################################################################################
+#
+# respeaker
+#
+################################################################################
+
+RESPEAKER_VERSION = be0812c70be29b0666a89f22a9d403cfb4c48fca
+RESPEAKER_SITE = $(call github,respeaker,seeed-voicecard,$(RESPEAKER_VERSION))
+RESPEAKER_LICENSE = GNU General Public License v3.0
+RESPEAKER_DEPENDENCIES = rpi-firmware rpi-userland dtc
+
+$(eval $(kernel-module))
+
+define RESPEAKER_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/respeaker/S16respeaker_modules \
+		$(TARGET_DIR)/etc/init.d/S16respeaker_modules
+	$(INSTALL) -D -m 0755 $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/respeaker/S60seeed_voicecard \
+                $(TARGET_DIR)/etc/init.d/S60seeed_voicecard
+
+	mkdir -p $(TARGET_DIR)/etc/voicecard
+	rm $(@D)/dkms.conf
+	$(INSTALL) -D -m 0644 $(@D)/*.conf $(TARGET_DIR)/etc/voicecard
+	$(INSTALL) -D -m 0644 $(@D)/*.state $(TARGET_DIR)/etc/voicecard
+	$(INSTALL) -D -m 0755 $(@D)/seeed-voicecard $(TARGET_DIR)/usr/bin
+
+	$(INSTALL) -D -m 0644 $(@D)/seeed-2mic-voicecard.dtbo $(BINARIES_DIR)/rpi-firmware/overlays/
+        $(INSTALL) -D -m 0644 $(@D)/seeed-4mic-voicecard.dtbo $(BINARIES_DIR)/rpi-firmware/overlays/
+        $(INSTALL) -D -m 0644 $(@D)/seeed-8mic-voicecard.dtbo $(BINARIES_DIR)/rpi-firmware/overlays/
+endef
+
+$(eval $(generic-package))