Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[le11] linux (RPi): update to 6.1.45 #8062

Merged
merged 9 commits into from
Aug 20, 2023
2 changes: 1 addition & 1 deletion config/noobs/partition_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/graphics/bcm2835-driver/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions packages/linux/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ case "${LINUX}" in
PKG_PATCH_DIRS="default"
;;
raspberrypi)
PKG_VERSION="431319d91b8584c9f28b195ab9a97d7e78905aeb" # 6.1.42
PKG_SHA256="1608f0741e02416e9af9cd0232e21a60c33db94dd0681d8f26909c2a7216038c"
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"
;;
Expand Down
4 changes: 2 additions & 2 deletions packages/tools/bcm2835-bootloader/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions packages/tools/rpi-eeprom/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion projects/RPi/devices/RPi/linux/linux.arm.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 6.1.38 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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion projects/RPi/devices/RPi2/linux/linux.arm.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 6.1.38 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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion projects/RPi/devices/RPi4/linux/linux.aarch64.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.1.38 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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions projects/RPi/options
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
# default: default mainline kernel
LINUX="raspberrypi"

# use framebuffer console
EXTRA_CMDLINE="console=tty0"

################################################################################
# setup build defaults
################################################################################
Expand Down
3 changes: 3 additions & 0 deletions scripts/image
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,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

Expand Down