This patch add support for gpimage format as a preparatory patch for porting u-boot for keystone2 devices and is based on omapimage format. It re-uses gph header to store the size and loadaddr as done in omapimage.c Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Acked-by: Tom Rini <trini@ti.com>master
Karicheri, Muralidharan
11 years ago
committed by
Tom Rini
parent
00c200f137
commit
bf411ea9f1
@ -0,0 +1,40 @@ |
||||
/*
|
||||
* (C) Copyright 2014 |
||||
* Texas Instruments Incorporated |
||||
* Refactored common functions in to gpimage-common.c. Include this common |
||||
* header file |
||||
* |
||||
* (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> |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#ifndef _GPIMAGE_H_ |
||||
#define _GPIMAGE_H_ |
||||
|
||||
/* common headers for gpimage and omapimage formats */ |
||||
struct gp_header { |
||||
uint32_t size; |
||||
uint32_t load_addr; |
||||
}; |
||||
#define GPIMAGE_HDR_SIZE (sizeof(struct gp_header)) |
||||
|
||||
/* common functions across gpimage and omapimage handlers */ |
||||
int valid_gph_size(uint32_t size); |
||||
int valid_gph_load_addr(uint32_t load_addr); |
||||
int gph_verify_header(struct gp_header *gph, int be); |
||||
void gph_print_header(const struct gp_header *gph, int be); |
||||
void gph_set_header(struct gp_header *gph, uint32_t size, uint32_t load_addr, |
||||
int be); |
||||
int gpimage_check_params(struct image_tool_params *params); |
||||
#endif |
||||
@ -0,0 +1,80 @@ |
||||
/*
|
||||
* (C) Copyright 2014 |
||||
* Texas Instruments Incorporated |
||||
* Refactored common functions in to gpimage-common.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> |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#include "imagetool.h" |
||||
#include <compiler.h> |
||||
#include <image.h> |
||||
#include "gpheader.h" |
||||
|
||||
/* Helper to convert size and load_addr to big endian */ |
||||
void to_be32(uint32_t *gph_size, uint32_t *gph_load_addr) |
||||
{ |
||||
*gph_size = cpu_to_be32(*gph_size); |
||||
*gph_load_addr = cpu_to_be32(*gph_load_addr); |
||||
} |
||||
|
||||
int gph_verify_header(struct gp_header *gph, int be) |
||||
{ |
||||
uint32_t gph_size = gph->size, gph_load_addr = gph->load_addr; |
||||
|
||||
if (be) |
||||
to_be32(&gph_size, &gph_load_addr); |
||||
|
||||
if (!gph_size || !gph_load_addr) |
||||
return -1; |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
void gph_print_header(const struct gp_header *gph, int be) |
||||
{ |
||||
uint32_t gph_size = gph->size, gph_load_addr = gph->load_addr; |
||||
|
||||
if (be) |
||||
to_be32(&gph_size, &gph_load_addr); |
||||
|
||||
if (!gph_size) { |
||||
fprintf(stderr, "Error: invalid image size %x\n", gph_size); |
||||
exit(EXIT_FAILURE); |
||||
} |
||||
|
||||
if (!gph_load_addr) { |
||||
fprintf(stderr, "Error: invalid image load address %x\n", |
||||
gph_load_addr); |
||||
exit(EXIT_FAILURE); |
||||
} |
||||
printf("GP Header: Size %x LoadAddr %x\n", gph_size, gph_load_addr); |
||||
} |
||||
|
||||
void gph_set_header(struct gp_header *gph, uint32_t size, uint32_t load_addr, |
||||
int be) |
||||
{ |
||||
gph->size = size; |
||||
gph->load_addr = load_addr; |
||||
if (be) |
||||
to_be32(&gph->size, &gph->load_addr); |
||||
} |
||||
|
||||
int gpimage_check_params(struct image_tool_params *params) |
||||
{ |
||||
return (params->dflag && (params->fflag || params->lflag)) || |
||||
(params->fflag && (params->dflag || params->lflag)) || |
||||
(params->lflag && (params->dflag || params->fflag)); |
||||
} |
||||
@ -0,0 +1,77 @@ |
||||
/*
|
||||
* (C) Copyright 2014 |
||||
* Texas Instruments Incorporated |
||||
* Add gpimage format for keystone devices to format spl image. This is |
||||
* Based on omapimage.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> |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#include "imagetool.h" |
||||
#include <compiler.h> |
||||
#include <image.h> |
||||
#include "gpheader.h" |
||||
|
||||
static uint8_t gpimage_header[GPIMAGE_HDR_SIZE]; |
||||
|
||||
/* to be in keystone gpimage */ |
||||
static int gpimage_check_image_types(uint8_t type) |
||||
{ |
||||
if (type == IH_TYPE_GPIMAGE) |
||||
return EXIT_SUCCESS; |
||||
return EXIT_FAILURE; |
||||
} |
||||
|
||||
static int gpimage_verify_header(unsigned char *ptr, int image_size, |
||||
struct image_tool_params *params) |
||||
{ |
||||
struct gp_header *gph = (struct gp_header *)ptr; |
||||
|
||||
return gph_verify_header(gph, 1); |
||||
} |
||||
|
||||
static void gpimage_print_header(const void *ptr) |
||||
{ |
||||
const struct gp_header *gph = (struct gp_header *)ptr; |
||||
|
||||
gph_print_header(gph, 1); |
||||
} |
||||
|
||||
static void gpimage_set_header(void *ptr, struct stat *sbuf, int ifd, |
||||
struct image_tool_params *params) |
||||
{ |
||||
struct gp_header *gph = (struct gp_header *)ptr; |
||||
|
||||
gph_set_header(gph, sbuf->st_size - GPIMAGE_HDR_SIZE, params->addr, 1); |
||||
} |
||||
|
||||
/*
|
||||
* gpimage parameters |
||||
*/ |
||||
static struct image_type_params gpimage_params = { |
||||
.name = "TI KeyStone GP Image support", |
||||
.header_size = GPIMAGE_HDR_SIZE, |
||||
.hdr = (void *)&gpimage_header, |
||||
.check_image_type = gpimage_check_image_types, |
||||
.verify_header = gpimage_verify_header, |
||||
.print_header = gpimage_print_header, |
||||
.set_header = gpimage_set_header, |
||||
.check_params = gpimage_check_params, |
||||
}; |
||||
|
||||
void init_gpimage_type(void) |
||||
{ |
||||
register_image_type(&gpimage_params); |
||||
} |
||||
Loading…
Reference in new issue