From f857337e98a0a364ed584d325617d1678e4318af Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 14 Jul 2020 10:04:56 +0200 Subject: [PATCH 01/20] linux (RPi): update to 5.4.51-95a969f Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index abe520750b..3fa7de8630 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -16,8 +16,8 @@ PKG_PATCH_DIRS="$LINUX" case "$LINUX" in raspberrypi) - PKG_VERSION="3c860a6fd128e7cf1c39b3f51258a2a078d1a1a4" # 5.4.50 - PKG_SHA256="27bf43c2624acb156330b284f4704c0a85d75d76022c79b5157789511da7b04a" + PKG_VERSION="95a969f451f6ed61029741411c1c9aa44023e465" # 5.4.51 + PKG_SHA256="64bbb49dc5b6bdf4dabb05096a8e6d3f25b9b32108601892c9edbb6fe330224a" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; From 8dc6b494c0888f2a36d77928996a08022e2203b0 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 14 Jul 2020 10:14:06 +0200 Subject: [PATCH 02/20] RPi: update to firmware 7e74bcb Signed-off-by: Matthias Reichl --- packages/graphics/bcm2835-driver/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 39bb891c0a..2fa9cc1fb3 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="66fc5eaac3d0af1d5a7ffa616086cbfaefd72e98" -PKG_SHA256="373872b00d566fbc8873125336b3a09696e85602d2e49a48c0b5c5cabb15d989" +PKG_VERSION="7e74bcb4f9706f36f752d1c3d3164628ccf2aae5" +PKG_SHA256="bc1c539e6c48d640c44c9cd1ec0965c216698f921ca21bca8add300e84975dbc" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index e1c54cbcc8..baf5696609 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="66fc5eaac3d0af1d5a7ffa616086cbfaefd72e98" -PKG_SHA256="fe7fe713409120768c37dbbe02a7a06c0e808b0e60dad09ea054d7006947b76d" +PKG_VERSION="7e74bcb4f9706f36f752d1c3d3164628ccf2aae5" +PKG_SHA256="f743e83fc8fd8821d00ca794c0de0f483ef6b0bb134a60980b1b9ad9fd68af2d" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" From ae7c23522a2a48ff297cf81d06561abcd50eea08 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 16 Jul 2020 17:41:48 +0200 Subject: [PATCH 03/20] rpi-eeprom: update to 3325de5 Signed-off-by: Matthias Reichl --- packages/tools/rpi-eeprom/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/rpi-eeprom/package.mk b/packages/tools/rpi-eeprom/package.mk index 3ba3fa6126..193f33a54e 100644 --- a/packages/tools/rpi-eeprom/package.mk +++ b/packages/tools/rpi-eeprom/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rpi-eeprom" -PKG_VERSION="befe05b42a2a69fcbf2a5ec0ac4a8e7085c543f7" -PKG_SHA256="99880d1d51d229091d63c9c0e42033c757cf5847120aee4e01993443edb2560c" +PKG_VERSION="3325de5b9a0d08898096306d1bd343b6a275694d" +PKG_SHA256="5b9e4c714e86c0c688e8806ed17ec80f5319c57b36a1d53e35ee8481d17b1a19" PKG_ARCH="arm" PKG_LICENSE="BSD-3/custom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" From 06ea462af3869dc589d004e6de70d3de6443a283 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 25 Jul 2020 13:57:27 +0200 Subject: [PATCH 04/20] RPi: update to firmware 542aceb Signed-off-by: Matthias Reichl --- packages/graphics/bcm2835-driver/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 2fa9cc1fb3..5324ae803e 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="7e74bcb4f9706f36f752d1c3d3164628ccf2aae5" -PKG_SHA256="bc1c539e6c48d640c44c9cd1ec0965c216698f921ca21bca8add300e84975dbc" +PKG_VERSION="542aceb30364db3ce87d532ea90451f46bbb84e9" +PKG_SHA256="382cef80844df025adf6a47d1586755d400e30c08c90bafd44ceb8647ea11d97" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index baf5696609..90ecbd3b9e 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="7e74bcb4f9706f36f752d1c3d3164628ccf2aae5" -PKG_SHA256="f743e83fc8fd8821d00ca794c0de0f483ef6b0bb134a60980b1b9ad9fd68af2d" +PKG_VERSION="542aceb30364db3ce87d532ea90451f46bbb84e9" +PKG_SHA256="a55f2a9d90931de10cef078a8ac032ce0c678c66e4088272bec6223e75a4d173" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" From ad37f84a1da59ca340a9e08056b653f3290e265d Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 25 Jul 2020 14:11:05 +0200 Subject: [PATCH 05/20] linux (RPi): update to 5.4.51-aac47fd Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 3fa7de8630..ae1feab73e 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -16,8 +16,8 @@ PKG_PATCH_DIRS="$LINUX" case "$LINUX" in raspberrypi) - PKG_VERSION="95a969f451f6ed61029741411c1c9aa44023e465" # 5.4.51 - PKG_SHA256="64bbb49dc5b6bdf4dabb05096a8e6d3f25b9b32108601892c9edbb6fe330224a" + PKG_VERSION="aac47fd9e07926faf1b89a27b2f671e1f4f794e6" # 5.4.51 + PKG_SHA256="7eade5d39e6ad5d60f6357639ff7078af512ce6d591dd916733a200c1c73e6ab" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; From 1b2dc5276dd2988ca1e12e324190bda3875f7d51 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 25 Jul 2020 14:12:59 +0200 Subject: [PATCH 06/20] linux (RPi): config options for 5.4.51-aac47fd enable LEDS_TRIGGER_ACTPWR Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 3 ++- projects/RPi/devices/RPi2/linux/linux.arm.conf | 3 ++- projects/RPi/devices/RPi4/linux/linux.arm.conf | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 267229366d..c6fe0f8def 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.4.50 Kernel Configuration +# Linux/arm 5.4.51 Kernel Configuration # # @@ -4102,6 +4102,7 @@ CONFIG_LEDS_TRIGGER_INPUT=y # CONFIG_LEDS_TRIGGER_NETDEV is not set # CONFIG_LEDS_TRIGGER_PATTERN is not set # CONFIG_LEDS_TRIGGER_AUDIO is not set +CONFIG_LEDS_TRIGGER_ACTPWR=y # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set CONFIG_EDAC_ATOMIC_SCRUB=y diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 5071a1994e..dfd26340e4 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.4.50 Kernel Configuration +# Linux/arm 5.4.51 Kernel Configuration # # @@ -4235,6 +4235,7 @@ CONFIG_LEDS_TRIGGER_INPUT=y # CONFIG_LEDS_TRIGGER_NETDEV is not set # CONFIG_LEDS_TRIGGER_PATTERN is not set # CONFIG_LEDS_TRIGGER_AUDIO is not set +CONFIG_LEDS_TRIGGER_ACTPWR=y # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set CONFIG_EDAC_ATOMIC_SCRUB=y diff --git a/projects/RPi/devices/RPi4/linux/linux.arm.conf b/projects/RPi/devices/RPi4/linux/linux.arm.conf index 48cf175da9..2a68836e59 100644 --- a/projects/RPi/devices/RPi4/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi4/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.4.50 Kernel Configuration +# Linux/arm 5.4.51 Kernel Configuration # # @@ -4847,6 +4847,7 @@ CONFIG_LEDS_TRIGGER_INPUT=y # CONFIG_LEDS_TRIGGER_NETDEV is not set # CONFIG_LEDS_TRIGGER_PATTERN is not set # CONFIG_LEDS_TRIGGER_AUDIO is not set +CONFIG_LEDS_TRIGGER_ACTPWR=y # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set CONFIG_EDAC_ATOMIC_SCRUB=y From 17796397b88e7ac7e1f1cf506f0839dbc0c5acfd Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 25 Jul 2020 14:51:59 +0200 Subject: [PATCH 07/20] rpi-eeprom: update to 8e9aca3 Signed-off-by: Matthias Reichl --- packages/tools/rpi-eeprom/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/rpi-eeprom/package.mk b/packages/tools/rpi-eeprom/package.mk index 193f33a54e..959b17620e 100644 --- a/packages/tools/rpi-eeprom/package.mk +++ b/packages/tools/rpi-eeprom/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rpi-eeprom" -PKG_VERSION="3325de5b9a0d08898096306d1bd343b6a275694d" -PKG_SHA256="5b9e4c714e86c0c688e8806ed17ec80f5319c57b36a1d53e35ee8481d17b1a19" +PKG_VERSION="8e9aca34aeead5fb87aa334cc29edc927bbeae7a" +PKG_SHA256="f3d3af536adf4bc105ed5b86e4090b008f298daccacc7536cb3c91a2f8a22352" PKG_ARCH="arm" PKG_LICENSE="BSD-3/custom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" From a70380233b9776d8ada002741a910fb5b3e90727 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 31 Jul 2020 21:24:08 +0200 Subject: [PATCH 08/20] RPi: update to firmware bd816db Signed-off-by: Matthias Reichl --- packages/graphics/bcm2835-driver/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 5324ae803e..758a255347 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="542aceb30364db3ce87d532ea90451f46bbb84e9" -PKG_SHA256="382cef80844df025adf6a47d1586755d400e30c08c90bafd44ceb8647ea11d97" +PKG_VERSION="bd816dbac723e04f8f8b06bb2e16d767cda7692c" +PKG_SHA256="ee0ca44c5f3ee2f1dae4d6645126f9ba28c6cd6223d1459058af99c35aa0a2a2" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 90ecbd3b9e..bb986cd761 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="542aceb30364db3ce87d532ea90451f46bbb84e9" -PKG_SHA256="a55f2a9d90931de10cef078a8ac032ce0c678c66e4088272bec6223e75a4d173" +PKG_VERSION="bd816dbac723e04f8f8b06bb2e16d767cda7692c" +PKG_SHA256="2931cf5de2b09a483603486f3a8eff04990fef0aa694ea809c159b81aa50d18c" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" From 916ffa20a54e931424126db84e377f513166004a Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 31 Jul 2020 21:28:14 +0200 Subject: [PATCH 09/20] linux (RPi): update to 5.4.51-3311531 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index ae1feab73e..c63395d85a 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -16,8 +16,8 @@ PKG_PATCH_DIRS="$LINUX" case "$LINUX" in raspberrypi) - PKG_VERSION="aac47fd9e07926faf1b89a27b2f671e1f4f794e6" # 5.4.51 - PKG_SHA256="7eade5d39e6ad5d60f6357639ff7078af512ce6d591dd916733a200c1c73e6ab" + PKG_VERSION="33115317f0006e15418396acef7bd6f9dc99b91e" # 5.4.51 + PKG_SHA256="e07eb356f226187f8d7c26712bedf72d2b0fd21ee6f08b3de63a7074f482853a" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; From 7ddcd717f62ea004162b4e05b684f79cb6a62547 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 31 Jul 2020 21:48:54 +0200 Subject: [PATCH 10/20] rpi-eeprom: update to d7b1a49 Signed-off-by: Matthias Reichl --- packages/tools/rpi-eeprom/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/rpi-eeprom/package.mk b/packages/tools/rpi-eeprom/package.mk index 959b17620e..9a08241bd4 100644 --- a/packages/tools/rpi-eeprom/package.mk +++ b/packages/tools/rpi-eeprom/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rpi-eeprom" -PKG_VERSION="8e9aca34aeead5fb87aa334cc29edc927bbeae7a" -PKG_SHA256="f3d3af536adf4bc105ed5b86e4090b008f298daccacc7536cb3c91a2f8a22352" +PKG_VERSION="d7b1a49a8356b09384817d362cbfb572e50770a8" +PKG_SHA256="2d1c86ec9425697cfaf53bed95c03159f49b97d1be9e0f2486cdbc72c66269bf" PKG_ARCH="arm" PKG_LICENSE="BSD-3/custom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" From da1eeefb83be84c14d0e2e3ae7788bd3b72f4de1 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 5 Aug 2020 16:04:39 +0200 Subject: [PATCH 11/20] RPi: update to firmware ce9911c Signed-off-by: Matthias Reichl --- packages/graphics/bcm2835-driver/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 758a255347..1cf7058627 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="bd816dbac723e04f8f8b06bb2e16d767cda7692c" -PKG_SHA256="ee0ca44c5f3ee2f1dae4d6645126f9ba28c6cd6223d1459058af99c35aa0a2a2" +PKG_VERSION="ce9911cefc825c43c867b7dbb3a53be0974db5d4" +PKG_SHA256="feb4188bb358aea16931a5f05ea41c19f69a3c553271e25e9f706878d1426446" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index bb986cd761..32efc53f84 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="bd816dbac723e04f8f8b06bb2e16d767cda7692c" -PKG_SHA256="2931cf5de2b09a483603486f3a8eff04990fef0aa694ea809c159b81aa50d18c" +PKG_VERSION="ce9911cefc825c43c867b7dbb3a53be0974db5d4" +PKG_SHA256="5b19ab4cbbbcf634575c344b076f1fc3c9f9d11fe14779a5bd85db3e72bb6457" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" From d6ef3d64f70eae848422eac7b658effe4dec4b39 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 6 Aug 2020 00:48:49 +0200 Subject: [PATCH 12/20] RPi: update to firmware 46e2c3e Signed-off-by: Matthias Reichl --- packages/graphics/bcm2835-driver/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 1cf7058627..ddb470df17 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="ce9911cefc825c43c867b7dbb3a53be0974db5d4" -PKG_SHA256="feb4188bb358aea16931a5f05ea41c19f69a3c553271e25e9f706878d1426446" +PKG_VERSION="46e2c3ee6ceb0f64b9c4ba4dafeb852ffb4396d3" +PKG_SHA256="d0381a345c984e1915b776074d9971ddb3d2bb9eafa3420c8f85394845c0fc0e" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 32efc53f84..8e1872fe2f 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="ce9911cefc825c43c867b7dbb3a53be0974db5d4" -PKG_SHA256="5b19ab4cbbbcf634575c344b076f1fc3c9f9d11fe14779a5bd85db3e72bb6457" +PKG_VERSION="46e2c3ee6ceb0f64b9c4ba4dafeb852ffb4396d3" +PKG_SHA256="18c8e79db0ed13ed29a18302a5aa896bfa4d07184a582cc2be1048f05d90574e" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" From 80689e04199a8037339cffe6d1b9e93c8d0134fe Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 10 Aug 2020 11:02:07 +0200 Subject: [PATCH 13/20] RPi: update to firmware b571a3c Signed-off-by: Matthias Reichl --- packages/graphics/bcm2835-driver/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index ddb470df17..b41f308826 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="46e2c3ee6ceb0f64b9c4ba4dafeb852ffb4396d3" -PKG_SHA256="d0381a345c984e1915b776074d9971ddb3d2bb9eafa3420c8f85394845c0fc0e" +PKG_VERSION="b571a3cfbb3198d445727f4a0057847fedce410b" +PKG_SHA256="d93dcdc07c3944a5479752fe53ed286706268147a98898b67bd73a3d90be9e4b" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 8e1872fe2f..8da1af7ac6 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="46e2c3ee6ceb0f64b9c4ba4dafeb852ffb4396d3" -PKG_SHA256="18c8e79db0ed13ed29a18302a5aa896bfa4d07184a582cc2be1048f05d90574e" +PKG_VERSION="b571a3cfbb3198d445727f4a0057847fedce410b" +PKG_SHA256="1390d85a314b26269aaa72878a6e109db185c1256b4b801989b69313c600d685" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" From d0af2036e102880f768f1aa56c3851b29aaffd56 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 11 Aug 2020 20:54:31 +0200 Subject: [PATCH 14/20] rpi-eeprom: update to 0e7da7e Signed-off-by: Matthias Reichl --- packages/tools/rpi-eeprom/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/rpi-eeprom/package.mk b/packages/tools/rpi-eeprom/package.mk index 9a08241bd4..63fb8f5a23 100644 --- a/packages/tools/rpi-eeprom/package.mk +++ b/packages/tools/rpi-eeprom/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rpi-eeprom" -PKG_VERSION="d7b1a49a8356b09384817d362cbfb572e50770a8" -PKG_SHA256="2d1c86ec9425697cfaf53bed95c03159f49b97d1be9e0f2486cdbc72c66269bf" +PKG_VERSION="0e7da7ecd84cdf7b65d6fc8d43446aee665187dc" +PKG_SHA256="d33d29f377217909f3fd4e41a8bdeeed0c2c5ce828947aaf21f593dbab2c9521" PKG_ARCH="arm" PKG_LICENSE="BSD-3/custom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" From e5269ee54d647e1c0c28a580370726f231260ec1 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 13 Aug 2020 11:44:31 +0200 Subject: [PATCH 15/20] linux (RPi): update to 5.4.58-8adbcbc Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 +- .../linux-999.20-fix-perf-gcc-10.patch | 234 ------------------ .../linux-999.21-fix-perf-gcc-10.patch | 37 --- 3 files changed, 2 insertions(+), 273 deletions(-) delete mode 100644 packages/linux/patches/raspberrypi/linux-999.20-fix-perf-gcc-10.patch delete mode 100644 packages/linux/patches/raspberrypi/linux-999.21-fix-perf-gcc-10.patch diff --git a/packages/linux/package.mk b/packages/linux/package.mk index c63395d85a..7285a10efd 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -16,8 +16,8 @@ PKG_PATCH_DIRS="$LINUX" case "$LINUX" in raspberrypi) - PKG_VERSION="33115317f0006e15418396acef7bd6f9dc99b91e" # 5.4.51 - PKG_SHA256="e07eb356f226187f8d7c26712bedf72d2b0fd21ee6f08b3de63a7074f482853a" + PKG_VERSION="8adbcbce11b889ab770366752dd57ea56a4d46a9" # 5.4.58 + PKG_SHA256="5b7f727d0bf2d6d5fc30b8b90c81112ab5ea6c007abe28295aa5fa5e1b1b709f" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; diff --git a/packages/linux/patches/raspberrypi/linux-999.20-fix-perf-gcc-10.patch b/packages/linux/patches/raspberrypi/linux-999.20-fix-perf-gcc-10.patch deleted file mode 100644 index b5b89e45c6..0000000000 --- a/packages/linux/patches/raspberrypi/linux-999.20-fix-perf-gcc-10.patch +++ /dev/null @@ -1,234 +0,0 @@ -From e4d9b04b973b2dbce7b42af95ea70d07da1c936d Mon Sep 17 00:00:00 2001 -From: Arnaldo Carvalho de Melo -Date: Mon, 2 Mar 2020 12:09:38 -0300 -Subject: [PATCH] perf bench: Share some global variables to fix build with gcc - 10 - -Noticed with gcc 10 (fedora rawhide) that those variables were not being -declared as static, so end up with: - - ld: /tmp/build/perf/bench/epoll-wait.o:/git/perf/tools/perf/bench/epoll-wait.c:93: multiple definition of `end'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - ld: /tmp/build/perf/bench/epoll-wait.o:/git/perf/tools/perf/bench/epoll-wait.c:93: multiple definition of `start'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - ld: /tmp/build/perf/bench/epoll-wait.o:/git/perf/tools/perf/bench/epoll-wait.c:93: multiple definition of `runtime'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - ld: /tmp/build/perf/bench/epoll-ctl.o:/git/perf/tools/perf/bench/epoll-ctl.c:38: multiple definition of `end'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - ld: /tmp/build/perf/bench/epoll-ctl.o:/git/perf/tools/perf/bench/epoll-ctl.c:38: multiple definition of `start'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - ld: /tmp/build/perf/bench/epoll-ctl.o:/git/perf/tools/perf/bench/epoll-ctl.c:38: multiple definition of `runtime'; /tmp/build/perf/bench/futex-hash.o:/git/perf/tools/perf/bench/futex-hash.c:40: first defined here - make[4]: *** [/git/perf/tools/build/Makefile.build:145: /tmp/build/perf/bench/perf-in.o] Error 1 - -Prefix those with bench__ and add them to bench/bench.h, so that we can -share those on the tools needing to access those variables from signal -handlers. - -Acked-by: Thomas Gleixner -Cc: Adrian Hunter -Cc: Davidlohr Bueso -Cc: Jiri Olsa -Cc: Namhyung Kim -Link: http://lore.kernel.org/lkml/20200303155811.GD13702@kernel.org -Signed-off-by: Arnaldo Carvalho de Melo ---- - tools/perf/bench/bench.h | 4 ++++ - tools/perf/bench/epoll-ctl.c | 7 +++---- - tools/perf/bench/epoll-wait.c | 11 +++++------ - tools/perf/bench/futex-hash.c | 12 ++++++------ - tools/perf/bench/futex-lock-pi.c | 11 +++++------ - 5 files changed, 23 insertions(+), 22 deletions(-) - -diff --git a/tools/perf/bench/bench.h b/tools/perf/bench/bench.h -index fddb3ced9db6..4aa6de1aa67d 100644 ---- a/tools/perf/bench/bench.h -+++ b/tools/perf/bench/bench.h -@@ -2,6 +2,10 @@ - #ifndef BENCH_H - #define BENCH_H - -+#include -+ -+extern struct timeval bench__start, bench__end, bench__runtime; -+ - /* - * The madvise transparent hugepage constants were added in glibc - * 2.13. For compatibility with older versions of glibc, define these -diff --git a/tools/perf/bench/epoll-ctl.c b/tools/perf/bench/epoll-ctl.c -index bb617e568841..a7526c05df38 100644 ---- a/tools/perf/bench/epoll-ctl.c -+++ b/tools/perf/bench/epoll-ctl.c -@@ -35,7 +35,6 @@ - - static unsigned int nthreads = 0; - static unsigned int nsecs = 8; --struct timeval start, end, runtime; - static bool done, __verbose, randomize; - - /* -@@ -94,8 +93,8 @@ static void toggle_done(int sig __maybe_unused, - { - /* inform all threads that we're done for the day */ - done = true; -- gettimeofday(&end, NULL); -- timersub(&end, &start, &runtime); -+ gettimeofday(&bench__end, NULL); -+ timersub(&bench__end, &bench__start, &bench__runtime); - } - - static void nest_epollfd(void) -@@ -361,7 +360,7 @@ int bench_epoll_ctl(int argc, const char **argv) - - threads_starting = nthreads; - -- gettimeofday(&start, NULL); -+ gettimeofday(&bench__start, NULL); - - do_threads(worker, cpu); - -diff --git a/tools/perf/bench/epoll-wait.c b/tools/perf/bench/epoll-wait.c -index 7af694437f4e..d1c5cb526b9f 100644 ---- a/tools/perf/bench/epoll-wait.c -+++ b/tools/perf/bench/epoll-wait.c -@@ -90,7 +90,6 @@ - - static unsigned int nthreads = 0; - static unsigned int nsecs = 8; --struct timeval start, end, runtime; - static bool wdone, done, __verbose, randomize, nonblocking; - - /* -@@ -276,8 +275,8 @@ static void toggle_done(int sig __maybe_unused, - { - /* inform all threads that we're done for the day */ - done = true; -- gettimeofday(&end, NULL); -- timersub(&end, &start, &runtime); -+ gettimeofday(&bench__end, NULL); -+ timersub(&bench__end, &bench__start, &bench__runtime); - } - - static void print_summary(void) -@@ -287,7 +286,7 @@ static void print_summary(void) - - printf("\nAveraged %ld operations/sec (+- %.2f%%), total secs = %d\n", - avg, rel_stddev_stats(stddev, avg), -- (int) runtime.tv_sec); -+ (int)bench__runtime.tv_sec); - } - - static int do_threads(struct worker *worker, struct perf_cpu_map *cpu) -@@ -479,7 +478,7 @@ int bench_epoll_wait(int argc, const char **argv) - - threads_starting = nthreads; - -- gettimeofday(&start, NULL); -+ gettimeofday(&bench__start, NULL); - - do_threads(worker, cpu); - -@@ -519,7 +518,7 @@ int bench_epoll_wait(int argc, const char **argv) - qsort(worker, nthreads, sizeof(struct worker), cmpworker); - - for (i = 0; i < nthreads; i++) { -- unsigned long t = worker[i].ops/runtime.tv_sec; -+ unsigned long t = worker[i].ops / bench__runtime.tv_sec; - - update_stats(&throughput_stats, t); - -diff --git a/tools/perf/bench/futex-hash.c b/tools/perf/bench/futex-hash.c -index 8ba0c3330a9a..21776862e940 100644 ---- a/tools/perf/bench/futex-hash.c -+++ b/tools/perf/bench/futex-hash.c -@@ -37,7 +37,7 @@ static unsigned int nfutexes = 1024; - static bool fshared = false, done = false, silent = false; - static int futex_flag = 0; - --struct timeval start, end, runtime; -+struct timeval bench__start, bench__end, bench__runtime; - static pthread_mutex_t thread_lock; - static unsigned int threads_starting; - static struct stats throughput_stats; -@@ -103,8 +103,8 @@ static void toggle_done(int sig __maybe_unused, - { - /* inform all threads that we're done for the day */ - done = true; -- gettimeofday(&end, NULL); -- timersub(&end, &start, &runtime); -+ gettimeofday(&bench__end, NULL); -+ timersub(&bench__end, &bench__start, &bench__runtime); - } - - static void print_summary(void) -@@ -114,7 +114,7 @@ static void print_summary(void) - - printf("%sAveraged %ld operations/sec (+- %.2f%%), total secs = %d\n", - !silent ? "\n" : "", avg, rel_stddev_stats(stddev, avg), -- (int) runtime.tv_sec); -+ (int)bench__runtime.tv_sec); - } - - int bench_futex_hash(int argc, const char **argv) -@@ -161,7 +161,7 @@ int bench_futex_hash(int argc, const char **argv) - - threads_starting = nthreads; - pthread_attr_init(&thread_attr); -- gettimeofday(&start, NULL); -+ gettimeofday(&bench__start, NULL); - for (i = 0; i < nthreads; i++) { - worker[i].tid = i; - worker[i].futex = calloc(nfutexes, sizeof(*worker[i].futex)); -@@ -204,7 +204,7 @@ int bench_futex_hash(int argc, const char **argv) - pthread_mutex_destroy(&thread_lock); - - for (i = 0; i < nthreads; i++) { -- unsigned long t = worker[i].ops/runtime.tv_sec; -+ unsigned long t = worker[i].ops / bench__runtime.tv_sec; - update_stats(&throughput_stats, t); - if (!silent) { - if (nfutexes == 1) -diff --git a/tools/perf/bench/futex-lock-pi.c b/tools/perf/bench/futex-lock-pi.c -index d0cae8125423..30d97121dc4f 100644 ---- a/tools/perf/bench/futex-lock-pi.c -+++ b/tools/perf/bench/futex-lock-pi.c -@@ -37,7 +37,6 @@ static bool silent = false, multi = false; - static bool done = false, fshared = false; - static unsigned int nthreads = 0; - static int futex_flag = 0; --struct timeval start, end, runtime; - static pthread_mutex_t thread_lock; - static unsigned int threads_starting; - static struct stats throughput_stats; -@@ -64,7 +63,7 @@ static void print_summary(void) - - printf("%sAveraged %ld operations/sec (+- %.2f%%), total secs = %d\n", - !silent ? "\n" : "", avg, rel_stddev_stats(stddev, avg), -- (int) runtime.tv_sec); -+ (int)bench__runtime.tv_sec); - } - - static void toggle_done(int sig __maybe_unused, -@@ -73,8 +72,8 @@ static void toggle_done(int sig __maybe_unused, - { - /* inform all threads that we're done for the day */ - done = true; -- gettimeofday(&end, NULL); -- timersub(&end, &start, &runtime); -+ gettimeofday(&bench__end, NULL); -+ timersub(&bench__end, &bench__start, &bench__runtime); - } - - static void *workerfn(void *arg) -@@ -185,7 +184,7 @@ int bench_futex_lock_pi(int argc, const char **argv) - - threads_starting = nthreads; - pthread_attr_init(&thread_attr); -- gettimeofday(&start, NULL); -+ gettimeofday(&bench__start, NULL); - - create_threads(worker, thread_attr, cpu); - pthread_attr_destroy(&thread_attr); -@@ -211,7 +210,7 @@ int bench_futex_lock_pi(int argc, const char **argv) - pthread_mutex_destroy(&thread_lock); - - for (i = 0; i < nthreads; i++) { -- unsigned long t = worker[i].ops/runtime.tv_sec; -+ unsigned long t = worker[i].ops / bench__runtime.tv_sec; - - update_stats(&throughput_stats, t); - if (!silent) diff --git a/packages/linux/patches/raspberrypi/linux-999.21-fix-perf-gcc-10.patch b/packages/linux/patches/raspberrypi/linux-999.21-fix-perf-gcc-10.patch deleted file mode 100644 index 3596ff39c5..0000000000 --- a/packages/linux/patches/raspberrypi/linux-999.21-fix-perf-gcc-10.patch +++ /dev/null @@ -1,37 +0,0 @@ -From cff20b3151ccab690715cb6cf0f5da5cccb32adf Mon Sep 17 00:00:00 2001 -From: Arnaldo Carvalho de Melo -Date: Mon, 2 Mar 2020 11:13:19 -0300 -Subject: [PATCH] perf tests bp_account: Make global variable static - -To fix the build with newer gccs, that without this patch exit with: - - LD /tmp/build/perf/tests/perf-in.o - ld: /tmp/build/perf/tests/bp_account.o:/git/perf/tools/perf/tests/bp_account.c:22: multiple definition of `the_var'; /tmp/build/perf/tests/bp_signal.o:/git/perf/tools/perf/tests/bp_signal.c:38: first defined here - make[4]: *** [/git/perf/tools/build/Makefile.build:145: /tmp/build/perf/tests/perf-in.o] Error 1 - -First noticed in fedora:rawhide/32 with: - - [perfbuilder@a5ff49d6e6e4 ~]$ gcc --version - gcc (GCC) 10.0.1 20200216 (Red Hat 10.0.1-0.8) - -Reported-by: Jiri Olsa -Cc: Adrian Hunter -Cc: Namhyung Kim -Signed-off-by: Arnaldo Carvalho de Melo ---- - tools/perf/tests/bp_account.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/perf/tests/bp_account.c b/tools/perf/tests/bp_account.c -index d0b935356274..489b50604cf2 100644 ---- a/tools/perf/tests/bp_account.c -+++ b/tools/perf/tests/bp_account.c -@@ -19,7 +19,7 @@ - #include "../perf-sys.h" - #include "cloexec.h" - --volatile long the_var; -+static volatile long the_var; - - static noinline int test_function(void) - { From a2693e541b6805734a8df71213ac6f0a8bc971d2 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 13 Aug 2020 11:45:08 +0200 Subject: [PATCH 16/20] linux (RPi): config options for 5.4.58-8adbcbc Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 3 +-- projects/RPi/devices/RPi2/linux/linux.arm.conf | 3 +-- projects/RPi/devices/RPi4/linux/linux.arm.conf | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index c6fe0f8def..5bffec2d6e 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.4.51 Kernel Configuration +# Linux/arm 5.4.58 Kernel Configuration # # @@ -1355,7 +1355,6 @@ CONFIG_SCSI_DMA=y CONFIG_BLK_DEV_SD=y # CONFIG_CHR_DEV_ST is not set CONFIG_BLK_DEV_SR=y -# CONFIG_BLK_DEV_SR_VENDOR is not set # CONFIG_CHR_DEV_SG is not set # CONFIG_CHR_DEV_SCH is not set # CONFIG_SCSI_CONSTANTS is not set diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index dfd26340e4..64aca7b00b 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.4.51 Kernel Configuration +# Linux/arm 5.4.58 Kernel Configuration # # @@ -1478,7 +1478,6 @@ CONFIG_SCSI_DMA=y CONFIG_BLK_DEV_SD=y # CONFIG_CHR_DEV_ST is not set CONFIG_BLK_DEV_SR=y -# CONFIG_BLK_DEV_SR_VENDOR is not set # CONFIG_CHR_DEV_SG is not set # CONFIG_CHR_DEV_SCH is not set # CONFIG_SCSI_CONSTANTS is not set diff --git a/projects/RPi/devices/RPi4/linux/linux.arm.conf b/projects/RPi/devices/RPi4/linux/linux.arm.conf index 2a68836e59..2220d81b17 100644 --- a/projects/RPi/devices/RPi4/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi4/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.4.51 Kernel Configuration +# Linux/arm 5.4.58 Kernel Configuration # # @@ -1569,7 +1569,6 @@ CONFIG_SCSI_DMA=y CONFIG_BLK_DEV_SD=y # CONFIG_CHR_DEV_ST is not set CONFIG_BLK_DEV_SR=y -# CONFIG_BLK_DEV_SR_VENDOR is not set # CONFIG_CHR_DEV_SG is not set # CONFIG_CHR_DEV_SCH is not set # CONFIG_SCSI_CONSTANTS is not set From 018247264e20bb347e53dc386dd4ec33148c2c5c Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 13 Aug 2020 22:53:28 +0200 Subject: [PATCH 17/20] linux (RPi): update to 5.4.58-cc069e1 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 7285a10efd..05facebaa5 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -16,8 +16,8 @@ PKG_PATCH_DIRS="$LINUX" case "$LINUX" in raspberrypi) - PKG_VERSION="8adbcbce11b889ab770366752dd57ea56a4d46a9" # 5.4.58 - PKG_SHA256="5b7f727d0bf2d6d5fc30b8b90c81112ab5ea6c007abe28295aa5fa5e1b1b709f" + PKG_VERSION="cc069e10e5617515ccf9bcdf9d71e7bd11a94de2" # 5.4.58 + PKG_SHA256="1b9091f9b6ac0f1d5cff3df5c760bebd6eb7edb89c14128f754f4c1f34ae07a9" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; From f358298383ca341d489f5318fe09ee8eb7e357f5 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 17 Aug 2020 12:41:03 +0200 Subject: [PATCH 18/20] linux (RPi): drop obsolete patches from popcornmix Synced with https://github.com/popcornmix/linux/tree/kodi/rpi4-kms Only the workaround to hide 4k modes is now left. Signed-off-by: Matthias Reichl --- .../raspberrypi/linux-001-hide-4k-modes.patch | 35 +++++ .../linux-001-popcornmix-kodi-rpi4-kms.patch | 123 ------------------ 2 files changed, 35 insertions(+), 123 deletions(-) create mode 100644 packages/linux/patches/raspberrypi/linux-001-hide-4k-modes.patch delete mode 100644 packages/linux/patches/raspberrypi/linux-001-popcornmix-kodi-rpi4-kms.patch diff --git a/packages/linux/patches/raspberrypi/linux-001-hide-4k-modes.patch b/packages/linux/patches/raspberrypi/linux-001-hide-4k-modes.patch new file mode 100644 index 0000000000..4d71668ad1 --- /dev/null +++ b/packages/linux/patches/raspberrypi/linux-001-hide-4k-modes.patch @@ -0,0 +1,35 @@ +From 11c0cfc8ed33cda1435fc9a9efd8476514054842 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Mon, 16 Mar 2020 20:38:37 +0000 +Subject: [PATCH] vc4_hdmi: Reduce max pixel rate to hide 4k modes + +vc4_hdmi: Increase pixel clock to 162MHz for 1920x1200@60 +--- + drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c +index 219964ff2f0e7..31d7565d2d904 100644 +--- a/drivers/gpu/drm/vc4/vc4_hdmi.c ++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c +@@ -2322,7 +2322,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = { + static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { + .id = 0, + .audio_available = true, +- .max_pixel_clock = 297000000, ++ .max_pixel_clock = 162000000, + .cec_input_clock = 27000000, + .registers = vc5_hdmi_hdmi0_fields, + .num_registers = ARRAY_SIZE(vc5_hdmi_hdmi0_fields), +@@ -2350,7 +2350,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { + static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { + .id = 1, + .audio_available = true, +- .max_pixel_clock = 297000000, ++ .max_pixel_clock = 162000000, + .cec_input_clock = 27000000, + .registers = vc5_hdmi_hdmi1_fields, + .num_registers = ARRAY_SIZE(vc5_hdmi_hdmi1_fields), +-- +2.20.1 + diff --git a/packages/linux/patches/raspberrypi/linux-001-popcornmix-kodi-rpi4-kms.patch b/packages/linux/patches/raspberrypi/linux-001-popcornmix-kodi-rpi4-kms.patch deleted file mode 100644 index a846333ad5..0000000000 --- a/packages/linux/patches/raspberrypi/linux-001-popcornmix-kodi-rpi4-kms.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 1ae562e48904ef7584d7c12ea0e29e089928b79e Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 16 Mar 2020 20:38:37 +0000 -Subject: [PATCH 1/3] vc4_hdmi: Reduce max pixel rate to hide 4k modes - -vc4_hdmi: Increase pixel clock to 162MHz for 1920x1200@60 ---- - drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index bce82f011d9fb..15946f8538898 100644 ---- a/drivers/gpu/drm/vc4/vc4_hdmi.c -+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1907,7 +1907,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = { - static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { - .id = 0, - .audio_available = true, -- .max_pixel_clock = 297000000, -+ .max_pixel_clock = 162000000, - .cec_input_clock = 27000000, - .registers = vc5_hdmi_hdmi0_fields, - .num_registers = ARRAY_SIZE(vc5_hdmi_hdmi0_fields), -@@ -1935,7 +1935,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { - static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { - .id = 1, - .audio_available = true, -- .max_pixel_clock = 297000000, -+ .max_pixel_clock = 162000000, - .cec_input_clock = 27000000, - .registers = vc5_hdmi_hdmi1_fields, - .num_registers = ARRAY_SIZE(vc5_hdmi_hdmi1_fields), --- -2.20.1 - - -From 589ce075d9117e4d5e6bbf09f90f29cce2b6d233 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 10 Mar 2020 22:19:51 +0000 -Subject: [PATCH 2/3] vc4_hdmi: Set channel mapping as expected by kodi - -vc4_hdmi: Don't mangle channels for passthrough ---- - drivers/gpu/drm/vc4/vc4_hdmi.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 15946f8538898..87836349d0982 100644 ---- a/drivers/gpu/drm/vc4/vc4_hdmi.c -+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -785,6 +785,10 @@ static u32 vc4_hdmi_channel_map(struct vc4_hdmi *vc4_hdmi, u32 channel_mask) - int i; - u32 channel_map = 0; - -+ /* hack: return the mapping expected by kodi until we have a way of configuring this */ -+ if (channel_mask == 0xff) -+ return 0xb13f88; -+ - for (i = 0; i < 8; i++) { - if (channel_mask & BIT(i)) - channel_map |= i << (3 * i); -@@ -797,6 +801,12 @@ static u32 vc5_hdmi_channel_map(struct vc4_hdmi *vc4_hdmi, u32 channel_mask) - int i; - u32 channel_map = 0; - -+ /* hack: return the mapping expected by kodi until we have a way of configuring this */ -+ -+ if (!(vc4_hdmi->audio.iec_status[0] & IEC958_AES0_NONAUDIO) && -+ vc4_hdmi->audio.channels == 8) -+ return 0x54237610; -+ - for (i = 0; i < 8; i++) { - if (channel_mask & BIT(i)) - channel_map |= i << (4 * i); --- -2.20.1 - - -From f9c550eb6f339edd2b62bf285d617f752cd7f251 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 10 Mar 2020 23:07:11 +0000 -Subject: [PATCH 3/3] vc4_hdmi: Set channel_allocation to something plausible - ---- - drivers/gpu/drm/vc4/vc4_hdmi.c | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index 87836349d0982..bd2ec74d6dc62 100644 ---- a/drivers/gpu/drm/vc4/vc4_hdmi.c -+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -339,6 +339,17 @@ static void vc4_hdmi_set_spd_infoframe(struct drm_encoder *encoder) - - static void vc4_hdmi_set_audio_infoframe(struct drm_encoder *encoder) - { -+ static const u8 cea_map[] = { -+ 0xff, // 0 -+ 0xff, // 1 -+ 0x00, // 2.0 -+ 0x01, // 2.1 -+ 0x03, // 3.1 -+ 0x09, // 4.1 -+ 0x0b, // 5.1 -+ 0x12, // 7.0 -+ 0x13, // 7.1 -+ }; - struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder); - union hdmi_infoframe frame; - int ret; -@@ -349,6 +360,10 @@ static void vc4_hdmi_set_audio_infoframe(struct drm_encoder *encoder) - frame.audio.sample_frequency = HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM; - frame.audio.sample_size = HDMI_AUDIO_SAMPLE_SIZE_STREAM; - frame.audio.channels = vc4_hdmi->audio.channels; -+ if (frame.audio.channels < 2 || frame.audio.channels > 8) -+ DRM_ERROR("Unable to map channels: %d\n", frame.audio.channels); -+ else -+ frame.audio.channel_allocation = cea_map[frame.audio.channels]; - - vc4_hdmi_write_infoframe(encoder, &frame); - } --- -2.20.1 - From 31a9ad786c0a52e682e5ed8df4b8d4889c577a72 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 17 Aug 2020 18:56:41 +0200 Subject: [PATCH 19/20] RPi: update to firmware 1ab1308 Signed-off-by: Matthias Reichl --- packages/graphics/bcm2835-driver/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index b41f308826..54753e256c 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="b571a3cfbb3198d445727f4a0057847fedce410b" -PKG_SHA256="d93dcdc07c3944a5479752fe53ed286706268147a98898b67bd73a3d90be9e4b" +PKG_VERSION="1ab130804fa901f1332bb1815f020e7fdfc1e5f6" +PKG_SHA256="d1d6766e65c1e7f35478fe6a65936883e54da2dd8268792c88690206217b3b6f" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 8da1af7ac6..4daf937945 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="b571a3cfbb3198d445727f4a0057847fedce410b" -PKG_SHA256="1390d85a314b26269aaa72878a6e109db185c1256b4b801989b69313c600d685" +PKG_VERSION="1ab130804fa901f1332bb1815f020e7fdfc1e5f6" +PKG_SHA256="4c38b9dc91e8832cc57854a1424dc56498622d5c3b6e1e5dfbe10fc2132fb794" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" From 877fa9e9babfa50583100877310b6e58d033f314 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 19 Aug 2020 21:36:24 +0200 Subject: [PATCH 20/20] RPi: update to firmware f293685 Signed-off-by: Matthias Reichl --- packages/graphics/bcm2835-driver/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 54753e256c..df4aa0ff3d 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="1ab130804fa901f1332bb1815f020e7fdfc1e5f6" -PKG_SHA256="d1d6766e65c1e7f35478fe6a65936883e54da2dd8268792c88690206217b3b6f" +PKG_VERSION="f293685f683c48b1872beeb38c2f7da1f46141a0" +PKG_SHA256="42e9f59785e55c4234352b60e775281add15997c6cb706b6ec5b603978d92c19" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 4daf937945..caf286ebae 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="1ab130804fa901f1332bb1815f020e7fdfc1e5f6" -PKG_SHA256="4c38b9dc91e8832cc57854a1424dc56498622d5c3b6e1e5dfbe10fc2132fb794" +PKG_VERSION="f293685f683c48b1872beeb38c2f7da1f46141a0" +PKG_SHA256="cf72421d38c65317a49f1f0387df86e78b0b83e8738ac4a58651c3fb8cac86ca" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com"