mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 15:41:40 +00:00
cmd: Split 'bootz' and 'booti' out from 'bootm'
The bootz and booti commands rely on common functionality that is found in common/bootm.c and common/bootm_os.c. They do not however rely on the rest of cmd/bootm.c to be implemented so split them into their own files. Have various Makefiles include the required infrastructure for CONFIG_CMD_BOOT[IZ] as well as CONFIG_CMD_BOOTM. Move the declaration of 'images' over to common/bootm.c. Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
parent
f2a9942fbc
commit
5db28905c9
8 changed files with 276 additions and 251 deletions
|
|
@ -26,8 +26,9 @@ endif
|
|||
|
||||
obj-$(CONFIG_CPU_V7M) += cmd_boot.o
|
||||
obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
|
||||
obj-$(CONFIG_CMD_BOOTI) += bootm.o
|
||||
obj-$(CONFIG_CMD_BOOTM) += bootm.o
|
||||
obj-$(CONFIG_CMD_BOOTM) += zimage.o
|
||||
obj-$(CONFIG_CMD_BOOTZ) += bootm.o zimage.o
|
||||
obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
|
||||
obj-$(CONFIG_USE_ARCH_MEMSET) += memset.o
|
||||
obj-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o
|
||||
|
|
|
|||
|
|
@ -12,3 +12,4 @@ ifndef CONFIG_SPL_BUILD
|
|||
obj-$(CONFIG_PCI) += pci_io.o
|
||||
endif
|
||||
obj-$(CONFIG_CMD_BOOTM) += bootm.o
|
||||
obj-$(CONFIG_CMD_BOOTZ) += bootm.o
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@ obj-$(CONFIG_CMD_BOOTEFI) += bootefi.o
|
|||
obj-$(CONFIG_CMD_BOOTMENU) += bootmenu.o
|
||||
obj-$(CONFIG_CMD_BOOTLDR) += bootldr.o
|
||||
obj-$(CONFIG_CMD_BOOTSTAGE) += bootstage.o
|
||||
obj-$(CONFIG_CMD_BOOTZ) += bootz.o
|
||||
obj-$(CONFIG_CMD_BOOTI) += booti.o
|
||||
obj-$(CONFIG_CMD_CACHE) += cache.o
|
||||
obj-$(CONFIG_CMD_CBFS) += cbfs.o
|
||||
obj-$(CONFIG_CMD_CLK) += clk.o
|
||||
|
|
|
|||
161
cmd/booti.c
Normal file
161
cmd/booti.c
Normal file
|
|
@ -0,0 +1,161 @@
|
|||
/*
|
||||
* (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>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
/* See Documentation/arm64/booting.txt in the Linux kernel */
|
||||
struct Image_header {
|
||||
uint32_t code0; /* Executable code */
|
||||
uint32_t code1; /* Executable code */
|
||||
uint64_t text_offset; /* Image load offset, LE */
|
||||
uint64_t image_size; /* Effective Image size, LE */
|
||||
uint64_t res1; /* reserved */
|
||||
uint64_t res2; /* reserved */
|
||||
uint64_t res3; /* reserved */
|
||||
uint64_t res4; /* reserved */
|
||||
uint32_t magic; /* Magic number */
|
||||
uint32_t res5;
|
||||
};
|
||||
|
||||
#define LINUX_ARM64_IMAGE_MAGIC 0x644d5241
|
||||
|
||||
static int booti_setup(bootm_headers_t *images)
|
||||
{
|
||||
struct Image_header *ih;
|
||||
uint64_t dst;
|
||||
uint64_t image_size;
|
||||
|
||||
ih = (struct Image_header *)map_sysmem(images->ep, 0);
|
||||
|
||||
if (ih->magic != le32_to_cpu(LINUX_ARM64_IMAGE_MAGIC)) {
|
||||
puts("Bad Linux ARM64 Image magic!\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (ih->image_size == 0) {
|
||||
puts("Image lacks image_size field, assuming 16MiB\n");
|
||||
image_size = 16 << 20;
|
||||
} else {
|
||||
image_size = le64_to_cpu(ih->image_size);
|
||||
}
|
||||
|
||||
/*
|
||||
* If we are not at the correct run-time location, set the new
|
||||
* correct location and then move the image there.
|
||||
*/
|
||||
dst = gd->bd->bi_dram[0].start + le64_to_cpu(ih->text_offset);
|
||||
|
||||
unmap_sysmem(ih);
|
||||
|
||||
if (images->ep != dst) {
|
||||
void *src;
|
||||
|
||||
debug("Moving Image from 0x%lx to 0x%llx\n", images->ep, dst);
|
||||
|
||||
src = (void *)images->ep;
|
||||
images->ep = dst;
|
||||
memmove((void *)dst, src, image_size);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Image booting support
|
||||
*/
|
||||
static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||
char * const argv[], bootm_headers_t *images)
|
||||
{
|
||||
int ret;
|
||||
struct Image_header *ih;
|
||||
|
||||
ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START,
|
||||
images, 1);
|
||||
|
||||
/* Setup Linux kernel Image entry point */
|
||||
if (!argc) {
|
||||
images->ep = load_addr;
|
||||
debug("* kernel: default image load address = 0x%08lx\n",
|
||||
load_addr);
|
||||
} else {
|
||||
images->ep = simple_strtoul(argv[0], NULL, 16);
|
||||
debug("* kernel: cmdline image address = 0x%08lx\n",
|
||||
images->ep);
|
||||
}
|
||||
|
||||
ret = booti_setup(images);
|
||||
if (ret != 0)
|
||||
return 1;
|
||||
|
||||
ih = (struct Image_header *)map_sysmem(images->ep, 0);
|
||||
|
||||
lmb_reserve(&images->lmb, images->ep, le32_to_cpu(ih->image_size));
|
||||
|
||||
unmap_sysmem(ih);
|
||||
|
||||
/*
|
||||
* 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;
|
||||
ret = do_bootm_states(cmdtp, flag, argc, argv,
|
||||
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
|
||||
);
|
||||
250
cmd/bootm.c
250
cmd/bootm.c
|
|
@ -14,12 +14,9 @@
|
|||
#include <environment.h>
|
||||
#include <errno.h>
|
||||
#include <image.h>
|
||||
#include <lmb.h>
|
||||
#include <malloc.h>
|
||||
#include <mapmem.h>
|
||||
#include <nand.h>
|
||||
#include <asm/byteorder.h>
|
||||
#include <linux/compiler.h>
|
||||
#include <linux/ctype.h>
|
||||
#include <linux/err.h>
|
||||
#include <u-boot/zlib.h>
|
||||
|
|
@ -40,8 +37,6 @@ extern flash_info_t flash_info[]; /* info for FLASH chips */
|
|||
static int do_imls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
|
||||
#endif
|
||||
|
||||
bootm_headers_t images; /* pointers to os/initrd/fdt images */
|
||||
|
||||
/* we overload the cmd field with our state machine info instead of a
|
||||
* function pointer */
|
||||
static cmd_tbl_t cmd_bootm_sub[] = {
|
||||
|
|
@ -540,248 +535,3 @@ U_BOOT_CMD(
|
|||
" boundaries in nor/nand flash."
|
||||
);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CMD_BOOTZ
|
||||
|
||||
int __weak bootz_setup(ulong image, ulong *start, ulong *end)
|
||||
{
|
||||
/* Please define bootz_setup() for your platform */
|
||||
|
||||
puts("Your platform's zImage format isn't supported yet!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*
|
||||
* zImage booting support
|
||||
*/
|
||||
static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||
char * const argv[], bootm_headers_t *images)
|
||||
{
|
||||
int ret;
|
||||
ulong zi_start, zi_end;
|
||||
|
||||
ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START,
|
||||
images, 1);
|
||||
|
||||
/* Setup Linux kernel zImage entry point */
|
||||
if (!argc) {
|
||||
images->ep = load_addr;
|
||||
debug("* kernel: default image load address = 0x%08lx\n",
|
||||
load_addr);
|
||||
} else {
|
||||
images->ep = simple_strtoul(argv[0], NULL, 16);
|
||||
debug("* kernel: cmdline image address = 0x%08lx\n",
|
||||
images->ep);
|
||||
}
|
||||
|
||||
ret = bootz_setup(images->ep, &zi_start, &zi_end);
|
||||
if (ret != 0)
|
||||
return 1;
|
||||
|
||||
lmb_reserve(&images->lmb, images->ep, zi_end - zi_start);
|
||||
|
||||
/*
|
||||
* 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_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||
{
|
||||
int ret;
|
||||
|
||||
/* Consume 'bootz' */
|
||||
argc--; argv++;
|
||||
|
||||
if (bootz_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;
|
||||
ret = do_bootm_states(cmdtp, flag, argc, argv,
|
||||
BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO |
|
||||
BOOTM_STATE_OS_GO,
|
||||
&images, 1);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SYS_LONGHELP
|
||||
static char bootz_help_text[] =
|
||||
"[addr [initrd[:size]] [fdt]]\n"
|
||||
" - boot Linux zImage stored in memory\n"
|
||||
"\tThe argument 'initrd' is optional and specifies the address\n"
|
||||
"\tof the initrd in memory. The optional argument ':size' allows\n"
|
||||
"\tspecifying the size of RAW initrd.\n"
|
||||
#if defined(CONFIG_OF_LIBFDT)
|
||||
"\tWhen booting a Linux kernel which requires a flat device-tree\n"
|
||||
"\ta third argument is required which is the address of the\n"
|
||||
"\tdevice-tree blob. To boot that kernel without an initrd image,\n"
|
||||
"\tuse a '-' for the second argument. If you do not pass a third\n"
|
||||
"\ta bd_info struct will be passed instead\n"
|
||||
#endif
|
||||
"";
|
||||
#endif
|
||||
|
||||
U_BOOT_CMD(
|
||||
bootz, CONFIG_SYS_MAXARGS, 1, do_bootz,
|
||||
"boot Linux zImage image from memory", bootz_help_text
|
||||
);
|
||||
#endif /* CONFIG_CMD_BOOTZ */
|
||||
|
||||
#ifdef CONFIG_CMD_BOOTI
|
||||
/* See Documentation/arm64/booting.txt in the Linux kernel */
|
||||
struct Image_header {
|
||||
uint32_t code0; /* Executable code */
|
||||
uint32_t code1; /* Executable code */
|
||||
uint64_t text_offset; /* Image load offset, LE */
|
||||
uint64_t image_size; /* Effective Image size, LE */
|
||||
uint64_t res1; /* reserved */
|
||||
uint64_t res2; /* reserved */
|
||||
uint64_t res3; /* reserved */
|
||||
uint64_t res4; /* reserved */
|
||||
uint32_t magic; /* Magic number */
|
||||
uint32_t res5;
|
||||
};
|
||||
|
||||
#define LINUX_ARM64_IMAGE_MAGIC 0x644d5241
|
||||
|
||||
static int booti_setup(bootm_headers_t *images)
|
||||
{
|
||||
struct Image_header *ih;
|
||||
uint64_t dst;
|
||||
uint64_t image_size;
|
||||
|
||||
ih = (struct Image_header *)map_sysmem(images->ep, 0);
|
||||
|
||||
if (ih->magic != le32_to_cpu(LINUX_ARM64_IMAGE_MAGIC)) {
|
||||
puts("Bad Linux ARM64 Image magic!\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (ih->image_size == 0) {
|
||||
puts("Image lacks image_size field, assuming 16MiB\n");
|
||||
image_size = 16 << 20;
|
||||
} else {
|
||||
image_size = le64_to_cpu(ih->image_size);
|
||||
}
|
||||
|
||||
/*
|
||||
* If we are not at the correct run-time location, set the new
|
||||
* correct location and then move the image there.
|
||||
*/
|
||||
dst = gd->bd->bi_dram[0].start + le64_to_cpu(ih->text_offset);
|
||||
|
||||
unmap_sysmem(ih);
|
||||
|
||||
if (images->ep != dst) {
|
||||
void *src;
|
||||
|
||||
debug("Moving Image from 0x%lx to 0x%llx\n", images->ep, dst);
|
||||
|
||||
src = (void *)images->ep;
|
||||
images->ep = dst;
|
||||
memmove((void *)dst, src, image_size);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Image booting support
|
||||
*/
|
||||
static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||
char * const argv[], bootm_headers_t *images)
|
||||
{
|
||||
int ret;
|
||||
struct Image_header *ih;
|
||||
|
||||
ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START,
|
||||
images, 1);
|
||||
|
||||
/* Setup Linux kernel Image entry point */
|
||||
if (!argc) {
|
||||
images->ep = load_addr;
|
||||
debug("* kernel: default image load address = 0x%08lx\n",
|
||||
load_addr);
|
||||
} else {
|
||||
images->ep = simple_strtoul(argv[0], NULL, 16);
|
||||
debug("* kernel: cmdline image address = 0x%08lx\n",
|
||||
images->ep);
|
||||
}
|
||||
|
||||
ret = booti_setup(images);
|
||||
if (ret != 0)
|
||||
return 1;
|
||||
|
||||
ih = (struct Image_header *)map_sysmem(images->ep, 0);
|
||||
|
||||
lmb_reserve(&images->lmb, images->ep, le32_to_cpu(ih->image_size));
|
||||
|
||||
unmap_sysmem(ih);
|
||||
|
||||
/*
|
||||
* 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;
|
||||
ret = do_bootm_states(cmdtp, flag, argc, argv,
|
||||
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
|
||||
);
|
||||
#endif /* CONFIG_CMD_BOOTI */
|
||||
|
|
|
|||
106
cmd/bootz.c
Normal file
106
cmd/bootz.c
Normal file
|
|
@ -0,0 +1,106 @@
|
|||
/*
|
||||
* (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 <lmb.h>
|
||||
#include <linux/compiler.h>
|
||||
|
||||
int __weak bootz_setup(ulong image, ulong *start, ulong *end)
|
||||
{
|
||||
/* Please define bootz_setup() for your platform */
|
||||
|
||||
puts("Your platform's zImage format isn't supported yet!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*
|
||||
* zImage booting support
|
||||
*/
|
||||
static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||
char * const argv[], bootm_headers_t *images)
|
||||
{
|
||||
int ret;
|
||||
ulong zi_start, zi_end;
|
||||
|
||||
ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START,
|
||||
images, 1);
|
||||
|
||||
/* Setup Linux kernel zImage entry point */
|
||||
if (!argc) {
|
||||
images->ep = load_addr;
|
||||
debug("* kernel: default image load address = 0x%08lx\n",
|
||||
load_addr);
|
||||
} else {
|
||||
images->ep = simple_strtoul(argv[0], NULL, 16);
|
||||
debug("* kernel: cmdline image address = 0x%08lx\n",
|
||||
images->ep);
|
||||
}
|
||||
|
||||
ret = bootz_setup(images->ep, &zi_start, &zi_end);
|
||||
if (ret != 0)
|
||||
return 1;
|
||||
|
||||
lmb_reserve(&images->lmb, images->ep, zi_end - zi_start);
|
||||
|
||||
/*
|
||||
* 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_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||
{
|
||||
int ret;
|
||||
|
||||
/* Consume 'bootz' */
|
||||
argc--; argv++;
|
||||
|
||||
if (bootz_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;
|
||||
ret = do_bootm_states(cmdtp, flag, argc, argv,
|
||||
BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO |
|
||||
BOOTM_STATE_OS_GO,
|
||||
&images, 1);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SYS_LONGHELP
|
||||
static char bootz_help_text[] =
|
||||
"[addr [initrd[:size]] [fdt]]\n"
|
||||
" - boot Linux zImage stored in memory\n"
|
||||
"\tThe argument 'initrd' is optional and specifies the address\n"
|
||||
"\tof the initrd in memory. The optional argument ':size' allows\n"
|
||||
"\tspecifying the size of RAW initrd.\n"
|
||||
#if defined(CONFIG_OF_LIBFDT)
|
||||
"\tWhen booting a Linux kernel which requires a flat device-tree\n"
|
||||
"\ta third argument is required which is the address of the\n"
|
||||
"\tdevice-tree blob. To boot that kernel without an initrd image,\n"
|
||||
"\tuse a '-' for the second argument. If you do not pass a third\n"
|
||||
"\ta bd_info struct will be passed instead\n"
|
||||
#endif
|
||||
"";
|
||||
#endif
|
||||
|
||||
U_BOOT_CMD(
|
||||
bootz, CONFIG_SYS_MAXARGS, 1, do_bootz,
|
||||
"boot Linux zImage image from memory", bootz_help_text
|
||||
);
|
||||
|
|
@ -26,6 +26,8 @@ obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o
|
|||
obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o
|
||||
|
||||
obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o
|
||||
obj-$(CONFIG_CMD_BOOTZ) += bootm.o bootm_os.o
|
||||
obj-$(CONFIG_CMD_BOOTI) += bootm.o bootm_os.o
|
||||
|
||||
# environment
|
||||
obj-y += env_attr.o
|
||||
|
|
|
|||
|
|
@ -41,6 +41,8 @@
|
|||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
bootm_headers_t images; /* pointers to os/initrd/fdt images */
|
||||
|
||||
static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||
char * const argv[], bootm_headers_t *images,
|
||||
ulong *os_data, ulong *os_len);
|
||||
|
|
|
|||
Loading…
Reference in a new issue