diff options
author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2021-05-04 12:45:11 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-05-17 08:29:42 +0200 |
commit | 7000b90984a0ca50443f1bd84c058e129c05f229 (patch) | |
tree | 54a04e62cf2156af635ed4a4f7982f79a83bc584 /common | |
parent | 9174376cd08e1e3e638cd852525cc529d25fde47 (diff) | |
download | barebox-7000b90984a0ca50443f1bd84c058e129c05f229.tar.gz barebox-7000b90984a0ca50443f1bd84c058e129c05f229.tar.xz |
bootm: move ARM64 Linux image parsing to common directory
Linux on RISC-V adopts the same structure as on ARM64 for both 32-
and 64-bit kernel images and it's likely future architectures will
as well. In preparation for adding RISC-V Linux boot support,
move the bulk of the code to a common location for reusability.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20210504104513.2640-1-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
-rw-r--r-- | common/Makefile | 2 | ||||
-rw-r--r-- | common/booti.c | 66 |
2 files changed, 67 insertions, 1 deletions
diff --git a/common/Makefile b/common/Makefile index c0b45d263e..2c679090a0 100644 --- a/common/Makefile +++ b/common/Makefile @@ -20,7 +20,7 @@ obj-$(CONFIG_BAREBOX_UPDATE) += bbu.o obj-$(CONFIG_BINFMT) += binfmt.o obj-$(CONFIG_BLOCK) += block.o obj-$(CONFIG_BLSPEC) += blspec.o -obj-$(CONFIG_BOOTM) += bootm.o +obj-$(CONFIG_BOOTM) += bootm.o booti.o obj-$(CONFIG_CMD_LOADS) += s_record.o obj-$(CONFIG_CMD_MEMTEST) += memtest.o obj-$(CONFIG_COMMAND_SUPPORT) += command.o diff --git a/common/booti.c b/common/booti.c new file mode 100644 index 0000000000..a2d63d8c31 --- /dev/null +++ b/common/booti.c @@ -0,0 +1,66 @@ +// SPDX-License-Identifier: GPL-2.0-only +// SPDX-FileCopyrightText: 2018 Sascha Hauer <s.hauer@pengutronix.de> + +#include <common.h> +#include <memory.h> +#include <bootm.h> +#include <linux/sizes.h> + +void *booti_load_image(struct image_data *data, phys_addr_t *oftree) +{ + const void *kernel_header = + data->os_fit ? data->fit_kernel : data->os_header; + resource_size_t start, end; + unsigned long text_offset, image_size, devicetree, kernel; + unsigned long image_end; + int ret; + void *fdt; + + text_offset = le64_to_cpup(kernel_header + 8); + image_size = le64_to_cpup(kernel_header + 16); + + ret = memory_bank_first_find_space(&start, &end); + if (ret) + return ERR_PTR(ret); + + kernel = ALIGN(start, SZ_2M) + text_offset; + + ret = bootm_load_os(data, kernel); + if (ret) + return ERR_PTR(ret); + + image_end = PAGE_ALIGN(kernel + image_size); + + if (oftree) { + if (bootm_has_initrd(data)) { + ret = bootm_load_initrd(data, image_end); + if (ret) + return ERR_PTR(ret); + + image_end += resource_size(data->initrd_res); + image_end = PAGE_ALIGN(image_end); + } + + devicetree = image_end; + + fdt = bootm_get_devicetree(data); + if (IS_ERR(fdt)) + return fdt; + + ret = bootm_load_devicetree(data, fdt, devicetree); + + free(fdt); + + if (ret) + return ERR_PTR(ret); + + *oftree = devicetree; + } + + printf("Loaded kernel to 0x%08lx", kernel); + if (oftree) + printf(", devicetree at 0x%08lx", devicetree); + printf("\n"); + + return (void *)kernel; +} |