summaryrefslogtreecommitdiffstats
path: root/common/bbu.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-04-08 13:37:28 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-04-08 13:37:28 +0200
commitfd50a8d758cb79a6ca833e82e6d533a3bbcc247d (patch)
treede862ee99138ea54e97234ec4a1ae172e87487de /common/bbu.c
parent0d3f88a6dbe59bced2530e69d241f569be58cf3c (diff)
parent60f2c23684797173169a940abf9f1985537c156e (diff)
downloadbarebox-fd50a8d758cb79a6ca833e82e6d533a3bbcc247d.tar.gz
barebox-fd50a8d758cb79a6ca833e82e6d533a3bbcc247d.tar.xz
Merge branch 'for-next/imx-bbu-nand-fcb'
Diffstat (limited to 'common/bbu.c')
-rw-r--r--common/bbu.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/common/bbu.c b/common/bbu.c
index 5fbef6a668..1b22139908 100644
--- a/common/bbu.c
+++ b/common/bbu.c
@@ -66,9 +66,13 @@ int bbu_confirm(struct bbu_data *data)
if (data->flags & BBU_FLAG_YES)
return 0;
- printf("update barebox from %s using handler %s to %s (y/n)?\n",
+ if (data->imagefile)
+ printf("update barebox from %s using handler %s to %s (y/n)?\n",
data->imagefile, data->handler_name,
data->devicefile);
+ else
+ printf("Refresh barebox on %s using handler %s (y/n)?\n",
+ data->devicefile, data->handler_name);
key = read_key();
@@ -215,6 +219,12 @@ int barebox_update(struct bbu_data *data)
if (!handler)
return -ENODEV;
+ if (!data->image && !data->imagefile &&
+ !(handler->flags & BBU_HANDLER_CAN_REFRESH)) {
+ pr_err("No Image file given\n");
+ return -EINVAL;
+ }
+
if (!data->handler_name)
data->handler_name = handler->name;