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;