renamed 'xburst-tools' utility back to 'usbboot'

usbboot/README

@@ -0,0 +1,41 @@
+*
+* usbboot
+*
+* Utility to respond to the Ingenic XBurst USB boot protocol, provide
+* initial boot stages and ability to access NAND on device.
+*
+
+Authors: Ingenic Semiconductor, Inc.
+         Xiangfu Liu <xiangfu.z@gmail.com>
+         Marek Lindner <lindner_marek@yahoo.de>
+         Wolfgang Spraul <wolfgang@qi-hardware.com>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version
+3 of the License, or (at your option) any later version.
+
+usbboot is the Linux version and rewrite of a Windows utility from Ingenic also called usbboot.
+Homepage: http://www.ingenic.cn/eng/productServ/kfyd/compiler/pffaqContents.aspx#questionAnchor8
+Windows Binary: ftp://ftp.ingenic.cn/3sw/00tools/usb_boot/tools/usbboot1.4b-tools.zip
+Windows Sources: ftp://ftp.ingenic.cn/3sw/00tools/usb_boot/tools/usbboot1.4b-sources.zip
+Manual: ftp://ftp.ingenic.cn/3sw/00tools/usb_boot/manual/USB_Boot_Tool_Manual_1.4_EN.pdf
+
+Build Requirements: libusb-dev, libconfuse-dev
+
+Build and Installation:
+  ./autogen.sh
+  ./configure
+  make
+  make install
+    *) make install will install the 'usbboot' binary to /usr/bin/usbboot
+       and the stage 1 and 2 bootloaders as well as usbboot.cfg configuration
+       file into /usr/share/xburst-tools
+
+Configuration file: /usr/share/xburst-tools/usbboot.cfg
+
+Examples:
+  sudo usbboot (invoking usbboot without options will let you enter commands at the usbboot prompt)
+  sudo usbboot  -c "boot"
+  sudo usbboot  -c "nprog 0 u-boot-nand.bin 0 0 -n"
+  sudo usbboot  -c "nprog 2048 uImage 0 0 -n"

usbboot/src/Makefile.am

@@ -10,15 +10,15 @@ xburst_tools_version.h:
 	'\n#endif' > xburst_tools_version.h
 BUILT_SOURCES = xburst_tools_version.h
 
-bin_PROGRAMS = xburst_tools
+bin_PROGRAMS = usbboot
-xburst_tools_SOURCES = cmd.c  command_line.c  ingenic_cfg.c  \
+usbboot_SOURCES = cmd.c  command_line.c  ingenic_cfg.c  \
 	ingenic_usb.c  main.c
 
 prefix = /usr
 datadir = /usr/share/xburst_tools
 data_DATA = ../xburst_stage1/xburst_stage1.bin \
 	../xburst_stage2/xburst_stage2.bin \
-	xburst_tools.cfg
+	usbboot.cfg
 EXTRA_DIST = $(datadir)
 
 ../xburst_stage1/xburst_stage1.bin:

usbboot/src/command_line.c

@@ -284,7 +284,7 @@ int command_handle(char *buf)
 		debug_go();
 		break;
 	case 16:		/* exit */
-		printf(" exiting xburst-tools software\n");
+		printf(" exiting usbboot software\n");
 		return -1;	/* return -1 to break the main.c while
 				 * then run usb_ingenic_cleanup*/
 		/*case 17:

usbboot/src/main.c

@@ -22,18 +22,18 @@ extern struct hand hand;
 
 static void help(void)
 {
-	printf("Usage: xburst-tools [options] ...(must run as root)\n"
+	printf("Usage: usbboot [options] ...(must run as root)\n"
 	       "  -h --help\t\t\tPrint this help message\n"
 	       "  -v --version\t\t\tPrint the version number\n"
 	       "  -c --command\t\t\tDirect run the commands, split by ';'\n"
-	       "  <run without options to enter commands via xburst-tools prompt>\n\n"
+	       "  <run without options to enter commands via usbboot prompt>\n\n"
 	       "Report bugs to <xiangfu.z@gmail.com>.\n"
 		);
 }
 
 static void print_version(void)
 {
-	printf("xburst-tools version: %s\n", XBURST_TOOLS_VERSION);
+	printf("usbboot version: %s\n", XBURST_TOOLS_VERSION);
 }
 
 static struct option opts[] = {
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
 	char com_buf[256] = {0};
 	char *cmdpt;
 
-	printf("xburst-tools - Ingenic XBurst USB Boot Utility\n"
+	printf("usbboot - Ingenic XBurst USB Boot Utility\n"
 	       "(c) 2009 Ingenic Semiconductor Inc., Qi Hardware Inc., Xiangfu Liu, Marek Lindner\n"
 	       "This program is Free Software and comes with ABSOLUTELY NO WARRANTY.\n\n");
 
@@ -106,7 +106,7 @@ int main(int argc, char **argv)
 	}
 
 	while (1) {
-		printf("xburst-tools :> ");
+		printf("usbboot :> ");
 		cptr = fgets(com_buf, 256, stdin);
 		if (cptr == NULL)
 			continue;

usbboot/src/usbboot.cfg

@@ -1,11 +1,13 @@
 #
-# xburst-tools configuration file
+# usbboot configuration file
 #
-# Utility to respond to Ingenic XBurst USB boot protocol, provide
+# Utility to respond to the Ingenic XBurst USB boot protocol, provide
 # initial boot stages and ability to access NAND on device.
 #
-# Authors: Xiangfu Liu <xiangfu.z@gmail.com>
+# Authors: Ingenic Semiconductor, Inc.
+#          Xiangfu Liu <xiangfu.z@gmail.com>
 #          Marek Lindner <lindner_marek@yahoo.de>
+#          Wolfgang Spraul <wolfgang@qi-hardware.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

xburst-tools/README

@@ -1,38 +0,0 @@
-*
-* xburst-tools
-*
-* Utility to respond to Ingenic XBurst USB boot protocol, provide
-* initial boot stages and ability to access NAND on device.
-*
-
-Authors: Xiangfu Liu <xiangfu.z@gmail.com>
-         Marek Lindner <lindner_marek@yahoo.de>
-         Wolfgang Spraul <wolfgang@qi-hardware.com>
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version
-3 of the License, or (at your option) any later version.
-
-xburst-tools is the Linux version of a Windows utility from Ingenic called 'usbboot'.
-Homepage: http://www.ingenic.cn/eng/productServ/kfyd/compiler/pffaqContents.aspx#questionAnchor8
-Manual: ftp://ftp.ingenic.cn/3sw/00tools/usb_boot/manual/USB_Boot_Tool_Manual_1.4_EN.pdf
-
-Build Requirements: libusb-dev, libconfuse-dev
-
-Build and Installation:
-  ./autogen.sh
-  ./configure
-  make
-  make install
-    *) make install will install the 'xburst-tools' binary to /usr/bin/xburst-tools
-       and the stage 1 and 2 bootloaders as well as xburst-tools.cfg configuration
-       file into /usr/share/xburst-tools
-
-Configuration file: /usr/share/xburst-tools/xburst-tools.cfg
-
-Examples:
-  sudo xburst-tools (invoking xburst-tools without options will let you enter commands at the xburst-tools prompt)
-  sudo xburst-tools  -c "boot"
-  sudo xburst-tools  -c "nprog 0 u-boot-nand.bin 0 0 -n"
-  sudo xburst-tools  -c "nprog 2048 uImage 0 0 -n"