summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2018-10-07 23:35:16 -0700
committerSascha Hauer <s.hauer@pengutronix.de>2018-10-08 10:07:12 +0200
commitc4ed3b223126e69d697fbf482ab60e125bbe3d43 (patch)
treea4147091bdb2051dbb331aaedb987106cf978079
parent76b44a34fc00772319395a84e67b8f816804f5bc (diff)
downloadbarebox-c4ed3b223126e69d697fbf482ab60e125bbe3d43.tar.gz
barebox-c4ed3b223126e69d697fbf482ab60e125bbe3d43.tar.xz
bbu: Add "handler" parameter to barebox_update()
Add "handler" parameter to barebox_update() and remove the code that was respondible for header lookup before. With this change finding appropriate handler is caller's responsibility, which makes it possible to implement custom handler lookup/existence check, chache it, and then re-use it without calling handler_find_by_* functions for the second time. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--commands/barebox-update.c11
-rw-r--r--common/bbu.c11
-rw-r--r--drivers/usb/gadget/f_fastboot.c6
-rw-r--r--include/bbu.h2
4 files changed, 16 insertions, 14 deletions
diff --git a/commands/barebox-update.c b/commands/barebox-update.c
index 84798ab0d9..903b4068df 100644
--- a/commands/barebox-update.c
+++ b/commands/barebox-update.c
@@ -28,6 +28,7 @@ static int do_barebox_update(int argc, char *argv[])
{
int opt, ret, repair = 0;
struct bbu_data data = {};
+ struct bbu_handler *handler;
void *image = NULL;
while ((opt = getopt(argc, argv, "t:yf:ld:r")) > 0) {
@@ -69,7 +70,15 @@ static int do_barebox_update(int argc, char *argv[])
return COMMAND_ERROR_USAGE;
}
- ret = barebox_update(&data);
+ handler = bbu_find_handler_by_device(data.devicefile);
+
+ if (!handler)
+ handler = bbu_find_handler_by_name(data.handler_name);
+
+ if (!handler)
+ return COMMAND_ERROR_USAGE;
+
+ ret = barebox_update(&data, handler);
free(image);
diff --git a/common/bbu.c b/common/bbu.c
index fabd949664..75c3221d56 100644
--- a/common/bbu.c
+++ b/common/bbu.c
@@ -216,19 +216,10 @@ static int bbu_check_metadata(struct bbu_data *data)
/*
* do a barebox update with data from *data
*/
-int barebox_update(struct bbu_data *data)
+int barebox_update(struct bbu_data *data, struct bbu_handler *handler)
{
- struct bbu_handler *handler;
int ret;
- handler = bbu_find_handler_by_device(data->devicefile);
-
- if (!handler)
- handler = bbu_find_handler_by_name(data->handler_name);
-
- if (!handler)
- return -ENODEV;
-
if (!data->image && !data->imagefile &&
!(handler->flags & BBU_HANDLER_CAN_REFRESH)) {
pr_err("No Image file given\n");
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 0f25c13998..58d9230b07 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -986,12 +986,14 @@ static void cb_flash(struct f_fastboot *f_fb, const char *cmd)
}
if (IS_ENABLED(CONFIG_BAREBOX_UPDATE) && filetype_is_barebox_image(filetype)) {
+ struct bbu_handler *handler;
struct bbu_data data = {
.devicefile = filename,
.flags = BBU_FLAG_YES,
};
- if (!bbu_find_handler_by_device(data.devicefile))
+ handler = bbu_find_handler_by_device(data.devicefile);
+ if (!handler)
goto copy;
fastboot_tx_print(f_fb, "INFOThis is a barebox image...");
@@ -1010,7 +1012,7 @@ static void cb_flash(struct f_fastboot *f_fb, const char *cmd)
data.image = f_fb->buf;
data.imagefile = sourcefile;
- ret = barebox_update(&data);
+ ret = barebox_update(&data, handler);
if (ret)
fastboot_tx_print(f_fb, "FAILupdate barebox: %s", strerror(-ret));
diff --git a/include/bbu.h b/include/bbu.h
index 775d7a3100..0ed355b539 100644
--- a/include/bbu.h
+++ b/include/bbu.h
@@ -40,7 +40,7 @@ int bbu_force(struct bbu_data *, const char *fmt, ...)
int bbu_confirm(struct bbu_data *);
-int barebox_update(struct bbu_data *);
+int barebox_update(struct bbu_data *, struct bbu_handler *);
struct bbu_handler *bbu_find_handler_by_name(const char *name);
struct bbu_handler *bbu_find_handler_by_device(const char *devicepath);