mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-01 09:00:45 +09:00
[new uImage] Rename and move print_image_hdr() routine
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
This commit is contained in:
parent
f50433d670
commit
2242f53698
@ -185,7 +185,7 @@ mpl_prg_image(uchar *ld_addr)
|
|||||||
puts("Bad Magic Number\n");
|
puts("Bad Magic Number\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
print_image_hdr(hdr);
|
image_print_contents (hdr);
|
||||||
if (!image_check_os (hdr, IH_OS_U_BOOT)) {
|
if (!image_check_os (hdr, IH_OS_U_BOOT)) {
|
||||||
puts("No U-Boot Image\n");
|
puts("No U-Boot Image\n");
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -36,10 +36,6 @@
|
|||||||
#include <environment.h>
|
#include <environment.h>
|
||||||
#include <asm/byteorder.h>
|
#include <asm/byteorder.h>
|
||||||
|
|
||||||
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
|
|
||||||
#include <rtc.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CFG_HUSH_PARSER
|
#ifdef CFG_HUSH_PARSER
|
||||||
#include <hush.h>
|
#include <hush.h>
|
||||||
#endif
|
#endif
|
||||||
@ -69,7 +65,6 @@ static int do_imls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
|||||||
static void fixup_silent_linux (void);
|
static void fixup_silent_linux (void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void print_type (image_header_t *hdr);
|
|
||||||
static image_header_t *get_kernel (cmd_tbl_t *cmdtp, int flag,
|
static image_header_t *get_kernel (cmd_tbl_t *cmdtp, int flag,
|
||||||
int argc, char *argv[], int verify,
|
int argc, char *argv[], int verify,
|
||||||
ulong *os_data, ulong *os_len);
|
ulong *os_data, ulong *os_len);
|
||||||
@ -318,7 +313,7 @@ static image_header_t *get_kernel (cmd_tbl_t *cmdtp, int flag,
|
|||||||
}
|
}
|
||||||
|
|
||||||
show_boot_progress (3);
|
show_boot_progress (3);
|
||||||
print_image_hdr (hdr);
|
image_print_contents (hdr);
|
||||||
|
|
||||||
if (verify) {
|
if (verify) {
|
||||||
puts (" Verifying Checksum ... ");
|
puts (" Verifying Checksum ... ");
|
||||||
@ -445,7 +440,7 @@ static int image_info (ulong addr)
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
print_image_hdr (hdr);
|
image_print_contents (hdr);
|
||||||
|
|
||||||
puts (" Verifying Checksum ... ");
|
puts (" Verifying Checksum ... ");
|
||||||
if (!image_check_dcrc (hdr)) {
|
if (!image_check_dcrc (hdr)) {
|
||||||
@ -493,7 +488,7 @@ int do_imls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||||||
goto next_sector;
|
goto next_sector;
|
||||||
|
|
||||||
printf ("Image at %08lX:\n", (ulong)hdr);
|
printf ("Image at %08lX:\n", (ulong)hdr);
|
||||||
print_image_hdr (hdr);
|
image_print_contents (hdr);
|
||||||
|
|
||||||
puts (" Verifying Checksum ... ");
|
puts (" Verifying Checksum ... ");
|
||||||
if (!image_check_dcrc (hdr)) {
|
if (!image_check_dcrc (hdr)) {
|
||||||
@ -521,56 +516,6 @@ U_BOOT_CMD(
|
|||||||
/*******************************************************************/
|
/*******************************************************************/
|
||||||
/* helper routines */
|
/* helper routines */
|
||||||
/*******************************************************************/
|
/*******************************************************************/
|
||||||
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 data, len;
|
|
||||||
ulong count = image_multi_count (hdr);
|
|
||||||
|
|
||||||
puts (" Contents:\n");
|
|
||||||
for (i = 0; i < count; i++) {
|
|
||||||
image_multi_getimg (hdr, i, &data, &len);
|
|
||||||
printf (" Image %d: %8ld Bytes = ", i, len);
|
|
||||||
print_size (len, "\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void print_type (image_header_t *hdr)
|
|
||||||
{
|
|
||||||
const char *os, *arch, *type, *comp;
|
|
||||||
|
|
||||||
os = image_get_os_name (image_get_os (hdr));
|
|
||||||
arch = image_get_arch_name (image_get_arch (hdr));
|
|
||||||
type = image_get_type_name (image_get_type (hdr));
|
|
||||||
comp = image_get_comp_name (image_get_comp (hdr));
|
|
||||||
|
|
||||||
printf ("%s %s %s (%s)", arch, os, type, comp);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_SILENT_CONSOLE
|
#ifdef CONFIG_SILENT_CONSOLE
|
||||||
static void fixup_silent_linux ()
|
static void fixup_silent_linux ()
|
||||||
{
|
{
|
||||||
|
@ -265,7 +265,7 @@ int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||||||
|
|
||||||
if (image_check_magic (hdr)) {
|
if (image_check_magic (hdr)) {
|
||||||
|
|
||||||
print_image_hdr (hdr);
|
image_print_contents (hdr);
|
||||||
|
|
||||||
cnt = image_get_image_size (hdr);
|
cnt = image_get_image_size (hdr);
|
||||||
cnt -= SECTORSIZE;
|
cnt -= SECTORSIZE;
|
||||||
|
@ -840,7 +840,7 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||||||
printf ("Bad Magic Number\n");
|
printf ("Bad Magic Number\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
print_image_hdr (hdr);
|
image_print_contents (hdr);
|
||||||
|
|
||||||
imsize= image_get_image_size (hdr);
|
imsize= image_get_image_size (hdr);
|
||||||
nrofblk=imsize/512;
|
nrofblk=imsize/512;
|
||||||
|
@ -462,7 +462,7 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||||||
}
|
}
|
||||||
show_boot_progress (50);
|
show_boot_progress (50);
|
||||||
|
|
||||||
print_image_hdr (hdr);
|
image_print_contents (hdr);
|
||||||
|
|
||||||
cnt = image_get_image_size (hdr);
|
cnt = image_get_image_size (hdr);
|
||||||
cnt += info.blksz - 1;
|
cnt += info.blksz - 1;
|
||||||
|
@ -521,7 +521,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
|
|||||||
}
|
}
|
||||||
show_boot_progress (57);
|
show_boot_progress (57);
|
||||||
|
|
||||||
print_image_hdr (hdr);
|
image_print_contents (hdr);
|
||||||
|
|
||||||
cnt = image_get_image_size (hdr);
|
cnt = image_get_image_size (hdr);
|
||||||
if (jffs2) {
|
if (jffs2) {
|
||||||
@ -984,7 +984,7 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||||||
|
|
||||||
if (image_check_magic (hdr)) {
|
if (image_check_magic (hdr)) {
|
||||||
|
|
||||||
print_image_hdr (hdr);
|
image_print_contents (hdr);
|
||||||
|
|
||||||
cnt = image_get_image_size (hdr);
|
cnt = image_get_image_size (hdr);
|
||||||
cnt -= SECTORSIZE;
|
cnt -= SECTORSIZE;
|
||||||
|
@ -285,7 +285,7 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
print_image_hdr (hdr);
|
image_print_contents (hdr);
|
||||||
cnt = image_get_image_size (hdr);
|
cnt = image_get_image_size (hdr);
|
||||||
cnt += info.blksz - 1;
|
cnt += info.blksz - 1;
|
||||||
cnt /= info.blksz;
|
cnt /= info.blksz;
|
||||||
|
@ -398,7 +398,7 @@ int do_usbboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
print_image_hdr (hdr);
|
image_print_contents (hdr);
|
||||||
|
|
||||||
cnt = image_get_image_size (hdr);
|
cnt = image_get_image_size (hdr);
|
||||||
cnt += info.blksz - 1;
|
cnt += info.blksz - 1;
|
||||||
|
@ -70,7 +70,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
print_image_hdr (hdr);
|
image_print_contents (hdr);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!image_check_type (hdr, IH_TYPE_MULTI)) {
|
if (!image_check_type (hdr, IH_TYPE_MULTI)) {
|
||||||
|
@ -41,6 +41,10 @@
|
|||||||
#include <logbuff.h>
|
#include <logbuff.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
|
||||||
|
#include <rtc.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_FIT)
|
#if defined(CONFIG_FIT)
|
||||||
#include <fdt.h>
|
#include <fdt.h>
|
||||||
#include <libfdt.h>
|
#include <libfdt.h>
|
||||||
@ -310,6 +314,56 @@ const char* image_get_comp_name (uint8_t comp)
|
|||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void image_print_type (image_header_t *hdr)
|
||||||
|
{
|
||||||
|
const char *os, *arch, *type, *comp;
|
||||||
|
|
||||||
|
os = image_get_os_name (image_get_os (hdr));
|
||||||
|
arch = image_get_arch_name (image_get_arch (hdr));
|
||||||
|
type = image_get_type_name (image_get_type (hdr));
|
||||||
|
comp = image_get_comp_name (image_get_comp (hdr));
|
||||||
|
|
||||||
|
printf ("%s %s %s (%s)", arch, os, type, comp);
|
||||||
|
}
|
||||||
|
|
||||||
|
void image_print_contents (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: ");
|
||||||
|
image_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 data, len;
|
||||||
|
ulong count = image_multi_count (hdr);
|
||||||
|
|
||||||
|
puts (" Contents:\n");
|
||||||
|
for (i = 0; i < count; i++) {
|
||||||
|
image_multi_getimg (hdr, i, &data, &len);
|
||||||
|
printf (" Image %d: %8ld Bytes = ", i, len);
|
||||||
|
print_size (len, "\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gen_image_get_format - get image format type
|
* gen_image_get_format - get image format type
|
||||||
* @img_addr: image start address
|
* @img_addr: image start address
|
||||||
@ -454,7 +508,7 @@ image_header_t* image_get_ramdisk (cmd_tbl_t *cmdtp, int flag,
|
|||||||
}
|
}
|
||||||
|
|
||||||
show_boot_progress (10);
|
show_boot_progress (10);
|
||||||
print_image_hdr (rd_hdr);
|
image_print_contents (rd_hdr);
|
||||||
|
|
||||||
if (verify) {
|
if (verify) {
|
||||||
puts(" Verifying Checksum ... ");
|
puts(" Verifying Checksum ... ");
|
||||||
|
@ -224,9 +224,6 @@ void flash_perror (int);
|
|||||||
/* common/cmd_autoscript.c */
|
/* common/cmd_autoscript.c */
|
||||||
int autoscript (ulong addr);
|
int autoscript (ulong addr);
|
||||||
|
|
||||||
/* common/cmd_bootm.c */
|
|
||||||
void print_image_hdr (image_header_t *hdr);
|
|
||||||
|
|
||||||
extern ulong load_addr; /* Default Load Address */
|
extern ulong load_addr; /* Default Load Address */
|
||||||
|
|
||||||
/* common/cmd_nvedit.c */
|
/* common/cmd_nvedit.c */
|
||||||
|
@ -342,6 +342,7 @@ const char* image_get_os_name (uint8_t os);
|
|||||||
const char* image_get_arch_name (uint8_t arch);
|
const char* image_get_arch_name (uint8_t arch);
|
||||||
const char* image_get_type_name (uint8_t type);
|
const char* image_get_type_name (uint8_t type);
|
||||||
const char* image_get_comp_name (uint8_t comp);
|
const char* image_get_comp_name (uint8_t comp);
|
||||||
|
void image_print_contents (image_header_t *hdr);
|
||||||
|
|
||||||
#define IMAGE_FORMAT_INVALID 0x00
|
#define IMAGE_FORMAT_INVALID 0x00
|
||||||
#define IMAGE_FORMAT_LEGACY 0x01
|
#define IMAGE_FORMAT_LEGACY 0x01
|
||||||
|
@ -254,7 +254,7 @@ static ulong get_fdt (ulong alloc_current,
|
|||||||
printf ("## Flattened Device Tree Image at %08lx\n",
|
printf ("## Flattened Device Tree Image at %08lx\n",
|
||||||
fdt_hdr);
|
fdt_hdr);
|
||||||
|
|
||||||
print_image_hdr (fdt_hdr);
|
image_print_contents (fdt_hdr);
|
||||||
|
|
||||||
image_start = (ulong)fdt_hdr;
|
image_start = (ulong)fdt_hdr;
|
||||||
image_end = image_get_image_end (fdt_hdr);
|
image_end = image_get_image_end (fdt_hdr);
|
||||||
|
Loading…
Reference in New Issue
Block a user