diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-07-09 08:21:04 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-07-09 08:21:04 +0200 |
commit | 0e8bd85d9b2f981ad24847badda70c73397d8385 (patch) | |
tree | ad0e96ae3da29ab5c5797d99555d280e9b4d5d14 /arch/mips | |
parent | b5ba232df1cf1fd68bd2d7dfb0f3f70f11903c99 (diff) | |
parent | a54a47ff7710d12e5a6c88953b3da85cc162c1ea (diff) | |
download | barebox-0e8bd85d9b2f981ad24847badda70c73397d8385.tar.gz barebox-0e8bd85d9b2f981ad24847badda70c73397d8385.tar.xz |
Merge branch 'for-next/bootm'
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/Kconfig | 1 | ||||
-rw-r--r-- | arch/mips/lib/bootm.c | 59 |
2 files changed, 60 insertions, 0 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 359f67883c..9aedf9a77b 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -7,6 +7,7 @@ config MIPS select HAVE_CONFIGURABLE_MEMORY_LAYOUT select HAVE_CONFIGURABLE_TEXT_BASE select HAS_DMA + select ELF default y config SYS_SUPPORTS_BIG_ENDIAN diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index 91e7e1c68a..f14540a4c4 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -10,6 +10,7 @@ #include <restart.h> #include <asm/byteorder.h> +#include <asm/io.h> static int do_bootm_barebox(struct image_data *data) { @@ -42,11 +43,69 @@ static struct binfmt_hook binfmt_barebox_hook = { .exec = "bootm", }; +static int do_bootm_elf(struct image_data *data) +{ + void (*entry)(int, void *); + struct elf_image *elf; + void *fdt, *buf; + int ret = 0; + + buf = read_file(data->os_file, NULL); + if (!buf) + return -EINVAL; + + elf = elf_load_image(buf); + if (IS_ERR(elf)) + return PTR_ERR(elf); + + fdt = bootm_get_devicetree(data); + if (IS_ERR(fdt)) { + ret = PTR_ERR(fdt); + goto bootm_elf_done; + } + + pr_info("Starting application at 0x%08lx, dts 0x%08lx...\n", + phys_to_virt(elf->entry), data->of_root_node); + + if (data->dryrun) + goto bootm_elf_done; + + shutdown_barebox(); + + entry = (void *)elf->entry; + + entry(-2, phys_to_virt((unsigned long)fdt)); + + pr_err("ELF application terminated\n"); + ret = -EINVAL; + +bootm_elf_done: + elf_release_image(elf); + free(fdt); + free(buf); + + return ret; +} + +static struct image_handler elf_handler = { + .name = "ELF", + .bootm = do_bootm_elf, + .filetype = filetype_elf, +}; + +static struct binfmt_hook binfmt_elf_hook = { + .type = filetype_elf, + .exec = "bootm", +}; + static int mips_register_image_handler(void) { register_image_handler(&barebox_handler); binfmt_register(&binfmt_barebox_hook); + register_image_handler(&elf_handler); + binfmt_register(&binfmt_elf_hook); + return 0; } late_initcall(mips_register_image_handler); |