From: Maxim Moskalets <maximmosk4@gmail.com>
To: marek.vasut+renesas@mailbox.org, mkorpershoek@baylibre.com,
ralph.siemsen@linaro.org, sean.anderson@seco.com,
sjg@chromium.org, souajih@baylibre.com,
takahiro.akashi@linaro.org, trini@konsulko.com,
u-boot@lists.denx.de, xypron.glpk@gmx.de,
quentin.schulz@theobroma-systems.com
Cc: maximmosk4@gmail.com, Maxim.Moskalets@kaspersky.com
Subject: [PATCH v4] cmd: bootm: add ELF file support
Date: Thu, 11 Apr 2024 11:57:38 +0300 [thread overview]
Message-ID: <20240411085738.31779-1-Maxim.Moskalets@kaspersky.com> (raw)
From: Maxim Moskalets <maximmosk4@gmail.com>
Some operating systems (e.g. seL4) and embedded applications are ELF
images. It is convenient to use FIT-images to implement trusted boot.
Added "elf" image type for booting using bootm command.
Signed-off-by: Maxim Moskalets <maximmosk4@gmail.com>
---
boot/bootm_os.c | 23 +++++++++++++++++++++++
boot/image-fit.c | 3 ++-
boot/image.c | 3 +++
include/image.h | 1 +
4 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/boot/bootm_os.c b/boot/bootm_os.c
index ccde72d22c..f6b46cf57f 100644
--- a/boot/bootm_os.c
+++ b/boot/bootm_os.c
@@ -395,6 +395,26 @@ static int do_bootm_qnxelf(int flag, struct bootm_info *bmi)
}
#endif
+#if defined(CONFIG_CMD_ELF)
+static int do_bootm_elf(int flag, struct bootm_info *bmi)
+{
+ struct bootm_headers *images = bmi->images;
+ char *local_args[2] = {NULL};
+ char str[19] = ""; /* "0x" + 16 digits + "\0" */
+
+ if (flag != BOOTM_STATE_OS_GO)
+ return 0;
+
+ snprintf(str, ARRAY_SIZE(str), "0x%lx", images->ep); /* write entry-point into string */
+ local_args[0] = bmi->argv[0];
+ local_args[1] = str; /* and provide it via the arguments */
+
+ do_bootelf(NULL, 0, 2, local_args);
+
+ return 1;
+}
+#endif
+
#ifdef CONFIG_INTEGRITY
static int do_bootm_integrity(int flag, struct bootm_info *bmi)
{
@@ -536,6 +556,9 @@ static boot_os_fn *boot_os[] = {
#ifdef CONFIG_BOOTM_EFI
[IH_OS_EFI] = do_bootm_efi,
#endif
+#if defined(CONFIG_CMD_ELF)
+ [IH_OS_ELF] = do_bootm_elf,
+#endif
};
/* Allow for arch specific config before we boot */
diff --git a/boot/image-fit.c b/boot/image-fit.c
index 89e377563c..0419bef6d2 100644
--- a/boot/image-fit.c
+++ b/boot/image-fit.c
@@ -2180,7 +2180,8 @@ int fit_image_load(struct bootm_headers *images, ulong addr,
fit_image_check_os(fit, noffset, IH_OS_TEE) ||
fit_image_check_os(fit, noffset, IH_OS_OPENRTOS) ||
fit_image_check_os(fit, noffset, IH_OS_EFI) ||
- fit_image_check_os(fit, noffset, IH_OS_VXWORKS);
+ fit_image_check_os(fit, noffset, IH_OS_VXWORKS) ||
+ fit_image_check_os(fit, noffset, IH_OS_ELF);
/*
* If either of the checks fail, we should report an error, but
diff --git a/boot/image.c b/boot/image.c
index 073931cd7a..5b88d6808c 100644
--- a/boot/image.c
+++ b/boot/image.c
@@ -134,6 +134,9 @@ static const table_entry_t uimage_os[] = {
#endif
{ IH_OS_OPENSBI, "opensbi", "RISC-V OpenSBI", },
{ IH_OS_EFI, "efi", "EFI Firmware" },
+#ifdef CONFIG_CMD_ELF
+ { IH_OS_ELF, "elf", "ELF Image" },
+#endif
{ -1, "", "", },
};
diff --git a/include/image.h b/include/image.h
index 21de70f0c9..9a40bca22c 100644
--- a/include/image.h
+++ b/include/image.h
@@ -100,6 +100,7 @@ enum {
IH_OS_TEE, /* Trusted Execution Environment */
IH_OS_OPENSBI, /* RISC-V OpenSBI */
IH_OS_EFI, /* EFI Firmware (e.g. GRUB2) */
+ IH_OS_ELF, /* ELF Image (e.g. seL4) */
IH_OS_COUNT,
};
--
2.39.2
next reply other threads:[~2024-04-11 8:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-11 8:57 Maxim Moskalets [this message]
2024-04-11 10:57 ` [PATCH v4] cmd: bootm: add ELF file support Heinrich Schuchardt
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=20240411085738.31779-1-Maxim.Moskalets@kaspersky.com \
--to=maximmosk4@gmail.com \
--cc=Maxim.Moskalets@kaspersky.com \
--cc=marek.vasut+renesas@mailbox.org \
--cc=mkorpershoek@baylibre.com \
--cc=quentin.schulz@theobroma-systems.com \
--cc=ralph.siemsen@linaro.org \
--cc=sean.anderson@seco.com \
--cc=sjg@chromium.org \
--cc=souajih@baylibre.com \
--cc=takahiro.akashi@linaro.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=xypron.glpk@gmx.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;
as well as URLs for NNTP newsgroup(s).