diff --git a/inflash/debian/changelog b/inflash/debian/changelog deleted file mode 100644 index c39f5e7..0000000 --- a/inflash/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -inflash (20090630-1) unstable; urgency=low - - * Initial release (Closes: #nnnn) - - -- xiangfu Mon, 29 Jun 2009 16:24:32 +0800 diff --git a/inflash/debian/dirs b/inflash/debian/dirs deleted file mode 100644 index 9fe37db..0000000 --- a/inflash/debian/dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/share/inflash -usr/man/man1 diff --git a/inflash/COPYING b/xburst-tools/COPYING similarity index 100% rename from inflash/COPYING rename to xburst-tools/COPYING diff --git a/inflash/ChangeLog b/xburst-tools/ChangeLog similarity index 73% rename from inflash/ChangeLog rename to xburst-tools/ChangeLog index d6b9394..f9d5afa 100644 --- a/inflash/ChangeLog +++ b/xburst-tools/ChangeLog @@ -1,4 +1,4 @@ - * inflash ChangeLog + * xburst-tools ChangeLog 25Jun2009 [WS] some cleanup in directory structure and build system diff --git a/inflash/Makefile.am b/xburst-tools/Makefile.am similarity index 100% rename from inflash/Makefile.am rename to xburst-tools/Makefile.am diff --git a/inflash/README b/xburst-tools/README similarity index 57% rename from inflash/README rename to xburst-tools/README index 68579d6..55b1696 100644 --- a/inflash/README +++ b/xburst-tools/README @@ -1,5 +1,5 @@ * -* inflash +* xburst-tools * * Utility to respond to Ingenic XBurst USB boot protocol, provide * initial boot stages and ability to access NAND on device. @@ -14,7 +14,7 @@ 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. -inflash is the Linux version of a Windows utility from Ingenic called 'usbboot'. +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 @@ -25,14 +25,14 @@ Build and Installation: ./configure make make install - *) make install will install the 'inflash' binary to /usr/bin/inflash - and the stage 1 and 2 bootloaders as well as inflash.cfg configuration - file into /usr/share/inflash + *) 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/inflash/inflash.cfg +Configuration file: /usr/share/xburst-tools/xburst-tools.cfg Examples: - sudo inflash (invoking inflash without options will let you enter commands at the inflash prompt) - sudo inflash -c "boot" - sudo inflash -c "nprog 0 u-boot-nand.bin 0 0 -n" - sudo inflash -c "nprog 2048 uImage 0 0 -n" + 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" diff --git a/inflash/autogen.sh b/xburst-tools/autogen.sh similarity index 100% rename from inflash/autogen.sh rename to xburst-tools/autogen.sh diff --git a/inflash/configure.ac b/xburst-tools/configure.ac similarity index 96% rename from inflash/configure.ac rename to xburst-tools/configure.ac index 469e8d2..97e171e 100644 --- a/inflash/configure.ac +++ b/xburst-tools/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.63) -AC_INIT([inflash], [0.1]) +AC_INIT([xburst-tools], [0.1]) AC_CONFIG_AUX_DIR(m4) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER([config.h]) diff --git a/xburst-tools/debian/changelog b/xburst-tools/debian/changelog new file mode 100644 index 0000000..2ff76c0 --- /dev/null +++ b/xburst-tools/debian/changelog @@ -0,0 +1,5 @@ +xburst-tools (20090630-1) unstable; urgency=low + + * Initial release (Closes: #nnnn) + + -- xiangfu Mon, 29 Jun 2009 16:27:20 +0800 diff --git a/inflash/debian/compat b/xburst-tools/debian/compat similarity index 100% rename from inflash/debian/compat rename to xburst-tools/debian/compat diff --git a/inflash/debian/control b/xburst-tools/debian/control similarity index 81% rename from inflash/debian/control rename to xburst-tools/debian/control index 3ed5bc8..5aa3563 100644 --- a/inflash/debian/control +++ b/xburst-tools/debian/control @@ -1,4 +1,4 @@ -Source: inflash +Source: xburst-tools Section: misc Priority: extra Maintainer: xiangfu liu @@ -6,11 +6,11 @@ Build-Depends: debhelper (>= 7), libusb-dev, libconfuse-dev Standards-Version: 3.8.0 Homepage: http://code.google.com/p/pi-project -Package: inflash +Package: xburst-tools Architecture: any Depends: ${shlibs:Depends}, libusb, libconfuse Description: host tool for Ingenic XBurst CPU USB boot and NAND flash access. - inflash is a host tool for Ingenic XBurst CPU device usb boot. + xburst-tools is a host tool for Ingenic XBurst CPU device usb boot. it's can flash bootloader, kernel, rootfs to Ingenic XBurst CPU device nand. also have some test function for Ingenic XBurst CPU device. diff --git a/inflash/debian/copyright b/xburst-tools/debian/copyright similarity index 100% rename from inflash/debian/copyright rename to xburst-tools/debian/copyright diff --git a/xburst-tools/debian/dirs b/xburst-tools/debian/dirs new file mode 100644 index 0000000..141fd23 --- /dev/null +++ b/xburst-tools/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/xburst-tools +usr/man/man1 diff --git a/inflash/debian/docs b/xburst-tools/debian/docs similarity index 100% rename from inflash/debian/docs rename to xburst-tools/debian/docs diff --git a/inflash/debian/rules b/xburst-tools/debian/rules similarity index 92% rename from inflash/debian/rules rename to xburst-tools/debian/rules index 3fc5e34..ad47651 100755 --- a/inflash/debian/rules +++ b/xburst-tools/debian/rules @@ -41,7 +41,7 @@ build-stamp: config.status # Add here commands to compile the package. $(MAKE) - #docbook-to-man debian/inflash.sgml > inflash.1 + #docbook-to-man debian/xburst-tools.sgml > xburst-tools.1 touch $@ @@ -62,8 +62,8 @@ install: build dh_prep dh_installdirs - # Add here commands to install the package into debian/inflash. - $(MAKE) DESTDIR=$(CURDIR)/debian/inflash install + # Add here commands to install the package into debian/xburst-tools. + $(MAKE) DESTDIR=$(CURDIR)/debian/xburst-tools install # Build architecture-independent files here. diff --git a/inflash/src/Makefile.am b/xburst-tools/src/Makefile.am similarity index 62% rename from inflash/src/Makefile.am rename to xburst-tools/src/Makefile.am index acea824..a381632 100644 --- a/inflash/src/Makefile.am +++ b/xburst-tools/src/Makefile.am @@ -4,21 +4,21 @@ BUILD_BRANCH := $(shell git branch | grep ^\* | cut -d' ' -f2) BUILD_HEAD := $(shell git show --pretty=oneline | head -n1 | cut -d' ' -f1 | cut -b1-16) BUILD_VERSION := ${BUILD_BRANCH}_${BUILD_HEAD} -inflash_version.h: - echo -e '#ifndef INFLASH_VERSION' \ - '\n#define INFLASH_VERSION "20090628-1"' \ - '\n#endif' > inflash_version.h -BUILT_SOURCES = inflash_version.h +xburst_tools_version.h: + echo -e '#ifndef XBURST_TOOLS_VERSION' \ + '\n#define XBURST_TOOLS_VERSION "20090630-1"' \ + '\n#endif' > xburst_tools_version.h +BUILT_SOURCES = xburst_tools_version.h -bin_PROGRAMS = inflash -inflash_SOURCES = cmd.c command_line.c ingenic_cfg.c \ +bin_PROGRAMS = xburst_tools +xburst_tools_SOURCES = cmd.c command_line.c ingenic_cfg.c \ ingenic_usb.c main.c prefix = /usr -datadir = /usr/share/inflash +datadir = /usr/share/xburst_tools data_DATA = ../xburst_stage1/xburst_stage1.bin \ ../xburst_stage2/xburst_stage2.bin \ - inflash.cfg + xburst_tools.cfg EXTRA_DIST = $(datadir) ../xburst_stage1/xburst_stage1.bin: diff --git a/inflash/src/cmd.c b/xburst-tools/src/cmd.c similarity index 100% rename from inflash/src/cmd.c rename to xburst-tools/src/cmd.c diff --git a/inflash/src/cmd.h b/xburst-tools/src/cmd.h similarity index 100% rename from inflash/src/cmd.h rename to xburst-tools/src/cmd.h diff --git a/inflash/src/command_line.c b/xburst-tools/src/command_line.c similarity index 97% rename from inflash/src/command_line.c rename to xburst-tools/src/command_line.c index 312a97a..c2226ed 100644 --- a/inflash/src/command_line.c +++ b/xburst-tools/src/command_line.c @@ -13,7 +13,7 @@ #include "usb_boot_defines.h" #include "ingenic_usb.h" #include "cmd.h" -#include "inflash_version.h" +#include "xburst_tools_version.h" extern struct nand_in nand_in; extern struct sdram_in sdram_in; @@ -97,7 +97,7 @@ static int handle_help(void) static int handle_version(void) { - printf(" USB Boot Software current version: %s\n", INFLASH_VERSION); + printf(" USB Boot Software current version: %s\n", XBURST_TOOLS_VERSION); return 1; } @@ -284,7 +284,7 @@ int command_handle(char *buf) debug_go(); break; case 16: /* exit */ - printf(" exiting inflash software\n"); + printf(" exiting xburst-tools software\n"); return -1; /* return -1 to break the main.c while * then run usb_ingenic_cleanup*/ /*case 17: diff --git a/inflash/src/command_line.h b/xburst-tools/src/command_line.h similarity index 100% rename from inflash/src/command_line.h rename to xburst-tools/src/command_line.h diff --git a/inflash/src/ingenic_cfg.c b/xburst-tools/src/ingenic_cfg.c similarity index 100% rename from inflash/src/ingenic_cfg.c rename to xburst-tools/src/ingenic_cfg.c diff --git a/inflash/src/ingenic_cfg.h b/xburst-tools/src/ingenic_cfg.h similarity index 89% rename from inflash/src/ingenic_cfg.h rename to xburst-tools/src/ingenic_cfg.h index 3ea5b01..d6cc671 100644 --- a/inflash/src/ingenic_cfg.h +++ b/xburst-tools/src/ingenic_cfg.h @@ -12,7 +12,7 @@ #include "usb_boot_defines.h" -#define CONFIG_FILE_PATH "/usr/share/inflash/inflash.cfg" +#define CONFIG_FILE_PATH "/usr/share/xburst_tools/xburst_tools.cfg" int hand_init_def(struct hand *hand); int check_dump_cfg(struct hand *hand); diff --git a/inflash/src/ingenic_usb.c b/xburst-tools/src/ingenic_usb.c similarity index 100% rename from inflash/src/ingenic_usb.c rename to xburst-tools/src/ingenic_usb.c diff --git a/inflash/src/ingenic_usb.h b/xburst-tools/src/ingenic_usb.h similarity index 93% rename from inflash/src/ingenic_usb.h rename to xburst-tools/src/ingenic_usb.h index 5ade2b0..8983a5b 100644 --- a/inflash/src/ingenic_usb.h +++ b/xburst-tools/src/ingenic_usb.h @@ -37,8 +37,8 @@ #define VENDOR_ID 0x601a #define PRODUCT_ID 0x4740 -#define STAGE1_FILE_PATH "/usr/share/inflash/xburst_stage1.bin" -#define STAGE2_FILE_PATH "/usr/share/inflash/xburst_stage2.bin" +#define STAGE1_FILE_PATH "/usr/share/xburst_tools/xburst_stage1.bin" +#define STAGE2_FILE_PATH "/usr/share/xburst_tools/xburst_stage2.bin" #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) diff --git a/inflash/src/main.c b/xburst-tools/src/main.c similarity index 88% rename from inflash/src/main.c rename to xburst-tools/src/main.c index ddb5ce3..0c60bae 100644 --- a/inflash/src/main.c +++ b/xburst-tools/src/main.c @@ -12,7 +12,7 @@ #include #include #include -#include "inflash_version.h" +#include "xburst_tools_version.h" #include "command_line.h" #include "ingenic_usb.h" #include "ingenic_cfg.h" @@ -22,18 +22,18 @@ extern struct hand hand; static void help(void) { - printf("Usage: inflash [options] ...(must run as root)\n" + printf("Usage: xburst-tools [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" - " \n\n" + " \n\n" "Report bugs to .\n" ); } static void print_version(void) { - printf("inflash version: %s\n", INFLASH_VERSION); + printf("xburst-tools 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("inflash - Ingenic XBurst USB Boot Utility\n" + printf("xburst-tools - 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("inflash :> "); + printf("xburst-tools :> "); cptr = fgets(com_buf, 256, stdin); if (cptr == NULL) continue; diff --git a/inflash/src/usb_boot_defines.h b/xburst-tools/src/usb_boot_defines.h similarity index 100% rename from inflash/src/usb_boot_defines.h rename to xburst-tools/src/usb_boot_defines.h diff --git a/inflash/src/inflash.cfg b/xburst-tools/src/xburst_tools.cfg similarity index 98% rename from inflash/src/inflash.cfg rename to xburst-tools/src/xburst_tools.cfg index 2b16cc1..f6595c1 100644 --- a/inflash/src/inflash.cfg +++ b/xburst-tools/src/xburst_tools.cfg @@ -1,5 +1,5 @@ # -# inflash configuration file +# xburst-tools configuration file # # Utility to respond to Ingenic XBurst USB boot protocol, provide # initial boot stages and ability to access NAND on device. diff --git a/inflash/xburst_include/archdefs.h b/xburst-tools/xburst_include/archdefs.h similarity index 100% rename from inflash/xburst_include/archdefs.h rename to xburst-tools/xburst_include/archdefs.h diff --git a/inflash/xburst_include/configs.h b/xburst-tools/xburst_include/configs.h similarity index 100% rename from inflash/xburst_include/configs.h rename to xburst-tools/xburst_include/configs.h diff --git a/inflash/xburst_include/error.h b/xburst-tools/xburst_include/error.h similarity index 100% rename from inflash/xburst_include/error.h rename to xburst-tools/xburst_include/error.h diff --git a/inflash/xburst_include/jz4740.h b/xburst-tools/xburst_include/jz4740.h similarity index 100% rename from inflash/xburst_include/jz4740.h rename to xburst-tools/xburst_include/jz4740.h diff --git a/inflash/xburst_include/jz4750.h b/xburst-tools/xburst_include/jz4750.h similarity index 100% rename from inflash/xburst_include/jz4750.h rename to xburst-tools/xburst_include/jz4750.h diff --git a/inflash/xburst_include/mips.h b/xburst-tools/xburst_include/mips.h similarity index 100% rename from inflash/xburst_include/mips.h rename to xburst-tools/xburst_include/mips.h diff --git a/inflash/xburst_include/mipsregs.h b/xburst-tools/xburst_include/mipsregs.h similarity index 100% rename from inflash/xburst_include/mipsregs.h rename to xburst-tools/xburst_include/mipsregs.h diff --git a/inflash/xburst_include/nandflash.h b/xburst-tools/xburst_include/nandflash.h similarity index 100% rename from inflash/xburst_include/nandflash.h rename to xburst-tools/xburst_include/nandflash.h diff --git a/inflash/xburst_include/sysdefs.h b/xburst-tools/xburst_include/sysdefs.h similarity index 100% rename from inflash/xburst_include/sysdefs.h rename to xburst-tools/xburst_include/sysdefs.h diff --git a/inflash/xburst_include/udc.h b/xburst-tools/xburst_include/udc.h similarity index 100% rename from inflash/xburst_include/udc.h rename to xburst-tools/xburst_include/udc.h diff --git a/inflash/xburst_include/usb.h b/xburst-tools/xburst_include/usb.h similarity index 100% rename from inflash/xburst_include/usb.h rename to xburst-tools/xburst_include/usb.h diff --git a/inflash/xburst_include/usb_boot.h b/xburst-tools/xburst_include/usb_boot.h similarity index 100% rename from inflash/xburst_include/usb_boot.h rename to xburst-tools/xburst_include/usb_boot.h diff --git a/inflash/xburst_include/xburst_types.h b/xburst-tools/xburst_include/xburst_types.h similarity index 100% rename from inflash/xburst_include/xburst_types.h rename to xburst-tools/xburst_include/xburst_types.h diff --git a/inflash/xburst_stage1/Makefile b/xburst-tools/xburst_stage1/Makefile similarity index 100% rename from inflash/xburst_stage1/Makefile rename to xburst-tools/xburst_stage1/Makefile diff --git a/inflash/xburst_stage1/board_4740.c b/xburst-tools/xburst_stage1/board_4740.c similarity index 100% rename from inflash/xburst_stage1/board_4740.c rename to xburst-tools/xburst_stage1/board_4740.c diff --git a/inflash/xburst_stage1/board_4750.c b/xburst-tools/xburst_stage1/board_4750.c similarity index 100% rename from inflash/xburst_stage1/board_4750.c rename to xburst-tools/xburst_stage1/board_4750.c diff --git a/inflash/xburst_stage1/common.c b/xburst-tools/xburst_stage1/common.c similarity index 100% rename from inflash/xburst_stage1/common.c rename to xburst-tools/xburst_stage1/common.c diff --git a/inflash/xburst_stage1/debug.c b/xburst-tools/xburst_stage1/debug.c similarity index 100% rename from inflash/xburst_stage1/debug.c rename to xburst-tools/xburst_stage1/debug.c diff --git a/inflash/xburst_stage1/head.S b/xburst-tools/xburst_stage1/head.S similarity index 100% rename from inflash/xburst_stage1/head.S rename to xburst-tools/xburst_stage1/head.S diff --git a/inflash/xburst_stage1/main.c b/xburst-tools/xburst_stage1/main.c similarity index 100% rename from inflash/xburst_stage1/main.c rename to xburst-tools/xburst_stage1/main.c diff --git a/inflash/xburst_stage1/target.ld b/xburst-tools/xburst_stage1/target.ld similarity index 100% rename from inflash/xburst_stage1/target.ld rename to xburst-tools/xburst_stage1/target.ld diff --git a/inflash/xburst_stage2/Makefile b/xburst-tools/xburst_stage2/Makefile similarity index 100% rename from inflash/xburst_stage2/Makefile rename to xburst-tools/xburst_stage2/Makefile diff --git a/inflash/xburst_stage2/boothandler.c b/xburst-tools/xburst_stage2/boothandler.c similarity index 100% rename from inflash/xburst_stage2/boothandler.c rename to xburst-tools/xburst_stage2/boothandler.c diff --git a/inflash/xburst_stage2/cache.c b/xburst-tools/xburst_stage2/cache.c similarity index 100% rename from inflash/xburst_stage2/cache.c rename to xburst-tools/xburst_stage2/cache.c diff --git a/inflash/xburst_stage2/head.S b/xburst-tools/xburst_stage2/head.S similarity index 100% rename from inflash/xburst_stage2/head.S rename to xburst-tools/xburst_stage2/head.S diff --git a/inflash/xburst_stage2/main.c b/xburst-tools/xburst_stage2/main.c similarity index 100% rename from inflash/xburst_stage2/main.c rename to xburst-tools/xburst_stage2/main.c diff --git a/inflash/xburst_stage2/nandflash_4740.c b/xburst-tools/xburst_stage2/nandflash_4740.c similarity index 100% rename from inflash/xburst_stage2/nandflash_4740.c rename to xburst-tools/xburst_stage2/nandflash_4740.c diff --git a/inflash/xburst_stage2/nandflash_4750.c b/xburst-tools/xburst_stage2/nandflash_4750.c similarity index 100% rename from inflash/xburst_stage2/nandflash_4750.c rename to xburst-tools/xburst_stage2/nandflash_4750.c diff --git a/inflash/xburst_stage2/serial.c b/xburst-tools/xburst_stage2/serial.c similarity index 100% rename from inflash/xburst_stage2/serial.c rename to xburst-tools/xburst_stage2/serial.c diff --git a/inflash/xburst_stage2/target.ld b/xburst-tools/xburst_stage2/target.ld similarity index 100% rename from inflash/xburst_stage2/target.ld rename to xburst-tools/xburst_stage2/target.ld diff --git a/inflash/xburst_stage2/udc.c b/xburst-tools/xburst_stage2/udc.c similarity index 100% rename from inflash/xburst_stage2/udc.c rename to xburst-tools/xburst_stage2/udc.c