From 4115aab13d70bbe8300562bcd789cc5bc27c8ded Mon Sep 17 00:00:00 2001 From: pancake Date: Tue, 20 Nov 2007 04:14:13 +0100 Subject: - Import patches from Osvaldo Santana * Fix build on gcc 4 * Fix nanddump call definition (ignore oob added) * Fixed some stupid bugs with -pedantic -std=c99 release 0.3.1 --- src/main.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index a029e40..999eaf7 100644 --- a/src/main.c +++ b/src/main.c @@ -41,27 +41,27 @@ int info = 0; /* global structs */ char *pieces[] = { - "xloader", // xloader.bin - "2nd", // 2nd - "secondary", // secondary.bin - "kernel", // zImage - "initfs", // jffs'd initfs - "rootfs", // 80mB of blob - "omap-nand", // 8kB of food for the nand - NULL + "xloader", // xloader.bin + "2nd", // 2nd + "secondary", // secondary.bin + "kernel", // zImage + "initfs", // jffs'd initfs + "rootfs", // 80mB of blob + "omap-nand", // 8kB of food for the nand + NULL }; char *modes[]={ - "host", - "peripheral", - NULL + "host", + "peripheral", + NULL }; char *root_devices[] = { - "flash", - "mmc", - "usb", - NULL + "flash", + "mmc", + "usb", + NULL }; @@ -132,6 +132,7 @@ int fiasco_flash(char *file) openfiasco( file ); printf("\nTODO: Implement the fiasco flashing here.\n"); + return -1; } int connect_via_usb() -- cgit v1.2.3