Skip to content

W
White Rabbit Switch - Software
Commit 7df864ea authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

userspace/tools/lm32-load: fix variable setting 

We need to reset the CPU outside of the whole loop. This moves stuff
around a lot to do that. Otherwise the variables are set after the CPU
already started, and it may be too late (it is too late in our
specific case).
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent a90e1542
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
userspace/tools/load-lm32.c
View file @ 7df864ea
...@@ -205,26 +205,7 @@ int load_lm32(char *fname, int noload) ...@@ -205,26 +205,7 @@ int load_lm32(char *fname, int noload)
{ {
void *buf; void *buf;
FILE *f; FILE *f;
int fdmem, iself, ret; int iself, ret;
setbuffer(stdout, NULL, 0);
if ((fdmem = open("/dev/mem", O_RDWR | O_SYNC)) < 0) {
fprintf(stderr, "%s: /dev/mem: %s\n", prgname,
strerror(errno));
exit(1);
}
base_fpga = mmap(0, SIZE_FPGA, PROT_READ | PROT_WRITE,
MAP_SHARED, fdmem,
BASE_FPGA);
close(fdmem);
if (base_fpga == MAP_FAILED) {
fprintf(stderr, "%s: mmap(/dev/mem): %s\n",
prgname, strerror(errno));
exit(1);
}
f=fopen(fname,"rb"); f=fopen(fname,"rb");
if(!f) if(!f)
...@@ -256,11 +237,8 @@ int load_lm32(char *fname, int noload) ...@@ -256,11 +237,8 @@ int load_lm32(char *fname, int noload)
return -1; return -1;
} }
if (!noload)
rst_lm32(1);
/* /*
* If else, we need to call the function even if (noload) * If ELF, we need to call the function even if (noload)
* because the function parses ELF and sets global variables. * because the function parses ELF and sets global variables.
* To the same to the binary loader for symmetry. * To the same to the binary loader for symmetry.
*/ */
...@@ -268,8 +246,6 @@ int load_lm32(char *fname, int noload) ...@@ -268,8 +246,6 @@ int load_lm32(char *fname, int noload)
ret = copy_lm32_elf(buf, noload, size); ret = copy_lm32_elf(buf, noload, size);
else else
ret = copy_lm32(buf, noload, size, 0); ret = copy_lm32(buf, noload, size, 0);
if (!noload)
rst_lm32(0);
free(buf); free(buf);
return ret; return ret;
} }
...@@ -334,7 +310,7 @@ static int varaction_lm32(char *fname, char *action) ...@@ -334,7 +310,7 @@ static int varaction_lm32(char *fname, char *action)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int ret; int fdmem, ret;
int i, noload = 0; int i, noload = 0;
prgname = argv[0]; prgname = argv[0];
...@@ -348,6 +324,28 @@ int main(int argc, char **argv) ...@@ -348,6 +324,28 @@ int main(int argc, char **argv)
fprintf(stderr, "%s: Use: \"%s [-n] <filename> " fprintf(stderr, "%s: Use: \"%s [-n] <filename> "
"[<var>=<value> ...]\"\n", prgname, prgname); "[<var>=<value> ...]\"\n", prgname, prgname);
} }
setbuffer(stdout, NULL, 0);
if ((fdmem = open("/dev/mem", O_RDWR | O_SYNC)) < 0) {
fprintf(stderr, "%s: /dev/mem: %s\n", prgname,
strerror(errno));
exit(1);
}
base_fpga = mmap(0, SIZE_FPGA, PROT_READ | PROT_WRITE,
MAP_SHARED, fdmem,
BASE_FPGA);
close(fdmem);
if (base_fpga == MAP_FAILED) {
fprintf(stderr, "%s: mmap(/dev/mem): %s\n",
prgname, strerror(errno));
exit(1);
}
if (!noload)
rst_lm32(1);
ret = load_lm32(argv[1], noload); ret = load_lm32(argv[1], noload);
if (ret) if (ret)
exit(1); exit(1);
...@@ -355,5 +353,7 @@ int main(int argc, char **argv) ...@@ -355,5 +353,7 @@ int main(int argc, char **argv)
for (i = 2; i < argc; i++) for (i = 2; i < argc; i++)
if (varaction_lm32(argv[1], argv[i])) if (varaction_lm32(argv[1], argv[i]))
exit(1); exit(1);
if (!noload)
rst_lm32(0);
return 0; return 0;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment