Skip to contentSkip to conversation

cmd: bootm: add ELF file support

PATCH Superseded Maxim Moskalets 2 participants 2 messages Apr 11, 2024

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 cmd: bootm: add ELF file support

From: Maxim Moskalets <[email protected]>

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.

---
 boot/bootm_os.c  | 24 ++++++++++++++++++++++++
 boot/image-fit.c |  3 ++-
 boot/image.c     |  3 +++
 include/image.h  |  1 +
 4 files changed, 30 insertions(+), 1 deletion(-)
boot/bootm_os.c +23 -0
index ccde72d22c..1c92b8149c 100644
@@ -395,6 +395,27 @@ 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, sizeof 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 +557,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 */
boot/image-fit.c +2 -1
index 89e377563c..0419bef6d2 100644
@@ -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
boot/image.c +3 -0
index 073931cd7a..5b88d6808c 100644
@@ -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,		"",		"",			},
 };
include/image.h +1 -0
index 21de70f0c9..9a40bca22c 100644
@@ -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,
 };
Signature · 1 line
2.39.2
#1 lore raw

Hi Maxim,

Quoted 23 lines · Maxim Moskalets

From: Maxim Moskalets <[email protected]>

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.

---
  boot/bootm_os.c  | 24 ++++++++++++++++++++++++
  boot/image-fit.c |  3 ++-
  boot/image.c     |  3 +++
  include/image.h  |  1 +
  4 files changed, 30 insertions(+), 1 deletion(-)
boot/bootm_os.c +1 -0
index ccde72d22c..1c92b8149c 100644
@@ -395,6 +395,27 @@ static int do_bootm_qnxelf(int flag, struct bootm_info *bmi)
  }
  #endif
 
+#if defined(CONFIG_CMD_ELF)

boot/bootm_os.c static int do_bootm_qnxelf(int flag, struct bootm_info *bmi) · line 408

Quoted 10 lines
boot/bootm_os.c +10 -0
+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, sizeof str, "0x%lx", images->ep); /* write entry-point into string */

While sizeof str does return the same as the number of elements in the array, it's only because it's a char array and thus its elements are all 1B, any other type would have returned something incorrect.

I recommend using ARRAY_SIZE(str) instead, which is the way to know the number of elements in the array (dividing the size of the array by the size of an element in the array).

Cheers,
Quentin