rpm/raspberrypi-eeprom
SHA256
1
0
Fork 0
forked from pool/raspberrypi-eeprom
Code Pull Requests Activity

Accepting request 1128489 from hardware:boot

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1128489
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/raspberrypi-eeprom?expand=0&rev=9
This commit is contained in:
Ana Guerrero 2023-11-24 22:34:33 +00:00 committed by Git OBS Bridge
commit 9b65da76bf
8 changed files with 67 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_service
View File

@ -1,17 +1,17 @@
<services> <services>
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="manual">
<param name="scm">git</param> <param name="scm">git</param>
<param name="url">https://github.com/raspberrypi/rpi-eeprom.git</param> <param name="url">https://github.com/raspberrypi/rpi-eeprom.git</param>
<param name="filename">raspberrypi-eeprom</param> <param name="filename">raspberrypi-eeprom</param>
<param name="revision">bf7419c961e8b65854fd73ec29fbc515087539e8</param> <param name="revision">6b14e84a2fb2e1f7220a404f65e7e0985f07c9e5</param>
<param name="versionrewrite-pattern">v([0-9\.]{10}).*</param> <param name="versionrewrite-pattern">v([0-9\.]{10}).*</param>
<param name="versionformat">@PARENT_TAG@</param> <param name="versionformat">@PARENT_TAG@</param>
<!-- <!--
<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@~g%h</param> <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@~g%h</param>
--> -->
</service> </service>
<service name="set_version" mode="disabled"/> <service name="set_version" mode="manual"/>
<service name="recompress" mode="disabled"> <service name="recompress" mode="manual">
<param name="file">*.tar</param> <param name="file">*.tar</param>
<param name="compression">xz</param> <param name="compression">xz</param>
</service> </service>

38
add-suse-config.patch
View File

@ -1,25 +1,13 @@
From d1d1945ef34cab5ff0d41eda2e08266f417be3dc Mon Sep 17 00:00:00 2001 diff --git a/rpi-eeprom-update b/rpi-eeprom-update
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> index 984ade2..c50a5b1 100755
Date: Fri, 22 Jan 2021 16:54:49 +0100 --- a/rpi-eeprom-update
Subject: [PATCH] Add suse config +++ b/rpi-eeprom-update
@@ -688,7 +688,7 @@ findBootFS()
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> BOOTFS="${TMP_BOOTFS_MNT}"
--- elif [ -z "$BOOTFS" ]; then
rpi-eeprom-update-default | 4 ++-- if ! BOOTFS=$(/usr/lib/raspberrypi-sys-mods/get_fw_loc 2> /dev/null); then
1 file changed, 2 insertions(+), 2 deletions(-) - for BOOTFS in /boot/firmware /boot; do
+ for BOOTFS in /boot/efi /boot; do
diff --git a/rpi-eeprom-update-default b/rpi-eeprom-update-default if [ -f "${BOOTFS}/config.txt" ]; then
index f567b6a..7111176 100644 break
--- a/rpi-eeprom-update-default elif findmnt --fstab "$BOOTFS" > /dev/null; then
+++ b/rpi-eeprom-update-default
@@ -3,6 +3,6 @@ FIRMWARE_ROOT=/lib/firmware/raspberrypi/bootloader
FIRMWARE_RELEASE_STATUS="critical"
FIRMWARE_IMAGE_DIR="${FIRMWARE_ROOT}/${FIRMWARE_RELEASE_STATUS}"
FIRMWARE_BACKUP_DIR="/var/lib/raspberrypi/bootloader/backup"
-BOOTFS=/boot
+BOOTFS=/boot/efi
USE_FLASHROM=0
EEPROM_CONFIG_HOOK=
--
2.30.0

BIN
raspberrypi-eeprom-2023.01.11.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

3
raspberrypi-eeprom-2023.10.30.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6e9a32f8eade9bb9d8df0dece1d7a4d2146c7d8123b31b2863b00898748febac
size 5760252

22
raspberrypi-eeprom.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Thu Nov 23 10:12:48 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Update to v2023.10.30:
* Fix SDIO / WiFi clock-setup for BOOT_ORDER=0xf14
* Fix SD power-on-reset
* Firmware support for improved watchdog driver
* Update DHCP Option97 to be R,P,i,5 on Pi5
- Updates from skipped v2023.10.18:
* Add support for HAT gpiomap for improved HAT compatibility.
* Add I2C probe for DSI display auto detect
* Automatically set dtparam=nvme if booted from nvme
* Fix network boot reset issue where only the first attempt works.
* Adding pciex4_reset=0 to config.txt will leave RP1 PCIe enabled
when ARM stage is started.
* Prevent HDMI diagnostics being displayed immediately when
waking after HALT.
* Update board-name - "Raspberry Pi 5"
- Refresh patches:
* add-suse-config.patch
* rpi-eeprom-update-Use-tr-instead-of-strings.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 29 14:42:22 UTC 2023 - Tobias Klausmann <tobias.klausmann@freenet.de> Sun Jan 29 14:42:22 UTC 2023 - Tobias Klausmann <tobias.klausmann@freenet.de>

