Lakka: RPi: use upstream repository + tag

- revert change for rpi kernel
- update kernel using tag
- update bootloader using tag to match kernel
- update driver using tag to match kernel

Author: ToKe79

packages/graphics/bcm2835-driver/package.mk

@@ -8,6 +8,14 @@ PKG_SHA256="7118e689bca498073420e4f2fa1fe391c95a36d246794e6ea9fc6ab0c66a0edb"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"
 PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
+
+# for Lakka we use the upstream repo tag
+if [ "${DISTRO}" = "Lakka" ]; then
+  PKG_VERSION="1.20220308" # for kernel 5.10.103
+  PKG_SHA256="70638d515fd16aee31a963d2693e6ef5963b22420db585e2e99a0b62a43fd287"
+  PKG_URL="https://github.com/raspberrypi/firmware/archive/refs/tags/${PKG_VERSION}.tar.gz"
+fi
+
 PKG_DEPENDS_TARGET="toolchain dtc"
 PKG_LONGDESC="OpenMAX-bcm2835: OpenGL-ES and OpenMAX driver for BCM2835"
 PKG_TOOLCHAIN="manual"

packages/linux/package.mk

@@ -22,9 +22,19 @@ case "${LINUX}" in
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     ;;
   raspberrypi)
-    PKG_VERSION="dc6771425e9604650d1d57f7c69948be405f59a5" # 5.10.103
-    PKG_SHA256="6dc2a664687d5efd98f7a2bdd6f2a2084d251965ec244d1c6288c04bce841030"
+    PKG_VERSION="b0272c695e99a8dcc3a01298db56361333f1fdcf" # 5.10.95
+    PKG_SHA256="e545db3c1064318c76477436589d3d36041389bae254bcf050022807b0822086"
     PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
+
+    # for Lakka we use the upstream repo tag
+    # when updating kernel for RPi, also update bcm2835-bootloader and bcm2835-driver
+    # packages to match the kernel version
+    if [ "${DISTRO}" = "Lakka" ]; then
+      PKG_VERSION="1.20220308" # 5.10.103
+      PKG_SHA256="90790deb1c6ea74406963fcf7bea1906090e06e8c87496ef6e54bd6976f03e92"
+      PKG_URL="https://github.com/raspberrypi/linux/archive/refs/tags/${PKG_VERSION}.tar.gz"
+    fi
+
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     ;;
   L4T)

packages/tools/bcm2835-bootloader/package.mk

@@ -9,20 +9,35 @@ PKG_ARCH="arm aarch64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"
 PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
+
+# for Lakka we use the upstream repo tag
+if [ "${DISTRO}" = "Lakka" ]; then
+  PKG_VERSION="1.20220308" # for kernel 5.10.103
+  PKG_SHA256="70638d515fd16aee31a963d2693e6ef5963b22420db585e2e99a0b62a43fd287"
+  PKG_URL="https://github.com/raspberrypi/firmware/archive/refs/tags/${PKG_VERSION}.tar.gz"
+fi
+
 PKG_DEPENDS_TARGET="toolchain linux bcmstat"
 PKG_LONGDESC="bcm2835-bootloader: Tool to create a bootable kernel for RaspberryPi"
 PKG_TOOLCHAIN="manual"
 
 makeinstall_target() {
+  # upstream repo stores the firmware file in 'boot' subfolder
+  if [ "${DISTRO}" = "Lakka" ]; then
+    PKG_BOOT_FOLDER="boot"
+  else
+    PKG_BOOT_FOLDER="."
+  fi
+
   mkdir -p ${INSTALL}/usr/share/bootloader
-    cp -PRv LICENCE* ${INSTALL}/usr/share/bootloader
-    cp -PRv bootcode.bin ${INSTALL}/usr/share/bootloader
+    cp -PRv ${PKG_BOOT_FOLDER}/LICENCE* ${INSTALL}/usr/share/bootloader
+    cp -PRv ${PKG_BOOT_FOLDER}/bootcode.bin ${INSTALL}/usr/share/bootloader
     if [ "${DEVICE:0:4}" = "RPi4" ]; then
-      cp -PRv fixup4x.dat ${INSTALL}/usr/share/bootloader/fixup.dat
-      cp -PRv start4x.elf ${INSTALL}/usr/share/bootloader/start.elf
+      cp -PRv ${PKG_BOOT_FOLDER}/fixup4x.dat ${INSTALL}/usr/share/bootloader/fixup.dat
+      cp -PRv ${PKG_BOOT_FOLDER}/start4x.elf ${INSTALL}/usr/share/bootloader/start.elf
     else
-      cp -PRv fixup_x.dat ${INSTALL}/usr/share/bootloader/fixup.dat
-      cp -PRv start_x.elf ${INSTALL}/usr/share/bootloader/start.elf
+      cp -PRv ${PKG_BOOT_FOLDER}/fixup_x.dat ${INSTALL}/usr/share/bootloader/fixup.dat
+      cp -PRv ${PKG_BOOT_FOLDER}/start_x.elf ${INSTALL}/usr/share/bootloader/start.elf
     fi
 
     find_file_path bootloader/update.sh ${PKG_DIR}/files/update.sh && cp -PRv ${FOUND_PATH} ${INSTALL}/usr/share/bootloader
@@ -34,8 +49,6 @@ makeinstall_target() {
     if [ "${DISTRO}" = "Lakka" ]; then
       echo "disable_splash=1" >> ${INSTALL}/usr/share/bootloader/distroconfig.txt
       echo "dtparam=audio=on" >> ${INSTALL}/usr/share/bootloader/distroconfig.txt
-      echo "hdmi_max_pixel_freq:0=200000000" >> ${INSTALL}/usr/share/bootloader/distroconfig.txt
-      echo "hdmi_max_pixel_freq:1=200000000" >> ${INSTALL}/usr/share/bootloader/distroconfig.txt
       if [ "${DEVICE}" = "RPi4" -o "${DEVICE}" = "RPi4-PiBoyDmg" ]; then
         sed -e "s|^gpu_mem=.*$|gpu_mem=384|g" -i ${INSTALL}/usr/share/bootloader/config.txt
       elif [ "${DEVICE}" = "RPi4-RetroDreamer" ]; then