*/
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
+#include <ctype.h>
#include "common.h"
#include "cbfs.h"
base = strtoul(argv[6], NULL, 0);
}
cbfsfile = create_cbfs_file(cbfsname, filedata, &filesize, type, &base);
- if (add_file_to_cbfs(cbfsfile, filesize, base))
+ if (add_file_to_cbfs(cbfsfile, filesize, base)) {
+ printf("Adding file '%s' failed.\n", filename);
return 1;
+ }
if (writerom(romname, rom, romsize))
return 1;
return 0;
cbfsfile =
create_cbfs_file(cbfsname, payload, &filesize,
CBFS_COMPONENT_PAYLOAD, &base);
- if (add_file_to_cbfs(cbfsfile, filesize, base))
+ if (add_file_to_cbfs(cbfsfile, filesize, base)) {
+ printf("Adding payload '%s' failed.\n", filename);
return 1;
+ }
if (writerom(romname, rom, romsize))
return 1;
return 0;
create_cbfs_file(cbfsname, stage, &filesize,
CBFS_COMPONENT_STAGE, &base);
- if (add_file_to_cbfs(cbfsfile, filesize, base))
+ if (add_file_to_cbfs(cbfsfile, filesize, base)) {
+ printf("Adding stage '%s' failed.\n", filename);
return 1;
+ }
if (writerom(romname, rom, romsize))
return 1;
return 0;
static int cbfs_create(int argc, char **argv)
{
char *romname = argv[1];
- char *cmd = argv[2];
if (argc < 5) {
printf("not enough arguments to 'create'.\n");
return 1;
static int cbfs_print(int argc, char **argv)
{
char *romname = argv[1];
- char *cmd = argv[2];
void *rom = loadrom(romname);
if (rom == NULL) {
static int cbfs_extract(int argc, char **argv)
{
char *romname = argv[1];
- char *cmd = argv[2];
void *rom = loadrom(romname);
if (rom == NULL) {
return extract_file_from_cbfs(romname, argv[3], argv[4]);
}
-struct command commands[] = {
+static const struct command commands[] = {
{CMD_ADD, "add", cbfs_add},
{CMD_ADD_PAYLOAD, "add-payload", cbfs_add_payload},
{CMD_ADD_STAGE, "add-stage", cbfs_add_stage},
{CMD_EXTRACT, "extract", cbfs_extract},
};
-void usage(void)
+static void usage(void)
{
printf
("cbfstool: Management utility for CBFS formatted ROM images\n\n"
print_supported_filetypes();
}
+/* Small, OS/libc independent runtime check
+ * for endianess
+ */
+int host_bigendian = 0;
+
+static void which_endian(void)
+{
+ char test[4] = "1234";
+ uint32_t inttest = *(uint32_t *) test;
+ if (inttest == 0x31323334) {
+ host_bigendian = 1;
+ }
+}
+
int main(int argc, char **argv)
{
int i;
return 1;
}
+ which_endian();
+
char *cmd = argv[2];
for (i = 0; i < ARRAY_SIZE(commands); i++) {