4
raspberrypi-eeprom.obsinfo
View File

@ -1,4 +0,0 @@
name: raspberrypi-eeprom
version: 2023.01.11
mtime: 1674059670
commit: bf7419c961e8b65854fd73ec29fbc515087539e8

34
raspberrypi-eeprom.spec
View File

@ -21,9 +21,9 @@
%endif %endif
Name: raspberrypi-eeprom Name: raspberrypi-eeprom
Version: 2023.01.11 Version: 2023.10.30
Release: 0 Release: 0
Summary: Raspberry Pi 4 EEPROM firmware Summary: Raspberry Pi 4 and Pi 5 EEPROM firmware
License: SUSE-Firmware License: SUSE-Firmware
Group: System/Boot Group: System/Boot
URL: https://github.com/raspberrypi/rpi-eeprom URL: https://github.com/raspberrypi/rpi-eeprom
@ -42,7 +42,7 @@ Requires: raspberrypi-eeprom-firmware
BuildArch: noarch BuildArch: noarch
%description %description
First stage bootloader packages for Raspberry Pi 4 First stage bootloader packages for Raspberry Pi 4 and Pi 5
%package firmware %package firmware
Summary: Raspberry Pi 4 EEPROM firmware blobs Summary: Raspberry Pi 4 EEPROM firmware blobs
@ -53,7 +53,7 @@ Requires: raspberrypi-eeprom
BuildRequires: fdupes BuildRequires: fdupes
%description firmware %description firmware
First stage bootloader fimware blobs for Raspberry Pi 4 First stage bootloader fimware blobs for Raspberry Pi 4 and Pi 5
%prep %prep
%autosetup -p1 %autosetup -p1
@ -68,13 +68,15 @@ install -m 0755 rpi-eeprom-update %{buildroot}%{_bindir}
mkdir -p %{buildroot}/etc/default mkdir -p %{buildroot}/etc/default
install -m 644 rpi-eeprom-update-default %{buildroot}/etc/default/rpi-eeprom-update install -m 644 rpi-eeprom-update-default %{buildroot}/etc/default/rpi-eeprom-update
mkdir -p %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader for model in 2711 2712; do
mv firmware/beta %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader mkdir -p %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model
mv firmware/critical %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader mv firmware-$model/beta %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model
mv firmware/stable %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader mv firmware-$model/critical %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model
cp -a firmware/latest %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader mv firmware-$model/stable %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model
cp -a firmware/default %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader cp -a firmware-$model/latest %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model
%fdupes -s %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader cp -a firmware-$model/default %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model
%fdupes -s %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model
done
%files %files
%license LICENSE %license LICENSE
@ -86,10 +88,10 @@ cp -a firmware/default %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader
%files firmware %files firmware
%{_firmwaredir} %{_firmwaredir}
%{_firmwaredir}/raspberrypi %{_firmwaredir}/raspberrypi
%{_firmwaredir}/raspberrypi/bootloader/beta %{_firmwaredir}/raspberrypi/bootloader-*/beta
%{_firmwaredir}/raspberrypi/bootloader/critical %{_firmwaredir}/raspberrypi/bootloader-*/critical
%{_firmwaredir}/raspberrypi/bootloader/stable %{_firmwaredir}/raspberrypi/bootloader-*/stable
%{_firmwaredir}/raspberrypi/bootloader/latest %{_firmwaredir}/raspberrypi/bootloader-*/latest
%{_firmwaredir}/raspberrypi/bootloader/default %{_firmwaredir}/raspberrypi/bootloader-*/default
%changelog %changelog

17
rpi-eeprom-update-Use-tr-instead-of-strings.patch
View File

