From 8f7518e5dc117844654c75cf35dc8235dc4851c8 Mon Sep 17 00:00:00 2001 From: j1nx Date: Wed, 19 Aug 2020 14:54:24 +0200 Subject: [PATCH] MycroftOS: Bump linux kernel and firmware --- buildroot-external/configs/rpi4_64-gui_defconfig | 7 +++---- buildroot-patches/0106-Bump-RPI-Firmware-version.patch | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index 06748b10..d790e83e 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -32,7 +32,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL)/board/raspberrypi4-64/post-image.s BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --aarch64" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/f0eeafb5d9109c2a1d512f045d7326a8a1d33e7e.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/96be00073b63c170b6916f35abb58748bc8f6d26.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b" @@ -364,8 +364,9 @@ BR2_PACKAGE_LIBSVG_CAIRO=y BR2_PACKAGE_OPENJPEG=y BR2_PACKAGE_TIFF=y BR2_PACKAGE_WAFFLE=y +BR2_PACKAGE_DTC=y +BR2_PACKAGE_DTC_PROGRAMS=y BR2_PACKAGE_LIBCEC=y -BR2_PACKAGE_LIBGUDEV=y BR2_PACKAGE_LIBV4L=y BR2_PACKAGE_LIBV4L_UTILS=y BR2_PACKAGE_WIRINGPI=y @@ -477,7 +478,6 @@ BR2_PACKAGE_FIRSTBOOT_SERVICE=y BR2_PACKAGE_PREPARE_SYSTEM_SERVICE=y BR2_PACKAGE_PYTHON_MYCROFT=y BR2_PACKAGE_MYCROFT_GUI=y -BR2_PACKAGE_MYCROFT_GUI_EMBEDDED=y BR2_PACKAGE_MYCROFT_SERVICE=y BR2_PACKAGE_MYCROFT_SPLASH=y BR2_PACKAGE_ALSA_PLUGINS=y @@ -503,7 +503,6 @@ BR2_PACKAGE_KF5_PLASMA_NANO=y BR2_PACKAGE_LIBRE=y BR2_PACKAGE_LIBREM=y BR2_PACKAGE_LOTTIE_QML=y -BR2_PACKAGE_RESPEAKER=y BR2_PACKAGE_SNAPCAST=y BR2_PACKAGE_SNAPCAST_SERVER=y BR2_PACKAGE_SPOTIFYD=y diff --git a/buildroot-patches/0106-Bump-RPI-Firmware-version.patch b/buildroot-patches/0106-Bump-RPI-Firmware-version.patch index 60c1e6cf..0eec0f0c 100644 --- a/buildroot-patches/0106-Bump-RPI-Firmware-version.patch +++ b/buildroot-patches/0106-Bump-RPI-Firmware-version.patch @@ -15,7 +15,7 @@ index 59ab1da0c6..0506961472 100644 @@ -1,3 +1,3 @@ # Locally computed -sha256 31a84340be08be319570a9d1439f25c0e3513fed73065a56aa5dd61dd605d5d9 rpi-firmware-01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5.tar.gz -+sha256 b0aa49b5aeb12bb782d828b9b57139edc78058f90a957ef3dece444aa39d7431 rpi-firmware-1c7b2e3db97daf92934c3d64b939d90a0eb8d880.tar.gz ++sha256 03d4bd4da882b65ce33fcd9e683af888d63c387850ea643c57a4afe0759bac06 rpi-firmware-2878d98d7d0c113efbe6419bde4c4d3b90d2f43e.tar.gz sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 6fee60b08c..6053a12ba9 100644 @@ -26,7 +26,7 @@ index 6fee60b08c..6053a12ba9 100644 ################################################################################ -RPI_FIRMWARE_VERSION = 01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5 -+RPI_FIRMWARE_VERSION = 1c7b2e3db97daf92934c3d64b939d90a0eb8d880 ++RPI_FIRMWARE_VERSION = 2878d98d7d0c113efbe6419bde4c4d3b90d2f43e RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom