summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-02-15 12:59:10 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-02-15 12:59:10 +0100
commitc20952a62135d791a1a070aeedeee712a3bf017e (patch)
treed7c8b9eb7df6c4804f190d3059c8c66304afb972 /commands
parent4b06ebc820aa9a46dfb73c7050b073d8224b4b70 (diff)
parent238b7b1d99940a4fa0579adda026fdebd67ae243 (diff)
downloadbarebox-c20952a62135d791a1a070aeedeee712a3bf017e.tar.gz
barebox-c20952a62135d791a1a070aeedeee712a3bf017e.tar.xz
Merge branch 'master' into next
Diffstat (limited to 'commands')
-rw-r--r--commands/bootm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/commands/bootm.c b/commands/bootm.c
index c23f4f3996..e96665adcf 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -324,7 +324,7 @@ static int do_bootm(struct command *cmdtp, int argc, char *argv[])
if (os_type == filetype_uimage) {
ret = bootm_open_os_uimage(&data);
if (ret) {
- printf("loading initrd failed with %s\n",
+ printf("loading os image failed with %s\n",
strerror(-ret));
goto err_out;
}