GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cbfstool: Hide cbfstool_offset from the global namespace 

This is part of a larger effort to reduce global variable usage in
cbfstool. cbfstool_offset is particularly easy to hide since it's only
used in common.c .

Change-Id: Ic45349b5148d4407f31e12682ea0ad4b68136711
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-on: http://review.coreboot.org/5102
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Alexandru Gagniuc 2014-02-02 21:34:15 -06:00
parent f592c08b68
commit c677c7d6e4
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util/cbfstool/common.c
View File

@ -150,9 +150,19 @@ void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
static struct cbfs_header *cbfstool_master_header; static struct cbfs_header *cbfstool_master_header;
static uint32_t phys_start, phys_end, align; static uint32_t phys_start, phys_end, align;
uint32_t romsize; uint32_t romsize;
void *cbfstool_offset; static void *cbfstool_offset;
uint32_t arch = CBFS_ARCHITECTURE_UNKNOWN; uint32_t arch = CBFS_ARCHITECTURE_UNKNOWN;
static inline void *phys_to_virt(uint32_t addr)
{
return cbfstool_offset + addr;
}
static inline uint32_t virt_to_phys(void *addr)
{
return (unsigned long)(addr - cbfstool_offset) & 0xffffffff;
}
static struct { static struct {
uint32_t arch; uint32_t arch;
const char *name; const char *name;

11
util/cbfstool/common.h
View File

@ -62,7 +62,6 @@ int buffer_write_file(struct buffer *buffer, const char *filename);
/* Destroys a memory buffer. */ /* Destroys a memory buffer. */
void buffer_delete(struct buffer *buffer); void buffer_delete(struct buffer *buffer);
extern void *cbfstool_offset;
extern uint32_t romsize; extern uint32_t romsize;
extern int host_bigendian; extern int host_bigendian;
extern uint32_t arch; extern uint32_t arch;
@ -70,16 +69,6 @@ extern uint32_t arch;
const char *arch_to_string(uint32_t a); const char *arch_to_string(uint32_t a);
uint32_t string_to_arch(const char *arch_string); uint32_t string_to_arch(const char *arch_string);
static inline void *phys_to_virt(uint32_t addr)
{
return cbfstool_offset + addr;
}
static inline uint32_t virt_to_phys(void *addr)
{
return (unsigned long)(addr - cbfstool_offset) & 0xffffffff;
}
#define ALIGN(val, by) (((val) + (by)-1)&~((by)-1)) #define ALIGN(val, by) (((val) + (by)-1)&~((by)-1))
size_t getfilesize(const char *filename); size_t getfilesize(const char *filename);