summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorClement Leger <cleger@kalray.eu>2020-06-12 09:10:35 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-06-15 16:15:17 +0200
commit76c161b367ad78ed6212f46f547b1781939b6cc2 (patch)
tree210f763d130aca458f8d787835c01a70a5f26ec0 /common
parentaff0f38d5e702286cc2560c6b3f6a5fc24b7f557 (diff)
downloadbarebox-76c161b367ad78ed6212f46f547b1781939b6cc2.tar.gz
barebox-76c161b367ad78ed6212f46f547b1781939b6cc2.tar.xz
common: bootm: add support for elf file loading
This will allows elf loader to directly have an elf file available. Thus filetype_elf bootm handlers will be able to use standard bootm functions and data. Signed-off-by: Clement Leger <cleger@kalray.eu> Tested-by: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
-rw-r--r--common/Kconfig8
-rw-r--r--common/bootm.c33
2 files changed, 41 insertions, 0 deletions
diff --git a/common/Kconfig b/common/Kconfig
index ac282d8955..d75b43dfce 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -597,6 +597,14 @@ config BOOTM_AIMAGE
help
Support using Android Images.
+config BOOTM_ELF
+ bool
+ depends on BOOTM
+ select ELF
+ prompt "elf loading support"
+ help
+ Add support to load elf file with bootm.
+
config BOOTM_FITIMAGE
bool
prompt "FIT image support"
diff --git a/common/bootm.c b/common/bootm.c
index 8fec1ee34d..4110d8d6ef 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -143,6 +143,9 @@ int bootm_load_os(struct image_data *data, unsigned long load_address)
return 0;
}
+ if (IS_ENABLED(CONFIG_ELF) && data->elf)
+ return elf_load(data->elf);
+
if (data->os_file) {
data->os_res = file_to_sdram(data->os_file, load_address);
if (!data->os_res)
@@ -470,6 +473,8 @@ int bootm_get_os_size(struct image_data *data)
{
int ret;
+ if (data->elf)
+ return elf_get_mem_size(data->elf);
if (data->os)
return uimage_get_size(data->os, uimage_part_num(data->os_part));
if (data->os_fit)
@@ -517,6 +522,22 @@ static int bootm_open_os_uimage(struct image_data *data)
return 0;
}
+static int bootm_open_elf(struct image_data *data)
+{
+ if (!IS_ENABLED(CONFIG_ELF))
+ return -ENOSYS;
+
+ data->elf = elf_open(data->os_file);
+ if (IS_ERR(data->elf))
+ return PTR_ERR(data->elf);
+
+ printf("Entry Point: %08llx\n", data->elf->entry);
+
+ data->os_address = data->elf->entry;
+
+ return 0;
+}
+
static void bootm_print_info(struct image_data *data)
{
if (data->os_res)
@@ -652,6 +673,16 @@ int bootm_boot(struct bootm_data *bootm_data)
}
}
+ if (os_type == filetype_elf) {
+ ret = bootm_open_elf(data);
+ if (ret) {
+ printf("Loading ELF image failed with: %s\n",
+ strerror(-ret));
+ data->elf = NULL;
+ goto err_out;
+ }
+ }
+
if (bootm_data->appendroot) {
char *rootarg;
@@ -721,6 +752,8 @@ err_out:
uimage_close(data->initrd);
if (data->os)
uimage_close(data->os);
+ if (IS_ENABLED(CONFIG_ELF) && data->elf)
+ elf_close(data->elf);
if (IS_ENABLED(CONFIG_FITIMAGE) && data->os_fit)
fit_close(data->os_fit);
if (data->of_root_node && data->of_root_node != of_get_root_node())