mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Michael Tretter <m.tretter@pengutronix.de>
To: Sascha Hauer <s.hauer@pengutronix.de>,
	 BAREBOX <barebox@lists.infradead.org>
Cc: Michael Tretter <m.tretter@pengutronix.de>
Subject: [PATCH 2/4] ARM: rockchip: bbu: accept signed images
Date: Wed, 20 Aug 2025 12:16:58 +0200	[thread overview]
Message-ID: <20250820-rkimage-signed-v1-2-0ad3d1d1c952@pengutronix.de> (raw)
In-Reply-To: <20250820-rkimage-signed-v1-0-0ad3d1d1c952@pengutronix.de>

Accept Rockchip signed images in the update handler.

This is necessary to be able to use the update handler to flash a signed
image to an SD card or eMMC.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 arch/arm/mach-rockchip/bbu.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-rockchip/bbu.c b/arch/arm/mach-rockchip/bbu.c
index b4d2a5280fab9f8bf6357948f2188afcb8cc89a5..2067af7b1d231e00ec436d50686cb252e9c96dbd 100644
--- a/arch/arm/mach-rockchip/bbu.c
+++ b/arch/arm/mach-rockchip/bbu.c
@@ -46,10 +46,10 @@ static int rockchip_bbu_mmc_handler(struct bbu_handler *handler,
 	struct cdev *cdev;
 
 	filetype = file_detect_type(data->image, data->len);
-	if (filetype != filetype_rockchip_rkns_image) {
-		if (!bbu_force(data, "incorrect image type. Expected: %s, got %s",
-				file_type_to_string(filetype_rockchip_rkns_image),
-				file_type_to_string(filetype)))
+	if (filetype != filetype_rockchip_rkns_image &&
+	    filetype != filetype_rockchip_rkss_image) {
+		if (!bbu_force(data, "incorrect image type. Got %s",
+			       file_type_to_string(filetype)))
 			return -EINVAL;
 	}
 

-- 
2.39.5




  parent reply	other threads:[~2025-08-20 12:19 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-20 10:16 [PATCH 0/4] ARM: rockchip: add support for " Michael Tretter
2025-08-20 10:16 ` [PATCH 1/4] filetype: detect Rockchip " Michael Tretter
2025-08-20 10:16 ` Michael Tretter [this message]
2025-08-20 10:16 ` [PATCH 3/4] ARM: rockchip: bootm: don't propagate error from register_image_handler Michael Tretter
2025-08-20 10:17 ` [PATCH 4/4] ARM: rockchip: bootm: accept signed images Michael Tretter
2025-08-20 12:30 ` [PATCH 0/4] ARM: rockchip: add support for " Sascha Hauer

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=20250820-rkimage-signed-v1-2-0ad3d1d1c952@pengutronix.de \
    --to=m.tretter@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@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