mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-31 03:21:32 +00:00
[new uImage] Cleanup cmd_bootm.c
- sort and cleanup headers, declarations, etc. - group related routines - cleanup indentation, white spaces Signed-off-by: Marian Balakowicz <m8@semihalf.com>
This commit is contained in:
parent
af13cdbc01
commit
1ee1180b6e
2 changed files with 321 additions and 310 deletions
|
@ -44,11 +44,6 @@
|
||||||
#include <ft_build.h>
|
#include <ft_build.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
|
||||||
|
|
||||||
/*cmd_boot.c*/
|
|
||||||
extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
|
||||||
|
|
||||||
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
|
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
|
||||||
#include <rtc.h>
|
#include <rtc.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -61,7 +56,12 @@ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
||||||
#include <dataflash.h>
|
#include <dataflash.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int gunzip (void *, int, unsigned char *, unsigned long *);
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
|
extern int gunzip (void *dst, int dstlen, unsigned char *src, unsigned long *lenp);
|
||||||
|
#ifndef CFG_BOOTM_LEN
|
||||||
|
#define CFG_BOOTM_LEN 0x800000 /* use 8MByte as default max gunzip size */
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_BZIP2
|
#ifdef CONFIG_BZIP2
|
||||||
extern void bz_internal_error(int);
|
extern void bz_internal_error(int);
|
||||||
|
@ -77,7 +77,12 @@ extern flash_info_t flash_info[]; /* info for FLASH chips */
|
||||||
static int do_imls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
static int do_imls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_SILENT_CONSOLE
|
||||||
|
static void fixup_silent_linux (void);
|
||||||
|
#endif
|
||||||
|
|
||||||
static void print_type (image_header_t *hdr);
|
static void print_type (image_header_t *hdr);
|
||||||
|
extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Continue booting an OS image; caller already has:
|
* Continue booting an OS image; caller already has:
|
||||||
|
@ -87,41 +92,38 @@ static void print_type (image_header_t *hdr);
|
||||||
* - loaded (first part of) image to header load address,
|
* - loaded (first part of) image to header load address,
|
||||||
* - disabled interrupts.
|
* - disabled interrupts.
|
||||||
*/
|
*/
|
||||||
typedef void boot_os_Fcn (cmd_tbl_t *cmdtp, int flag,
|
typedef void boot_os_fn (cmd_tbl_t *cmdtp, int flag,
|
||||||
int argc, char *argv[],
|
int argc, char *argv[],
|
||||||
ulong addr, /* of image to boot */
|
ulong addr, /* of image to boot */
|
||||||
ulong *len_ptr, /* multi-file image length table */
|
ulong *len_ptr, /* multi-file image length table */
|
||||||
int verify); /* getenv("verify")[0] != 'n' */
|
int verify); /* getenv("verify")[0] != 'n' */
|
||||||
|
|
||||||
extern boot_os_Fcn do_bootm_linux;
|
extern boot_os_fn do_bootm_linux;
|
||||||
|
static boot_os_fn do_bootm_netbsd;
|
||||||
#ifdef CONFIG_SILENT_CONSOLE
|
#ifdef CONFIG_LYNXKDI
|
||||||
static void fixup_silent_linux (void);
|
static boot_os_fn do_bootm_lynxkdi;
|
||||||
|
extern void lynxkdi_boot (image_header_t *);
|
||||||
#endif
|
#endif
|
||||||
static boot_os_Fcn do_bootm_netbsd;
|
static boot_os_fn do_bootm_rtems;
|
||||||
static boot_os_Fcn do_bootm_rtems;
|
|
||||||
#if defined(CONFIG_CMD_ELF)
|
#if defined(CONFIG_CMD_ELF)
|
||||||
static boot_os_Fcn do_bootm_vxworks;
|
static boot_os_fn do_bootm_vxworks;
|
||||||
static boot_os_Fcn do_bootm_qnxelf;
|
static boot_os_fn do_bootm_qnxelf;
|
||||||
int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
||||||
int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_ARTOS) && defined(CONFIG_PPC)
|
#if defined(CONFIG_ARTOS) && defined(CONFIG_PPC)
|
||||||
static boot_os_Fcn do_bootm_artos;
|
extern uchar (*env_get_char)(int); /* Returns a character from the environment */
|
||||||
#endif
|
static boot_os_fn do_bootm_artos;
|
||||||
#ifdef CONFIG_LYNXKDI
|
|
||||||
static boot_os_Fcn do_bootm_lynxkdi;
|
|
||||||
extern void lynxkdi_boot( image_header_t * );
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef CFG_BOOTM_LEN
|
|
||||||
#define CFG_BOOTM_LEN 0x800000 /* use 8MByte as default max gunzip size */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
image_header_t header;
|
image_header_t header;
|
||||||
|
|
||||||
ulong load_addr = CFG_LOAD_ADDR; /* Default Load Address */
|
ulong load_addr = CFG_LOAD_ADDR; /* Default Load Address */
|
||||||
|
|
||||||
|
|
||||||
|
/*******************************************************************/
|
||||||
|
/* bootm - boot application image from image in memory */
|
||||||
|
/*******************************************************************/
|
||||||
int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
{
|
{
|
||||||
ulong iflag;
|
ulong iflag;
|
||||||
|
@ -175,7 +177,6 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* for multi-file images we need the data part, too */
|
/* for multi-file images we need the data part, too */
|
||||||
print_image_hdr ((image_header_t *)addr);
|
print_image_hdr ((image_header_t *)addr);
|
||||||
|
|
||||||
|
@ -220,7 +221,8 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
for (i=1; len_ptr[i]; ++i)
|
for (i=1; len_ptr[i]; ++i)
|
||||||
data += 4;
|
data += 4;
|
||||||
break;
|
break;
|
||||||
default: printf ("Wrong Image Type for %s command\n", cmdtp->name);
|
default:
|
||||||
|
printf ("Wrong Image Type for %s command\n", cmdtp->name);
|
||||||
show_boot_progress (-5);
|
show_boot_progress (-5);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -231,7 +233,6 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
* overwrite all exception vector code, so we cannot easily
|
* overwrite all exception vector code, so we cannot easily
|
||||||
* recover from any failures any more...
|
* recover from any failures any more...
|
||||||
*/
|
*/
|
||||||
|
|
||||||
iflag = disable_interrupts();
|
iflag = disable_interrupts();
|
||||||
|
|
||||||
#ifdef CONFIG_AMIGAONEG3SE
|
#ifdef CONFIG_AMIGAONEG3SE
|
||||||
|
@ -334,6 +335,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
do_bootm_linux (cmdtp, flag, argc, argv,
|
do_bootm_linux (cmdtp, flag, argc, argv,
|
||||||
addr, len_ptr, verify);
|
addr, len_ptr, verify);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IH_OS_NETBSD:
|
case IH_OS_NETBSD:
|
||||||
do_bootm_netbsd (cmdtp, flag, argc, argv,
|
do_bootm_netbsd (cmdtp, flag, argc, argv,
|
||||||
addr, len_ptr, verify);
|
addr, len_ptr, verify);
|
||||||
|
@ -361,6 +363,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
addr, len_ptr, verify);
|
addr, len_ptr, verify);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_ARTOS
|
#ifdef CONFIG_ARTOS
|
||||||
case IH_OS_ARTOS:
|
case IH_OS_ARTOS:
|
||||||
do_bootm_artos (cmdtp, flag, argc, argv,
|
do_bootm_artos (cmdtp, flag, argc, argv,
|
||||||
|
@ -392,9 +395,259 @@ U_BOOT_CMD(
|
||||||
#endif
|
#endif
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/*******************************************************************/
|
||||||
|
/* bootd - boot default image */
|
||||||
|
/*******************************************************************/
|
||||||
|
#if defined(CONFIG_CMD_BOOTD)
|
||||||
|
int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
|
{
|
||||||
|
int rcode = 0;
|
||||||
|
|
||||||
|
#ifndef CFG_HUSH_PARSER
|
||||||
|
if (run_command (getenv ("bootcmd"), flag) < 0)
|
||||||
|
rcode = 1;
|
||||||
|
#else
|
||||||
|
if (parse_string_outer (getenv ("bootcmd"),
|
||||||
|
FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP) != 0)
|
||||||
|
rcode = 1;
|
||||||
|
#endif
|
||||||
|
return rcode;
|
||||||
|
}
|
||||||
|
|
||||||
|
U_BOOT_CMD(
|
||||||
|
boot, 1, 1, do_bootd,
|
||||||
|
"boot - boot default, i.e., run 'bootcmd'\n",
|
||||||
|
NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
/* keep old command name "bootd" for backward compatibility */
|
||||||
|
U_BOOT_CMD(
|
||||||
|
bootd, 1, 1, do_bootd,
|
||||||
|
"bootd - boot default, i.e., run 'bootcmd'\n",
|
||||||
|
NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/*******************************************************************/
|
||||||
|
/* iminfo - print header info for a requested image */
|
||||||
|
/*******************************************************************/
|
||||||
|
#if defined(CONFIG_CMD_IMI)
|
||||||
|
int do_iminfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
|
{
|
||||||
|
int arg;
|
||||||
|
ulong addr;
|
||||||
|
int rcode = 0;
|
||||||
|
|
||||||
|
if (argc < 2) {
|
||||||
|
return image_info (load_addr);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (arg = 1; arg < argc; ++arg) {
|
||||||
|
addr = simple_strtoul (argv[arg], NULL, 16);
|
||||||
|
if (image_info (addr) != 0)
|
||||||
|
rcode = 1;
|
||||||
|
}
|
||||||
|
return rcode;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int image_info (ulong addr)
|
||||||
|
{
|
||||||
|
image_header_t *hdr = (image_header_t *)addr;
|
||||||
|
|
||||||
|
printf ("\n## Checking Image at %08lx ...\n", addr);
|
||||||
|
|
||||||
|
if (!image_check_magic (hdr)) {
|
||||||
|
puts (" Bad Magic Number\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!image_check_hcrc (hdr)) {
|
||||||
|
puts (" Bad Header Checksum\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
print_image_hdr (hdr);
|
||||||
|
|
||||||
|
puts (" Verifying Checksum ... ");
|
||||||
|
if (!image_check_dcrc (hdr)) {
|
||||||
|
puts (" Bad Data CRC\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
puts ("OK\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
U_BOOT_CMD(
|
||||||
|
iminfo, CFG_MAXARGS, 1, do_iminfo,
|
||||||
|
"iminfo - print header information for application image\n",
|
||||||
|
"addr [addr ...]\n"
|
||||||
|
" - print header information for application image starting at\n"
|
||||||
|
" address 'addr' in memory; this includes verification of the\n"
|
||||||
|
" image contents (magic number, header and payload checksums)\n"
|
||||||
|
);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/*******************************************************************/
|
||||||
|
/* imls - list all images found in flash */
|
||||||
|
/*******************************************************************/
|
||||||
|
#if defined(CONFIG_CMD_IMLS)
|
||||||
|
int do_imls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
|
{
|
||||||
|
flash_info_t *info;
|
||||||
|
int i, j;
|
||||||
|
image_header_t *hdr;
|
||||||
|
|
||||||
|
for (i = 0, info = &flash_info[0];
|
||||||
|
i < CFG_MAX_FLASH_BANKS; ++i, ++info) {
|
||||||
|
|
||||||
|
if (info->flash_id == FLASH_UNKNOWN)
|
||||||
|
goto next_bank;
|
||||||
|
for (j = 0; j < info->sector_count; ++j) {
|
||||||
|
|
||||||
|
hdr = (image_header_t *)info->start[j];
|
||||||
|
|
||||||
|
if (!hdr || !image_check_magic (hdr))
|
||||||
|
goto next_sector;
|
||||||
|
|
||||||
|
if (!image_check_hcrc (hdr))
|
||||||
|
goto next_sector;
|
||||||
|
|
||||||
|
printf ("Image at %08lX:\n", (ulong)hdr);
|
||||||
|
print_image_hdr (hdr);
|
||||||
|
|
||||||
|
puts (" Verifying Checksum ... ");
|
||||||
|
if (!image_check_dcrc (hdr)) {
|
||||||
|
puts ("Bad Data CRC\n");
|
||||||
|
} else {
|
||||||
|
puts ("OK\n");
|
||||||
|
}
|
||||||
|
next_sector: ;
|
||||||
|
}
|
||||||
|
next_bank: ;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
U_BOOT_CMD(
|
||||||
|
imls, 1, 1, do_imls,
|
||||||
|
"imls - list all images found in flash\n",
|
||||||
|
"\n"
|
||||||
|
" - Prints information about all images found at sector\n"
|
||||||
|
" boundaries in flash.\n"
|
||||||
|
);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*******************************************************************/
|
||||||
|
/* */
|
||||||
|
/*******************************************************************/
|
||||||
|
void print_image_hdr (image_header_t *hdr)
|
||||||
|
{
|
||||||
|
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
|
||||||
|
time_t timestamp = (time_t)image_get_time (hdr);
|
||||||
|
struct rtc_time tm;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
printf (" Image Name: %.*s\n", IH_NMLEN, image_get_name (hdr));
|
||||||
|
|
||||||
|
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
|
||||||
|
to_tm (timestamp, &tm);
|
||||||
|
printf (" Created: %4d-%02d-%02d %2d:%02d:%02d UTC\n",
|
||||||
|
tm.tm_year, tm.tm_mon, tm.tm_mday,
|
||||||
|
tm.tm_hour, tm.tm_min, tm.tm_sec);
|
||||||
|
#endif
|
||||||
|
puts (" Image Type: ");
|
||||||
|
print_type (hdr);
|
||||||
|
|
||||||
|
printf ("\n Data Size: %d Bytes = ", image_get_data_size (hdr));
|
||||||
|
print_size (image_get_data_size (hdr), "\n");
|
||||||
|
printf (" Load Address: %08x\n"
|
||||||
|
" Entry Point: %08x\n",
|
||||||
|
image_get_load (hdr), image_get_ep (hdr));
|
||||||
|
|
||||||
|
if (image_check_type (hdr, IH_TYPE_MULTI)) {
|
||||||
|
int i;
|
||||||
|
ulong len;
|
||||||
|
ulong *len_ptr = (ulong *)((ulong)hdr + image_get_header_size ());
|
||||||
|
|
||||||
|
puts (" Contents:\n");
|
||||||
|
for (i = 0; (len = image_to_cpu (*len_ptr)); ++i, ++len_ptr) {
|
||||||
|
printf (" Image %d: %8ld Bytes = ", i, len);
|
||||||
|
print_size (len, "\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void print_type (image_header_t *hdr)
|
||||||
|
{
|
||||||
|
char *os, *arch, *type, *comp;
|
||||||
|
|
||||||
|
switch (image_get_os (hdr)) {
|
||||||
|
case IH_OS_INVALID: os = "Invalid OS"; break;
|
||||||
|
case IH_OS_NETBSD: os = "NetBSD"; break;
|
||||||
|
case IH_OS_LINUX: os = "Linux"; break;
|
||||||
|
case IH_OS_VXWORKS: os = "VxWorks"; break;
|
||||||
|
case IH_OS_QNX: os = "QNX"; break;
|
||||||
|
case IH_OS_U_BOOT: os = "U-Boot"; break;
|
||||||
|
case IH_OS_RTEMS: os = "RTEMS"; break;
|
||||||
|
#ifdef CONFIG_ARTOS
|
||||||
|
case IH_OS_ARTOS: os = "ARTOS"; break;
|
||||||
|
#endif
|
||||||
|
#ifdef CONFIG_LYNXKDI
|
||||||
|
case IH_OS_LYNXOS: os = "LynxOS"; break;
|
||||||
|
#endif
|
||||||
|
default: os = "Unknown OS"; break;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (image_get_arch (hdr)) {
|
||||||
|
case IH_ARCH_INVALID: arch = "Invalid CPU"; break;
|
||||||
|
case IH_ARCH_ALPHA: arch = "Alpha"; break;
|
||||||
|
case IH_ARCH_ARM: arch = "ARM"; break;
|
||||||
|
case IH_ARCH_AVR32: arch = "AVR32"; break;
|
||||||
|
case IH_ARCH_BLACKFIN: arch = "Blackfin"; break;
|
||||||
|
case IH_ARCH_I386: arch = "Intel x86"; break;
|
||||||
|
case IH_ARCH_IA64: arch = "IA64"; break;
|
||||||
|
case IH_ARCH_M68K: arch = "M68K"; break;
|
||||||
|
case IH_ARCH_MICROBLAZE:arch = "Microblaze"; break;
|
||||||
|
case IH_ARCH_MIPS64: arch = "MIPS 64 Bit"; break;
|
||||||
|
case IH_ARCH_MIPS: arch = "MIPS"; break;
|
||||||
|
case IH_ARCH_NIOS2: arch = "Nios-II"; break;
|
||||||
|
case IH_ARCH_NIOS: arch = "Nios"; break;
|
||||||
|
case IH_ARCH_PPC: arch = "PowerPC"; break;
|
||||||
|
case IH_ARCH_S390: arch = "IBM S390"; break;
|
||||||
|
case IH_ARCH_SH: arch = "SuperH"; break;
|
||||||
|
case IH_ARCH_SPARC64: arch = "SPARC 64 Bit"; break;
|
||||||
|
case IH_ARCH_SPARC: arch = "SPARC"; break;
|
||||||
|
default: arch = "Unknown Architecture"; break;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (image_get_type (hdr)) {
|
||||||
|
case IH_TYPE_INVALID: type = "Invalid Image"; break;
|
||||||
|
case IH_TYPE_STANDALONE:type = "Standalone Program"; break;
|
||||||
|
case IH_TYPE_KERNEL: type = "Kernel Image"; break;
|
||||||
|
case IH_TYPE_RAMDISK: type = "RAMDisk Image"; break;
|
||||||
|
case IH_TYPE_MULTI: type = "Multi-File Image"; break;
|
||||||
|
case IH_TYPE_FIRMWARE: type = "Firmware"; break;
|
||||||
|
case IH_TYPE_SCRIPT: type = "Script"; break;
|
||||||
|
case IH_TYPE_FLATDT: type = "Flat Device Tree"; break;
|
||||||
|
default: type = "Unknown Image"; break;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (image_get_comp (hdr)) {
|
||||||
|
case IH_COMP_NONE: comp = "uncompressed"; break;
|
||||||
|
case IH_COMP_GZIP: comp = "gzip compressed"; break;
|
||||||
|
case IH_COMP_BZIP2: comp = "bzip2 compressed"; break;
|
||||||
|
default: comp = "unknown compression"; break;
|
||||||
|
}
|
||||||
|
|
||||||
|
printf ("%s %s %s (%s)", arch, os, type, comp);
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_SILENT_CONSOLE
|
#ifdef CONFIG_SILENT_CONSOLE
|
||||||
static void
|
static void fixup_silent_linux ()
|
||||||
fixup_silent_linux ()
|
|
||||||
{
|
{
|
||||||
char buf[256], *start, *end;
|
char buf[256], *start, *end;
|
||||||
char *cmdline = getenv ("bootargs");
|
char *cmdline = getenv ("bootargs");
|
||||||
|
@ -425,11 +678,14 @@ fixup_silent_linux ()
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_SILENT_CONSOLE */
|
#endif /* CONFIG_SILENT_CONSOLE */
|
||||||
|
|
||||||
static void
|
|
||||||
do_bootm_netbsd (cmd_tbl_t *cmdtp, int flag,
|
/*******************************************************************/
|
||||||
|
/* OS booting routines */
|
||||||
|
/*******************************************************************/
|
||||||
|
|
||||||
|
static void do_bootm_netbsd (cmd_tbl_t *cmdtp, int flag,
|
||||||
int argc, char *argv[],
|
int argc, char *argv[],
|
||||||
ulong addr,
|
ulong addr, ulong *len_ptr,
|
||||||
ulong *len_ptr,
|
|
||||||
int verify)
|
int verify)
|
||||||
{
|
{
|
||||||
image_header_t *hdr = &header;
|
image_header_t *hdr = &header;
|
||||||
|
@ -439,7 +695,6 @@ do_bootm_netbsd (cmd_tbl_t *cmdtp, int flag,
|
||||||
char *consdev;
|
char *consdev;
|
||||||
char *cmdline;
|
char *cmdline;
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Booting a (NetBSD) kernel image
|
* Booting a (NetBSD) kernel image
|
||||||
*
|
*
|
||||||
|
@ -456,7 +711,6 @@ do_bootm_netbsd (cmd_tbl_t *cmdtp, int flag,
|
||||||
if ((image_check_type (hdr, IH_TYPE_MULTI)) && (len_ptr[1]))
|
if ((image_check_type (hdr, IH_TYPE_MULTI)) && (len_ptr[1]))
|
||||||
img_addr = (image_header_t *)addr;
|
img_addr = (image_header_t *)addr;
|
||||||
|
|
||||||
|
|
||||||
consdev = "";
|
consdev = "";
|
||||||
#if defined (CONFIG_8xx_CONS_SMC1)
|
#if defined (CONFIG_8xx_CONS_SMC1)
|
||||||
consdev = "smc1";
|
consdev = "smc1";
|
||||||
|
@ -503,16 +757,72 @@ do_bootm_netbsd (cmd_tbl_t *cmdtp, int flag,
|
||||||
(*loader) (gd->bd, img_addr, consdev, cmdline);
|
(*loader) (gd->bd, img_addr, consdev, cmdline);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_ARTOS) && defined(CONFIG_PPC)
|
#ifdef CONFIG_LYNXKDI
|
||||||
|
static void do_bootm_lynxkdi (cmd_tbl_t *cmdtp, int flag,
|
||||||
/* Function that returns a character from the environment */
|
|
||||||
extern uchar (*env_get_char)(int);
|
|
||||||
|
|
||||||
static void
|
|
||||||
do_bootm_artos (cmd_tbl_t *cmdtp, int flag,
|
|
||||||
int argc, char *argv[],
|
int argc, char *argv[],
|
||||||
ulong addr,
|
ulong addr, ulong *len_ptr,
|
||||||
ulong *len_ptr,
|
int verify)
|
||||||
|
{
|
||||||
|
lynxkdi_boot (&header);
|
||||||
|
}
|
||||||
|
#endif /* CONFIG_LYNXKDI */
|
||||||
|
|
||||||
|
static void do_bootm_rtems (cmd_tbl_t *cmdtp, int flag,
|
||||||
|
int argc, char *argv[],
|
||||||
|
ulong addr, ulong *len_ptr,
|
||||||
|
int verify)
|
||||||
|
{
|
||||||
|
image_header_t *hdr = &header;
|
||||||
|
void (*entry_point)(bd_t *);
|
||||||
|
|
||||||
|
entry_point = (void (*)(bd_t *))image_get_ep (hdr);
|
||||||
|
|
||||||
|
printf ("## Transferring control to RTEMS (at address %08lx) ...\n",
|
||||||
|
(ulong)entry_point);
|
||||||
|
|
||||||
|
show_boot_progress (15);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* RTEMS Parameters:
|
||||||
|
* r3: ptr to board info data
|
||||||
|
*/
|
||||||
|
(*entry_point)(gd->bd);
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(CONFIG_CMD_ELF)
|
||||||
|
static void do_bootm_vxworks (cmd_tbl_t *cmdtp, int flag,
|
||||||
|
int argc, char *argv[],
|
||||||
|
ulong addr, ulong *len_ptr,
|
||||||
|
int verify)
|
||||||
|
{
|
||||||
|
image_header_t *hdr = &header;
|
||||||
|
char str[80];
|
||||||
|
|
||||||
|
sprintf(str, "%x", image_get_ep (hdr)); /* write entry-point into string */
|
||||||
|
setenv("loadaddr", str);
|
||||||
|
do_bootvx(cmdtp, 0, 0, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void do_bootm_qnxelf (cmd_tbl_t *cmdtp, int flag,
|
||||||
|
int argc, char *argv[],
|
||||||
|
ulong addr, ulong *len_ptr,
|
||||||
|
int verify)
|
||||||
|
{
|
||||||
|
image_header_t *hdr = &header;
|
||||||
|
char *local_args[2];
|
||||||
|
char str[16];
|
||||||
|
|
||||||
|
sprintf(str, "%x", image_get_ep (hdr)); /* write entry-point into string */
|
||||||
|
local_args[0] = argv[0];
|
||||||
|
local_args[1] = str; /* and provide it via the arguments */
|
||||||
|
do_bootelf(cmdtp, 0, 2, local_args);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(CONFIG_ARTOS) && defined(CONFIG_PPC)
|
||||||
|
static void do_bootm_artos (cmd_tbl_t *cmdtp, int flag,
|
||||||
|
int argc, char *argv[],
|
||||||
|
ulong addr, ulong *len_ptr,
|
||||||
int verify)
|
int verify)
|
||||||
{
|
{
|
||||||
ulong top;
|
ulong top;
|
||||||
|
@ -593,302 +903,3 @@ do_bootm_artos (cmd_tbl_t *cmdtp, int flag,
|
||||||
(*entry) (kbd, cmdline, fwenv, top);
|
(*entry) (kbd, cmdline, fwenv, top);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#if defined(CONFIG_CMD_BOOTD)
|
|
||||||
int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|
||||||
{
|
|
||||||
int rcode = 0;
|
|
||||||
#ifndef CFG_HUSH_PARSER
|
|
||||||
if (run_command (getenv ("bootcmd"), flag) < 0) rcode = 1;
|
|
||||||
#else
|
|
||||||
if (parse_string_outer(getenv("bootcmd"),
|
|
||||||
FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP) != 0 ) rcode = 1;
|
|
||||||
#endif
|
|
||||||
return rcode;
|
|
||||||
}
|
|
||||||
|
|
||||||
U_BOOT_CMD(
|
|
||||||
boot, 1, 1, do_bootd,
|
|
||||||
"boot - boot default, i.e., run 'bootcmd'\n",
|
|
||||||
NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
/* keep old command name "bootd" for backward compatibility */
|
|
||||||
U_BOOT_CMD(
|
|
||||||
bootd, 1, 1, do_bootd,
|
|
||||||
"bootd - boot default, i.e., run 'bootcmd'\n",
|
|
||||||
NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(CONFIG_CMD_IMI)
|
|
||||||
int do_iminfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|
||||||
{
|
|
||||||
int arg;
|
|
||||||
ulong addr;
|
|
||||||
int rcode=0;
|
|
||||||
|
|
||||||
if (argc < 2) {
|
|
||||||
return image_info (load_addr);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (arg=1; arg <argc; ++arg) {
|
|
||||||
addr = simple_strtoul(argv[arg], NULL, 16);
|
|
||||||
if (image_info (addr) != 0) rcode = 1;
|
|
||||||
}
|
|
||||||
return rcode;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int image_info (ulong addr)
|
|
||||||
{
|
|
||||||
image_header_t *hdr = (image_header_t *)addr;
|
|
||||||
|
|
||||||
printf ("\n## Checking Image at %08lx ...\n", addr);
|
|
||||||
|
|
||||||
if (!image_check_magic (hdr)) {
|
|
||||||
puts (" Bad Magic Number\n");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!image_check_hcrc (hdr)) {
|
|
||||||
puts (" Bad Header Checksum\n");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
print_image_hdr (hdr);
|
|
||||||
|
|
||||||
puts (" Verifying Checksum ... ");
|
|
||||||
if (!image_check_dcrc (hdr)) {
|
|
||||||
puts (" Bad Data CRC\n");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
puts ("OK\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
U_BOOT_CMD(
|
|
||||||
iminfo, CFG_MAXARGS, 1, do_iminfo,
|
|
||||||
"iminfo - print header information for application image\n",
|
|
||||||
"addr [addr ...]\n"
|
|
||||||
" - print header information for application image starting at\n"
|
|
||||||
" address 'addr' in memory; this includes verification of the\n"
|
|
||||||
" image contents (magic number, header and payload checksums)\n"
|
|
||||||
);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(CONFIG_CMD_IMLS)
|
|
||||||
/*-----------------------------------------------------------------------
|
|
||||||
* List all images found in flash.
|
|
||||||
*/
|
|
||||||
int do_imls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|
||||||
{
|
|
||||||
flash_info_t *info;
|
|
||||||
int i, j;
|
|
||||||
image_header_t *hdr;
|
|
||||||
|
|
||||||
for (i=0, info=&flash_info[0]; i<CFG_MAX_FLASH_BANKS; ++i, ++info) {
|
|
||||||
if (info->flash_id == FLASH_UNKNOWN)
|
|
||||||
goto next_bank;
|
|
||||||
for (j=0; j<info->sector_count; ++j) {
|
|
||||||
|
|
||||||
hdr = (image_header_t *)info->start[j];
|
|
||||||
|
|
||||||
if (!hdr || !image_check_magic (hdr))
|
|
||||||
goto next_sector;
|
|
||||||
|
|
||||||
if (!image_check_hcrc (hdr))
|
|
||||||
goto next_sector;
|
|
||||||
|
|
||||||
printf ("Image at %08lX:\n", (ulong)hdr);
|
|
||||||
print_image_hdr (hdr);
|
|
||||||
|
|
||||||
puts (" Verifying Checksum ... ");
|
|
||||||
if (!image_check_dcrc (hdr)) {
|
|
||||||
puts ("Bad Data CRC\n");
|
|
||||||
} else {
|
|
||||||
puts ("OK\n");
|
|
||||||
}
|
|
||||||
next_sector: ;
|
|
||||||
}
|
|
||||||
next_bank: ;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
|
|
||||||
U_BOOT_CMD(
|
|
||||||
imls, 1, 1, do_imls,
|
|
||||||
"imls - list all images found in flash\n",
|
|
||||||
"\n"
|
|
||||||
" - Prints information about all images found at sector\n"
|
|
||||||
" boundaries in flash.\n"
|
|
||||||
);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void
|
|
||||||
print_image_hdr (image_header_t *hdr)
|
|
||||||
{
|
|
||||||
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
|
|
||||||
time_t timestamp = (time_t)image_get_time (hdr);
|
|
||||||
struct rtc_time tm;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
printf (" Image Name: %.*s\n", IH_NMLEN, image_get_name (hdr));
|
|
||||||
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
|
|
||||||
to_tm (timestamp, &tm);
|
|
||||||
printf (" Created: %4d-%02d-%02d %2d:%02d:%02d UTC\n",
|
|
||||||
tm.tm_year, tm.tm_mon, tm.tm_mday,
|
|
||||||
tm.tm_hour, tm.tm_min, tm.tm_sec);
|
|
||||||
#endif
|
|
||||||
puts (" Image Type: "); print_type(hdr);
|
|
||||||
printf ("\n Data Size: %d Bytes = ", image_get_data_size (hdr));
|
|
||||||
print_size (image_get_data_size (hdr), "\n");
|
|
||||||
printf (" Load Address: %08x\n"
|
|
||||||
" Entry Point: %08x\n",
|
|
||||||
image_get_load (hdr), image_get_ep (hdr));
|
|
||||||
|
|
||||||
if (image_check_type (hdr, IH_TYPE_MULTI)) {
|
|
||||||
int i;
|
|
||||||
ulong len;
|
|
||||||
ulong *len_ptr = (ulong *)((ulong)hdr + image_get_header_size ());
|
|
||||||
|
|
||||||
puts (" Contents:\n");
|
|
||||||
for (i=0; (len = image_to_cpu (*len_ptr)); ++i, ++len_ptr) {
|
|
||||||
printf (" Image %d: %8ld Bytes = ", i, len);
|
|
||||||
print_size (len, "\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static void
|
|
||||||
print_type (image_header_t *hdr)
|
|
||||||
{
|
|
||||||
char *os, *arch, *type, *comp;
|
|
||||||
|
|
||||||
switch (image_get_os (hdr)) {
|
|
||||||
case IH_OS_INVALID: os = "Invalid OS"; break;
|
|
||||||
case IH_OS_NETBSD: os = "NetBSD"; break;
|
|
||||||
case IH_OS_LINUX: os = "Linux"; break;
|
|
||||||
case IH_OS_VXWORKS: os = "VxWorks"; break;
|
|
||||||
case IH_OS_QNX: os = "QNX"; break;
|
|
||||||
case IH_OS_U_BOOT: os = "U-Boot"; break;
|
|
||||||
case IH_OS_RTEMS: os = "RTEMS"; break;
|
|
||||||
#ifdef CONFIG_ARTOS
|
|
||||||
case IH_OS_ARTOS: os = "ARTOS"; break;
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_LYNXKDI
|
|
||||||
case IH_OS_LYNXOS: os = "LynxOS"; break;
|
|
||||||
#endif
|
|
||||||
default: os = "Unknown OS"; break;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (image_get_arch (hdr)) {
|
|
||||||
case IH_ARCH_INVALID: arch = "Invalid CPU"; break;
|
|
||||||
case IH_ARCH_ALPHA: arch = "Alpha"; break;
|
|
||||||
case IH_ARCH_ARM: arch = "ARM"; break;
|
|
||||||
case IH_ARCH_AVR32: arch = "AVR32"; break;
|
|
||||||
case IH_ARCH_BLACKFIN: arch = "Blackfin"; break;
|
|
||||||
case IH_ARCH_I386: arch = "Intel x86"; break;
|
|
||||||
case IH_ARCH_IA64: arch = "IA64"; break;
|
|
||||||
case IH_ARCH_M68K: arch = "M68K"; break;
|
|
||||||
case IH_ARCH_MICROBLAZE:arch = "Microblaze"; break;
|
|
||||||
case IH_ARCH_MIPS64: arch = "MIPS 64 Bit"; break;
|
|
||||||
case IH_ARCH_MIPS: arch = "MIPS"; break;
|
|
||||||
case IH_ARCH_NIOS2: arch = "Nios-II"; break;
|
|
||||||
case IH_ARCH_NIOS: arch = "Nios"; break;
|
|
||||||
case IH_ARCH_PPC: arch = "PowerPC"; break;
|
|
||||||
case IH_ARCH_S390: arch = "IBM S390"; break;
|
|
||||||
case IH_ARCH_SH: arch = "SuperH"; break;
|
|
||||||
case IH_ARCH_SPARC64: arch = "SPARC 64 Bit"; break;
|
|
||||||
case IH_ARCH_SPARC: arch = "SPARC"; break;
|
|
||||||
default: arch = "Unknown Architecture"; break;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (image_get_type (hdr)) {
|
|
||||||
case IH_TYPE_INVALID: type = "Invalid Image"; break;
|
|
||||||
case IH_TYPE_STANDALONE:type = "Standalone Program"; break;
|
|
||||||
case IH_TYPE_KERNEL: type = "Kernel Image"; break;
|
|
||||||
case IH_TYPE_RAMDISK: type = "RAMDisk Image"; break;
|
|
||||||
case IH_TYPE_MULTI: type = "Multi-File Image"; break;
|
|
||||||
case IH_TYPE_FIRMWARE: type = "Firmware"; break;
|
|
||||||
case IH_TYPE_SCRIPT: type = "Script"; break;
|
|
||||||
case IH_TYPE_FLATDT: type = "Flat Device Tree"; break;
|
|
||||||
default: type = "Unknown Image"; break;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (image_get_comp (hdr)) {
|
|
||||||
case IH_COMP_NONE: comp = "uncompressed"; break;
|
|
||||||
case IH_COMP_GZIP: comp = "gzip compressed"; break;
|
|
||||||
case IH_COMP_BZIP2: comp = "bzip2 compressed"; break;
|
|
||||||
default: comp = "unknown compression"; break;
|
|
||||||
}
|
|
||||||
|
|
||||||
printf ("%s %s %s (%s)", arch, os, type, comp);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
do_bootm_rtems (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|
||||||
ulong addr, ulong *len_ptr, int verify)
|
|
||||||
{
|
|
||||||
image_header_t *hdr = &header;
|
|
||||||
void (*entry_point)(bd_t *);
|
|
||||||
|
|
||||||
entry_point = (void (*)(bd_t *))image_get_ep (hdr);
|
|
||||||
|
|
||||||
printf ("## Transferring control to RTEMS (at address %08lx) ...\n",
|
|
||||||
(ulong)entry_point);
|
|
||||||
|
|
||||||
show_boot_progress (15);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* RTEMS Parameters:
|
|
||||||
* r3: ptr to board info data
|
|
||||||
*/
|
|
||||||
|
|
||||||
(*entry_point ) ( gd->bd );
|
|
||||||
}
|
|
||||||
|
|
||||||
#if defined(CONFIG_CMD_ELF)
|
|
||||||
static void
|
|
||||||
do_bootm_vxworks (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|
||||||
ulong addr, ulong *len_ptr, int verify)
|
|
||||||
{
|
|
||||||
image_header_t *hdr = &header;
|
|
||||||
char str[80];
|
|
||||||
|
|
||||||
sprintf(str, "%x", image_get_ep (hdr)); /* write entry-point into string */
|
|
||||||
setenv("loadaddr", str);
|
|
||||||
do_bootvx(cmdtp, 0, 0, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
do_bootm_qnxelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
|
|
||||||
ulong addr, ulong *len_ptr, int verify)
|
|
||||||
{
|
|
||||||
image_header_t *hdr = &header;
|
|
||||||
char *local_args[2];
|
|
||||||
char str[16];
|
|
||||||
|
|
||||||
sprintf(str, "%x", image_get_ep (hdr)); /* write entry-point into string */
|
|
||||||
local_args[0] = argv[0];
|
|
||||||
local_args[1] = str; /* and provide it via the arguments */
|
|
||||||
do_bootelf(cmdtp, 0, 2, local_args);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_LYNXKDI
|
|
||||||
static void
|
|
||||||
do_bootm_lynxkdi (cmd_tbl_t *cmdtp, int flag,
|
|
||||||
int argc, char *argv[],
|
|
||||||
ulong addr,
|
|
||||||
ulong *len_ptr,
|
|
||||||
int verify)
|
|
||||||
{
|
|
||||||
lynxkdi_boot( &header );
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* CONFIG_LYNXKDI */
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue