From 6ffd42548bf10cda13a01555ff4fa56d4213cdf2 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Thu, 22 Dec 2022 19:23:29 +0000 Subject: multiboot: Refactor boot data validation, add version numbers Instead of verifying the CRC before every access of the boot data, verify the CRC once at startup and set a flag to indicate the boot data is valid. Also add a framework to support multiple boot protocol versions. Firmware declares the maximum supported protocol version using a version byte in the boot data header. The bootloader chooses the highest version supported by it and the firmware when deciding what boot protocol to use. Change-Id: I810194625dc0833f026d2a23b8d64ed467fa6aca --- firmware/common/rb-loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'firmware/common/rb-loader.c') diff --git a/firmware/common/rb-loader.c b/firmware/common/rb-loader.c index 0256f21884..61d8b1ddd2 100644 --- a/firmware/common/rb-loader.c +++ b/firmware/common/rb-loader.c @@ -112,7 +112,7 @@ int load_firmware(unsigned char* buf, const char* firmware, int buffer_size) { ret = load_firmware_filename(buf, filename, buffer_size); /* if firmware has no boot_data don't load from external drive */ - if (write_bootdata(buf, ret, i) <= 0) + if (!write_bootdata(buf, ret, i)) ret = EKEY_NOT_FOUND; } /* if ret is valid breaks from loop to continue loading */ -- cgit v1.2.3