From 3ae9d8a33063bb9e86e747ab3792c3d9d43b7e78 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 3 Aug 2023 19:11:16 +0200 Subject: [PATCH 1/9] linux (RPi): update to 6.1.43-9d516c9 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 4674511755..dea1a5b793 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="431319d91b8584c9f28b195ab9a97d7e78905aeb" # 6.1.42 - PKG_SHA256="1608f0741e02416e9af9cd0232e21a60c33db94dd0681d8f26909c2a7216038c" + PKG_VERSION="9d516c9f10eb7c6950131488e9893d3c1530c0dc" # 6.1.43 + PKG_SHA256="338f72f4fed2541c574ef4d95e70fb9ea6ad6f4b8113be3d5973088ee4292a8c" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From 8cbef7d8c6f0803199cfc6420d804e23e27ed1a0 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 3 Aug 2023 19:11:16 +0200 Subject: [PATCH 2/9] linux (RPi): config options for 6.1.43-9d516c9 Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 2 +- projects/RPi/devices/RPi2/linux/linux.arm.conf | 2 +- projects/RPi/devices/RPi4/linux/linux.aarch64.conf | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 76ab802670..aae7ac37b1 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.1.38 Kernel Configuration +# Linux/arm 6.1.43 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 0d85078021..0c899310e5 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.1.38 Kernel Configuration +# Linux/arm 6.1.43 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf index 17bba563ef..42b06bec06 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.1.38 Kernel Configuration +# Linux/arm64 6.1.43 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -327,6 +327,7 @@ CONFIG_ARCH_BCM2835=y # # ARM errata workarounds via the alternatives framework # +CONFIG_AMPERE_ERRATUM_AC03_CPU_38=y CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y CONFIG_ARM64_ERRATUM_826319=y CONFIG_ARM64_ERRATUM_827319=y From 11424a7b0a5b92f764a9646306dc4cd220a4d272 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 9 Aug 2023 16:02:21 +0200 Subject: [PATCH 3/9] linux (RPi): update to 6.1.44-ac7c015 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 dea1a5b793..4a4af2b8d2 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="9d516c9f10eb7c6950131488e9893d3c1530c0dc" # 6.1.43 - PKG_SHA256="338f72f4fed2541c574ef4d95e70fb9ea6ad6f4b8113be3d5973088ee4292a8c" + PKG_VERSION="ac7c01535f9687c282c5a42a03264d9c659108a8" # 6.1.44 + PKG_SHA256="b3dee98defc2b3884224e63f65d4f738233b0f5f3ae778c9307bc56323f8e9d4" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From adb7743ff5072be4c0e661863065dc9574a2a9bf Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 9 Aug 2023 16:02:21 +0200 Subject: [PATCH 4/9] linux (RPi): config options for 6.1.44-ac7c015 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.aarch64.conf | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index aae7ac37b1..3ba475f6f3 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.1.43 Kernel Configuration +# Linux/arm 6.1.44 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -496,6 +496,7 @@ CONFIG_GENERIC_IDLE_POLL_SETUP=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_KEEPINITRD=y CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_ARCH_32BIT_OFF_T=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 0c899310e5..c9125c84ef 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.1.43 Kernel Configuration +# Linux/arm 6.1.44 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -608,6 +608,7 @@ CONFIG_GENERIC_IDLE_POLL_SETUP=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_KEEPINITRD=y CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_ARCH_32BIT_OFF_T=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf index 42b06bec06..9859de1faa 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.1.43 Kernel Configuration +# Linux/arm64 6.1.44 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y From fa14f836396d1ce8416859258be2cf2ad5989058 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 17 Aug 2023 10:43:44 +0200 Subject: [PATCH 5/9] linux (RPi): update to 6.1.45-19a1b03 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 4a4af2b8d2..050b923ef3 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="ac7c01535f9687c282c5a42a03264d9c659108a8" # 6.1.44 - PKG_SHA256="b3dee98defc2b3884224e63f65d4f738233b0f5f3ae778c9307bc56323f8e9d4" + PKG_VERSION="19a1b03529363945fbbb4b9160fe8645809a9dce" # 6.1.45 + PKG_SHA256="d349aa0a032c251cd186316b48419125f306874ecfafaeb03d0e1804cfdfc980" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From c891b2f2e2d28573ac642f7dfb4638b5a3048b06 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 17 Aug 2023 10:44:31 +0200 Subject: [PATCH 6/9] rpi-eeprom: update to d774d57 Drop beta firmwares, they have been removed upstream Signed-off-by: Matthias Reichl --- packages/tools/rpi-eeprom/package.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/tools/rpi-eeprom/package.mk b/packages/tools/rpi-eeprom/package.mk index 3be9bc3156..227779fab6 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="75d3a760469130cb537e5d8d504f892336abd62b" -PKG_SHA256="a71573a80149b1c2c4b6d5ec1527ef011611c6883a0cf06c02961fe518384307" +PKG_VERSION="d774d5794cc63248e559bba201630d00a6e35762" +PKG_SHA256="cd66d1fff5f45d5141e1b6fd6abf17c6977ef81339efad5979f1bfd2347f71a1" 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" @@ -16,7 +16,6 @@ makeinstall_target() { mkdir -p ${DESTDIR} _dirs="critical stable" - [ "${LIBREELEC_VERSION}" = "devel" ] && _dirs+=" beta" for _maindir in ${_dirs}; do for _dir in ${PKG_BUILD}/firmware/${_maindir} ${PKG_BUILD}/firmware/{_maindir}-*; do From d54ec8093f5ecbdf36b2375ea2d01a53de3dcadb Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 20 Aug 2023 13:33:36 +0200 Subject: [PATCH 7/9] RPi: update to firmware 7cb8f19 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 9e5a8e3e4c..0c7949b066 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="543692d23dff7075915bc9c7e34abb3fe28e1c46" -PKG_SHA256="838aa79b842fc10030c6a8b8d7f8dc6b6b08ed7ac762a5488d3d64f1bc51a4ec" +PKG_VERSION="7cb8f19514cd01ba53fff6792c519f88ed31963b" +PKG_SHA256="4600e72874713ddcf09f4fbaea2bbd47ea4e32c532892fd5cbd79f94c4219efc" 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 a49cd2c752..8afd9c145e 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="543692d23dff7075915bc9c7e34abb3fe28e1c46" -PKG_SHA256="718389513a36ce7073ee26666dfbdfeb259a7e88beaac603c3b7d1f5bde067a2" +PKG_VERSION="7cb8f19514cd01ba53fff6792c519f88ed31963b" +PKG_SHA256="2ae355c40e56996da5f3fbc5fe0fd7637b6fcafe4e963454d14ed8faa1cbcf1b" PKG_ARCH="arm aarch64" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" From a43ba0706af2c5691f249b36b7266fa9ede09e2b Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 20 Aug 2023 15:04:22 +0200 Subject: [PATCH 8/9] RPi: explicitly select framebuffer console in cmdline.txt This prevents boot messages being sent to the (possibly unconnected) serial console. Signed-off-by: Matthias Reichl --- projects/RPi/options | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/RPi/options b/projects/RPi/options index 1d9b20c142..7828705bfb 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -18,6 +18,9 @@ # default: default mainline kernel LINUX="raspberrypi" + # use framebuffer console + EXTRA_CMDLINE="console=tty0" + ################################################################################ # setup build defaults ################################################################################ From 63c68f7670685f1d4e4251cd1950a5a3a38f4b6e Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 20 Aug 2023 15:44:02 +0200 Subject: [PATCH 9/9] scripts/image: support EXTRA_CMDLINE in noobs image creation Signed-off-by: Matthias Reichl --- config/noobs/partition_setup.sh | 2 +- scripts/image | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config/noobs/partition_setup.sh b/config/noobs/partition_setup.sh index 50577f5e6b..7f0e5344db 100755 --- a/config/noobs/partition_setup.sh +++ b/config/noobs/partition_setup.sh @@ -46,7 +46,7 @@ fi # create bootloader configuration echo "creating bootloader configuration..." - echo "boot=$id1 disk=$id2 quiet" > $MOUNTPOINT/cmdline.txt + echo "boot=$id1 disk=$id2 quiet @EXTRA_CMDLINE@" > $MOUNTPOINT/cmdline.txt # cleanup mountpoint umount $MOUNTPOINT diff --git a/scripts/image b/scripts/image index c309c7a049..d0fb3825a7 100755 --- a/scripts/image +++ b/scripts/image @@ -407,6 +407,9 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then -e "s%@SYSTEM_SIZE@%${SYSTEM_SIZE}%g" \ -i ${RELEASE_DIR}/${NOOBS_DISTRO}/partitions.json + sed -e "s%@EXTRA_CMDLINE@%${EXTRA_CMDLINE}%g" \ + -i ${RELEASE_DIR}/${NOOBS_DISTRO}/partition_setup.sh + # Create System dir mkdir -p ${RELEASE_DIR}/${NOOBS_DISTRO}/System