jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-30 14:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4430 from HiassofT/le10-kernel-5.4.47+

Browse Source 
linux (RPi): update to 5.4.47+
This commit is contained in:
Christian Hewitt 2020-07-11 07:20:48 +04:00 committed by GitHub
commit 39070c5155
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/graphics/bcm2835-driver/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="bcm2835-driver" PKG_NAME="bcm2835-driver"
PKG_VERSION="cb2b95d73e9f0b1ebf05e03bb1959603d982feeb" PKG_VERSION="66fc5eaac3d0af1d5a7ffa616086cbfaefd72e98"
PKG_SHA256="814b1e012513f08b9e4a4a72fd37d2a3d2ba4b8fd5aeb0bb093e87b0085b5c21" PKG_SHA256="373872b00d566fbc8873125336b3a09696e85602d2e49a48c0b5c5cabb15d989"
PKG_LICENSE="nonfree" PKG_LICENSE="nonfree"
PKG_SITE="http://www.broadcom.com" PKG_SITE="http://www.broadcom.com"
PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"

4
packages/linux/package.mk
View File

@ -16,8 +16,8 @@ PKG_PATCH_DIRS="$LINUX"
case "$LINUX" in case "$LINUX" in
raspberrypi) raspberrypi)
PKG_VERSION="d00cdd80abb2a8c201cae2f6bd80e27eb2f7d347" # 5.4.45 PKG_VERSION="3c860a6fd128e7cf1c39b3f51258a2a078d1a1a4" # 5.4.50
PKG_SHA256="4c6e5c458dfd07c8557afaedb54ad037f8d35c741f297a1b92ed796c69dec9de" PKG_SHA256="27bf43c2624acb156330b284f4704c0a85d75d76022c79b5157789511da7b04a"
PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz"
PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
;; ;;

33
packages/linux/patches/raspberrypi/linux-001-popcornmix-kodi-rpi4-kms.patch
View File

