sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

install updates from Uros

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3597 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-05-12 18:10:00 +00:00
parent 95d8f15748
commit 9922f4b5d4
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
system/install/install.c
View File

@ -64,7 +64,7 @@ const char *install_help =
"Installs XIP program into flash and creates a start-up script in the\n" "Installs XIP program into flash and creates a start-up script in the\n"
"destination directory.\n\n" "destination directory.\n\n"
"Usage:\t%s [options] source-file.xip destination-directory\n\n" "Usage:\t%s [options] source-file.xip destination-directory\n\n"
"Example:\n\t%s --stack 1024 demo.xip /usr/bin\n\n" "Example:\n\t%s --stack 1024 /sdcard/demo.xip /usr/bin\n\n"
"Options:\n" "Options:\n"
"\t--stack <required_stack_space>\n" "\t--stack <required_stack_space>\n"
"\t--priority <priority>\n" "\t--priority <priority>\n"
@ -77,7 +77,7 @@ const char *install_script_text =
"# XIP stacksize=%x priority=%x size=%x\n"; "# XIP stacksize=%x priority=%x size=%x\n";
const char *install_script_exec = const char *install_script_exec =
"exec %x\n"; "exec 0x%x\n";
/**************************************************************************** /****************************************************************************
@ -88,12 +88,13 @@ int install_getstartpage(int startpage, int pagemargin, int desiredsize)
{ {
uint16_t page = 0, stpage = 0xFFFF; uint16_t page = 0, stpage = 0xFFFF;
uint16_t pagesize = 0; uint16_t pagesize = 0;
int maxlen = 0, maxlen_start = 0xFFFF; int maxlen = -1;
int status; int maxlen_start = 0xFFFF;
int status;
for (status=0, page=0; status >= 0; page++) { for (status=0, page=0; status >= 0; page++) {
status = up_progmem_ispageerased(page); status = up_progmem_ispageerased(page);
pagesize = up_progmem_pagesize(page); pagesize = up_progmem_pagesize(page);
/* Is this beginning of new free space section */ /* Is this beginning of new free space section */
@ -102,7 +103,7 @@ int install_getstartpage(int startpage, int pagemargin, int desiredsize)
} }
else if (status != 0) { else if (status != 0) {
if (stpage != 0xFFFF && up_progmem_isuniform()) { if (stpage != 0xFFFF) {
if ( (page - stpage) > maxlen) { if ( (page - stpage) > maxlen) {
@ -293,7 +294,7 @@ int install_remove(const char *scriptname)
int install_main(int argc, char *argv[]) int install_main(int argc, char *argv[])
{ {
int i; int i;
int progsize; int progsize;
int scrsta; int scrsta;
int stacksize = 4096; int stacksize = 4096;
@ -302,7 +303,7 @@ int install_main(int argc, char *argv[])
int startpage = 0; int startpage = 0;
int startaddr = 0; int startaddr = 0;
int action = ACTION_INSTALL; int action = ACTION_INSTALL;
char scriptname[2*CONFIG_NAME_MAX]; char scriptname[128];
/* Supported? */ /* Supported? */

2
vsn/Makefile
View File

@ -37,7 +37,7 @@
# Sub-directories # Sub-directories
SUBDIRS = free hello poweroff ramtron sdcard sysinfo SUBDIRS = hello poweroff ramtron sdcard sysinfo
all: nothing all: nothing
.PHONY: nothing context depend clean distclean .PHONY: nothing context depend clean distclean