mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-12 14:23:00 +00:00
8fcf5959a8
Using mkimage with e.g. tools/mkimage -A arm -T firmware -O u-boot -d u-boot.bin foo.img gives a warning "Unknown OMAP image type - 5" while it seems that the image itself is created successfully. This does come from the patch "mkimage: Add OMAP boot image support". The method check_image_type in image_type_params is supposed to just return success or failure. However, for omap it also calls fprintf: static int omapimage_check_image_types(uint8_t type) { if (type == IH_TYPE_OMAPIMAGE) return EXIT_SUCCESS; else { fprintf(stderr, "Unknown OMAP image type - %x", type); return EXIT_FAILURE; } } All the other image checkers and no others have this, so the fix is to simply remove the fprintf. Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> CC: John Rigby <john.rigby@linaro.org> CC: Aneesh V <aneesh@ti.com> CC: Sandeep Paulraj <s-paulraj@ti.com>
223 lines
5.4 KiB
C
223 lines
5.4 KiB
C
/*
|
|
* (C) Copyright 2010
|
|
* Linaro LTD, www.linaro.org
|
|
* Author: John Rigby <john.rigby@linaro.org>
|
|
* Based on TI's signGP.c
|
|
*
|
|
* (C) Copyright 2009
|
|
* Stefano Babic, DENX Software Engineering, sbabic@denx.de.
|
|
*
|
|
* (C) Copyright 2008
|
|
* Marvell Semiconductor <www.marvell.com>
|
|
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
* MA 02111-1307 USA
|
|
*/
|
|
|
|
/* Required to obtain the getline prototype from stdio.h */
|
|
#define _GNU_SOURCE
|
|
|
|
#include "mkimage.h"
|
|
#include <image.h>
|
|
#include "omapimage.h"
|
|
|
|
/* Header size is CH header rounded up to 512 bytes plus GP header */
|
|
#define OMAP_CH_HDR_SIZE 512
|
|
#define OMAP_GP_HDR_SIZE (sizeof(struct gp_header))
|
|
#define OMAP_FILE_HDR_SIZE (OMAP_CH_HDR_SIZE+OMAP_GP_HDR_SIZE)
|
|
|
|
static uint8_t omapimage_header[OMAP_FILE_HDR_SIZE];
|
|
|
|
static int omapimage_check_image_types(uint8_t type)
|
|
{
|
|
if (type == IH_TYPE_OMAPIMAGE)
|
|
return EXIT_SUCCESS;
|
|
else {
|
|
return EXIT_FAILURE;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Only the simplest image type is currently supported:
|
|
* TOC pointing to CHSETTINGS
|
|
* TOC terminator
|
|
* CHSETTINGS
|
|
*
|
|
* padding to OMAP_CH_HDR_SIZE bytes
|
|
*
|
|
* gp header
|
|
* size
|
|
* load_addr
|
|
*/
|
|
static int valid_gph_size(uint32_t size)
|
|
{
|
|
return size;
|
|
}
|
|
|
|
static int valid_gph_load_addr(uint32_t load_addr)
|
|
{
|
|
return load_addr;
|
|
}
|
|
|
|
static int omapimage_verify_header(unsigned char *ptr, int image_size,
|
|
struct mkimage_params *params)
|
|
{
|
|
struct ch_toc *toc = (struct ch_toc *)ptr;
|
|
struct gp_header *gph = (struct gp_header *)(ptr+OMAP_CH_HDR_SIZE);
|
|
uint32_t offset, size;
|
|
|
|
while (toc->section_offset != 0xffffffff
|
|
&& toc->section_size != 0xffffffff) {
|
|
offset = toc->section_offset;
|
|
size = toc->section_size;
|
|
if (!offset || !size)
|
|
return -1;
|
|
if (offset >= OMAP_CH_HDR_SIZE ||
|
|
offset+size >= OMAP_CH_HDR_SIZE)
|
|
return -1;
|
|
toc++;
|
|
}
|
|
if (!valid_gph_size(gph->size))
|
|
return -1;
|
|
if (!valid_gph_load_addr(gph->load_addr))
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void omapimage_print_section(struct ch_settings *chs)
|
|
{
|
|
const char *section_name;
|
|
|
|
if (chs->section_key)
|
|
section_name = "CHSETTINGS";
|
|
else
|
|
section_name = "UNKNOWNKEY";
|
|
|
|
printf("%s (%x) "
|
|
"valid:%x "
|
|
"version:%x "
|
|
"reserved:%x "
|
|
"flags:%x\n",
|
|
section_name,
|
|
chs->section_key,
|
|
chs->valid,
|
|
chs->version,
|
|
chs->reserved,
|
|
chs->flags);
|
|
}
|
|
|
|
static void omapimage_print_header(const void *ptr)
|
|
{
|
|
const struct ch_toc *toc = (struct ch_toc *)ptr;
|
|
const struct gp_header *gph =
|
|
(struct gp_header *)(ptr+OMAP_CH_HDR_SIZE);
|
|
uint32_t offset, size;
|
|
|
|
while (toc->section_offset != 0xffffffff
|
|
&& toc->section_size != 0xffffffff) {
|
|
offset = toc->section_offset;
|
|
size = toc->section_size;
|
|
|
|
if (offset >= OMAP_CH_HDR_SIZE ||
|
|
offset+size >= OMAP_CH_HDR_SIZE)
|
|
exit(EXIT_FAILURE);
|
|
|
|
printf("Section %s offset %x length %x\n",
|
|
toc->section_name,
|
|
toc->section_offset,
|
|
toc->section_size);
|
|
|
|
omapimage_print_section((struct ch_settings *)(ptr+offset));
|
|
toc++;
|
|
}
|
|
|
|
if (!valid_gph_size(gph->size)) {
|
|
fprintf(stderr,
|
|
"Error: invalid image size %x\n",
|
|
gph->size);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
|
|
if (!valid_gph_load_addr(gph->load_addr)) {
|
|
fprintf(stderr,
|
|
"Error: invalid image load address %x\n",
|
|
gph->size);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
|
|
printf("GP Header: Size %x LoadAddr %x\n",
|
|
gph->size, gph->load_addr);
|
|
}
|
|
|
|
static int toc_offset(void *hdr, void *member)
|
|
{
|
|
return member - hdr;
|
|
}
|
|
|
|
static void omapimage_set_header(void *ptr, struct stat *sbuf, int ifd,
|
|
struct mkimage_params *params)
|
|
{
|
|
struct ch_toc *toc = (struct ch_toc *)ptr;
|
|
struct ch_settings *chs = (struct ch_settings *)
|
|
(ptr + 2 * sizeof(*toc));
|
|
struct gp_header *gph = (struct gp_header *)(ptr + OMAP_CH_HDR_SIZE);
|
|
|
|
toc->section_offset = toc_offset(ptr, chs);
|
|
toc->section_size = sizeof(struct ch_settings);
|
|
strcpy((char *)toc->section_name, "CHSETTINGS");
|
|
|
|
chs->section_key = KEY_CHSETTINGS;
|
|
chs->valid = 0;
|
|
chs->version = 1;
|
|
chs->reserved = 0;
|
|
chs->flags = 0;
|
|
|
|
toc++;
|
|
memset(toc, 0xff, sizeof(*toc));
|
|
|
|
gph->size = sbuf->st_size - OMAP_FILE_HDR_SIZE;
|
|
gph->load_addr = params->addr;
|
|
}
|
|
|
|
int omapimage_check_params(struct mkimage_params *params)
|
|
{
|
|
return (params->dflag && (params->fflag || params->lflag)) ||
|
|
(params->fflag && (params->dflag || params->lflag)) ||
|
|
(params->lflag && (params->dflag || params->fflag));
|
|
}
|
|
|
|
/*
|
|
* omapimage parameters
|
|
*/
|
|
static struct image_type_params omapimage_params = {
|
|
.name = "TI OMAP CH/GP Boot Image support",
|
|
.header_size = OMAP_FILE_HDR_SIZE,
|
|
.hdr = (void *)&omapimage_header,
|
|
.check_image_type = omapimage_check_image_types,
|
|
.verify_header = omapimage_verify_header,
|
|
.print_header = omapimage_print_header,
|
|
.set_header = omapimage_set_header,
|
|
.check_params = omapimage_check_params,
|
|
};
|
|
|
|
void init_omap_image_type(void)
|
|
{
|
|
mkimage_register(&omapimage_params);
|
|
}
|