@ -1,4 +1,4 @@
From c7852992ed9c4973e83d961fcf92b6be316e6b60 Mon Sep 17 00:00:00 2001 From 1ae562e48904ef7584d7c12ea0e29e089928b79e Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com> From: popcornmix <popcornmix@gmail.com>
Date: Mon, 16 Mar 2020 20:38:37 +0000 Date: Mon, 16 Mar 2020 20:38:37 +0000
Subject: [PATCH 1/3] vc4_hdmi: Reduce max pixel rate to hide 4k modes Subject: [PATCH 1/3] vc4_hdmi: Reduce max pixel rate to hide 4k modes
@ -9,10 +9,10 @@ vc4_hdmi: Increase pixel clock to 162MHz for 1920x1200@60
1 file changed, 2 insertions(+), 2 deletions(-) 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 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 2d608cf9dff9..152c9d8c2898 100644 index bce82f011d9fb..15946f8538898 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -1791,7 +1791,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = { @@ -1907,7 +1907,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = {
static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = {
.id = 0, .id = 0,
.audio_available = true, .audio_available = true,
@ -21,7 +21,7 @@ index 2d608cf9dff9..152c9d8c2898 100644
.cec_input_clock = 27000000, .cec_input_clock = 27000000,
.registers = vc5_hdmi_hdmi0_fields, .registers = vc5_hdmi_hdmi0_fields,
.num_registers = ARRAY_SIZE(vc5_hdmi_hdmi0_fields), .num_registers = ARRAY_SIZE(vc5_hdmi_hdmi0_fields),
@@ -1819,7 +1819,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { @@ -1935,7 +1935,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = {
static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = {
.id = 1, .id = 1,
.audio_available = true, .audio_available = true,
@ -34,20 +34,21 @@ index 2d608cf9dff9..152c9d8c2898 100644
2.20.1 2.20.1
From cc54619b00f89058791d3211843d043caad0cf0c Mon Sep 17 00:00:00 2001 From 589ce075d9117e4d5e6bbf09f90f29cce2b6d233 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com> From: popcornmix <popcornmix@gmail.com>
Date: Tue, 10 Mar 2020 22:19:51 +0000 Date: Tue, 10 Mar 2020 22:19:51 +0000
Subject: [PATCH 2/3] vc4_hdmi: Set channel mapping as expected by kodi 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 | 8 ++++++++ drivers/gpu/drm/vc4/vc4_hdmi.c | 10 ++++++++++
1 file changed, 8 insertions(+) 1 file changed, 10 insertions(+)
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 152c9d8c2898..057595ec853d 100644 index 15946f8538898..87836349d0982 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -775,6 +775,10 @@ static u32 vc4_hdmi_channel_map(struct vc4_hdmi *vc4_hdmi, u32 channel_mask) @@ -785,6 +785,10 @@ static u32 vc4_hdmi_channel_map(struct vc4_hdmi *vc4_hdmi, u32 channel_mask)
int i; int i;
u32 channel_map = 0; u32 channel_map = 0;
@ -58,12 +59,14 @@ index 152c9d8c2898..057595ec853d 100644
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if (channel_mask & BIT(i)) if (channel_mask & BIT(i))
channel_map |= i << (3 * i); channel_map |= i << (3 * i);
@@ -787,6 +791,10 @@ static u32 vc5_hdmi_channel_map(struct vc4_hdmi *vc4_hdmi, u32 channel_mask) @@ -797,6 +801,12 @@ static u32 vc5_hdmi_channel_map(struct vc4_hdmi *vc4_hdmi, u32 channel_mask)
int i; int i;
u32 channel_map = 0; u32 channel_map = 0;
+ /* hack: return the mapping expected by kodi until we have a way of configuring this */ + /* hack: return the mapping expected by kodi until we have a way of configuring this */
+ if (channel_mask == 0xff) +
+ if (!(vc4_hdmi->audio.iec_status[0] & IEC958_AES0_NONAUDIO) &&
+ vc4_hdmi->audio.channels == 8)
+ return 0x54237610; + return 0x54237610;
+ +
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
@ -73,7 +76,7 @@ index 152c9d8c2898..057595ec853d 100644
2.20.1 2.20.1
From c8d2ab620ecb95cd12708876000a76fc003990bb Mon Sep 17 00:00:00 2001 From f9c550eb6f339edd2b62bf285d617f752cd7f251 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com> From: popcornmix <popcornmix@gmail.com>
Date: Tue, 10 Mar 2020 23:07:11 +0000 Date: Tue, 10 Mar 2020 23:07:11 +0000
Subject: [PATCH 3/3] vc4_hdmi: Set channel_allocation to something plausible Subject: [PATCH 3/3] vc4_hdmi: Set channel_allocation to something plausible
@ -83,10 +86,10 @@ Subject: [PATCH 3/3] vc4_hdmi: Set channel_allocation to something plausible
1 file changed, 15 insertions(+) 1 file changed, 15 insertions(+)
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 057595ec853d..2a733ab5343c 100644 index 87836349d0982..bd2ec74d6dc62 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -329,6 +329,17 @@ static void vc4_hdmi_set_spd_infoframe(struct drm_encoder *encoder) @@ -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 void vc4_hdmi_set_audio_infoframe(struct drm_encoder *encoder)
{ {
@ -104,7 +107,7 @@ index 057595ec853d..2a733ab5343c 100644
struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder); struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
union hdmi_infoframe frame; union hdmi_infoframe frame;
int ret; int ret;
@@ -339,6 +350,10 @@ static void vc4_hdmi_set_audio_infoframe(struct drm_encoder *encoder) @@ -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_frequency = HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM;
frame.audio.sample_size = HDMI_AUDIO_SAMPLE_SIZE_STREAM; frame.audio.sample_size = HDMI_AUDIO_SAMPLE_SIZE_STREAM;
frame.audio.channels = vc4_hdmi->audio.channels; frame.audio.channels = vc4_hdmi->audio.channels;

4
packages/tools/bcm2835-bootloader/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="bcm2835-bootloader" PKG_NAME="bcm2835-bootloader"
PKG_VERSION="cb2b95d73e9f0b1ebf05e03bb1959603d982feeb" PKG_VERSION="66fc5eaac3d0af1d5a7ffa616086cbfaefd72e98"
PKG_SHA256="e223022bf48ba55aecbcb0013f98cb50ef449daffcfb96cf9af48c5b61e85869" PKG_SHA256="fe7fe713409120768c37dbbe02a7a06c0e808b0e60dad09ea054d7006947b76d"
PKG_ARCH="arm" PKG_ARCH="arm"
PKG_LICENSE="nonfree" PKG_LICENSE="nonfree"
PKG_SITE="http://www.broadcom.com" PKG_SITE="http://www.broadcom.com"

4
packages/tools/rpi-eeprom/package.mk
View File

@ -2,8 +2,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="rpi-eeprom" PKG_NAME="rpi-eeprom"
PKG_VERSION="2a8c2e77c34d16554956e5ca56697eba9611d2ad" PKG_VERSION="befe05b42a2a69fcbf2a5ec0ac4a8e7085c543f7"
PKG_SHA256="3982aa10f45f3dcd80d6072db0ddf27d76d4fbf2e9cdb08304ba32a953d55c8b" PKG_SHA256="99880d1d51d229091d63c9c0e42033c757cf5847120aee4e01993443edb2560c"
PKG_ARCH="arm" PKG_ARCH="arm"
PKG_LICENSE="BSD-3/custom" PKG_LICENSE="BSD-3/custom"
PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom"

7
projects/RPi/devices/RPi/linux/linux.arm.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm 5.4.42 Kernel Configuration # Linux/arm 5.4.50 Kernel Configuration
# #
# #
@ -1962,7 +1962,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y
# end of Serial drivers # end of Serial drivers
CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_MCTRL_GPIO=y
CONFIG_SERIAL_DEV_BUS=m CONFIG_SERIAL_DEV_BUS=y
CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
# CONFIG_TTY_PRINTK is not set # CONFIG_TTY_PRINTK is not set
# CONFIG_HVC_DCC is not set # CONFIG_HVC_DCC is not set
# CONFIG_IPMI_HANDLER is not set # CONFIG_IPMI_HANDLER is not set
@ -2013,7 +2014,7 @@ CONFIG_I2C_BCM2708_BAUDRATE=100000
# #
# I2C system bus drivers (mostly embedded / system-on-chip) # I2C system bus drivers (mostly embedded / system-on-chip)
# #
CONFIG_I2C_BCM2835=m CONFIG_I2C_BCM2835=y
CONFIG_I2C_BRCMSTB=y CONFIG_I2C_BRCMSTB=y
# CONFIG_I2C_CBUS_GPIO is not set # CONFIG_I2C_CBUS_GPIO is not set
# CONFIG_I2C_DESIGNWARE_PLATFORM is not set # CONFIG_I2C_DESIGNWARE_PLATFORM is not set

7
projects/RPi/devices/RPi2/linux/linux.arm.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm 5.4.42 Kernel Configuration # Linux/arm 5.4.50 Kernel Configuration
# #
# #
@ -2085,7 +2085,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y
# end of Serial drivers # end of Serial drivers
CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_MCTRL_GPIO=y
CONFIG_SERIAL_DEV_BUS=m CONFIG_SERIAL_DEV_BUS=y
CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
# CONFIG_TTY_PRINTK is not set # CONFIG_TTY_PRINTK is not set
# CONFIG_HVC_DCC is not set # CONFIG_HVC_DCC is not set
# CONFIG_IPMI_HANDLER is not set # CONFIG_IPMI_HANDLER is not set
@ -2136,7 +2137,7 @@ CONFIG_I2C_BCM2708_BAUDRATE=100000
# #
# I2C system bus drivers (mostly embedded / system-on-chip) # I2C system bus drivers (mostly embedded / system-on-chip)
# #
CONFIG_I2C_BCM2835=m CONFIG_I2C_BCM2835=y
CONFIG_I2C_BRCMSTB=y CONFIG_I2C_BRCMSTB=y
# CONFIG_I2C_CBUS_GPIO is not set # CONFIG_I2C_CBUS_GPIO is not set
# CONFIG_I2C_DESIGNWARE_PLATFORM is not set # CONFIG_I2C_DESIGNWARE_PLATFORM is not set

7
projects/RPi/devices/RPi4/linux/linux.arm.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm 5.4.42 Kernel Configuration # Linux/arm 5.4.50 Kernel Configuration
# #
# #
@ -2473,7 +2473,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y
# end of Serial drivers # end of Serial drivers
CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_MCTRL_GPIO=y
CONFIG_SERIAL_DEV_BUS=m CONFIG_SERIAL_DEV_BUS=y
CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
# CONFIG_TTY_PRINTK is not set # CONFIG_TTY_PRINTK is not set
# CONFIG_HVC_DCC is not set # CONFIG_HVC_DCC is not set
# CONFIG_IPMI_HANDLER is not set # CONFIG_IPMI_HANDLER is not set
@ -3485,6 +3486,7 @@ CONFIG_VIDEO_CX25840=m
# CONFIG_VIDEO_IMX219 is not set # CONFIG_VIDEO_IMX219 is not set
# CONFIG_VIDEO_IMX258 is not set # CONFIG_VIDEO_IMX258 is not set
# CONFIG_VIDEO_IMX274 is not set # CONFIG_VIDEO_IMX274 is not set
# CONFIG_VIDEO_IMX290 is not set
# CONFIG_VIDEO_IMX477 is not set # CONFIG_VIDEO_IMX477 is not set
# CONFIG_VIDEO_IMX319 is not set # CONFIG_VIDEO_IMX319 is not set
# CONFIG_VIDEO_IMX355 is not set # CONFIG_VIDEO_IMX355 is not set
@ -3506,6 +3508,7 @@ CONFIG_VIDEO_CX25840=m
# CONFIG_VIDEO_OV7740 is not set # CONFIG_VIDEO_OV7740 is not set
# CONFIG_VIDEO_OV8856 is not set # CONFIG_VIDEO_OV8856 is not set
# CONFIG_VIDEO_OV9640 is not set # CONFIG_VIDEO_OV9640 is not set
# CONFIG_VIDEO_OV9281 is not set
# CONFIG_VIDEO_OV9650 is not set # CONFIG_VIDEO_OV9650 is not set
# CONFIG_VIDEO_OV13858 is not set # CONFIG_VIDEO_OV13858 is not set
# CONFIG_VIDEO_IRS1125 is not set # CONFIG_VIDEO_IRS1125 is not set