From cc42143d092d74915d34227a204f6c7e1df60a72 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 13 Jan 2025 19:53:04 +0100 Subject: [PATCH 1/9] rpi-eeprom: update to 6a7ca68 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 fcbcc76d17..b451eb882a 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="54d9c333a9d39941b4fc881275f433821c7b5cde" -PKG_SHA256="4424884c26bea47fe307b2de0087b1d7026da8f66d7ca20beb6e988da02670b1" +PKG_VERSION="6a7ca681cb932eaaf6cdaf09e3edbcc89b53fa84" +PKG_SHA256="9f9dad707f2e2c600cf7e5bf2a424d0fa31ee77eeddd9cb71d1bd5f21d5b22f7" PKG_LICENSE="BSD-3/custom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" PKG_URL="https://github.com/raspberrypi/rpi-eeprom/archive/${PKG_VERSION}.tar.gz" From 2ba854e6ccadeaa8cdd1e96b05eb08937d172025 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 14 Jan 2025 18:41:34 +0100 Subject: [PATCH 2/9] rpi-eeprom: update to cc58b7d 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 b451eb882a..427e933b3a 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="6a7ca681cb932eaaf6cdaf09e3edbcc89b53fa84" -PKG_SHA256="9f9dad707f2e2c600cf7e5bf2a424d0fa31ee77eeddd9cb71d1bd5f21d5b22f7" +PKG_VERSION="cc58b7d6ce9f026d4d2a05f65ddc1aa89090fa78" +PKG_SHA256="fc4161e0d0eccae27494a3569a261d9dfac0c6573a3a9fc78ba68d46359f30e9" PKG_LICENSE="BSD-3/custom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" PKG_URL="https://github.com/raspberrypi/rpi-eeprom/archive/${PKG_VERSION}.tar.gz" From 732869c5cd2c4c2eb41ce491c6d407548cd68b3e Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 14 Jan 2025 19:41:50 +0100 Subject: [PATCH 3/9] linux (RPi): update to 6.12.9-c2ec0c0 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 e593164299..a84c2b28b9 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default rtlwifi/after-6.12" ;; raspberrypi) - PKG_VERSION="a20d400dff3d1d3eb40a192fecff22a70d064b3e" # 6.12.9 - PKG_SHA256="a4ec937d36ccb891c23bfd3ae5577a4ed770cc313df305e027d74b7545f4318d" + PKG_VERSION="c2ec0c0e0c8992a4f183de5ae782ee220818c938" # 6.12.9 + PKG_SHA256="91108ebc3828d0c8fb949bc9e04d77f35fedd6f04afb7982ac0eccaae9901189" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" PKG_PATCH_DIRS="raspberrypi rtlwifi/after-6.12" From 5a7d9f78bbd4f3bdbec15eed682ef5642df42911 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 14 Jan 2025 19:41:50 +0100 Subject: [PATCH 4/9] linux (RPi): config options for 6.12.9-c2ec0c0 Also switch to the upstream SDHOST driver, like RPi kernels did. Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 8 +++++--- projects/RPi/devices/RPi2/linux/linux.arm.conf | 8 +++++--- projects/RPi/devices/RPi4/linux/linux.aarch64.conf | 6 +++--- projects/RPi/devices/RPi5/linux/linux.aarch64.conf | 6 +++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index d4826d4b72..17967150d1 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 6.12.8 Kernel Configuration +# Linux/arm 6.12.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -4000,6 +4000,8 @@ CONFIG_FB_SYSMEM_FOPS=y CONFIG_FB_DEFERRED_IO=y CONFIG_FB_DMAMEM_HELPERS=y CONFIG_FB_DMAMEM_HELPERS_DEFERRED=y +CONFIG_FB_IOMEM_FOPS=y +CONFIG_FB_IOMEM_HELPERS=y CONFIG_FB_SYSMEM_HELPERS=y CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y # CONFIG_FB_MODE_HELPERS is not set @@ -4777,7 +4779,7 @@ CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BCM2835_MMC=y CONFIG_MMC_BCM2835_DMA=y CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2 -CONFIG_MMC_BCM2835_SDHOST=y +# CONFIG_MMC_BCM2835_SDHOST is not set # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_ARMMMCI is not set CONFIG_MMC_SDHCI=y @@ -4797,7 +4799,7 @@ CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_REALTEK_USB=m # CONFIG_MMC_CQHCI is not set CONFIG_MMC_HSQ=y -# CONFIG_MMC_BCM2835 is not set +CONFIG_MMC_BCM2835=y # CONFIG_MMC_MTK is not set # CONFIG_MMC_SDHCI_BRCMSTB is not set # CONFIG_MMC_SDHCI_XENON is not set diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index d7d430d82b..b77d773ec4 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 6.12.8 Kernel Configuration +# Linux/arm 6.12.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -4240,6 +4240,8 @@ CONFIG_FB_SYSMEM_FOPS=y CONFIG_FB_DEFERRED_IO=y CONFIG_FB_DMAMEM_HELPERS=y CONFIG_FB_DMAMEM_HELPERS_DEFERRED=y +CONFIG_FB_IOMEM_FOPS=y +CONFIG_FB_IOMEM_HELPERS=y CONFIG_FB_SYSMEM_HELPERS=y CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y # CONFIG_FB_MODE_HELPERS is not set @@ -5017,7 +5019,7 @@ CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BCM2835_MMC=y CONFIG_MMC_BCM2835_DMA=y CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2 -CONFIG_MMC_BCM2835_SDHOST=y +# CONFIG_MMC_BCM2835_SDHOST is not set # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_ARMMMCI is not set CONFIG_MMC_SDHCI=y @@ -5037,7 +5039,7 @@ CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_REALTEK_USB=m # CONFIG_MMC_CQHCI is not set CONFIG_MMC_HSQ=y -# CONFIG_MMC_BCM2835 is not set +CONFIG_MMC_BCM2835=y # CONFIG_MMC_MTK is not set # CONFIG_MMC_SDHCI_BRCMSTB is not set # CONFIG_MMC_SDHCI_XENON is not set diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf index 389079f4f9..c55feb8a51 100644 --- a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf +++ b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.12.8 Kernel Configuration +# Linux/arm64 6.12.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -5778,7 +5778,7 @@ CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_BCM2835_MMC=y CONFIG_MMC_BCM2835_DMA=y CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2 -CONFIG_MMC_BCM2835_SDHOST=y +# CONFIG_MMC_BCM2835_SDHOST is not set # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_ARMMMCI is not set CONFIG_MMC_SDHCI=y @@ -5804,7 +5804,7 @@ CONFIG_MMC_REALTEK_USB=m # CONFIG_MMC_CQHCI is not set CONFIG_MMC_HSQ=y # CONFIG_MMC_TOSHIBA_PCI is not set -# CONFIG_MMC_BCM2835 is not set +CONFIG_MMC_BCM2835=y # CONFIG_MMC_MTK is not set # CONFIG_MMC_SDHCI_BRCMSTB is not set # CONFIG_MMC_SDHCI_XENON is not set diff --git a/projects/RPi/devices/RPi5/linux/linux.aarch64.conf b/projects/RPi/devices/RPi5/linux/linux.aarch64.conf index ee6f59e56e..5cedb27d1e 100644 --- a/projects/RPi/devices/RPi5/linux/linux.aarch64.conf +++ b/projects/RPi/devices/RPi5/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.12.8 Kernel Configuration +# Linux/arm64 6.12.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -5826,7 +5826,7 @@ CONFIG_MMC_BLOCK_MINORS=32 # MMC/SD/SDIO Host Controller Drivers # # CONFIG_MMC_BCM2835_MMC is not set -CONFIG_MMC_BCM2835_SDHOST=y +# CONFIG_MMC_BCM2835_SDHOST is not set # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_ARMMMCI is not set CONFIG_MMC_SDHCI=y @@ -5852,7 +5852,7 @@ CONFIG_MMC_REALTEK_USB=m CONFIG_MMC_CQHCI=y CONFIG_MMC_HSQ=y # CONFIG_MMC_TOSHIBA_PCI is not set -# CONFIG_MMC_BCM2835 is not set +CONFIG_MMC_BCM2835=y # CONFIG_MMC_MTK is not set CONFIG_MMC_SDHCI_BRCMSTB=y # CONFIG_MMC_SDHCI_XENON is not set From c7dbbde0841b20b9a6c5c175cf514dcdf5bc94e4 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 19 Jan 2025 23:06:46 +0100 Subject: [PATCH 5/9] linux (RPi): update to 6.12.10-005644c 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 a84c2b28b9..7ae51b8e0b 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default rtlwifi/after-6.12" ;; raspberrypi) - PKG_VERSION="c2ec0c0e0c8992a4f183de5ae782ee220818c938" # 6.12.9 - PKG_SHA256="91108ebc3828d0c8fb949bc9e04d77f35fedd6f04afb7982ac0eccaae9901189" + PKG_VERSION="005644cc5317a69ac4326cd355f0c78e8acfb670" # 6.12.10 + PKG_SHA256="822cad7e0f384350f4a9869286c93a3f23db6b3f24c61cd640342e9e5e673e0c" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" PKG_PATCH_DIRS="raspberrypi rtlwifi/after-6.12" From adbe9b92d4269d6bf9a9f5dd233d35e2dd1ae552 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 19 Jan 2025 23:05:14 +0100 Subject: [PATCH 6/9] rpi-eeprom: update to 478ad48 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 427e933b3a..eb5ae15e2e 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="cc58b7d6ce9f026d4d2a05f65ddc1aa89090fa78" -PKG_SHA256="fc4161e0d0eccae27494a3569a261d9dfac0c6573a3a9fc78ba68d46359f30e9" +PKG_VERSION="478ad485caf65a4b6406ad35fdc8cb91276c8a49" +PKG_SHA256="182634633edc92a5f4331902bef0dc1d24334e1b532e4e6f8a066bd2aeadb923" PKG_LICENSE="BSD-3/custom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" PKG_URL="https://github.com/raspberrypi/rpi-eeprom/archive/${PKG_VERSION}.tar.gz" From a969317a4f544d7afb99fe1d3848b1514d987697 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 22 Jan 2025 19:04:05 +0100 Subject: [PATCH 7/9] rpi-eeprom: update to b67b21d 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 eb5ae15e2e..8585a47a12 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="478ad485caf65a4b6406ad35fdc8cb91276c8a49" -PKG_SHA256="182634633edc92a5f4331902bef0dc1d24334e1b532e4e6f8a066bd2aeadb923" +PKG_VERSION="b67b21ddda8b6468090fcdc5034bb075344a8903" +PKG_SHA256="8105d2d90fde2d109bf5c2fc45276e6570cb37aedd23b3fd36ba2f3e4249daf5" PKG_LICENSE="BSD-3/custom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" PKG_URL="https://github.com/raspberrypi/rpi-eeprom/archive/${PKG_VERSION}.tar.gz" From f437bc87c97794de163f2292889d07ed32c6a57b Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 24 Jan 2025 16:46:10 +0100 Subject: [PATCH 8/9] linux (RPi): update to 6.12.11-8007665 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 7ae51b8e0b..4cff5537aa 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default rtlwifi/after-6.12" ;; raspberrypi) - PKG_VERSION="005644cc5317a69ac4326cd355f0c78e8acfb670" # 6.12.10 - PKG_SHA256="822cad7e0f384350f4a9869286c93a3f23db6b3f24c61cd640342e9e5e673e0c" + PKG_VERSION="800766585842ced8ca7b34288b9bff6970b25f4a" # 6.12.11 + PKG_SHA256="579c78b9aa99edc2d32d4e4be65d487091cce9612e687459250e7937b88bedb4" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" PKG_PATCH_DIRS="raspberrypi rtlwifi/after-6.12" From c233b0a3d47fbadaf0551085c8e73d94b740fcd3 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 24 Jan 2025 19:35:22 +0100 Subject: [PATCH 9/9] linux (RPi): update to 6.12.11-26e9c58 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 4cff5537aa..4d1098e226 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default rtlwifi/after-6.12" ;; raspberrypi) - PKG_VERSION="800766585842ced8ca7b34288b9bff6970b25f4a" # 6.12.11 - PKG_SHA256="579c78b9aa99edc2d32d4e4be65d487091cce9612e687459250e7937b88bedb4" + PKG_VERSION="26e9c58fd607444366f03009ad377fd85b470c2f" # 6.12.11 + PKG_SHA256="f02d6038b657c4d2bf679a00d33f6f7a0f935cd361bc5ccf6e50ef64db693789" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" PKG_PATCH_DIRS="raspberrypi rtlwifi/after-6.12"