mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-16 17:58:23 +00:00
bf14d9a7e1
With commit6808ef9ac2("move booti_setup to arch/arm/lig/image.c"), images->ep has not been set at this point. Fixes:6808ef9ac2("move booti_setup to arch/arm/lig/image.c") Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Bin Chen <bin.chen@linaro.org>
114 lines
2.8 KiB
C
114 lines
2.8 KiB
C
/*
|
|
* (C) Copyright 2000-2009
|
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <bootm.h>
|
|
#include <command.h>
|
|
#include <image.h>
|
|
#include <lmb.h>
|
|
#include <mapmem.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/sizes.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
/*
|
|
* Image booting support
|
|
*/
|
|
static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc,
|
|
char * const argv[], bootm_headers_t *images)
|
|
{
|
|
int ret;
|
|
ulong ld;
|
|
ulong relocated_addr;
|
|
ulong image_size;
|
|
|
|
ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START,
|
|
images, 1);
|
|
|
|
/* Setup Linux kernel Image entry point */
|
|
if (!argc) {
|
|
ld = load_addr;
|
|
debug("* kernel: default image load address = 0x%08lx\n",
|
|
load_addr);
|
|
} else {
|
|
ld = simple_strtoul(argv[0], NULL, 16);
|
|
debug("* kernel: cmdline image address = 0x%08lx\n", ld);
|
|
}
|
|
|
|
ret = booti_setup(ld, &relocated_addr, &image_size);
|
|
if (ret != 0)
|
|
return 1;
|
|
|
|
/* Handle BOOTM_STATE_LOADOS */
|
|
if (relocated_addr != ld) {
|
|
debug("Moving Image from 0x%lx to 0x%lx\n", ld, relocated_addr);
|
|
memmove((void *)relocated_addr, (void *)ld, image_size);
|
|
}
|
|
|
|
images->ep = relocated_addr;
|
|
lmb_reserve(&images->lmb, images->ep, le32_to_cpu(image_size));
|
|
|
|
/*
|
|
* Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not
|
|
* have a header that provide this informaiton.
|
|
*/
|
|
if (bootm_find_images(flag, argc, argv))
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
int ret;
|
|
|
|
/* Consume 'booti' */
|
|
argc--; argv++;
|
|
|
|
if (booti_start(cmdtp, flag, argc, argv, &images))
|
|
return 1;
|
|
|
|
/*
|
|
* We are doing the BOOTM_STATE_LOADOS state ourselves, so must
|
|
* disable interrupts ourselves
|
|
*/
|
|
bootm_disable_interrupts();
|
|
|
|
images.os.os = IH_OS_LINUX;
|
|
images.os.arch = IH_ARCH_ARM64;
|
|
ret = do_bootm_states(cmdtp, flag, argc, argv,
|
|
#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
|
|
BOOTM_STATE_RAMDISK |
|
|
#endif
|
|
BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO |
|
|
BOOTM_STATE_OS_GO,
|
|
&images, 1);
|
|
|
|
return ret;
|
|
}
|
|
|
|
#ifdef CONFIG_SYS_LONGHELP
|
|
static char booti_help_text[] =
|
|
"[addr [initrd[:size]] [fdt]]\n"
|
|
" - boot arm64 Linux Image stored in memory\n"
|
|
"\tThe argument 'initrd' is optional and specifies the address\n"
|
|
"\tof an initrd in memory. The optional parameter ':size' allows\n"
|
|
"\tspecifying the size of a RAW initrd.\n"
|
|
#if defined(CONFIG_OF_LIBFDT)
|
|
"\tSince booting a Linux kernel requires a flat device-tree, a\n"
|
|
"\tthird argument providing the address of the device-tree blob\n"
|
|
"\tis required. To boot a kernel with a device-tree blob but\n"
|
|
"\twithout an initrd image, use a '-' for the initrd argument.\n"
|
|
#endif
|
|
"";
|
|
#endif
|
|
|
|
U_BOOT_CMD(
|
|
booti, CONFIG_SYS_MAXARGS, 1, do_booti,
|
|
"boot arm64 Linux Image image from memory", booti_help_text
|
|
);
|