colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: boot: replace android_image_check_header

Browse Source 
With the new vendor boot image introduced in versions 3 and 4
of boot image header, the header check must be done for both boot
image and vendor boot image. Thus, replace android_image_check_header()
by is_android_boot_image_header() to only refer to boot image header check.

Signed-off-by: Safae Ouajih <souajih@baylibre.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
This commit is contained in:
Safae Ouajih
2023-02-06 00:50:05 +01:00
committed by Tom Rini
parent 86b62947eb
commit 734cb47d6d
5 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/image.h
View File

@@ -1736,17 +1736,6 @@ struct cipher_algo *image_get_cipher_algo(const char *full_name);
struct andr_boot_img_hdr_v0;
/**
* android_image_check_header() - Check the magic of boot image
*
* This checks the header of Android boot image and verifies the
* magic is "ANDROID!"
*
* @hdr: Pointer to image header
* Return: 0 if the magic is correct, non-zero if there is a magic mismatch
*/
int android_image_check_header(const struct andr_boot_img_hdr_v0 *hdr);
/**
* android_image_get_kernel() - Processes kernel part of Android boot images
*
@@ -1838,6 +1827,17 @@ ulong android_image_get_kcomp(const struct andr_boot_img_hdr_v0 *hdr);
void android_print_contents(const struct andr_boot_img_hdr_v0 *hdr);
bool android_image_print_dtb_contents(ulong hdr_addr);
/**
* is_android_boot_image_header() - Check the magic of boot image
*
* This checks the header of Android boot image and verifies the
* magic is "ANDROID!"
*
* @hdr: Pointer to boot image
* Return: non-zero if the magic is correct, zero otherwise
*/
bool is_android_boot_image_header(const struct andr_boot_img_hdr_v0 *hdr);
/**
* board_fit_config_name_match() - Check for a matching board name
*