summaryrefslogtreecommitdiff
path: root/util/cbfstool
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@gmail.com>2009-04-30 22:45:41 +0000
committerMyles Watson <mylesgw@gmail.com>2009-04-30 22:45:41 +0000
commitfa12b67771f73f0e7acf2308a13cf33b8c619884 (patch)
tree853c5b64915c1b13749561d30bbd34c8d46f1bc4 /util/cbfstool
parentd233f363c129dae2ba5fd7ac536cf92fb4c2dd6e (diff)
downloadcoreboot-fa12b67771f73f0e7acf2308a13cf33b8c619884.tar.xz
Remove warnings from compilation of the s2892 with and without CBFS.
I didn't try to remove "defined but not used" warnings because there are too many ifdefs to be sure I wouldn't break something. For shadowed variable declarations I renamed the inner-most variable. The one in src/pc80/keyboard.c might need help. I didn't change the functionality but it looks like a bug. I boot tested it on s2892 and abuild tested it. Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Ronald G. Minnich <rminnich@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4240 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/cbfstool')
-rw-r--r--util/cbfstool/cbfstool.h2
-rw-r--r--util/cbfstool/util.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/util/cbfstool/cbfstool.h b/util/cbfstool/cbfstool.h
index f90b5670d0..289b4812ab 100644
--- a/util/cbfstool/cbfstool.h
+++ b/util/cbfstool/cbfstool.h
@@ -58,7 +58,7 @@ struct rom {
/* util.c */
int open_rom(struct rom *rom, const char *filename);
int create_rom(struct rom *rom, const unsigned char *filename, int size,
- const unsigned char *bootblockname, int bootblocksize,
+ const char *bootblockname, int bootblocksize,
int align);
int size_and_open(const char *filename, unsigned int *size);
int copy_from_fd(int fd, void *ptr, int size);
diff --git a/util/cbfstool/util.c b/util/cbfstool/util.c
index 5dd946b5d7..8f2a65bd0c 100644
--- a/util/cbfstool/util.c
+++ b/util/cbfstool/util.c
@@ -168,7 +168,7 @@ err:
}
int create_rom(struct rom *rom, const unsigned char *filename,
- int romsize, const unsigned char *bootblockname,
+ int romsize, const char *bootblockname,
int bootblocksize, int align)
{
unsigned char null = '\0';
@@ -226,7 +226,6 @@ int add_bootblock(struct rom *rom, const char *filename)
unsigned int size;
int fd = size_and_open(filename, &size);
int ret;
- struct cbfs_header tmp;
if (fd == -1)
return -1;