Commit 8a704565 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

greybus: move all firmware prefix strings to one place

The firmware prefix is hard-coded in a few different places.  Put it all
in one handy #define, for when/if we ever decide to change it in the
future...

Testing: 'strings gb-firmware.ko gb-bootrom.ko | grep ara_' produced the
	 same output before and after this patch.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Reviewed-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarSandeep Patil <sspatil@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 4f7e413b
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include "greybus.h" #include "greybus.h"
#include "firmware.h"
/* Timeout, in jiffies, within which the next request must be received */ /* Timeout, in jiffies, within which the next request must be received */
#define NEXT_REQ_TIMEOUT_MS 1000 #define NEXT_REQ_TIMEOUT_MS 1000
...@@ -157,7 +158,7 @@ static int download_firmware(struct gb_bootrom *bootrom, u8 stage) ...@@ -157,7 +158,7 @@ static int download_firmware(struct gb_bootrom *bootrom, u8 stage)
* XXX Name it properly.. * XXX Name it properly..
*/ */
snprintf(firmware_name, sizeof(firmware_name), snprintf(firmware_name, sizeof(firmware_name),
"ara_%08x_%08x_%08x_%08x_s2l.tftf", FW_NAME_PREFIX "%08x_%08x_%08x_%08x_s2l.tftf",
intf->ddbl1_manufacturer_id, intf->ddbl1_product_id, intf->ddbl1_manufacturer_id, intf->ddbl1_product_id,
intf->vendor_id, intf->product_id); intf->vendor_id, intf->product_id);
......
...@@ -12,6 +12,11 @@ ...@@ -12,6 +12,11 @@
#include "greybus.h" #include "greybus.h"
#define FW_NAME_PREFIX "ara_"
/* Length of the string in format: "FW_NAME_PREFIX""%08x_%08x_%08x_%08x_%s.tftf" */
#define FW_NAME_LEN 56
/* Firmware Management Protocol specific functions */ /* Firmware Management Protocol specific functions */
int fw_mgmt_init(void); int fw_mgmt_init(void);
void fw_mgmt_exit(void); void fw_mgmt_exit(void);
......
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
#include "firmware.h" #include "firmware.h"
#include "greybus.h" #include "greybus.h"
/* Length of the string in format: ara_%08x_%08x_%08x_%08x_%s.tftf */
#define FW_NAME_LEN 56
/* Estimated minimum buffer size, actual size can be smaller than this */ /* Estimated minimum buffer size, actual size can be smaller than this */
#define MIN_FETCH_SIZE 512 #define MIN_FETCH_SIZE 512
/* Timeout, in jiffies, within which fetch or release firmware must be called */ /* Timeout, in jiffies, within which fetch or release firmware must be called */
...@@ -182,7 +180,7 @@ static struct fw_request *find_firmware(struct fw_download *fw_download, ...@@ -182,7 +180,7 @@ static struct fw_request *find_firmware(struct fw_download *fw_download,
fw_req->firmware_id = ret; fw_req->firmware_id = ret;
snprintf(fw_req->name, sizeof(fw_req->name), snprintf(fw_req->name, sizeof(fw_req->name),
"ara_%08x_%08x_%08x_%08x_%s.tftf", FW_NAME_PREFIX "%08x_%08x_%08x_%08x_%s.tftf",
intf->ddbl1_manufacturer_id, intf->ddbl1_product_id, intf->ddbl1_manufacturer_id, intf->ddbl1_product_id,
intf->vendor_id, intf->product_id, tag); intf->vendor_id, intf->product_id, tag);
......
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