From: Mattijs Korpershoek <mkorpershoek@baylibre.com>
To: Simon Glass <sjg@chromium.org>
Cc: Julien Masson <jmasson@baylibre.com>,
Guillaume La Roque <glaroque@baylibre.com>,
Dmitrii Merkurev <dimorinny@google.com>,
Roman Stratiienko <r.stratiienko@gmail.com>,
Igor Opaniuk <igor.opaniuk@gmail.com>,
u-boot@lists.denx.de,
Mattijs Korpershoek <mkorpershoek@baylibre.com>
Subject: [PATCH 2/6] boot: android: Add image_android_get_version()
Date: Thu, 06 Jun 2024 14:23:54 +0200 [thread overview]
Message-ID: <20240606-bootmeth-android-v1-2-0c69d4457cc5@baylibre.com> (raw)
In-Reply-To: <20240606-bootmeth-android-v1-0-0c69d4457cc5@baylibre.com>
When reading a boot image header, we may need to retrieve the header
version.
Add a helper function for it.
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
---
boot/image-android.c | 7 ++++++-
include/image.h | 7 +++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/boot/image-android.c b/boot/image-android.c
index ddd8ffd5e540..4f8fb51585eb 100644
--- a/boot/image-android.c
+++ b/boot/image-android.c
@@ -185,7 +185,7 @@ bool android_image_get_data(const void *boot_hdr, const void *vendor_boot_hdr,
return false;
}
- if (((struct andr_boot_img_hdr_v0 *)boot_hdr)->header_version > 2) {
+ if (android_image_get_version(boot_hdr) > 2) {
if (!vendor_boot_hdr) {
printf("For boot header v3+ vendor boot image has to be provided\n");
return false;
@@ -203,6 +203,11 @@ bool android_image_get_data(const void *boot_hdr, const void *vendor_boot_hdr,
return true;
}
+u32 android_image_get_version(const void *hdr)
+{
+ return ((struct andr_boot_img_hdr_v0 *)hdr)->header_version;
+}
+
static ulong android_image_get_kernel_addr(struct andr_image_data *img_data)
{
/*
diff --git a/include/image.h b/include/image.h
index acffd17e0dfd..18e5ced5ab42 100644
--- a/include/image.h
+++ b/include/image.h
@@ -1963,6 +1963,13 @@ bool is_android_boot_image_header(const void *hdr);
*/
bool is_android_vendor_boot_image_header(const void *vendor_boot_img);
+/**
+ * android_image_get_version() - Retrieve the boot.img version
+ *
+ * Return: Android boot image header version.
+ */
+u32 android_image_get_version(const void *hdr);
+
/**
* get_abootimg_addr() - Get Android boot image address
*
--
2.45.0
next prev parent reply other threads:[~2024-06-06 12:24 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-06 12:23 [PATCH 0/6] bootstd: Add Android support Mattijs Korpershoek
2024-06-06 12:23 ` [PATCH 1/6] boot: android: Provide vendor_bootimg_addr in boot_get_fdt() Mattijs Korpershoek
2024-06-10 8:51 ` Igor Opaniuk
2024-06-06 12:23 ` Mattijs Korpershoek [this message]
2024-06-10 9:20 ` [PATCH 2/6] boot: android: Add image_android_get_version() Igor Opaniuk
2024-06-11 9:01 ` Mattijs Korpershoek
2024-06-06 12:23 ` [PATCH 3/6] bootstd: Add bootflow_iter_check_mmc() helper Mattijs Korpershoek
2024-06-10 9:31 ` Igor Opaniuk
2024-06-11 9:06 ` Mattijs Korpershoek
2024-06-06 12:23 ` [PATCH 4/6] android: boot: Add set_abootimg_addr() and set_avendor_bootimg_addr() Mattijs Korpershoek
2024-06-10 14:27 ` Igor Opaniuk
2024-06-06 12:23 ` [PATCH 5/6] bootstd: Add a bootmeth for Android Mattijs Korpershoek
2024-06-10 15:15 ` Igor Opaniuk
2024-06-11 9:32 ` Mattijs Korpershoek
2024-06-11 18:52 ` Simon Glass
2024-06-12 10:18 ` Mattijs Korpershoek
2024-06-06 12:23 ` [PATCH 6/6] bootstd: Add test for bootmeth_android Mattijs Korpershoek
2024-06-11 18:52 ` Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240606-bootmeth-android-v1-2-0c69d4457cc5@baylibre.com \
--to=mkorpershoek@baylibre.com \
--cc=dimorinny@google.com \
--cc=glaroque@baylibre.com \
--cc=igor.opaniuk@gmail.com \
--cc=jmasson@baylibre.com \
--cc=r.stratiienko@gmail.com \
--cc=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox