public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
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 1/6] boot: android: Provide vendor_bootimg_addr in boot_get_fdt()
Date: Thu, 06 Jun 2024 14:23:53 +0200	[thread overview]
Message-ID: <20240606-bootmeth-android-v1-1-0c69d4457cc5@baylibre.com> (raw)
In-Reply-To: <20240606-bootmeth-android-v1-0-0c69d4457cc5@baylibre.com>

When calling android_image_get_dtb_by_index() using boot image v3+,
we should also pass the vendor_boot ramdisk address.

Use get_avendor_bootimg_addr() to do so.

Note: on boot image v2, this is harmless since get_avendor_bootimg_addr()
returns -1.

Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
---
 boot/image-fdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/image-fdt.c b/boot/image-fdt.c
index 56dd7687f51c..8332792b8e80 100644
--- a/boot/image-fdt.c
+++ b/boot/image-fdt.c
@@ -502,7 +502,7 @@ int boot_get_fdt(void *buf, const char *select, uint arch,
 		 * Firstly check if this android boot image has dtb field.
 		 */
 		dtb_idx = (u32)env_get_ulong("adtb_idx", 10, 0);
-		if (android_image_get_dtb_by_index((ulong)hdr, 0,
+		if (android_image_get_dtb_by_index((ulong)hdr, get_avendor_bootimg_addr(),
 						   dtb_idx, &fdt_addr, &fdt_size)) {
 			fdt_blob = (char *)map_sysmem(fdt_addr, 0);
 			if (fdt_check_header(fdt_blob))

-- 
2.45.0


  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 ` Mattijs Korpershoek [this message]
2024-06-10  8:51   ` [PATCH 1/6] boot: android: Provide vendor_bootimg_addr in boot_get_fdt() Igor Opaniuk
2024-06-06 12:23 ` [PATCH 2/6] boot: android: Add image_android_get_version() Mattijs Korpershoek
2024-06-10  9:20   ` 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-1-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