qi-hardware/xburst-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/xburst-tools.git synced 2025-04-21 12:27:27 +03:00
Code Activity

update libusb-1.0 LIBS CFLAGS to configure.ac

Browse Source 
update package version define in usbboot, xbboot
 update .gitignore
 resolve the confilict file on "config.h"

Signed-off-by: Xiangfu Liu <xiangfu@sharism.cc>
This commit is contained in:
Xiangfu Liu
2011-04-08 15:48:59 +08:00
parent fdbf94c903
commit 71d2db02e5
9 changed files with 31 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
usbboot/src/.gitignore vendored
View File

@@ -1,3 +1,2 @@
/.deps/
/*_version.h
/usbboot

6
usbboot/src/Makefile.am
View File

@@ -1,11 +1,5 @@
AM_CFLAGS = -pedantic -Wall -W -DCFGDIR=\"$(cfgdir)\" -DDATADIR=\"$(pkgdatadir)\"
xburst-tools_version.h:
echo -e '#ifndef XBURST_TOOLS_VERSION' \
'\n#define XBURST_TOOLS_VERSION "201103"' \
'\n#endif' > xburst-tools_version.h
BUILT_SOURCES = xburst-tools_version.h
bin_PROGRAMS = usbboot
usbboot_SOURCES = cmd.c command_line.c ingenic_cfg.c \
ingenic_usb.c main.c

1
usbboot/src/command_line.c
View File

@@ -22,7 +22,6 @@
#include "usb_boot_defines.h"
#include "ingenic_usb.h"
#include "cmd.h"
#include "xburst-tools_version.h"
extern struct nand_in nand_in;
extern struct sdram_in sdram_in;

18
usbboot/src/main.c
View File

@@ -21,7 +21,7 @@
#include <getopt.h>
#include <unistd.h>
#include <string.h>
#include "xburst-tools_version.h"
#include "xburst-tools-config.h"
#include "command_line.h"
#include "ingenic_usb.h"
#include "ingenic_cfg.h"
@@ -43,16 +43,16 @@ static void help(void)
" -c --command\t\t\tDirect run the commands, split by ';'\n"
" \t\t\tNOTICE: the max commands count is 10!\n"
" -f --configure\t\tconfigure file path\n"
" -1 --stage1\t\tstage1 file path\n"
" -2 --stage2\t\tstage2 file path\n"
" -1 --stage1\t\t\tstage1 file path\n"
" -2 --stage2\t\t\tstage2 file path\n"
" <run without options to enter commands via usbboot prompt>\n\n"
"Report bugs to <xiangfu@sharism.cc>.\n"
"Report bugs to xiangfu@sharism.cc.\n"
);
}
static void print_version(void)
{
printf("usbboot version: %s\n", XBURST_TOOLS_VERSION);
printf("usbboot %s\n", PACKAGE_VERSION);
}
static struct option opts[] = {
@@ -76,10 +76,6 @@ int main(int argc, char **argv)
stage1 = STAGE1_FILE_PATH;
stage2 = STAGE2_FILE_PATH;
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");
while(1) {
int c, option_index = 0;
c = getopt_long(argc, argv, "hvc:f:1:2:", opts,
@@ -113,6 +109,10 @@ int main(int argc, char **argv)
}
}
printf("\nusbboot version %s - 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", PACKAGE_VERSION);
if (usb_ingenic_init(&ingenic_dev) < 1)
return EXIT_FAILURE;