luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ROMFS was in RAM

Browse source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1954 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-06-25 22:25:30 +00:00
parent adad9dea8d
commit aa9034a49a
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
binfmt/nxflat.c
View file

@ -158,7 +158,7 @@ static int nxflat_loadbinary(struct binary_s *binp)
if (ret != 0)
{
bdbg("Failed to initialize for load of NXFLT program: %d\n", ret);
return ret;
goto errout;
}
/* Load the program binary */
@ -168,8 +168,7 @@ static int nxflat_loadbinary(struct binary_s *binp)
if (ret != 0)
{
bdbg("Failed to load NXFLT program binary: %d\n", ret);
nxflat_uninit(&loadinfo);
return ret;
goto errout_with_init;
}
/* Bind the program to the exported symbol table */
@ -178,8 +177,7 @@ static int nxflat_loadbinary(struct binary_s *binp)
if (ret != 0)
{
bdbg("Failed to bind symbols program binary: %d\n", ret);
nxflat_uninit(&loadinfo);
return ret;
goto errout_with_load;
}
/* Return the load information */
@ -192,8 +190,16 @@ static int nxflat_loadbinary(struct binary_s *binp)
nxflat_dumpbuffer("Entry code", (FAR const ubyte*)binp->entrypt,
MIN(binp->isize - loadinfo.entryoffs,512));
nxflat_uninit(&loadinfo);
return OK;
errout_with_load:
nxflat_unload(&loadinfo);
errout_with_init:
nxflat_uninit(&loadinfo);
errout:
return ret;
}
/***********************************************************************

2
examples/nxflat/tests/Makefile
View file

@ -82,7 +82,7 @@ $(ROMFS_IMG): populate
# Create the romfs.h header file from the romfs.img file
$(ROMFS_HDR) : $(ROMFS_IMG)
@(cd $(TESTS_DIR); xxd -i romfs.img >$@)
@(cd $(TESTS_DIR); xxd -i romfs.img | sed -e "s/^unsigned/static const unsigned/g" >$@)
# Create the dirlist.h header file from the romfs directory