diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 3159bd3652..c64863cf11 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="9c09b75242960117155712f41ce540df2e3cd63c" # 6.12.38
-    PKG_SHA256="efe2f6b14f4348c4930fdc1b2168fcdc7700034ba66393e860deb0f172a8083c"
+    PKG_VERSION="5a72e3ae00ecdd02244e867c2880a3ac0653ee25" # 6.12.40
+    PKG_SHA256="ef92cb35db68978a76f527988a11046c8598d2a512a03de67c8cde5467ddcecb"
     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/6.13 rtlwifi/6.14 rtlwifi/6.15"
diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk
index 8d589c4fdb..df28c1cac0 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="9a6ca61ec08d12108a443df9889993140c808df5"
-PKG_SHA256="d17adb3db13581bd526b832c23a5a094c2f01b20fb3d15db9324de337b5ed48e"
+PKG_VERSION="4558d93090658fe288d00bc7c5a1553454c012a2"
+PKG_SHA256="d6ee1d14ac788ffd2077fc2adca5bf4e783e931adb996c9b0b260d394b2c32f6"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"
diff --git a/packages/tools/rpi-eeprom/config/rpi-eeprom-update-config b/packages/tools/rpi-eeprom/config/rpi-eeprom-update-config
new file mode 100644
index 0000000000..a4db06e849
--- /dev/null
+++ b/packages/tools/rpi-eeprom/config/rpi-eeprom-update-config
@@ -0,0 +1 @@
+#FIRMWARE_RELEASE_STATUS="default"
diff --git a/packages/tools/rpi-eeprom/config/rpi-eeprom-update b/packages/tools/rpi-eeprom/config/rpi-eeprom-update-default
similarity index 71%
rename from packages/tools/rpi-eeprom/config/rpi-eeprom-update
rename to packages/tools/rpi-eeprom/config/rpi-eeprom-update-default
index 0a62ac0b4a..0469c30add 100644
--- a/packages/tools/rpi-eeprom/config/rpi-eeprom-update
+++ b/packages/tools/rpi-eeprom/config/rpi-eeprom-update-default
@@ -2,3 +2,7 @@
 FIRMWARE_ROOT="/usr/lib/kernel-overlays/base/lib/firmware/raspberrypi/bootloader"
 FIRMWARE_BACKUP_DIR="/storage/.config/rpifw-backup"
 BOOTFS=${BOOTFS:-/flash}
+
+if [ -f /storage/.config/rpi-eeprom-update ]; then
+  . /storage/.config/rpi-eeprom-update
+fi
diff --git a/packages/tools/rpi-eeprom/package.mk b/packages/tools/rpi-eeprom/package.mk
index e3f5246dff..3408276c2d 100644
--- a/packages/tools/rpi-eeprom/package.mk
+++ b/packages/tools/rpi-eeprom/package.mk
@@ -56,5 +56,9 @@ makeinstall_target() {
     cp -PRv ${PKG_BUILD}/rpi-eeprom-digest ${INSTALL}/usr/bin
 
   mkdir -p ${INSTALL}/etc/default
-    cp -PRv ${PKG_DIR}/config/* ${INSTALL}/etc/default
+    cp -PRv ${PKG_DIR}/config/rpi-eeprom-update-default ${INSTALL}/etc/default/rpi-eeprom-update
+
+  mkdir -p ${INSTALL}/usr/config
+    cp -PRv ${PKG_DIR}/config/rpi-eeprom-update-config ${INSTALL}/usr/config/rpi-eeprom-update
+
 }