@ -26,33 +26,30 @@ diff --git a/rpi-eeprom-update b/rpi-eeprom-update
index cb25316..431f24f 100755 index cb25316..431f24f 100755
--- a/rpi-eeprom-update --- a/rpi-eeprom-update
+++ b/rpi-eeprom-update +++ b/rpi-eeprom-update
@@ -125,7 +125,7 @@ getBootloaderConfig() { @@ -122,7 +122,7 @@ getBootloaderConfig() {
local blconfig_nvmem_path="" local blconfig_nvmem_path=""
if [ -f "${blconfig_alias}" ]; then if [ -f "${blconfig_alias}" ]; then
- local blconfig_ofnode_path="/sys/firmware/devicetree/base"$(strings "${blconfig_alias}")"" - local blconfig_ofnode_path="/sys/firmware/devicetree/base"$(strings "${blconfig_alias}")""
+ local blconfig_ofnode_path="/sys/firmware/devicetree/base"$(tr -cd [:print:] < "${blconfig_alias}")"" + local blconfig_ofnode_path="/sys/firmware/devicetree/base"$(tr -cd [:print:] < "${blconfig_alias}")""
local blconfig_ofnode_link=$(find -L /sys/bus/nvmem -maxdepth 3 -samefile "${blconfig_ofnode_path}" 2>/dev/null) local blconfig_ofnode_link=$(find -L /sys/bus/nvmem -maxdepth 3 -samefile "${blconfig_ofnode_path}" 2>/dev/null)
if [ -e "${blconfig_ofnode_link}" ]; then if [ -e "${blconfig_ofnode_link}" ]; then
@@ -185,7 +185,7 @@ applyRecoveryUpdate() @@ -189,7 +189,7 @@ applyRecoveryUpdate()
[ -n "${BOOTLOADER_UPDATE_IMAGE}" ] || [ -n "${VL805_UPDATE_IMAGE}" ] || die "No update images specified" [ -n "${BOOTLOADER_UPDATE_IMAGE}" ] || [ -n "${VL805_UPDATE_IMAGE}" ] || die "No update images specified"
getBootloaderCurrentVersion getBootloaderCurrentVersion
- BOOTLOADER_UPDATE_VERSION=$(strings "${BOOTLOADER_UPDATE_IMAGE}" | grep BUILD_TIMESTAMP | sed 's/.*=//g') - BOOTLOADER_UPDATE_VERSION=$(strings "${BOOTLOADER_UPDATE_IMAGE}" | grep BUILD_TIMESTAMP | sed 's/.*=//g')
+ BOOTLOADER_UPDATE_VERSION=$(tr -c [:print:] "\n" < "${BOOTLOADER_UPDATE_IMAGE}" | sed '/^BUILD_TIMESTAMP=/s/.*=//p;d') + BOOTLOADER_UPDATE_VERSION=$(tr -c [:print:] "\n" < "${BOOTLOADER_UPDATE_IMAGE}" | sed '/^BUILD_TIMESTAMP=/s/.*=//p;d')
if [ "${BOOTLOADER_CURRENT_VERSION}" -gt "${BOOTLOADER_UPDATE_VERSION}" ]; then if [ "${BOOTLOADER_CURRENT_VERSION}" -gt "${BOOTLOADER_UPDATE_VERSION}" ]; then
echo " WARNING: Installing an older bootloader version." echo " WARNING: Installing an older bootloader version."
echo " Update the rpi-eeprom package to fetch the latest bootloader images." echo " Update the rpi-eeprom package to fetch the latest bootloader images."
@@ -310,7 +310,7 @@ getBootloaderUpdateVersion() { @@ -358,7 +358,7 @@ getBootloaderUpdateVersion() {
match=".*/pieeprom-[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9].bin" match=".*/pieeprom-[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9].bin"
latest="$(find "${FIRMWARE_IMAGE_DIR}/" -maxdepth 1 -type f -size "${EEPROM_SIZE}c" -regex "${match}" | sort -r | head -n1)" latest="$(find "${FIRMWARE_IMAGE_DIR}/" -maxdepth 1 -type f -follow -size "${EEPROM_SIZE}c" -regex "${match}" | sort -r | head -n1)"
if [ -f "${latest}" ]; then if [ -f "${latest}" ]; then
- BOOTLOADER_UPDATE_VERSION=$(strings "${latest}" | grep BUILD_TIMESTAMP | sed 's/.*=//g') - BOOTLOADER_UPDATE_VERSION=$(strings "${latest}" | grep BUILD_TIMESTAMP | sed 's/.*=//g')
+ BOOTLOADER_UPDATE_VERSION=$(tr -c [:print:] "\n" < "${latest}" | sed '/^BUILD_TIMESTAMP=/s/.*=//p;d') + BOOTLOADER_UPDATE_VERSION=$(tr -c [:print:] "\n" < "${latest}" | sed '/^BUILD_TIMESTAMP=/s/.*=//p;d')
BOOTLOADER_UPDATE_IMAGE="${latest}" BOOTLOADER_UPDATE_IMAGE="${latest}"
fi fi
} }
--
2.39.1