diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 68150cc739..8b76ac8580 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="9e2193537c48abf8225e02e15e319a209cca558a" -PKG_SHA256="b8c8327fb692bc9380dfeba9b605d5a81f3bf8bb9238703a58078124168f1268" +PKG_VERSION="20354bebcc2a8448128f2348e19e155910d25122" +PKG_SHA256="4c20e01995e5ca76dc1f0c166690250204053039a9f8c210f3feb33bf25bbe6b" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/linux/package.mk b/packages/linux/package.mk index a5f60da5ca..a6056c8661 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "$LINUX" in PKG_PATCH_DIRS="amlogic" ;; raspberrypi) - PKG_VERSION="67d4589da4940159e2ded20e4bf5fa90b370b4c3" # 5.4.28 - PKG_SHA256="7ece38b077d609adf0c5e0504469ccfaa4c0309e702d7a637674748d8185cf7f" + PKG_VERSION="cda6aaf08ad0f88926611ec50e7de4c4b4f88832" # 5.4.35 with ISP + PKG_SHA256="b14f6aab5a4c32d71e203bb745bd78bc24c4daf04c5b29114fab30b177276bf2" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; @@ -265,7 +265,8 @@ makeinstall_target() { rm -f $INSTALL/usr/share/bootloader/bcm283*.dtb # install overlay dtbs - for dtb in arch/$TARGET_KERNEL_ARCH/boot/dts/overlays/*.dtbo; do + for dtb in arch/$TARGET_KERNEL_ARCH/boot/dts/overlays/*.dtb \ + arch/$TARGET_KERNEL_ARCH/boot/dts/overlays/*.dtbo; do cp $dtb $INSTALL/usr/share/bootloader/overlays 2>/dev/null || : done cp -p arch/$TARGET_KERNEL_ARCH/boot/dts/overlays/README $INSTALL/usr/share/bootloader/overlays diff --git a/packages/linux/patches/linux-0000-nop-gcc-plugin.patch b/packages/linux/patches/amlogic/linux-0000-nop-gcc-plugin.patch similarity index 100% rename from packages/linux/patches/linux-0000-nop-gcc-plugin.patch rename to packages/linux/patches/amlogic/linux-0000-nop-gcc-plugin.patch diff --git a/packages/linux/patches/default/linux-0000-nop-gcc-plugin.patch b/packages/linux/patches/default/linux-0000-nop-gcc-plugin.patch new file mode 100644 index 0000000000..251cbf0cb5 --- /dev/null +++ b/packages/linux/patches/default/linux-0000-nop-gcc-plugin.patch @@ -0,0 +1,23 @@ +From a7163ecab9b2a395e809e41255f3567d7a188a5d Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Fri, 14 Feb 2020 00:34:00 +0000 +Subject: [PATCH] gcc-plugin.sh: use CONFIG_PLUGIN_HOSTCC="" on all distros + +--- + scripts/gcc-plugin.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/scripts/gcc-plugin.sh b/scripts/gcc-plugin.sh +index d3caefe..6ba7f13 100755 +--- a/scripts/gcc-plugin.sh ++++ b/scripts/gcc-plugin.sh +@@ -1,5 +1,6 @@ + #!/bin/sh + # SPDX-License-Identifier: GPL-2.0 ++exit 0 + srctree=$(dirname "$0") + + SHOW_ERROR= +-- +2.20.1 + diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index cb05b91c4a..162df33597 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="9e2193537c48abf8225e02e15e319a209cca558a" -PKG_SHA256="b3adcc27db9874e881d32b196c0168a8d54f9553b219a9d300c96daf4c67583c" +PKG_VERSION="20354bebcc2a8448128f2348e19e155910d25122" +PKG_SHA256="ffa5ef73a2113467f55b12552055bbf3a5201ce6958b1f52296b6bf9ec1fbfbe" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 22790de77a..96b94917fe 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.28 Kernel Configuration +# Linux/arm 5.4.35 Kernel Configuration # # @@ -1995,7 +1995,7 @@ CONFIG_I2C_MUX=m # CONFIG_I2C_MUX_LTC4306 is not set # CONFIG_I2C_MUX_PCA9541 is not set # CONFIG_I2C_MUX_PCA954x is not set -# CONFIG_I2C_MUX_PINCTRL is not set +CONFIG_I2C_MUX_PINCTRL=m # CONFIG_I2C_MUX_REG is not set # CONFIG_I2C_DEMUX_PINCTRL is not set # CONFIG_I2C_MUX_MLXCPLD is not set @@ -2014,6 +2014,7 @@ CONFIG_I2C_BCM2708_BAUDRATE=100000 # I2C system bus drivers (mostly embedded / system-on-chip) # CONFIG_I2C_BCM2835=m +CONFIG_I2C_BRCMSTB=y # CONFIG_I2C_CBUS_GPIO is not set # CONFIG_I2C_DESIGNWARE_PLATFORM is not set # CONFIG_I2C_EMEV2 is not set @@ -3472,6 +3473,7 @@ CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m +CONFIG_SND_AUDIOINJECTOR_ISOLATED_SOUNDCARD=m CONFIG_SND_AUDIOSENSE_PI=m CONFIG_SND_DIGIDAC1_SOUNDCARD=m CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m @@ -4309,6 +4311,7 @@ CONFIG_SND_BCM2835=m CONFIG_BCM2835_VCHIQ_MMAL=y CONFIG_BCM_VC_SM_CMA=y CONFIG_VIDEO_CODEC_BCM2835=m +CONFIG_VIDEO_ISP_BCM2835=m # CONFIG_PI433 is not set # @@ -4465,6 +4468,7 @@ CONFIG_IRQCHIP=y # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_SIMPLE=y # CONFIG_RESET_TI_SYSCON is not set # diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 3b26026a0d..c829a16efa 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.28 Kernel Configuration +# Linux/arm 5.4.35 Kernel Configuration # # @@ -2117,7 +2117,7 @@ CONFIG_I2C_MUX=m # CONFIG_I2C_MUX_LTC4306 is not set # CONFIG_I2C_MUX_PCA9541 is not set # CONFIG_I2C_MUX_PCA954x is not set -# CONFIG_I2C_MUX_PINCTRL is not set +CONFIG_I2C_MUX_PINCTRL=m # CONFIG_I2C_MUX_REG is not set # CONFIG_I2C_DEMUX_PINCTRL is not set # CONFIG_I2C_MUX_MLXCPLD is not set @@ -2136,6 +2136,7 @@ CONFIG_I2C_BCM2708_BAUDRATE=100000 # I2C system bus drivers (mostly embedded / system-on-chip) # CONFIG_I2C_BCM2835=m +CONFIG_I2C_BRCMSTB=y # CONFIG_I2C_CBUS_GPIO is not set # CONFIG_I2C_DESIGNWARE_PLATFORM is not set # CONFIG_I2C_EMEV2 is not set @@ -3601,6 +3602,7 @@ CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m +CONFIG_SND_AUDIOINJECTOR_ISOLATED_SOUNDCARD=m CONFIG_SND_AUDIOSENSE_PI=m CONFIG_SND_DIGIDAC1_SOUNDCARD=m CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m @@ -4439,6 +4441,7 @@ CONFIG_SND_BCM2835=m CONFIG_BCM2835_VCHIQ_MMAL=y CONFIG_BCM_VC_SM_CMA=y CONFIG_VIDEO_CODEC_BCM2835=m +CONFIG_VIDEO_ISP_BCM2835=m # CONFIG_PI433 is not set # @@ -4599,6 +4602,7 @@ CONFIG_ARM_GIC_MAX_NR=1 # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_SIMPLE=y # CONFIG_RESET_TI_SYSCON is not set # diff --git a/projects/RPi/devices/RPi4/linux/linux.arm.conf b/projects/RPi/devices/RPi4/linux/linux.arm.conf index 6c4ced3322..85348a7730 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.28 Kernel Configuration +# Linux/arm 5.4.35 Kernel Configuration # # @@ -2509,7 +2509,7 @@ CONFIG_I2C_MUX=m # CONFIG_I2C_MUX_LTC4306 is not set # CONFIG_I2C_MUX_PCA9541 is not set # CONFIG_I2C_MUX_PCA954x is not set -# CONFIG_I2C_MUX_PINCTRL is not set +CONFIG_I2C_MUX_PINCTRL=m # CONFIG_I2C_MUX_REG is not set # CONFIG_I2C_DEMUX_PINCTRL is not set # CONFIG_I2C_MUX_MLXCPLD is not set @@ -2547,6 +2547,7 @@ CONFIG_I2C_BCM2708_BAUDRATE=100000 # I2C system bus drivers (mostly embedded / system-on-chip) # CONFIG_I2C_BCM2835=m +CONFIG_I2C_BRCMSTB=y # CONFIG_I2C_CBUS_GPIO is not set # CONFIG_I2C_DESIGNWARE_PLATFORM is not set # CONFIG_I2C_DESIGNWARE_PCI is not set @@ -4200,6 +4201,7 @@ CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m +CONFIG_SND_AUDIOINJECTOR_ISOLATED_SOUNDCARD=m CONFIG_SND_AUDIOSENSE_PI=m CONFIG_SND_DIGIDAC1_SOUNDCARD=m CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m @@ -5057,6 +5059,7 @@ CONFIG_SND_BCM2835=m CONFIG_BCM2835_VCHIQ_MMAL=m CONFIG_BCM_VC_SM_CMA=y CONFIG_VIDEO_CODEC_BCM2835=m +CONFIG_VIDEO_ISP_BCM2835=m # CONFIG_PI433 is not set # @@ -5220,6 +5223,7 @@ CONFIG_ARM_GIC_MAX_NR=1 # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_SIMPLE=y # CONFIG_RESET_TI_SYSCON is not set #