diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk
deleted file mode 100644
index a7674d4236..0000000000
--- a/packages/graphics/bcm2835-driver/package.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="bcm2835-driver"
-PKG_VERSION="fdb9eafae4b83e553593937eae8e77b0193903c3"
-PKG_SHA256="ae590baa29a507fa50b5beae46643519a2d2e012945668cfc7393f9275793c78"
-PKG_LICENSE="nonfree"
-PKG_SITE="http://www.broadcom.com"
-PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain dtc"
-PKG_LONGDESC="OpenMAX-bcm2835: OpenGL-ES and OpenMAX driver for BCM2835"
-PKG_TOOLCHAIN="manual"
-
-# Set SoftFP ABI or HardFP ABI
-if [ "${TARGET_FLOAT}" = "soft" ]; then
-  PKG_FLOAT="softfp"
-else
-  PKG_FLOAT="hardfp"
-fi
-
-makeinstall_target() {
-  # Install vendor header files except proprietary GL headers
-  mkdir -p ${SYSROOT_PREFIX}/usr/include
-    for f in $(cd ${PKG_FLOAT}/opt/vc/include; ls | grep -v "GL"); do
-      cp -PRv ${PKG_FLOAT}/opt/vc/include/${f} ${SYSROOT_PREFIX}/usr/include
-    done
-
-  # Install vendor libs & pkgconfigs except proprietary GL libs
-  mkdir -p ${SYSROOT_PREFIX}/usr/lib
-    for f in $(cd ${PKG_FLOAT}/opt/vc/lib; ls *.so *.a | grep -Ev "^lib(EGL|GL)"); do
-      cp -PRv ${PKG_FLOAT}/opt/vc/lib/${f}              ${SYSROOT_PREFIX}/usr/lib
-    done
-    mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig
-      for f in $(cd ${PKG_FLOAT}/opt/vc/lib/pkgconfig; ls | grep -v "gl"); do
-        cp -PRv ${PKG_FLOAT}/opt/vc/lib/pkgconfig/${f}  ${SYSROOT_PREFIX}/usr/lib/pkgconfig
-      done
-
-  # Update prefix in vendor pkgconfig files
-  for PKG_CONFIGS in $(find "${SYSROOT_PREFIX}/usr/lib" -type f -name "*.pc" 2>/dev/null); do
-    sed -e "s#prefix=/opt/vc#prefix=/usr#g" -i "${PKG_CONFIGS}"
-  done
-
-  # Create symlinks to /opt/vc to satisfy hardcoded include & lib paths
-  mkdir -p ${SYSROOT_PREFIX}/opt/vc
-    ln -sf ${SYSROOT_PREFIX}/usr/lib     ${SYSROOT_PREFIX}/opt/vc/lib
-    ln -sf ${SYSROOT_PREFIX}/usr/include ${SYSROOT_PREFIX}/opt/vc/include
-
-  # Install vendor libs except proprietary GL
-  mkdir -p ${INSTALL}/usr/lib
-    for f in $(cd ${PKG_FLOAT}/opt/vc/lib; ls *.so | grep -Ev "^lib(EGL|GL)"); do
-      cp -PRv ${PKG_FLOAT}/opt/vc/lib/${f} ${INSTALL}/usr/lib
-    done
-
-  # Install useful tools
-  mkdir -p ${INSTALL}/usr/bin
-    cp -PRv ${PKG_FLOAT}/opt/vc/bin/dtoverlay  ${INSTALL}/usr/bin
-    ln -s dtoverlay                            ${INSTALL}/usr/bin/dtparam
-    cp -PRv ${PKG_FLOAT}/opt/vc/bin/vcdbg      ${INSTALL}/usr/bin
-    cp -PRv ${PKG_FLOAT}/opt/vc/bin/vcgencmd   ${INSTALL}/usr/bin
-    cp -PRv ${PKG_FLOAT}/opt/vc/bin/vcmailbox  ${INSTALL}/usr/bin
-    cp -PRv ${PKG_FLOAT}/opt/vc/bin/tvservice  ${INSTALL}/usr/bin
-    cp -PRv ${PKG_FLOAT}/opt/vc/bin/edidparser ${INSTALL}/usr/bin
-
-  # Create symlinks to /opt/vc to satisfy hardcoded lib paths
-  mkdir -p ${INSTALL}/opt/vc
-    ln -sf /usr/bin ${INSTALL}/opt/vc/bin
-    ln -sf /usr/lib ${INSTALL}/opt/vc/lib
-}
-
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 3f50884900..5652e3a5b5 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="0c8e9f795429aeaeeaba80e378673b4972517193" # 6.6.16
-    PKG_SHA256="b19490411901943dccff4b549155c81b58d2dc4ebea9e0e9dbbf2e0ad6a1f90a"
+    PKG_VERSION="c575ed8cd074b02e356e87269a544dbffe1a2c84" # 6.6.16
+    PKG_SHA256="6ce7c5866b75d8d6fc857f658098e9a1b6541ad8bead2675c0e9af42debdfc03"
     PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     ;;
diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk
index a63a3deceb..d816a4a3c8 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="fdb9eafae4b83e553593937eae8e77b0193903c3"
-PKG_SHA256="ce45b07afce3279f9d31fe12008c5250de4da5491bd9ced2de2f2ebb563aea80"
+PKG_VERSION="2a1e5bfd933d977a57ba4cd62f3381fdc339e29a"
+PKG_SHA256="448465b617608c10a8718b84b6b18782339c4967eca8de68770ad0e4c84958b7"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"
diff --git a/packages/tools/rpi-eeprom/package.mk b/packages/tools/rpi-eeprom/package.mk
index 22bfbf4d88..75bc359799 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="c987375f1d9633ea7d33d30f68a024055b76b9a7"
-PKG_SHA256="e19c3d267a5c3f64d8e25ac2d6a0489720ffdf0539e86ad1b2ca8615d759a1b4"
+PKG_VERSION="d4918d4d4c099d04b5602fc1308babcf3c1df11b"
+PKG_SHA256="9dfd9e5299de73c3d3b73bde0f92be54f539bb8441f29f61c285694015c83d76"
 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"
diff --git a/tools/mkpkg/mkpkg_bcm2835-bootloader b/tools/mkpkg/mkpkg_bcm2835-bootloader
new file mode 100755
index 0000000000..0954d2cf77
--- /dev/null
+++ b/tools/mkpkg/mkpkg_bcm2835-bootloader
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+GIT_DIR="raspberrypi-firmware.git"
+
+echo "getting sources..."
+  if [ ! -d "${GIT_DIR}" ]; then
+    git clone https://github.com/raspberrypi/firmware.git --depth=1 -b master "${GIT_DIR}"
+  fi
+
+  cd "${GIT_DIR}"
+    git fetch
+    if [ $# -eq 1 ]; then
+      git checkout "$1"
+    else
+      git checkout origin/master
+    fi
+    GIT_REV=$(git log -n1 --format=%H)
+  cd ..
+
+BOOT_DIR="${GIT_DIR}/boot"
+PKG_DIR="bcm2835-bootloader-${GIT_REV}"
+
+echo "copying sources..."
+  rm -rf "${PKG_DIR}"
+  mkdir -p "${PKG_DIR}"
+    cp \
+      "${BOOT_DIR}"/LICENCE* \
+      "${BOOT_DIR}"/bootcode.bin \
+      "${BOOT_DIR}"/fixup*.dat \
+      "${BOOT_DIR}"/start*.elf \
+      "${PKG_DIR}"
+
+echo "packing sources..."
+  tar cvJf "${PKG_DIR}.tar.xz" "${PKG_DIR}"
+
+echo "remove temporary sourcedir..."
+  rm -rf "${PKG_DIR}"
diff --git a/tools/mkpkg/mkpkg_bcm2835-driver b/tools/mkpkg/mkpkg_bcm2835-driver
deleted file mode 100755
index cd9256cb9b..0000000000
--- a/tools/mkpkg/mkpkg_bcm2835-driver
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
-
-echo "getting sources..."
-  if [ ! -d bcm2835-driver.git ]; then
-    git clone git://github.com/raspberrypi/firmware.git --depth=1 -b master bcm2835-driver.git
-  fi
-
-  cd bcm2835-driver.git
-    git pull
-    GIT_REV=`git log -n1 --format=%H`
-  cd ..
-
-echo "copying sources..."
-  rm -rf bcm2835-driver-$GIT_REV
-  cp -R bcm2835-driver.git bcm2835-driver-$GIT_REV
-
-  rm -rf bcm2835-bootloader-$GIT_REV
-  cp -R bcm2835-driver.git/boot bcm2835-bootloader-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf bcm2835-driver-$GIT_REV/.git
-  mkdir bcm2835-driver-$GIT_REV/softfp
-  mv bcm2835-driver-$GIT_REV/opt bcm2835-driver-$GIT_REV/softfp
-  rm -rf bcm2835-driver-$GIT_REV/*/opt/vc/src
-  rm -rf bcm2835-driver-$GIT_REV/debug
-  rm -rf bcm2835-driver-$GIT_REV/extra
-  rm -rf bcm2835-driver-$GIT_REV/modules
-  rm -rf bcm2835-driver-$GIT_REV/cutdown
-  rm -rf bcm2835-driver-$GIT_REV/boot
-
-  chmod 644 bcm2835-driver-$GIT_REV/*/opt/vc/include/bcm_host.h
-
-  rm -rf bcm2835-bootloader-$GIT_REV/kernel*.img
-
-echo "packing sources..."
-  tar cvJf bcm2835-driver-$GIT_REV.tar.xz bcm2835-driver-$GIT_REV
-  tar cvJf bcm2835-bootloader-$GIT_REV.tar.xz bcm2835-bootloader-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf bcm2835-driver-$GIT_REV
-  rm -rf bcm2835-bootloader-$GIT_REV