Merge pull request #62 from hifiberry/development

Revert to buildroot 2019.08.3

build-config

@@ -17,7 +17,12 @@ echo "Building in $BRDIR"
 echo $VERSION > $BRDIR/.piversion
 echo $VERSION > buildroot/PIVERSION
 
-SRC=configs/hifiberryos
+if [[ "$2" == "" || "$2" == "release" ]]; then
+ TEMPLATE=hifiberryos
+else
+ TEMPLATE=$2
+fi
+SRC=configs/$TEMPLATE
 #SRC=configs/hifiberryos-gui
 TMP=./tmpfile.$$
 DST=./config.$$
@@ -28,8 +33,13 @@ if [ ! -f $PLATFORM ]; then
  exit 1
 fi
 
+if [ ! -f $SRC ]; then
+ echo "template $SRC does not exist, aborting..."
+ exit 1
+fi
 cp $SRC $TMP
 
+
 # These settings differ at at different Pi types
 for i in BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 BR2_ARCH_NEEDS_GCC_AT_LEAST_5 BR2_GCC_TARGET_CPU BR2_GCC_TARGET_FPU BR2_cortex_a53 BR2_cortex_a72 BR2_DEFCONFIG BR2_ROOTFS_POST_BUILD_SCRIPT BR2_ROOTFS_POST_IMAGE_SCRIPT BR2_LINUX_KERNEL_DEFCONFIG BR2_LINUX_KERNEL_INTREE_DTS_NAME BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 BR2_ARM_CPU_HAS_NEON BR2_ARM_CPU_HAS_VFPV3 BR2_ARM_CPU_HAS_VFPV4 BR2_ARM_CPU_HAS_FP_ARMV8 BR2_ARM_CPU_HAS_THUMB BR2_ARM_CPU_ARMV6 BR2_arm1176jzf_s BR2_ARM_FPU_VFPV2 BR2_ARM_FPU_VFPV3 BR2_ARM_FPU_VFPV3D16 BR2_ARM_FPU_VFPV4 BR2_ARM_FPU_VFPV4D16 BR2_ARM_FPU_NEON BR2_ARM_FPU_FP_ARMV8 BR2_ARM_FPU_NEON_FP_ARMV8 BR2_SYSTEM_DHCP BR2_PACKAGE_BAYER2RGB_NEON BR2_PACKAGE_JPEG_SIMD_SUPPORT BR2_PACKAGE_NE10 BR2_PACKAGE_OPENBLAS BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 BR2_ARM_INSTRUCTIONS_THUMB2 BR2_ARM_ENABLE_VFP BR2_ARM_CPU_ARMV7A BR2_cortex_a7; do
   cat $TMP | grep  -v $i > $DST

buildroot/buildroot-2019.08.3.patch

