Bump version 1.6

* Update rpi kernel 4.14.54 / Firmware / wifi

Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>

* Fix patch

* Update bluetooth-bcm43xx.mk

* Update bluetooth-bcm43xx.mk

* Update bluetooth-bcm43xx.mk

Documentation/bluetooth.md

@@ -0,0 +1,12 @@
+# Bluetooth
+
+We support `bluetoothctl` on host. Later we want also support bluetooth trought UI.
+All pairs and settings are persistent over reboots and updates.
+
+If you want setup bluetooth on host, use the *bluetoothctl* utility.
+
+## Scan devices
+
+```
+[bluetooth]# scan on
+```

Documentation/boards/raspberrypi.md

@@ -1,5 +1,19 @@
 # Raspberry PI
 
+Supported Hardware:
+
+| Device | Board | 
+|--------|-----------|
+| Raspberry Pi A+/B/B+| rpi |
+| Raspberry Pi Zero | rpi |
+| Raspberry Pi Zero W | rpi0-w |
+| Raspberry Pi 2 B | rpi2 |
+| Raspberry Pi 3 B/B+ | rpi3 / rpi3-64 |
+
 ## Serial console
 
 For access to terminal over serial console, add `console=ttyAMA0,115200` to `cmdline.txt` and `enable_uart=1` into `config.txt`.
+
+## Tweaks
+
+If you don't need bluetooth, disabled it with add `dtoverlay=pi3-disable-bt` into `config.txt`.

Documentation/deployment.md

@@ -21,3 +21,7 @@ The branch `dev` ist the actual development branch and from there we never make
 version from they we build a beta release.
 
 If we create a new staging/productive release, we create a new branch `rel-{MAJOR}`. They will be used for the hole cycle of this release.
