From efc559a3dd9f30bba7346689cce13fad948f3dbe Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Thu, 8 Feb 2024 17:36:40 +0100
Subject: [PATCH] mkpkg_bcm2835-driver: refactor and rename to
 mkpkg_bcm2835-bootloader

The old driver and tools are finally gone, only the firmware files
are important from the rpi firmware repo.

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 tools/mkpkg/mkpkg_bcm2835-bootloader | 41 +++++++++++++++++++++++++
 tools/mkpkg/mkpkg_bcm2835-driver     | 45 ----------------------------
 2 files changed, 41 insertions(+), 45 deletions(-)
 create mode 100755 tools/mkpkg/mkpkg_bcm2835-bootloader
 delete mode 100755 tools/mkpkg/mkpkg_bcm2835-driver

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