diff --git a/xburst-tools/.gitignore b/usbboot/.gitignore similarity index 100% rename from xburst-tools/.gitignore rename to usbboot/.gitignore diff --git a/xburst-tools/COPYING b/usbboot/COPYING similarity index 100% rename from xburst-tools/COPYING rename to usbboot/COPYING diff --git a/xburst-tools/ChangeLog b/usbboot/ChangeLog similarity index 100% rename from xburst-tools/ChangeLog rename to usbboot/ChangeLog diff --git a/xburst-tools/Makefile.am b/usbboot/Makefile.am similarity index 100% rename from xburst-tools/Makefile.am rename to usbboot/Makefile.am diff --git a/usbboot/README b/usbboot/README new file mode 100644 index 0000000..7015b04 --- /dev/null +++ b/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 + Marek Lindner + Wolfgang Spraul + +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" diff --git a/xburst-tools/autogen.sh b/usbboot/autogen.sh similarity index 100% rename from xburst-tools/autogen.sh rename to usbboot/autogen.sh diff --git a/xburst-tools/configure.ac b/usbboot/configure.ac similarity index 100% rename from xburst-tools/configure.ac rename to usbboot/configure.ac diff --git a/xburst-tools/debian/changelog b/usbboot/debian/changelog similarity index 100% rename from xburst-tools/debian/changelog rename to usbboot/debian/changelog diff --git a/xburst-tools/debian/compat b/usbboot/debian/compat similarity index 100% rename from xburst-tools/debian/compat rename to usbboot/debian/compat diff --git a/xburst-tools/debian/control b/usbboot/debian/control similarity index 100% rename from xburst-tools/debian/control rename to usbboot/debian/control diff --git a/xburst-tools/debian/copyright b/usbboot/debian/copyright similarity index 100% rename from xburst-tools/debian/copyright rename to usbboot/debian/copyright diff --git a/xburst-tools/debian/dirs b/usbboot/debian/dirs similarity index 100% rename from xburst-tools/debian/dirs rename to usbboot/debian/dirs diff --git a/xburst-tools/debian/docs b/usbboot/debian/docs similarity index 100% rename from xburst-tools/debian/docs rename to usbboot/debian/docs diff --git a/xburst-tools/debian/rules b/usbboot/debian/rules similarity index 100% rename from xburst-tools/debian/rules rename to usbboot/debian/rules diff --git a/xburst-tools/src/.gitignore b/usbboot/src/.gitignore similarity index 100% rename from xburst-tools/src/.gitignore rename to usbboot/src/.gitignore diff --git a/xburst-tools/src/Makefile.am b/usbboot/src/Makefile.am similarity index 87% rename from xburst-tools/src/Makefile.am rename to usbboot/src/Makefile.am index a381632..b978e47 100644 --- a/xburst-tools/src/Makefile.am +++ b/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 -xburst_tools_SOURCES = cmd.c command_line.c ingenic_cfg.c \ +bin_PROGRAMS = usbboot +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: diff --git a/xburst-tools/src/cmd.c b/usbboot/src/cmd.c similarity index 100% rename from xburst-tools/src/cmd.c rename to usbboot/src/cmd.c diff --git a/xburst-tools/src/cmd.h b/usbboot/src/cmd.h similarity index 100% rename from xburst-tools/src/cmd.h rename to usbboot/src/cmd.h diff --git a/xburst-tools/src/command_line.c b/usbboot/src/command_line.c similarity index 99% rename from xburst-tools/src/command_line.c rename to usbboot/src/command_line.c index c2226ed..f475085 100644 --- a/xburst-tools/src/command_line.c +++ b/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: diff --git a/xburst-tools/src/command_line.h b/usbboot/src/command_line.h similarity index 100% rename from xburst-tools/src/command_line.h rename to usbboot/src/command_line.h diff --git a/xburst-tools/src/ingenic_cfg.c b/usbboot/src/ingenic_cfg.c similarity index 100% rename from xburst-tools/src/ingenic_cfg.c rename to usbboot/src/ingenic_cfg.c diff --git a/xburst-tools/src/ingenic_cfg.h b/usbboot/src/ingenic_cfg.h similarity index 100% rename from xburst-tools/src/ingenic_cfg.h rename to usbboot/src/ingenic_cfg.h diff --git a/xburst-tools/src/ingenic_usb.c b/usbboot/src/ingenic_usb.c similarity index 100% rename from xburst-tools/src/ingenic_usb.c rename to usbboot/src/ingenic_usb.c diff --git a/xburst-tools/src/ingenic_usb.h b/usbboot/src/ingenic_usb.h similarity index 100% rename from xburst-tools/src/ingenic_usb.h rename to usbboot/src/ingenic_usb.h diff --git a/xburst-tools/src/main.c b/usbboot/src/main.c similarity index 89% rename from xburst-tools/src/main.c rename to usbboot/src/main.c index 0c60bae..55a203d 100644 --- a/xburst-tools/src/main.c +++ b/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" - " \n\n" + " \n\n" "Report bugs to .\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; diff --git a/xburst-tools/src/usb_boot_defines.h b/usbboot/src/usb_boot_defines.h similarity index 100% rename from xburst-tools/src/usb_boot_defines.h rename to usbboot/src/usb_boot_defines.h diff --git a/xburst-tools/src/xburst_tools.cfg b/usbboot/src/usbboot.cfg similarity index 90% rename from xburst-tools/src/xburst_tools.cfg rename to usbboot/src/usbboot.cfg index f6595c1..51af7c6 100644 --- a/xburst-tools/src/xburst_tools.cfg +++ b/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 +# Authors: Ingenic Semiconductor, Inc. +# Xiangfu Liu # Marek Lindner +# Wolfgang Spraul # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/xburst-tools/xburst_include/archdefs.h b/usbboot/xburst_include/archdefs.h similarity index 100% rename from xburst-tools/xburst_include/archdefs.h rename to usbboot/xburst_include/archdefs.h diff --git a/xburst-tools/xburst_include/configs.h b/usbboot/xburst_include/configs.h similarity index 100% rename from xburst-tools/xburst_include/configs.h rename to usbboot/xburst_include/configs.h diff --git a/xburst-tools/xburst_include/error.h b/usbboot/xburst_include/error.h similarity index 100% rename from xburst-tools/xburst_include/error.h rename to usbboot/xburst_include/error.h diff --git a/xburst-tools/xburst_include/jz4740.h b/usbboot/xburst_include/jz4740.h similarity index 100% rename from xburst-tools/xburst_include/jz4740.h rename to usbboot/xburst_include/jz4740.h diff --git a/xburst-tools/xburst_include/jz4750.h b/usbboot/xburst_include/jz4750.h similarity index 100% rename from xburst-tools/xburst_include/jz4750.h rename to usbboot/xburst_include/jz4750.h diff --git a/xburst-tools/xburst_include/mips.h b/usbboot/xburst_include/mips.h similarity index 100% rename from xburst-tools/xburst_include/mips.h rename to usbboot/xburst_include/mips.h diff --git a/xburst-tools/xburst_include/mipsregs.h b/usbboot/xburst_include/mipsregs.h similarity index 100% rename from xburst-tools/xburst_include/mipsregs.h rename to usbboot/xburst_include/mipsregs.h diff --git a/xburst-tools/xburst_include/nandflash.h b/usbboot/xburst_include/nandflash.h similarity index 100% rename from xburst-tools/xburst_include/nandflash.h rename to usbboot/xburst_include/nandflash.h diff --git a/xburst-tools/xburst_include/sysdefs.h b/usbboot/xburst_include/sysdefs.h similarity index 100% rename from xburst-tools/xburst_include/sysdefs.h rename to usbboot/xburst_include/sysdefs.h diff --git a/xburst-tools/xburst_include/udc.h b/usbboot/xburst_include/udc.h similarity index 100% rename from xburst-tools/xburst_include/udc.h rename to usbboot/xburst_include/udc.h diff --git a/xburst-tools/xburst_include/usb.h b/usbboot/xburst_include/usb.h similarity index 100% rename from xburst-tools/xburst_include/usb.h rename to usbboot/xburst_include/usb.h diff --git a/xburst-tools/xburst_include/usb_boot.h b/usbboot/xburst_include/usb_boot.h similarity index 100% rename from xburst-tools/xburst_include/usb_boot.h rename to usbboot/xburst_include/usb_boot.h diff --git a/xburst-tools/xburst_include/xburst_types.h b/usbboot/xburst_include/xburst_types.h similarity index 100% rename from xburst-tools/xburst_include/xburst_types.h rename to usbboot/xburst_include/xburst_types.h diff --git a/xburst-tools/xburst_stage1/.gitignore b/usbboot/xburst_stage1/.gitignore similarity index 100% rename from xburst-tools/xburst_stage1/.gitignore rename to usbboot/xburst_stage1/.gitignore diff --git a/xburst-tools/xburst_stage1/Makefile b/usbboot/xburst_stage1/Makefile similarity index 100% rename from xburst-tools/xburst_stage1/Makefile rename to usbboot/xburst_stage1/Makefile diff --git a/xburst-tools/xburst_stage1/board_4740.c b/usbboot/xburst_stage1/board_4740.c similarity index 100% rename from xburst-tools/xburst_stage1/board_4740.c rename to usbboot/xburst_stage1/board_4740.c diff --git a/xburst-tools/xburst_stage1/board_4750.c b/usbboot/xburst_stage1/board_4750.c similarity index 100% rename from xburst-tools/xburst_stage1/board_4750.c rename to usbboot/xburst_stage1/board_4750.c diff --git a/xburst-tools/xburst_stage1/common.c b/usbboot/xburst_stage1/common.c similarity index 100% rename from xburst-tools/xburst_stage1/common.c rename to usbboot/xburst_stage1/common.c diff --git a/xburst-tools/xburst_stage1/debug.c b/usbboot/xburst_stage1/debug.c similarity index 100% rename from xburst-tools/xburst_stage1/debug.c rename to usbboot/xburst_stage1/debug.c diff --git a/xburst-tools/xburst_stage1/head.S b/usbboot/xburst_stage1/head.S similarity index 100% rename from xburst-tools/xburst_stage1/head.S rename to usbboot/xburst_stage1/head.S diff --git a/xburst-tools/xburst_stage1/main.c b/usbboot/xburst_stage1/main.c similarity index 100% rename from xburst-tools/xburst_stage1/main.c rename to usbboot/xburst_stage1/main.c diff --git a/xburst-tools/xburst_stage1/target.ld b/usbboot/xburst_stage1/target.ld similarity index 100% rename from xburst-tools/xburst_stage1/target.ld rename to usbboot/xburst_stage1/target.ld diff --git a/xburst-tools/xburst_stage2/.gitignore b/usbboot/xburst_stage2/.gitignore similarity index 100% rename from xburst-tools/xburst_stage2/.gitignore rename to usbboot/xburst_stage2/.gitignore diff --git a/xburst-tools/xburst_stage2/Makefile b/usbboot/xburst_stage2/Makefile similarity index 100% rename from xburst-tools/xburst_stage2/Makefile rename to usbboot/xburst_stage2/Makefile diff --git a/xburst-tools/xburst_stage2/boothandler.c b/usbboot/xburst_stage2/boothandler.c similarity index 100% rename from xburst-tools/xburst_stage2/boothandler.c rename to usbboot/xburst_stage2/boothandler.c diff --git a/xburst-tools/xburst_stage2/cache.c b/usbboot/xburst_stage2/cache.c similarity index 100% rename from xburst-tools/xburst_stage2/cache.c rename to usbboot/xburst_stage2/cache.c diff --git a/xburst-tools/xburst_stage2/head.S b/usbboot/xburst_stage2/head.S similarity index 100% rename from xburst-tools/xburst_stage2/head.S rename to usbboot/xburst_stage2/head.S diff --git a/xburst-tools/xburst_stage2/main.c b/usbboot/xburst_stage2/main.c similarity index 100% rename from xburst-tools/xburst_stage2/main.c rename to usbboot/xburst_stage2/main.c diff --git a/xburst-tools/xburst_stage2/nandflash_4740.c b/usbboot/xburst_stage2/nandflash_4740.c similarity index 100% rename from xburst-tools/xburst_stage2/nandflash_4740.c rename to usbboot/xburst_stage2/nandflash_4740.c diff --git a/xburst-tools/xburst_stage2/nandflash_4750.c b/usbboot/xburst_stage2/nandflash_4750.c similarity index 100% rename from xburst-tools/xburst_stage2/nandflash_4750.c rename to usbboot/xburst_stage2/nandflash_4750.c diff --git a/xburst-tools/xburst_stage2/serial.c b/usbboot/xburst_stage2/serial.c similarity index 100% rename from xburst-tools/xburst_stage2/serial.c rename to usbboot/xburst_stage2/serial.c diff --git a/xburst-tools/xburst_stage2/target.ld b/usbboot/xburst_stage2/target.ld similarity index 100% rename from xburst-tools/xburst_stage2/target.ld rename to usbboot/xburst_stage2/target.ld diff --git a/xburst-tools/xburst_stage2/udc.c b/usbboot/xburst_stage2/udc.c similarity index 100% rename from xburst-tools/xburst_stage2/udc.c rename to usbboot/xburst_stage2/udc.c diff --git a/xburst-tools/README b/xburst-tools/README deleted file mode 100644 index 55b1696..0000000 --- a/xburst-tools/README +++ /dev/null @@ -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 - Marek Lindner - Wolfgang Spraul - -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"