mirror of
https://github.com/raspberrypi/rpi-eeprom.git
synced 2026-01-20 21:13:36 +08:00
Merge pull request #176 from timg236/tim/cm4_rpieeprom_update
Disable rpi-eeprom-update by default on CM4
This commit is contained in:
@@ -32,6 +32,7 @@ USE_FLASHROM=${USE_FLASHROM:-0}
|
|||||||
RECOVERY_BIN=${RECOVERY_BIN:-${FIRMWARE_ROOT}/${FIRMWARE_RELEASE_STATUS}/recovery.bin}
|
RECOVERY_BIN=${RECOVERY_BIN:-${FIRMWARE_ROOT}/${FIRMWARE_RELEASE_STATUS}/recovery.bin}
|
||||||
BOOTFS=${BOOTFS:-/boot}
|
BOOTFS=${BOOTFS:-/boot}
|
||||||
VCMAILBOX=${VCMAILBOX:-/opt/vc/bin/vcmailbox}
|
VCMAILBOX=${VCMAILBOX:-/opt/vc/bin/vcmailbox}
|
||||||
|
CM4_ENABLE_RPI_EEPROM_UPDATE=${CM4_ENABLE_RPI_EEPROM_UPDATE:-0}
|
||||||
|
|
||||||
EXIT_SUCCESS=0
|
EXIT_SUCCESS=0
|
||||||
EXIT_UPDATE_REQUIRED=1
|
EXIT_UPDATE_REQUIRED=1
|
||||||
@@ -272,6 +273,12 @@ checkDependencies() {
|
|||||||
BOARD_TYPE=$(((0x$BOARD_INFO >> 4) & 0xff))
|
BOARD_TYPE=$(((0x$BOARD_INFO >> 4) & 0xff))
|
||||||
BOARD_REVISION=$((0x$BOARD_INFO & 0xf))
|
BOARD_REVISION=$((0x$BOARD_INFO & 0xf))
|
||||||
|
|
||||||
|
if [ ${BOARD_TYPE} -eq 20 ] && [ ${CM4_ENABLE_RPI_EEPROM_UPDATE} != '1' ]; then
|
||||||
|
# For CM4, USB device boot is the recommended method for EEPROM updates.
|
||||||
|
echo "rpi-eeprom-update is not enabled by default on CM4"
|
||||||
|
exit ${EXIT_SUCCESS}
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ${BOARD_TYPE} -eq 17 ] && [ ${BOARD_REVISION} -lt 4 ]; then
|
if [ ${BOARD_TYPE} -eq 17 ] && [ ${BOARD_REVISION} -lt 4 ]; then
|
||||||
echo "Dedicated VL805 EEPROM detected"
|
echo "Dedicated VL805 EEPROM detected"
|
||||||
HAVE_VL805_EEPROM=1
|
HAVE_VL805_EEPROM=1
|
||||||
|
|||||||
Reference in New Issue
Block a user