DistroKit Mailinglist
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [DistroKit] [PATCH 2/2] v8a: barebox: env: fix boot for i.MX8M EVKs
Date: Tue,  5 Dec 2023 10:59:30 +0100	[thread overview]
Message-ID: <20231205095929.3469672-3-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20231205095929.3469672-1-a.fatoum@pengutronix.de>

Rockchip RK35* and i.MX8M* share the same barebox environment, but RAUC
and bootchooser were only configured for the Rockchip boards, rendering
the i.MX boards unbootable. Fix this by adding bootchooser as boot
target only for the radxa,rock3a.

While at it, we switch to using the new of_compatible command. This is
likey more stable than the Model string and allows easy extension in
future by additional compatibles.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 .../platform-v8a/barebox-common-defaultenv/init/bootsource   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configs/platform-v8a/barebox-common-defaultenv/init/bootsource b/configs/platform-v8a/barebox-common-defaultenv/init/bootsource
index fe63bbbe099b..af47c82c1001 100644
--- a/configs/platform-v8a/barebox-common-defaultenv/init/bootsource
+++ b/configs/platform-v8a/barebox-common-defaultenv/init/bootsource
@@ -7,10 +7,11 @@ fi
 
 if [ "$bootsource" = mmc ]; then
 	detect mmc$bootsource_instance
-	global.boot.default="bootchooser net"
+	global.boot.default="mmc$bootsource_instance net"
 fi
 
-if [ "${global.model}" = "Radxa ROCK3 Model A" ]; then
+if of_compatible -k radxa,rock3a; then
+	global.boot.default="bootchooser net"
 	global bootchooser.state_prefix="state.bootstate"
 	global bootchooser.targets="system0 system1"
 	global bootchooser.system0.boot="mmc1.root-A"
-- 
2.39.2




  parent reply	other threads:[~2023-12-05  9:59 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-05  9:59 [DistroKit] [PATCH 0/2] fixed after bootchooser switch Ahmad Fatoum
2023-12-05  9:59 ` [DistroKit] [PATCH 1/2] v7a: barebox: define state for all supported board variants Ahmad Fatoum
2023-12-11 10:33   ` Roland Hieber
2023-12-12 18:04   ` Robert Schwebel
2023-12-05  9:59 ` Ahmad Fatoum [this message]
2023-12-11 10:35   ` [DistroKit] [PATCH 2/2] v8a: barebox: env: fix boot for i.MX8M EVKs Roland Hieber

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=20231205095929.3469672-3-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=distrokit@pengutronix.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