This removes the hack implemented in http://review.coreboot.org/#/c/2280 (and should make using 64bit Tiano easier, but that's not yet supported) Change-Id: Ie30129c4102dfbd41584177f39057b31f5a937fd Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/2281 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
		
			
				
	
	
		
			134 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			134 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (C) 2009 coresystems GmbH
 | 
						|
 *                 written by Patrick Georgi <patrick.georgi@coresystems.de>
 | 
						|
 * Copyright (C) 2012 Google, Inc.
 | 
						|
 *
 | 
						|
 * 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; version 2 of the License.
 | 
						|
 *
 | 
						|
 * 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., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
 | 
						|
 */
 | 
						|
 | 
						|
#ifndef __CBFSTOOL_COMMON_H
 | 
						|
#define __CBFSTOOL_COMMON_H
 | 
						|
 | 
						|
#include <stdint.h>
 | 
						|
#include <assert.h>
 | 
						|
 | 
						|
/* Endianess */
 | 
						|
#include "swab.h"
 | 
						|
#ifndef __APPLE__
 | 
						|
#define ntohl(x)	(is_big_endian() ? (x) : swab32(x))
 | 
						|
#define htonl(x)	(is_big_endian() ? (x) : swab32(x))
 | 
						|
#endif
 | 
						|
#define ntohll(x)	(is_big_endian() ? (x) : swab64(x))
 | 
						|
#define htonll(x)	(is_big_endian() ? (x) : swab64(x))
 | 
						|
extern int is_big_endian(void);
 | 
						|
 | 
						|
/* Message output */
 | 
						|
extern int verbose;
 | 
						|
#define ERROR(x...) { fprintf(stderr, "E: " x); }
 | 
						|
#define WARN(x...) { fprintf(stderr, "W: " x); }
 | 
						|
#define LOG(x...) { fprintf(stderr, x); }
 | 
						|
#define INFO(x...) { if (verbose > 0) fprintf(stderr, "INFO: " x); }
 | 
						|
#define DEBUG(x...) { if (verbose > 1) fprintf(stderr, "DEBUG: " x); }
 | 
						|
 | 
						|
/* Buffer and file I/O */
 | 
						|
struct buffer {
 | 
						|
	char *name;
 | 
						|
	char *data;
 | 
						|
	size_t size;
 | 
						|
};
 | 
						|
 | 
						|
/* Creates an empty memory buffer with given size.
 | 
						|
 * Returns 0 on success, otherwise non-zero. */
 | 
						|
int buffer_create(struct buffer *buffer, size_t size, const char *name);
 | 
						|
 | 
						|
/* Loads a file into memory buffer. Returns 0 on success, otherwise non-zero. */
 | 
						|
int buffer_from_file(struct buffer *buffer, const char *filename);
 | 
						|
 | 
						|
/* Writes memory buffer content into file.
 | 
						|
 * Returns 0 on success, otherwise non-zero. */
 | 
						|
int buffer_write_file(struct buffer *buffer, const char *filename);
 | 
						|
 | 
						|
/* Destroys a memory buffer. */
 | 
						|
void buffer_delete(struct buffer *buffer);
 | 
						|
 | 
						|
extern void *offset;
 | 
						|
extern uint32_t romsize;
 | 
						|
extern int host_bigendian;
 | 
						|
extern uint32_t arch;
 | 
						|
 | 
						|
const char *arch_to_string(uint32_t a);
 | 
						|
uint32_t string_to_arch(const char *arch_string);
 | 
						|
 | 
						|
static inline void *phys_to_virt(uint32_t addr)
 | 
						|
{
 | 
						|
	return offset + addr;
 | 
						|
}
 | 
						|
 | 
						|
static inline uint32_t virt_to_phys(void *addr)
 | 
						|
{
 | 
						|
	return (unsigned long)(addr - offset) & 0xffffffff;
 | 
						|
}
 | 
						|
 | 
						|
#define ALIGN(val, by) (((val) + (by)-1)&~((by)-1))
 | 
						|
 | 
						|
size_t getfilesize(const char *filename);
 | 
						|
void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
 | 
						|
	       int place);
 | 
						|
void *loadrom(const char *filename);
 | 
						|
int writerom(const char *filename, void *start, uint32_t size);
 | 
						|
 | 
						|
int iself(unsigned char *input);
 | 
						|
 | 
						|
typedef void (*comp_func_ptr) (char *, int, char *, int *);
 | 
						|
typedef enum { CBFS_COMPRESS_NONE = 0, CBFS_COMPRESS_LZMA = 1 } comp_algo;
 | 
						|
 | 
						|
comp_func_ptr compression_function(comp_algo algo);
 | 
						|
 | 
						|
uint64_t intfiletype(const char *name);
 | 
						|
 | 
						|
/* cbfs-mkpayload.c */
 | 
						|
int parse_elf_to_payload(const struct buffer *input,
 | 
						|
			 struct buffer *output, comp_algo algo);
 | 
						|
int parse_fv_to_payload(const struct buffer *input,
 | 
						|
			 struct buffer *output, comp_algo algo);
 | 
						|
int parse_flat_binary_to_payload(const struct buffer *input,
 | 
						|
				 struct buffer *output,
 | 
						|
				 uint32_t loadaddress,
 | 
						|
				 uint32_t entrypoint,
 | 
						|
				 comp_algo algo);
 | 
						|
/* cbfs-mkstage.c */
 | 
						|
int parse_elf_to_stage(const struct buffer *input, struct buffer *output,
 | 
						|
		       comp_algo algo, uint32_t *location);
 | 
						|
 | 
						|
void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize,
 | 
						|
		       uint32_t type, uint32_t * location);
 | 
						|
 | 
						|
int create_cbfs_image(const char *romfile, uint32_t romsize,
 | 
						|
		      const char *bootblock, uint32_t align, uint32_t offs);
 | 
						|
 | 
						|
int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location);
 | 
						|
int remove_file_from_cbfs(const char *filename);
 | 
						|
void print_cbfs_directory(const char *filename);
 | 
						|
int extract_file_from_cbfs(const char *filename, const char *payloadname, const char *outpath);
 | 
						|
int remove_file_from_cbfs(const char *filename);
 | 
						|
 | 
						|
uint32_t cbfs_find_location(const char *romfile, uint32_t filesize,
 | 
						|
			    const char *filename, uint32_t align);
 | 
						|
 | 
						|
void print_supported_filetypes(void);
 | 
						|
 | 
						|
#define ARRAY_SIZE(a) (int)(sizeof(a) / sizeof((a)[0]))
 | 
						|
 | 
						|
#endif
 |