Commit b29906af authored by Michael Scott's avatar Michael Scott Committed by Greg Kroah-Hartman

greybus: firmware: replace colons with underscore in firmware file request

Due to some issues with handling colons in Android (and possibly
future exposure to other problems) we should remove the colons from
the firmware file request.  Replacing them with underscores.

Specifically, we copy firmware into the Android build using a line
similar to this:
PRODUCT_COPY_FILES += \
    source-repo/ara:00000126:00001000:00000001:00000001:02.tftf:system/etc/firmware/ara:00000126:00001000:00000001:00000001:02.tftf

There is a colon delimiter between the source and destination in the
PRODUCT_COPY_FILES format.  The greybus naming logic breaks the parsing
routine and generates an Android build break.
Signed-off-by: default avatarMichael Scott <michael.scott@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent b55d9431
...@@ -84,7 +84,7 @@ static int download_firmware(struct gb_firmware *firmware, u8 stage) ...@@ -84,7 +84,7 @@ static int download_firmware(struct gb_firmware *firmware, 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:%02x.tftf", "ara_%08x_%08x_%08x_%08x_%02x.tftf",
intf->ddbl1_manufacturer_id, intf->ddbl1_product_id, intf->ddbl1_manufacturer_id, intf->ddbl1_product_id,
firmware->vendor_id, firmware->product_id, stage); firmware->vendor_id, firmware->product_id, stage);
......
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