diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
| commit | 88107f6e121a3a1835aa261a39a0a284e06457ce (patch) | |
| tree | b8f7a1618c29215aa3bfa0c24fe99bdffb4da650 /commands | |
| parent | ae982001331215adb009cc93701401623b2a94d7 (diff) | |
| parent | 0d98114eb218aa80379b82192499e4c91d64123c (diff) | |
| download | barebox-88107f6e121a3a1835aa261a39a0a284e06457ce.tar.gz barebox-88107f6e121a3a1835aa261a39a0a284e06457ce.tar.xz | |
Merge branch 'for-next/randconfig'
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/Kconfig | 2 | ||||
| -rw-r--r-- | commands/exec.c | 4 | ||||
| -rw-r--r-- | commands/loadb.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/commands/Kconfig b/commands/Kconfig index 2478e3ffef..92a8152905 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -349,6 +349,7 @@ config CMD_BOOTM tristate default y select CRC32 + select UIMAGE select UNCOMPRESS select FILETYPE select GLOBALVAR @@ -397,6 +398,7 @@ config CMD_BOOTM_AIMAGE Support using Android Images. config CMD_UIMAGE + select UIMAGE tristate prompt "uimage" help diff --git a/commands/exec.c b/commands/exec.c index a25e8cf864..e2509ff475 100644 --- a/commands/exec.c +++ b/commands/exec.c @@ -38,11 +38,11 @@ static int do_exec(int argc, char *argv[]) return COMMAND_ERROR_USAGE; for (i=1; i<argc; ++i) { - script = read_file(argv[i]); + script = read_file(argv[i], NULL); if (!script) return 1; - if (run_command (script, flag) == -1) + if (run_command (script, 0) == -1) goto out; free(script); } diff --git a/commands/loadb.c b/commands/loadb.c index 9a697dd6e6..50f323e856 100644 --- a/commands/loadb.c +++ b/commands/loadb.c @@ -61,10 +61,10 @@ #define untochar(x) ((int) (((x) - SPACE) & 0xff)) #define DEF_FILE "image.bin" -#ifdef CONFIG_CMD_LOADB - static int ofd; /* output file descriptor */ +#ifdef CONFIG_CMD_LOADB + /* Size of my buffer to write to o/p file */ #define MAX_WRITE_BUFFER 4096 /* Write size to o/p file */ static char *write_buffer; /* buffer for finalized data to write */ |