Re: [PATCH v2 08/17] android: boot: boot image header v3,v4 do not support recovery DTBO

Mattijs Korpershoek
2023-02-01T08:37:25Z

On Thu, Jan 26, 2023 at 17:54, Simon Glass <sjg@chromium.org> wrote:

> On Thu, 26 Jan 2023 at 09:05, Safae Ouajih <souajih@baylibre.com> wrote:
>>
>> android_image_get_dtbo() is used to get recovery DTBO via abootimg cmd.
>> This is not supported in boot image header v3 and v4. Thus, we print an
>> error message when v1,v2 header version are not used.
>>
>> Signed-off-by: Safae Ouajih <souajih@baylibre.com>
>> ---
>> boot/image-android.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
>
> log_err() might be better
>

Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

>
>>
>> diff --git a/boot/image-android.c b/boot/image-android.c
>> index a6e7a7abb0..d797270a32 100644
>> --- a/boot/image-android.c
>> +++ b/boot/image-android.c
>> @@ -316,8 +316,8 @@ bool android_image_get_dtbo(ulong hdr_addr, ulong *addr, u32 *size)
>> goto exit;
>> }
>>
>> - if (hdr->header_version < 1) {
>> - printf("Error: header_version must be >= 1 to get dtbo\n");
>> + if (hdr->header_version != 1 && hdr->header_version != 2) {
>> + printf("Error: header version must be >= 1 and <= 2 to get dtbo\n");
>> ret = false;
>> goto exit;
>> }
>> --
>> 2.34.1
>>