raspberrypi/rpi-eeprom
1
0
Fork 0
mirror of https://github.com/raspberrypi/rpi-eeprom.git synced 2026-01-20 21:13:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

vl805: Move to old following removal of USE_FLASHROM option

Browse Source 
Move to to the old directory now that it's no longer referenced by rpi-eeprom-update.

Add a dependency check for 'lspci' which is normally provided by
pciutils or busybox and remove the failover to the vl805 helper.

Tweak the failure messages for missing dependencies to be slightly less
OS specific.
This commit is contained in:
Tim Gover
2021-02-13 13:29:50 +00:00
parent 2fec47bd7f
commit 3e03056215
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
firmware/vl805
View File

Binary file not shown.

12
rpi-eeprom-update
View File

@@ -328,11 +328,15 @@ checkDependencies() {
HAVE_VL805_EEPROM=0 HAVE_VL805_EEPROM=0
fi fi
if ! command -v lspci > /dev/null; then
die "lspci not found. Try installing the pciutils package."
fi
# vcgencmd bootloader_version is deprecated. Use device-tree if available to # vcgencmd bootloader_version is deprecated. Use device-tree if available to
# reduce the number of dependencies on VCHI. # reduce the number of dependencies on VCHI.
if ! [ -f "${DT_BOOTLOADER_TS}" ]; then if ! [ -f "${DT_BOOTLOADER_TS}" ]; then
if ! command -v vcgencmd > /dev/null; then if ! command -v vcgencmd > /dev/null; then
die "vcgencmd not found. On Debian, try installing the libraspberrypi-bin package." die "vcgencmd not found. Try installing the libraspberrypi-bin package."
fi fi
fi fi
@@ -351,7 +355,7 @@ checkDependencies() {
fi fi
if ! command -v sha256sum > /dev/null; then if ! command -v sha256sum > /dev/null; then
die "sha256sum not found. On Debian, try installing the coreutilities package" die "sha256sum not found. Try installing the coreutilities package."
fi fi
if [ ! -f "${RECOVERY_BIN}" ]; then if [ ! -f "${RECOVERY_BIN}" ]; then
@@ -557,11 +561,7 @@ getVL805CurrentVersion()
# root then treat the version as unknown and skip VLI updates. # root then treat the version as unknown and skip VLI updates.
VL805_CURRENT_VERSION="" VL805_CURRENT_VERSION=""
if [ "$(id -u)" = "0" ]; then if [ "$(id -u)" = "0" ]; then
if command -v lspci >/dev/null; then
vlver="$(lspci -d 1106:3483 -xxx | awk '/^50:/ { print "VL805 FW version: " $5 $4 $3 $2 }')" vlver="$(lspci -d 1106:3483 -xxx | awk '/^50:/ { print "VL805 FW version: " $5 $4 $3 $2 }')"
else
vlver="$(vl805 | grep "VL805 FW version")"
fi
if [ -n "${vlver}" ]; then if [ -n "${vlver}" ]; then
VL805_CURRENT_VERSION="${vlver#*: }" VL805_CURRENT_VERSION="${vlver#*: }"
fi fi

2
test/install
View File

@@ -22,7 +22,7 @@ CONFIG="/etc/default/rpi-eeprom-update"
cp -rfv "${FIRMWARE_DIR}"/* /lib/firmware/raspberrypi/bootloader cp -rfv "${FIRMWARE_DIR}"/* /lib/firmware/raspberrypi/bootloader
cp -fv "${script_dir}/../rpi-eeprom-config" /usr/bin cp -fv "${script_dir}/../rpi-eeprom-config" /usr/bin
cp -fv "${script_dir}/../rpi-eeprom-update" /usr/bin cp -fv "${script_dir}/../rpi-eeprom-update" /usr/bin
cp -fv "${script_dir}/../firmware/vl805" /usr/bin rm -f /usr/bin/vl805
cp -fv "${script_dir}/../rpi-eeprom-update-default" /etc/default/rpi-eeprom-update cp -fv "${script_dir}/../rpi-eeprom-update-default" /etc/default/rpi-eeprom-update