All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mattijs Korpershoek <mkorpershoek@baylibre.com>
To: Neil Armstrong <narmstrong@baylibre.com>
Cc: u-boot-amlogic@groups.io, u-boot@lists.denx.de,
	Mattijs Korpershoek <mkorpershoek@baylibre.com>
Subject: [PATCH 4/6] configs: meson64_android: use boot part label instead of index
Date: Thu, 29 Jul 2021 09:21:11 +0200	[thread overview]
Message-ID: <20210729072113.208099-5-mkorpershoek@baylibre.com> (raw)
In-Reply-To: <20210729072113.208099-1-mkorpershoek@baylibre.com>

To boot Android, we read the gpt and assume that the partition with
index "1" will be the "boot" partition.

This might not always be the case, as there are no requirements from
Android on the partition order.

However, Android does seem to use the "boot" label quite a lot on their
public documentation [1]

Load the boot partition by label instead of by index

[1] https://source.android.com/devices/bootloader/partitions
Signed-off-by: Guillaume La Roque <mkorpershoek@baylibre.com>
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
---
 include/configs/meson64_android.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h
index 4027a7fe0d..e22f05c889 100644
--- a/include/configs/meson64_android.h
+++ b/include/configs/meson64_android.h
@@ -9,6 +9,9 @@
 #ifndef __MESON64_ANDROID_CONFIG_H
 #define __MESON64_ANDROID_CONFIG_H
 
+#ifndef BOOT_PARTITION
+#define BOOT_PARTITION "boot"
+#endif
 
 #define BOOTENV_DEV_FASTBOOT(devtypeu, devtypel, instance) \
 	"bootcmd_fastboot=" \
@@ -77,11 +80,11 @@
 
 #define BOOTENV_DEV_SYSTEM(devtypeu, devtypel, instance) \
 	"bootcmd_system=" \
-		"echo Loading Android boot partition...;" \
+		"echo Loading Android " BOOT_PARTITION " partition...;" \
 		"mmc dev ${mmcdev};" \
 		"setenv bootargs ${bootargs} console=${console} androidboot.serialno=${serial#};" \
-		"part start mmc ${mmcdev} ${bootpart} boot_start;" \
-		"part size mmc ${mmcdev} ${bootpart} boot_size;" \
+		"part start mmc ${mmcdev} " BOOT_PARTITION " boot_start;" \
+		"part size mmc ${mmcdev} " BOOT_PARTITION " boot_size;" \
 		"if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \
 			"echo Running Android...;" \
 			"bootm ${loadaddr};" \
@@ -111,7 +114,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS                                     \
 	"partitions=" PARTS_DEFAULT "\0"                              \
 	"mmcdev=2\0"                                                  \
-	"bootpart=1\0"                                                \
 	"logopart=2\0"                                                \
 	"gpio_recovery=88\0"                                          \
 	"check_button=gpio input ${gpio_recovery};test $? -eq 0;\0"   \
-- 
2.30.2


  parent reply	other threads:[~2021-07-29 12:00 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-29  7:21 [PATCH 0/6] VIM3: misc cleanups to prepare android support Mattijs Korpershoek
2021-07-29  7:21 ` [PATCH 1/6] configs: sei610: fix typo in header comment Mattijs Korpershoek
2021-07-29  9:21   ` Neil Armstrong
2021-07-29  7:21 ` [PATCH 2/6] configs: meson64_android: fix bad indent in EXTRA_ENV_SETTINGS Mattijs Korpershoek
2021-07-29  9:21   ` Neil Armstrong
2021-07-29  7:21 ` [PATCH 3/6] configs: meson64_android: use CONFIG_FASTBOOT_USB_DEV Mattijs Korpershoek
2021-07-29  9:22   ` Neil Armstrong
2021-07-29  7:21 ` Mattijs Korpershoek [this message]
2021-07-29  9:22   ` [PATCH 4/6] configs: meson64_android: use boot part label instead of index Neil Armstrong
2021-07-29  7:21 ` [PATCH 5/6] configs: meson64_android: use logo " Mattijs Korpershoek
2021-07-29  9:22   ` Neil Armstrong
2021-07-29  7:21 ` [PATCH 6/6] configs: meson64_android: don't set console bootargs Mattijs Korpershoek
2021-07-29  9:23   ` Neil Armstrong
2021-07-29  9:37 ` [PATCH 0/6] VIM3: misc cleanups to prepare android support Neil Armstrong

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=20210729072113.208099-5-mkorpershoek@baylibre.com \
    --to=mkorpershoek@baylibre.com \
    --cc=narmstrong@baylibre.com \
    --cc=u-boot-amlogic@groups.io \
    --cc=u-boot@lists.denx.de \
    --subject='Re: [PATCH 4/6] configs: meson64_android: use boot part label instead of index' \
    /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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.