From 9adfd4c24c13a79c0f5a8658d5557603693de5a1d9f2e409889e7fdbdec19cc8 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Fri, 24 Nov 2023 07:22:50 +0000 Subject: [PATCH] Accepting request 1128311 from home:Guillaume_G:branches:hardware:boot - 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 OBS-URL: https://build.opensuse.org/request/show/1128311 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/raspberrypi-eeprom?expand=0&rev=25 --- _service | 8 ++-- add-suse-config.patch | 38 +++++++------------ raspberrypi-eeprom-2023.01.11.tar.xz | 3 -- raspberrypi-eeprom-2023.10.30.tar.xz | 3 ++ raspberrypi-eeprom.changes | 22 +++++++++++ raspberrypi-eeprom.obsinfo | 4 -- raspberrypi-eeprom.spec | 34 +++++++++-------- ...rom-update-Use-tr-instead-of-strings.patch | 17 ++++----- 8 files changed, 67 insertions(+), 62 deletions(-) delete mode 100644 raspberrypi-eeprom-2023.01.11.tar.xz create mode 100644 raspberrypi-eeprom-2023.10.30.tar.xz delete mode 100644 raspberrypi-eeprom.obsinfo diff --git a/_service b/_service index e219aaa..961e6d5 100644 --- a/_service +++ b/_service @@ -1,17 +1,17 @@ - + git https://github.com/raspberrypi/rpi-eeprom.git raspberrypi-eeprom - bf7419c961e8b65854fd73ec29fbc515087539e8 + 6b14e84a2fb2e1f7220a404f65e7e0985f07c9e5 v([0-9\.]{10}).* @PARENT_TAG@ - - + + *.tar xz diff --git a/add-suse-config.patch b/add-suse-config.patch index 878d77f..d214ab7 100644 --- a/add-suse-config.patch +++ b/add-suse-config.patch @@ -1,25 +1,13 @@ -From d1d1945ef34cab5ff0d41eda2e08266f417be3dc Mon Sep 17 00:00:00 2001 -From: Nicolas Saenz Julienne -Date: Fri, 22 Jan 2021 16:54:49 +0100 -Subject: [PATCH] Add suse config - -Signed-off-by: Nicolas Saenz Julienne ---- - rpi-eeprom-update-default | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/rpi-eeprom-update-default b/rpi-eeprom-update-default -index f567b6a..7111176 100644 ---- a/rpi-eeprom-update-default -+++ 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 - +diff --git a/rpi-eeprom-update b/rpi-eeprom-update +index 984ade2..c50a5b1 100755 +--- a/rpi-eeprom-update ++++ b/rpi-eeprom-update +@@ -688,7 +688,7 @@ findBootFS() + BOOTFS="${TMP_BOOTFS_MNT}" + elif [ -z "$BOOTFS" ]; then + if ! BOOTFS=$(/usr/lib/raspberrypi-sys-mods/get_fw_loc 2> /dev/null); then +- for BOOTFS in /boot/firmware /boot; do ++ for BOOTFS in /boot/efi /boot; do + if [ -f "${BOOTFS}/config.txt" ]; then + break + elif findmnt --fstab "$BOOTFS" > /dev/null; then diff --git a/raspberrypi-eeprom-2023.01.11.tar.xz b/raspberrypi-eeprom-2023.01.11.tar.xz deleted file mode 100644 index 8132d1e..0000000 --- a/raspberrypi-eeprom-2023.01.11.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8780e57912d9fbb31b28d0aea1e6337f3e9c4decfe0ae5544042cb21e2911aac -size 3531228 diff --git a/raspberrypi-eeprom-2023.10.30.tar.xz b/raspberrypi-eeprom-2023.10.30.tar.xz new file mode 100644 index 0000000..8220090 --- /dev/null +++ b/raspberrypi-eeprom-2023.10.30.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e9a32f8eade9bb9d8df0dece1d7a4d2146c7d8123b31b2863b00898748febac +size 5760252 diff --git a/raspberrypi-eeprom.changes b/raspberrypi-eeprom.changes index e75d13d..fe9ef67 100644 --- a/raspberrypi-eeprom.changes +++ b/raspberrypi-eeprom.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Thu Nov 23 10:12:48 UTC 2023 - Guillaume GARDET + +- 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 diff --git a/raspberrypi-eeprom.obsinfo b/raspberrypi-eeprom.obsinfo deleted file mode 100644 index 883500b..0000000 --- a/raspberrypi-eeprom.obsinfo +++ /dev/null @@ -1,4 +0,0 @@ -name: raspberrypi-eeprom -version: 2023.01.11 -mtime: 1674059670 -commit: bf7419c961e8b65854fd73ec29fbc515087539e8 diff --git a/raspberrypi-eeprom.spec b/raspberrypi-eeprom.spec index c50fbdc..c4f51fb 100644 --- a/raspberrypi-eeprom.spec +++ b/raspberrypi-eeprom.spec @@ -21,9 +21,9 @@ %endif Name: raspberrypi-eeprom -Version: 2023.01.11 +Version: 2023.10.30 Release: 0 -Summary: Raspberry Pi 4 EEPROM firmware +Summary: Raspberry Pi 4 and Pi 5 EEPROM firmware License: SUSE-Firmware Group: System/Boot URL: https://github.com/raspberrypi/rpi-eeprom @@ -42,7 +42,7 @@ Requires: raspberrypi-eeprom-firmware BuildArch: noarch %description -First stage bootloader packages for Raspberry Pi 4 +First stage bootloader packages for Raspberry Pi 4 and Pi 5 %package firmware Summary: Raspberry Pi 4 EEPROM firmware blobs @@ -53,7 +53,7 @@ Requires: raspberrypi-eeprom BuildRequires: fdupes %description firmware -First stage bootloader fimware blobs for Raspberry Pi 4 +First stage bootloader fimware blobs for Raspberry Pi 4 and Pi 5 %prep %autosetup -p1 @@ -68,13 +68,15 @@ install -m 0755 rpi-eeprom-update %{buildroot}%{_bindir} mkdir -p %{buildroot}/etc/default install -m 644 rpi-eeprom-update-default %{buildroot}/etc/default/rpi-eeprom-update -mkdir -p %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader -mv firmware/beta %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader -mv firmware/critical %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader -mv firmware/stable %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader -cp -a firmware/latest %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader -cp -a firmware/default %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader -%fdupes -s %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader +for model in 2711 2712; do + mkdir -p %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model + mv firmware-$model/beta %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model + mv firmware-$model/critical %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model + mv firmware-$model/stable %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model + cp -a firmware-$model/latest %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model + cp -a firmware-$model/default %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model + %fdupes -s %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader-$model +done %files %license LICENSE @@ -86,10 +88,10 @@ cp -a firmware/default %{buildroot}/%{_firmwaredir}/raspberrypi/bootloader %files firmware %{_firmwaredir} %{_firmwaredir}/raspberrypi -%{_firmwaredir}/raspberrypi/bootloader/beta -%{_firmwaredir}/raspberrypi/bootloader/critical -%{_firmwaredir}/raspberrypi/bootloader/stable -%{_firmwaredir}/raspberrypi/bootloader/latest -%{_firmwaredir}/raspberrypi/bootloader/default +%{_firmwaredir}/raspberrypi/bootloader-*/beta +%{_firmwaredir}/raspberrypi/bootloader-*/critical +%{_firmwaredir}/raspberrypi/bootloader-*/stable +%{_firmwaredir}/raspberrypi/bootloader-*/latest +%{_firmwaredir}/raspberrypi/bootloader-*/default %changelog diff --git a/rpi-eeprom-update-Use-tr-instead-of-strings.patch b/rpi-eeprom-update-Use-tr-instead-of-strings.patch index 978b1c1..161dec0 100644 --- a/rpi-eeprom-update-Use-tr-instead-of-strings.patch +++ b/rpi-eeprom-update-Use-tr-instead-of-strings.patch @@ -26,33 +26,30 @@ diff --git a/rpi-eeprom-update b/rpi-eeprom-update index cb25316..431f24f 100755 --- a/rpi-eeprom-update +++ b/rpi-eeprom-update -@@ -125,7 +125,7 @@ getBootloaderConfig() { +@@ -122,7 +122,7 @@ getBootloaderConfig() { local blconfig_nvmem_path="" - + if [ -f "${blconfig_alias}" ]; then - 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_link=$(find -L /sys/bus/nvmem -maxdepth 3 -samefile "${blconfig_ofnode_path}" 2>/dev/null) - + 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" - + getBootloaderCurrentVersion - 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') if [ "${BOOTLOADER_CURRENT_VERSION}" -gt "${BOOTLOADER_UPDATE_VERSION}" ]; then echo " WARNING: Installing an older bootloader version." 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" - 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 - 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_IMAGE="${latest}" fi } --- -2.39.1 -