mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge pull request #1501 from MilhouseVH/linux4919
linux: update to linux-4.9.20 (LE8)
This commit is contained in:
commit
2adbedec41
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bcm2835-driver"
|
||||
PKG_VERSION="2ef9cb6"
|
||||
PKG_VERSION="e5ca26f"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.broadcom.com"
|
||||
|
@ -59,7 +59,7 @@ case "$LINUX" in
|
||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan irqbalanced"
|
||||
;;
|
||||
*)
|
||||
PKG_VERSION="4.9.13"
|
||||
PKG_VERSION="4.9.20"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_PATCH_DIRS="default"
|
||||
;;
|
||||
|
@ -1,46 +0,0 @@
|
||||
From d13ee07f431c94ea72320ea4136e75ebeaee98c1 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Reichl <hias@horus.com>
|
||||
Date: Fri, 3 Mar 2017 10:27:44 +0100
|
||||
Subject: [PATCH] backport: rc: raw decoder for keymap protocol is not loaded
|
||||
on register
|
||||
|
||||
see http://www.spinics.net/lists/linux-media/msg111651.html
|
||||
---
|
||||
drivers/media/rc/rc-main.c | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
|
||||
index dedaf38..9a397da 100644
|
||||
--- a/drivers/media/rc/rc-main.c
|
||||
+++ b/drivers/media/rc/rc-main.c
|
||||
@@ -1441,6 +1441,7 @@ int rc_register_device(struct rc_dev *dev)
|
||||
int attr = 0;
|
||||
int minor;
|
||||
int rc;
|
||||
+ u64 rc_type;
|
||||
|
||||
if (!dev || !dev->map_name)
|
||||
return -EINVAL;
|
||||
@@ -1526,14 +1527,18 @@ int rc_register_device(struct rc_dev *dev)
|
||||
goto out_input;
|
||||
}
|
||||
|
||||
+ rc_type = BIT_ULL(rc_map->rc_type);
|
||||
+
|
||||
if (dev->change_protocol) {
|
||||
- u64 rc_type = (1ll << rc_map->rc_type);
|
||||
rc = dev->change_protocol(dev, &rc_type);
|
||||
if (rc < 0)
|
||||
goto out_raw;
|
||||
dev->enabled_protocols = rc_type;
|
||||
}
|
||||
|
||||
+ if (dev->driver_type == RC_DRIVER_IR_RAW)
|
||||
+ ir_raw_load_modules(&rc_type);
|
||||
+
|
||||
/* Allow the RC sysfs nodes to be accessible */
|
||||
atomic_set(&dev->initialized, 1);
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bcm2835-bootloader"
|
||||
PKG_VERSION="2ef9cb6"
|
||||
PKG_VERSION="e5ca26f"
|
||||
PKG_ARCH="arm"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.broadcom.com"
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 4.9.13 Kernel Configuration
|
||||
# Linux/arm 4.9.20 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ARM_HAS_SG_CHAIN=y
|
||||
@ -2775,6 +2775,7 @@ CONFIG_SND_SOC_COMPRESS=y
|
||||
# CONFIG_SND_SOC_AMD_ACP is not set
|
||||
# CONFIG_SND_ATMEL_SOC is not set
|
||||
CONFIG_SND_BCM2835_SOC_I2S=m
|
||||
CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m
|
||||
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
|
||||
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
|
||||
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
|
||||
@ -2789,11 +2790,14 @@ CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m
|
||||
CONFIG_SND_BCM2708_SOC_RASPIDAC3=m
|
||||
CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m
|
||||
CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m
|
||||
CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m
|
||||
CONFIG_SND_DIGIDAC1_SOUNDCARD=m
|
||||
CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m
|
||||
CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
|
||||
CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
|
||||
CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m
|
||||
CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
|
||||
CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m
|
||||
CONFIG_SND_PISOUND=m
|
||||
# CONFIG_SND_DESIGNWARE_I2S is not set
|
||||
|
||||
@ -2841,11 +2845,13 @@ CONFIG_SND_SOC_ADAU7002=m
|
||||
# CONFIG_SND_SOC_CS4270 is not set
|
||||
# CONFIG_SND_SOC_CS4271_I2C is not set
|
||||
# CONFIG_SND_SOC_CS4271_SPI is not set
|
||||
# CONFIG_SND_SOC_CS42XX8_I2C is not set
|
||||
CONFIG_SND_SOC_CS42XX8=m
|
||||
CONFIG_SND_SOC_CS42XX8_I2C=m
|
||||
# CONFIG_SND_SOC_CS4349 is not set
|
||||
# CONFIG_SND_SOC_CS53L30 is not set
|
||||
# CONFIG_SND_SOC_ES8328 is not set
|
||||
# CONFIG_SND_SOC_GTM601 is not set
|
||||
# CONFIG_SND_SOC_ICS43432 is not set
|
||||
# CONFIG_SND_SOC_INNO_RK3036 is not set
|
||||
# CONFIG_SND_SOC_MAX98504 is not set
|
||||
# CONFIG_SND_SOC_MAX9860 is not set
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 4.9.13 Kernel Configuration
|
||||
# Linux/arm 4.9.20 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ARM_HAS_SG_CHAIN=y
|
||||
@ -2867,6 +2867,7 @@ CONFIG_SND_SOC_COMPRESS=y
|
||||
# CONFIG_SND_SOC_AMD_ACP is not set
|
||||
# CONFIG_SND_ATMEL_SOC is not set
|
||||
CONFIG_SND_BCM2835_SOC_I2S=m
|
||||
CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m
|
||||
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
|
||||
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
|
||||
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
|
||||
@ -2881,11 +2882,14 @@ CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m
|
||||
CONFIG_SND_BCM2708_SOC_RASPIDAC3=m
|
||||
CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m
|
||||
CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m
|
||||
CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m
|
||||
CONFIG_SND_DIGIDAC1_SOUNDCARD=m
|
||||
CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m
|
||||
CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
|
||||
CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
|
||||
CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m
|
||||
CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
|
||||
CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m
|
||||
CONFIG_SND_PISOUND=m
|
||||
# CONFIG_SND_DESIGNWARE_I2S is not set
|
||||
|
||||
@ -2933,11 +2937,13 @@ CONFIG_SND_SOC_ADAU7002=m
|
||||
# CONFIG_SND_SOC_CS4270 is not set
|
||||
# CONFIG_SND_SOC_CS4271_I2C is not set
|
||||
# CONFIG_SND_SOC_CS4271_SPI is not set
|
||||
# CONFIG_SND_SOC_CS42XX8_I2C is not set
|
||||
CONFIG_SND_SOC_CS42XX8=m
|
||||
CONFIG_SND_SOC_CS42XX8_I2C=m
|
||||
# CONFIG_SND_SOC_CS4349 is not set
|
||||
# CONFIG_SND_SOC_CS53L30 is not set
|
||||
# CONFIG_SND_SOC_ES8328 is not set
|
||||
# CONFIG_SND_SOC_GTM601 is not set
|
||||
# CONFIG_SND_SOC_ICS43432 is not set
|
||||
# CONFIG_SND_SOC_INNO_RK3036 is not set
|
||||
# CONFIG_SND_SOC_MAX98504 is not set
|
||||
# CONFIG_SND_SOC_MAX9860 is not set
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -14,6 +14,8 @@ BRANCH="$1"
|
||||
while [ $# -gt 1 ]; do
|
||||
if [ "${2,,}" == "rebase" ]; then
|
||||
REBASE="_rebase"
|
||||
elif [[ ${2,,} =~ [_-]rebase ]]; then
|
||||
REBASE="$2"
|
||||
elif [[ ${2} =~ ^[0-9a-f]*$ ]]; then
|
||||
BASEREV="${2}"
|
||||
fi
|
||||
@ -24,10 +26,11 @@ usage()
|
||||
{
|
||||
local me="$(basename $0)"
|
||||
|
||||
echo "Usage: ${me} <major.minor>|<major.minor.patch> [rebase] [baserev]"
|
||||
echo "Usage: ${me} <major.minor>|<major.minor.patch> [[_-]rebase] [baserev]"
|
||||
echo
|
||||
echo "Example: 4.4 (for rpi-4.4.y) or 4.4.6 - specifying an exact kernel version avoids fetching the upstream repo"
|
||||
echo " 4.4 rebase - use rpi-4.4.y_rebase branch"
|
||||
echo " 4.4 -rebase - use rpi-4.4.y-rebase branch"
|
||||
echo " 4.6-rc6"
|
||||
echo " 4.7 523d939ef98fd712632d93a5a2b588e477a7565e"
|
||||
echo " 4.7.0"
|
||||
|
Loading…
x
Reference in New Issue
Block a user