@@ -0,0 +1,43 @@
+diff -ur buildroot-2019.08.orig/board/raspberrypi/genimage-raspberrypi0w.cfg buildroot-2019.08/board/raspberrypi/genimage-raspberrypi0w.cfg
+--- buildroot-2019.08.orig/board/raspberrypi/genimage-raspberrypi0w.cfg	2020-04-02 07:55:29.244072244 +0000
++++ buildroot-2019.08/board/raspberrypi/genimage-raspberrypi0w.cfg	2020-04-02 07:57:28.486755936 +0000
+@@ -1,7 +1,7 @@
+ image boot.vfat {
+   vfat {
+     files = {
+-      "bcm2708-rpi-0-w.dtb",
++      "bcm2708-rpi-zero-w.dtb",
+       "rpi-firmware/bootcode.bin",
+       "rpi-firmware/cmdline.txt",
+       "rpi-firmware/config.txt",
+diff -ur buildroot-2019.08.orig/package/gstreamer1/gstreamer1/gstreamer1.mk buildroot-2019.08/package/gstreamer1/gstreamer1/gstreamer1.mk
+--- buildroot-2019.08.orig/package/gstreamer1/gstreamer1/gstreamer1.mk	2020-04-02 07:55:29.416070345 +0000
++++ buildroot-2019.08/package/gstreamer1/gstreamer1/gstreamer1.mk	2020-04-02 08:04:58.981783184 +0000
+@@ -33,7 +33,6 @@
+ 	host-pkgconf \
+ 	libglib2 \
+ 	$(if $(BR2_PACKAGE_LIBUNWIND),libunwind) \
+-	$(if $(BR2_PACKAGE_VALGRIND),valgrind) \
+ 	$(TARGET_NLS_DEPENDENCIES)
+
+ GSTREAMER1_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
+diff -ur buildroot-2019.08.orig/package/rpi-firmware/rpi-firmware.hash buildroot-2019.08/package/rpi-firmware/rpi-firmware.hash
+--- buildroot-2019.08.orig/package/rpi-firmware/rpi-firmware.hash	2020-04-02 07:55:29.812065974 +0000
++++ buildroot-2019.08/package/rpi-firmware/rpi-firmware.hash	2020-04-02 09:13:24.722110230 +0000
+@@ -1,3 +1,4 @@
+ # Locally computed
+ sha256 c82c40cf37fac36160a7f6b9c314506beb942bf113a55d30fa163c56a4f98946 rpi-firmware-bcf40b5c2b94178c7564fb451098d44968e44af5.tar.gz
++sha256 31a84340be08be319570a9d1439f25c0e3513fed73065a56aa5dd61dd605d5d9 rpi-firmware-01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5.tar.gz
+ sha256 ba76edfc10a248166d965b8eaf320771c44f4f432d4fce2fd31fd272e7038add boot/LICENCE.broadcom
+diff -ur buildroot-2019.08.orig/package/rpi-firmware/rpi-firmware.mk buildroot-2019.08/package/rpi-firmware/rpi-firmware.mk
+--- buildroot-2019.08.orig/package/rpi-firmware/rpi-firmware.mk	2020-04-02 07:55:29.812065974 +0000
++++ buildroot-2019.08/package/rpi-firmware/rpi-firmware.mk	2020-04-02 07:56:27.951424179 +0000
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-RPI_FIRMWARE_VERSION = bcf40b5c2b94178c7564fb451098d44968e44af5
++RPI_FIRMWARE_VERSION = 01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5
+ RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
+ RPI_FIRMWARE_LICENSE = BSD-3-Clause
+ RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

buildroot/buildroot-dev.patch

@@ -1,96 +1,6 @@
-diff -urb buildroot-dev/package/gobject-introspection/gobject-introspection.mk brdev-working/package/gobject-introspection/gobject-introspection.mk
---- buildroot-dev/package/gobject-introspection/gobject-introspection.mk	2020-03-20 07:35:48.783430050 +0000
-+++ brdev-working/package/gobject-introspection/gobject-introspection.mk	2020-03-20 06:56:37.731416596 +0000
-@@ -18,6 +18,8 @@
- 	host-gobject-introspection \
- 	host-prelink-cross \
- 	host-qemu \
-+	gstreamer1 \
-+	gst1-plugins-base \
- 	libffi \
- 	libglib2 \
- 	python3 \
-@@ -56,6 +58,9 @@
- GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=disabled
- endif
-
-+GOBJECT_INTROSPECTION_DEPENDENCIES += gstreamer1 gst1-plugins-base
-+GOBJECT_INTROSPECTION_CONF_OPTS += -Dgstreamer1=enabled
-+
- # GI_SCANNER_DISABLE_CACHE=1 prevents g-ir-scanner from writing cache data to ${HOME}
- GOBJECT_INTROSPECTION_CONF_ENV = \
- 	GI_SCANNER_DISABLE_CACHE=1
-diff -urb buildroot-dev/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk brdev-working/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
---- buildroot-dev/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk	2020-03-20 07:35:48.787430009 +0000
-+++ brdev-working/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk	2020-03-19 20:00:14.274281083 +0000
-@@ -23,7 +23,7 @@
- 	-Dwinks=disabled \
- 	-Dandroidmedia=disabled \
- 	-Dapplemedia=disabled \
--	-Dintrospection=disabled \
-+	-Dintrospection=enabled \
- 	-Dgobject-cast-checks=disabled \
- 	-Dglib-asserts=disabled \
- 	-Dglib-checks=disabled
-diff -urb buildroot-dev/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk brdev-working/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
---- buildroot-dev/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk	2020-03-20 07:35:48.787430009 +0000
-+++ brdev-working/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk	2020-03-20 06:30:57.747235646 +0000
-@@ -18,7 +18,7 @@
- 	-Dglib-asserts=disabled \
- 	-Dglib-checks=disabled \
- 	-Dgtk_doc=disabled \
--	-Dintrospection=disabled
-+	-Dintrospection=enabled
-
- # Options which require currently unpackaged libraries
- GST1_PLUGINS_BASE_CONF_OPTS += \
-@@ -32,7 +32,10 @@
- GST1_PLUGINS_BASE_CONF_OPTS += -Dtools=disabled
- endif
-
--GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1 $(TARGET_NLS_DEPENDENCIES)
-+GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1 $(TARGET_NLS_DEPENDENCIES) \
-+	host-gstreamer1 \
-+	host-gobject-introspection \
-+        gobject-introspection
-
- GST1_PLUGINS_BASE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
-
-@@ -280,3 +283,5 @@
- endif
-
- $(eval $(meson-package))
-+$(eval $(host-meson-package))
-+
-diff -urb buildroot-dev/package/gstreamer1/gstreamer1/gstreamer1.mk brdev-working/package/gstreamer1/gstreamer1/gstreamer1.mk
---- buildroot-dev/package/gstreamer1/gstreamer1/gstreamer1.mk	2020-03-20 07:35:48.787430009 +0000
-+++ brdev-working/package/gstreamer1/gstreamer1/gstreamer1.mk	2020-03-20 07:32:26.025498231 +0000
-@@ -16,7 +16,7 @@
- 	-Dtests=disabled \
- 	-Dbenchmarks=disabled \
- 	-Dgtk_doc=disabled \
--	-Dintrospection=disabled \
-+	-Dintrospection=enabled \
- 	-Dglib-asserts=disabled \
- 	-Dglib-checks=disabled \
- 	-Dgobject-cast-checks=disabled \
-@@ -31,11 +31,12 @@
- 	host-bison \
- 	host-flex \
- 	host-pkgconf \
-+	host-gobject-introspection \
- 	libglib2 \
- 	$(if $(BR2_PACKAGE_LIBUNWIND),libunwind) \
--	$(if $(BR2_PACKAGE_VALGRIND),valgrind) \
- 	$(TARGET_NLS_DEPENDENCIES)
-
- GSTREAMER1_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
-
- $(eval $(meson-package))
-+$(eval $(host-meson-package))
-diff -urb buildroot-dev/package/nodejs/nodejs.mk brdev-working/package/nodejs/nodejs.mk
---- buildroot-dev/package/nodejs/nodejs.mk	2020-03-20 07:35:48.859429275 +0000
-+++ brdev-working/package/nodejs/nodejs.mk	2020-03-19 06:30:08.960598003 +0000
+diff -ru buildroot-dev/package/nodejs/nodejs.mk br-dev-april/package/nodejs/nodejs.mk
+--- buildroot-dev/package/nodejs/nodejs.mk	2020-03-31 12:59:18.553214135 +0000
++++ br-dev-april/package/nodejs/nodejs.mk	2020-03-31 12:57:07.094946091 +0000
 @@ -63,7 +63,6 @@
  		--shared-openssl \
  		--shared-openssl-includes=$(HOST_DIR)/include/openssl \
@@ -99,9 +9,9 @@ diff -urb buildroot-dev/package/nodejs/nodejs.mk brdev-working/package/nodejs/no
  		--no-cross-compiling \
  		--with-intl=small-icu \
  	)
-diff -urb buildroot-dev/package/python-pycairo/python-pycairo.mk brdev-working/package/python-pycairo/python-pycairo.mk
---- buildroot-dev/package/python-pycairo/python-pycairo.mk	2020-03-20 07:35:48.899428867 +0000
-+++ brdev-working/package/python-pycairo/python-pycairo.mk	2020-03-19 06:30:08.960598003 +0000
+diff -ru buildroot-dev/package/python-pycairo/python-pycairo.mk br-dev-april/package/python-pycairo/python-pycairo.mk
+--- buildroot-dev/package/python-pycairo/python-pycairo.mk	2020-03-31 12:59:18.593213608 +0000
++++ br-dev-april/package/python-pycairo/python-pycairo.mk	2020-03-31 12:57:07.094946091 +0000
 @@ -8,8 +8,16 @@
  PYTHON_PYCAIRO_SOURCE = pycairo-$(PYTHON_PYCAIRO_VERSION).tar.gz
  PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/3c/1a/c0478ecab31baae50fda9956547788afbd0ca563adc52c9b03cab30f17eb
@@ -120,24 +30,25 @@ diff -urb buildroot-dev/package/python-pycairo/python-pycairo.mk brdev-working/p
 +
  $(eval $(python-package))
 +$(eval $(host-python-package))
-Only in brdev-working/utils: package
-diff -urb buildroot-dev/utils/scanpypi brdev-working/utils/scanpypi
---- buildroot-dev/utils/scanpypi	2020-03-20 07:35:48.991427929 +0000
-+++ brdev-working/utils/scanpypi	2020-03-19 08:42:35.293726023 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- """
-
- Utility for building Buildroot packages for existing PyPI packages
---- buildroot-dev/package/rpi-firmware/rpi-firmware.mk	2020-03-30 08:34:17.762664308 +0000
-+++ buildroot-dev/package/rpi-firmware/rpi-firmware.mk	2020-03-30 09:07:44.410958163 +0000
+diff -ur buildroot-dev-unpatched/package/python-idna/python-idna.hash buildroot-dev/package/python-idna/python-idna.hash
+--- buildroot-dev-unpatched/package/python-idna/python-idna.hash        2020-03-31 15:45:57.312748338 +0000
++++ buildroot-dev/package/python-idna/python-idna.hash  2020-03-31 15:58:25.932079207 +0000
+@@ -1,5 +1,6 @@
+ # md5, sha256 from https://pypi.org/pypi/idna/json
+ md5  870b8b80267f00f0faf1b7ba4bdbf14e  idna-2.9.tar.gz
+ sha256  7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb  idna-2.9.tar.gz
++sha256  c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407  idna-2.8.tar.gz
+ # Locally computed sha256 checksums
+ sha256  412014420d2473dba06117c3d4d9e0eecaa6dde0ca30cd951f4ec2be39426f32  LICENSE.rst
+diff -ur buildroot-dev-unpatched/package/python-idna/python-idna.mk buildroot-dev/package/python-idna/python-idna.mk
+--- buildroot-dev-unpatched/package/python-idna/python-idna.mk  2020-03-31 15:45:57.312748338 +0000
++++ buildroot-dev/package/python-idna/python-idna.mk    2020-03-31 15:49:52.056995049 +0000
 @@ -4,7 +4,7 @@
  #
  ################################################################################
 
--RPI_FIRMWARE_VERSION = 01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5
-+RPI_FIRMWARE_VERSION = 5574077183389cd4c65077ba18b59144ed6ccd6d
- RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
- RPI_FIRMWARE_LICENSE = BSD-3-Clause
- RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
+-PYTHON_IDNA_VERSION = 2.9
++PYTHON_IDNA_VERSION = 2.8
+ PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz
+ PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/cb/19/57503b5de719ee45e83472f339f617b0c01ad75cba44aba1e4c97c2b0abd
+ PYTHON_IDNA_LICENSE = BSD-3-Clause

buildroot/package/audiocontrol2/Config.in

@@ -21,5 +21,5 @@ config BR2_PACKAGE_AUDIOCONTROL2
 	select BR2_PACKAGE_PYTHON_REQUESTS
 	select BR2_PACKAGE_PYTHON_EXPIRINGDICT
 	select BR2_PACKAGE_PYTHON_PYKY040
-	select BR2_PACKAGE_PYTHON_PYGOBJECT
+#	select BR2_PACKAGE_PYTHON_PYGOBJECT
 

buildroot/package/beocreate/beocreate.mk

@@ -7,8 +7,8 @@
 BEOCREATE_VERSION = f4ee1e69e093b5685f1bb913bc410cc340777555
 BEOCREATE_SITE = $(call github,bang-olufsen,create,$(BEOCREATE_VERSION))
 
-#BEOCREATE_VERSION = 5b88b723788f8cf15cace8ee67b43ce035400702
-#BEOCREATE_SITE = $(call github,hifiberry,create,$(BEOCREATE_VERSION))
+BEOCREATE_VERSION = 02d18225c029deb4688ca46721a43aa306e16338
+BEOCREATE_SITE = $(call github,hifiberry,create,$(BEOCREATE_VERSION))
 
 define BEOCREATE_BUILD_CMDS
 endef

buildroot/package/btspeaker/bluealsa-aplay-start

@@ -0,0 +1,4 @@
+#!/bin/sh
+. /etc/hifiberry.state
+/usr/bin/bluealsa-aplay --pcm-buffer-time=250000 00:00:00:00:00:00 --volume-control $CURRENT_MIXER_CONTROL
+

buildroot/package/btspeaker/bluealsa-aplay.service

@@ -7,7 +7,7 @@ After=bluealsa.service sound.target btinterface.service
 # BlueALSA takes some time to initialize
 ExecStartPre=/opt/hifiberry/bin/bootmsg "Starting bluealsa-aplay"
 ExecStartPre=sleep 2
-ExecStart=/usr/bin/bluealsa-aplay --pcm-buffer-time=250000 00:00:00:00:00:00
+ExecStart=/opt/btspeaker/bluealsa-aplay-start
 RestartSec=5  
 Restart=always
 

buildroot/package/btspeaker/bluealsa.service

@@ -5,7 +5,7 @@ After=a2dp-agent.service
 
 [Service]
 ExecStartPre=/opt/hifiberry/bin/bootmsg "Starting bluealsa"
-ExecStart=/usr/bin/bluealsa -i hci0 -p a2dp-sink
+ExecStart=/usr/bin/bluealsa -i hci0 -p a2dp-sink --a2dp-volume
 RestartSec=5
 Restart=always
 

buildroot/package/btspeaker/btspeaker.mk

@@ -48,6 +48,8 @@ define BTSPEAKER_INSTALL_INIT_SYSTEMD
                 $(TARGET_DIR)/usr/lib/systemd/system/bluealsa-aplay.service
         ln -fs ../../../../usr/lib/systemd/system/bluealsa-aplay.service \
                 $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/bluealsa-aplay.service
+	$(INSTALL) -D -m 0755 $(BR2_EXTERNAL_HIFIBERRY_PATH)/package/btspeaker/bluealsa-aplay-start \
+		$(TARGET_DIR)/opt/btspeaker/bluealsa-aplay-start
 endef
 
 # Overwrite original Bluez5 package to make sure it doesn't install in systemd

buildroot/package/btspeaker/btuart.sh

@@ -1,30 +1,46 @@
 #!/bin/sh
 
-echo "Calculating Bluetooth address"
+FIXCONFIG=`cat /boot/config.txt | grep "miniuart-bt"`
+if [ "$FIXCONFIG" != "" ]; then
+	mount -o remount,rw /boot
+	cat /boot/config.txt | grep -v "miniuart-bt" > /tmp/config.txt
+	cp /boot/config.txt /boot/config.txt.bak
+	mv /tmp/config.txt /boot/config.txt
+	sync
+	echo "Fixing Bluetooth UART configuration" >> /tmp/reboot	
+fi	
+
 if grep -q "Pi 4" /proc/device-tree/model; then
-  BDADDR=
+	BDADDR=
+	PI3=0
 else
-  SERIAL=`cat /proc/device-tree/serial-number | cut -c9-`
-  B1=`echo $SERIAL | cut -c3-4`
-  B2=`echo $SERIAL | cut -c5-6`
-  B3=`echo $SERIAL | cut -c7-8`
-  BDADDR=`printf b8:27:eb:%02x:%02x:%02x $((0x$B1 ^ 0xaa)) $((0x$B2 ^ 0xaa)) $((0x$B3 ^ 0xaa))`
+	SERIAL=`cat /proc/device-tree/serial-number | cut -c9-`
+	B1=`echo $SERIAL | cut -c3-4`
+	B2=`echo $SERIAL | cut -c5-6`
+	B3=`echo $SERIAL | cut -c7-8`
+	BDADDR=`printf b8:27:eb:%02x:%02x:%02x $((0x$B1 ^ 0xaa)) $((0x$B2 ^ 0xaa)) $((0x$B3 ^ 0xaa))`
 fi
+echo "BT address is $BDADDR"
 
 /opt/hifiberry/bin/bootmsg "Attaching Bluetooth interface"
 
 uart0_pins="`wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' '`"
-if [ "$uart0_pins" = "16" ] ; then
-	# This line is necessary to sort out the flow control pins
-	stty -F /dev/ttyAMA0 115200 raw -echo
-	/usr/bin/hciattach -n /dev/ttyAMA0 bcm43xx 3000000 flow - $BDADDR
-        if [ "$?" != "0" ]; then
-          echo "Failed"
-          /opt/hifiberry/bin/bootmsg "Attaching Bluetooth interface"
-        fi
-else
+if [ "$uart0_pins" != "16" ] ; then
+	if [ "$PI3" != "0" ]; then
+		PI3=1
+	fi
+fi
+
+if [ "$PI3" == "1" ]; then
 	echo "Looks like an Raspberry Pi 3 without flow control, BT audio will not work reliably"
         /opt/hifiberry/bin/bootmsg "Bluetooth not supported on Pi3B"
         exit 1
 fi
 
+# This line is necessary to sort out the flow control pins
+stty -F /dev/ttyAMA0 115200 raw -echo
+/usr/bin/hciattach -n /dev/ttyAMA0 bcm43xx 3000000 flow - $BDADDR
+if [ "$?" != "0" ]; then
+	echo "Failed"
+	/opt/hifiberry/bin/bootmsg "Attaching Bluetooth interface"
+fi

buildroot/package/configtxt/Config.in

@@ -10,4 +10,8 @@ config BR2_PACKAGE_CONFIGTXT_QUIET
           disable all boot messages to screen
         depends on BR2_PACKAGE_CONFIGTXT
 
-
+config BR2_PACKAGE_CONFIGTXT_EEPROM
+        bool "force_eeprom_read workaround"
+        help
+          set eeprom_foirce_read=0
+        depends on BR2_PACKAGE_CONFIGTXT

buildroot/package/configtxt/configtxt.mk

@@ -8,8 +8,11 @@ define CONFIGTXT_INSTALL_TARGET_CMDS
         echo "# Enable I2C and SPI" >> $(BINARIES_DIR)/rpi-firmware/config.txt
 	echo "dtparam=i2c=on" >> $(BINARIES_DIR)/rpi-firmware/config.txt
 	echo "dtparam=spi=on" >> $(BINARIES_DIR)/rpi-firmware/config.txt
+endef
+
+define CONFIGTXT_EEPROM_WORKAROUND
 	echo "# Workaround force_eeprom_read" >> $(BINARIES_DIR)/rpi-firmware/config.txt
-	echo "force_eeprom_read=0" >> $(BINARIES_DIR)/rpi-firmware/config.txt
+        echo "force_eeprom_read=0" >> $(BINARIES_DIR)/rpi-firmware/config.txt
 endef
 
 define CONFIGTXT_QUIET_INSTALL_TARGET_CMDS
@@ -30,5 +33,9 @@ else
 CONFIGTXT_POST_INSTALL_TARGET_HOOKS += CONFIGTXT_VERBOSE_INSTALL_TARGET_CMDS
 endif
 
+ifeq ($(BR2_PACKAGE_CONFIGTXT_EEPROM),y)
+CONFIGTXT_POST_INSTALL_TARGET_HOOKS += CONFIGTXT_EEPROM_WORKAROUND
+endif
+
 $(eval $(generic-package))
 

buildroot/package/hifiberry-bluezalsa/hifiberry-bluezalsa.mk

@@ -6,6 +6,8 @@
 
 HIFIBERRY_BLUEZALSA_VERSION = 2.1.0
 HIFIBERRY_BLUEZALSA_SITE = $(call github,Arkq,bluez-alsa,v$(HIFIBERRY_BLUEZALSA_VERSION))
+HIFIBERRY_BLUEZALSA_VERSION = c9021d932ae9464b6cdc4ca5ac240a6b8ada6e36
+HIFIBERRY_BLUEZALSA_SITE = $(call github,joerg-krause,bluez-alsa,$(HIFIBERRY_BLUEZALSA_VERSION))
 HIFIBERRY_BLUEZALSA_LICENSE = MIT
 HIFIBERRY_BLUEZALSA_LICENSE_FILES = LICENSE
 HIFIBERRY_BLUEZALSA_DEPENDENCIES = alsa-lib bluez5_utils libglib2 sbc host-pkgconf

buildroot/package/hifiberry-tools/debuginfo

@@ -27,6 +27,7 @@ cat /proc/device-tree/hat/product >> hat.txt
 journalctl > logs.txt
 /opt/hifiberry/bin/report-dump >> usage.txt
 cat /etc/mopidy.conf > mopidy.conf
+cat /boot/config.txt > config.txt
 # Collect some performance data
 top -b -n 5 > top.txt
 perf stat -a sleep 10