+
+## Upload release files
+
+We use [ghr](https://github.com/tcnksm/ghr) to upload files to our repository. A binary version is available inside `scripts`.

buildroot-external/Config.in

@@ -1,3 +1,4 @@
 source "$BR2_EXTERNAL_HASSOS_PATH/package/hassos/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/libapparmor/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/apparmor/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-bcm43xx/Config.in"

buildroot-external/bootloader/barebox/menu/10-boot-A/action

@@ -1,3 +1,5 @@
 #!/bin/sh
 
+global linux.bootargs.bootchooser="bootchooser.active=A"
+
 boot system0

buildroot-external/bootloader/barebox/menu/20-boot-B/action

@@ -1,3 +1,5 @@
 #!/bin/sh
 
+global linux.bootargs.bootchooser="bootchooser.active=B"
+
 boot system1

buildroot-external/busybox.config

@@ -398,7 +398,7 @@ CONFIG_SHOWKEY=y
 CONFIG_AWK=y
 CONFIG_FEATURE_AWK_LIBM=y
 CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
-# CONFIG_CMP is not set
+CONFIG_CMP=y
 # CONFIG_DIFF is not set
 # CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
 # CONFIG_FEATURE_DIFF_DIR is not set

buildroot-external/configs/ova_defconfig

@@ -40,6 +40,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/configs/rpi0_w_defconfig

@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi0-
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rpi-4.14.y"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="db81c14ce9fbd705c2d3936edecbc6036ace6c05"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -48,6 +48,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -94,3 +96,4 @@ BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
+BR2_PACKAGE_BLUETOOTH_BCM43XX=y

buildroot-external/configs/rpi2_defconfig

@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rpi-4.14.y"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="db81c14ce9fbd705c2d3936edecbc6036ace6c05"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -47,6 +47,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/configs/rpi3_64_defconfig

@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rpi-4.14.y"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="db81c14ce9fbd705c2d3936edecbc6036ace6c05"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -35,8 +35,8 @@ BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=y
@@ -48,6 +48,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -94,3 +96,4 @@ BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
+BR2_PACKAGE_BLUETOOTH_BCM43XX=y

buildroot-external/configs/rpi3_defconfig

@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rpi-4.14.y"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="db81c14ce9fbd705c2d3936edecbc6036ace6c05"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -35,8 +35,8 @@ BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_SQUASHFS=y
-BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=y
@@ -48,6 +48,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y
@@ -94,3 +96,4 @@ BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
+BR2_PACKAGE_BLUETOOTH_BCM43XX=y

buildroot-external/configs/rpi_defconfig

@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rpi-4.14.y"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="db81c14ce9fbd705c2d3936edecbc6036ace6c05"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -47,6 +47,8 @@ BR2_PACKAGE_AVAHI=y
 # BR2_PACKAGE_AVAHI_AUTOIPD is not set
 BR2_PACKAGE_AVAHI_DAEMON=y
 BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
 BR2_PACKAGE_DROPBEAR=y

buildroot-external/info

@@ -1,5 +1,5 @@
 VERSION_MAJOR=1
-VERSION_BUILD=4
+VERSION_BUILD=6
 
 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"

buildroot-external/package/bluetooth-bcm43xx/Config.in

@@ -0,0 +1,6 @@
+config BR2_PACKAGE_BLUETOOTH_BCM43XX
+	bool "bluetooth bcm43xx"
+	depends on BR2_PACKAGE_BLUEZ5_UTILS_CLIENT
+	select BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED
+	help
+	  Install bluetooth for bcm43xx. 

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+HCIATTACH=/usr/bin/hciattach
+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))`
+
+if [ "$(cat /proc/device-tree/aliases/uart0)" = "$(cat /proc/device-tree/aliases/serial1)" ] ; then
+    if [ "$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')" = "16" ] ; then
+        $HCIATTACH /dev/serial1 bcm43xx 3000000 flow - $BDADDR
+    else
+		$HCIATTACH /dev/serial1 bcm43xx 921600 noflow - $BDADDR
+    fi
+else
+    $HCIATTACH /dev/serial1 bcm43xx 460800 noflow - $BDADDR
+fi

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx.mk

@@ -0,0 +1,31 @@
+################################################################################
+#
+# Bluetooth BCM43xx
+#
+################################################################################
+
+BLUETOOTH_BCM43XX_VERSION = 1.0.0
+BLUETOOTH_BCM43XX_LICENSE = Apache License 2.0
+BLUETOOTH_BCM43XX_LICENSE_FILES = $(BR2_EXTERNAL_HASSOS_PATH)/../LICENSE
+BLUETOOTH_BCM43XX_SITE = $(BR2_EXTERNAL_HASSOS_PATH)/package/bluetooth-bcm43xx
+BLUETOOTH_BCM43XX_SITE_METHOD = local
+
+define BLUETOOTH_BCM43XX_BUILD_CMDS
+	curl -o $(@D)/BCM43430A1.hcd https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/ade2bae1aaaebede09abb8fb546f767a0e4c7804/broadcom/BCM43430A1.hcd
+	curl -o $(@D)/BCM4345C0.hcd https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/ade2bae1aaaebede09abb8fb546f767a0e4c7804/broadcom/BCM4345C0.hcd
+endef
+
+define BLUETOOTH_BCM43XX_INSTALL_TARGET_CMDS
+	$(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/hassos-hardware.target.wants
+	$(INSTALL) -m 0755 $(@D)/bluetooth-bcm43xx $(TARGET_DIR)/usr/sbin/
+	$(INSTALL) -m 0644 $(@D)/bluetooth-bcm43xx.service $(TARGET_DIR)/usr/lib/systemd/system/
+	ln -fs /usr/lib/systemd/system/bluetooth-bcm43xx.service $(TARGET_DIR)/etc/systemd/system/hassos-hardware.target.wants/
+
+	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm
+	$(INSTALL) -m 0644 $(@D)/*.hcd $(TARGET_DIR)/lib/firmware/brcm/
+
+	$(INSTALL) -d $(TARGET_DIR)/etc/udev/rules.d
+	$(INSTALL) -m 0644 $(@D)/bluetooth-bcm43xx.rules $(TARGET_DIR)/etc/udev/rules.d/
+endef
+
+$(eval $(generic-package))

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx.rules

@@ -0,0 +1,22 @@
+KERNEL=="ttyAMA[01]", PROGRAM="/bin/sh -c '\
+        ALIASES=/proc/device-tree/aliases; \
+        if cmp -s $ALIASES/uart0 $ALIASES/serial0; then \
+                echo 0;\
+        elif cmp -s $ALIASES/uart0 $ALIASES/serial1; then \
+                echo 1; \
+        else \
+                exit 1; \
+        fi\
+'", SYMLINK+="serial%c"
+
+KERNEL=="ttyS0", PROGRAM="/bin/sh -c '\
+        ALIASES=/proc/device-tree/aliases; \
+        if cmp -s $ALIASES/uart1 $ALIASES/serial0; then \
+                echo 0; \
+        elif cmp -s $ALIASES/uart1 $ALIASES/serial1; then \
+                echo 1; \
+        else \
+                exit 1; \
+        fi \
+'", SYMLINK+="serial%c"
+

buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Bluetooth for BCM43xx
+Before=bluetooth.service
+After=dev-ttyAMA0.device
+ConditionPathIsDirectory=/proc/device-tree/soc/gpio@7e200000/bt_pins
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/bluetooth-bcm43xx
+
+[Install]
+WantedBy=hassos-hardware.target

buildroot-external/rootfs-overlay/etc/bluetooth/main.conf

@@ -0,0 +1,2 @@
+[Policy]
+AutoEnable=true

buildroot-external/rootfs-overlay/etc/resolv.conf

@@ -1 +1 @@
-/run/NetworkManager/resolv.conf
+/run/resolv.conf

buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-lib-bluetooth.mount

@@ -0,0 +1 @@
+/usr/lib/systemd/system/var-lib-bluetooth.mount

buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-hardware.target

@@ -0,0 +1 @@
+/usr/lib/systemd/system/hassos-hardware.target

buildroot-external/rootfs-overlay/etc/tmpfiles.d/nm.conf

@@ -1,3 +1,4 @@
 # Cleanup lease files
 e /var/lib/NetworkManager/*.lease - - - 14d
 C /mnt/overlay/etc/NetworkManager/system-connections - - - - /usr/share/system-connections
+f /run/resolv.conf - - - -

buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-hardware.target

@@ -0,0 +1,3 @@
+[Unit]
+Description=HassOS hardware targets
+Documentation=man:systemd.target(5)

buildroot-external/rootfs-overlay/usr/lib/systemd/system/var-lib-bluetooth.mount

@@ -0,0 +1,14 @@
+[Unit]
+Description=Bluetooth persistent state
+Requires=mnt-overlay.mount
+After=mnt-overlay.mount
+Before=bluetooth.service
+
+[Mount]
+What=/mnt/overlay/var/lib/bluetooth
+Where=/var/lib/bluetooth
+Type=None
+Options=bind
+
+[Install]
+WantedBy=hassos-bind.target

buildroot-patches/0006-Pump-raspberry-pi-firmware-for-kernel-4.14.patch

@@ -16,7 +16,7 @@ index 4854deae03..3a9f21e877 100644
 @@ -1,2 +1,2 @@
  # Locally computed
 -sha256 ea451834e20136d249661e0ed7d1fdfa309249d233a387f44dd6c3b746a454c6 rpi-firmware-36f991382326907419f64917624427e59fd8e4a0.tar.gz
-+sha256 f2b0f8ec8e73f8fa399f2c72c574ea5fe7fa57ab6151b139842a3ba783cd2140 rpi-firmware-a46b1f9521229ec26a1377aab7d013df1ade2791.tar.gz
++sha256 25c04d9e5b0d9dfe3145784c983460b6e47f370c2082ced45392882d55932b8a rpi-firmware-418b77e24476a98aba4ee33942cc5321e6698ce4.tar.gz
 diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
 index eab4c5d307..cb2e9d6cd8 100644
 --- a/package/rpi-firmware/rpi-firmware.mk
@@ -26,7 +26,7 @@ index eab4c5d307..cb2e9d6cd8 100644
  ################################################################################
  
 -RPI_FIRMWARE_VERSION = 36f991382326907419f64917624427e59fd8e4a0
-+RPI_FIRMWARE_VERSION = a46b1f9521229ec26a1377aab7d013df1ade2791
++RPI_FIRMWARE_VERSION = 418b77e24476a98aba4ee33942cc5321e6698ce4
  RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
  RPI_FIRMWARE_LICENSE = BSD-3-Clause
  RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

buildroot-patches/0010-rpi-use-latest-wifi-driver.patch

@@ -0,0 +1,45 @@
+From 30af519c8cc4b4c46dfb4ee42adda49a81dbc475 Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Thu, 12 Jul 2018 21:33:50 +0000
+Subject: [PATCH 1/1] rpi: use latest wifi driver
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+---
+ package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +-
+ package/rpi-wifi-firmware/rpi-wifi-firmware.mk   | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
+index bc0d7c8b02..946a55fac0 100644
+--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
++++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
+@@ -1,3 +1,3 @@
+ # Locally calculated
+-sha256 beade89c5c072158b6cf18cf741d2695980fd6a4533dab3897bebf90c0631a30  rpi-wifi-firmware-18d7c931aff0a8a78360b9b9eaeb15d1224fb907.tar.gz
++sha256 163fc0629d9ddcf7b729fefd3129f8d4f43b8fc912fa487b6d8bc57cf57232a7  rpi-wifi-firmware-86e88fbf0345da49555d0ec34c80b4fbae7d0cd3.tar.gz
+ sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d  LICENCE.broadcom_bcm43xx
+diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
+index 32dd3e519b..248b0a2621 100644
+--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
++++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
+@@ -4,14 +4,14 @@
+ #
+ ################################################################################
+ 
+-RPI_WIFI_FIRMWARE_VERSION = 18d7c931aff0a8a78360b9b9eaeb15d1224fb907
+-RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION))
++RPI_WIFI_FIRMWARE_VERSION = 86e88fbf0345da49555d0ec34c80b4fbae7d0cd3
++RPI_WIFI_FIRMWARE_SITE = $(call github,RPi-Distro,firmware-nonfree,$(RPI_WIFI_FIRMWARE_VERSION))
+ RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY
+ RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
+ 
+ define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS
+ 	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm
+-	$(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm
++	$(INSTALL) -m 0644 $(@D)/brcm/brcmfmac434* $(TARGET_DIR)/lib/firmware/brcm
+ endef
+ 
+ $(eval $(generic-package))
+-- 
+2.17.1
+

buildroot/package/rpi-firmware/rpi-firmware.hash

@@ -1,2 +1,2 @@
 # Locally computed
-sha256 f2b0f8ec8e73f8fa399f2c72c574ea5fe7fa57ab6151b139842a3ba783cd2140 rpi-firmware-a46b1f9521229ec26a1377aab7d013df1ade2791.tar.gz
+sha256 25c04d9e5b0d9dfe3145784c983460b6e47f370c2082ced45392882d55932b8a rpi-firmware-418b77e24476a98aba4ee33942cc5321e6698ce4.tar.gz

buildroot/package/rpi-firmware/rpi-firmware.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = a46b1f9521229ec26a1377aab7d013df1ade2791
+RPI_FIRMWARE_VERSION = 418b77e24476a98aba4ee33942cc5321e6698ce4
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3-Clause
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 beade89c5c072158b6cf18cf741d2695980fd6a4533dab3897bebf90c0631a30  rpi-wifi-firmware-18d7c931aff0a8a78360b9b9eaeb15d1224fb907.tar.gz
+sha256 163fc0629d9ddcf7b729fefd3129f8d4f43b8fc912fa487b6d8bc57cf57232a7  rpi-wifi-firmware-86e88fbf0345da49555d0ec34c80b4fbae7d0cd3.tar.gz
 sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d  LICENCE.broadcom_bcm43xx

buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.mk

@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-RPI_WIFI_FIRMWARE_VERSION = 18d7c931aff0a8a78360b9b9eaeb15d1224fb907
+RPI_WIFI_FIRMWARE_VERSION = 86e88fbf0345da49555d0ec34c80b4fbae7d0cd3
-RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION))
+RPI_WIFI_FIRMWARE_SITE = $(call github,RPi-Distro,firmware-nonfree,$(RPI_WIFI_FIRMWARE_VERSION))
 RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY
 RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
 
 define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS
 	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm
-	$(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm
+	$(INSTALL) -m 0644 $(@D)/brcm/brcmfmac434* $(TARGET_DIR)/lib/firmware/brcm
 endef
 
 $(eval $(generic-package))

scripts/update-rpi-kernel.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+if [ -z "$1" ]; then
+    echo "Need a version!"
+    exit 1
+fi
+
+sed -i "s/BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION=\".*\"/BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION=\"$1\"/g" buildroot-external/configs/rpi*