greybus: firmware: replace colons with underscore in firmware file request
authorMichael Scott <michael.scott@linaro.org>
Fri, 15 Jan 2016 22:03:17 +0000 (14:03 -0800)
committerGreg Kroah-Hartman <gregkh@google.com>
Fri, 15 Jan 2016 22:41:18 +0000 (14:41 -0800)
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: Michael Scott <michael.scott@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
drivers/staging/greybus/firmware.c

index b65787c..11d605b 100644 (file)
@@ -84,7 +84,7 @@ static int download_firmware(struct gb_firmware *firmware, u8 stage)
         * XXX Name it properly..
         */
        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,
                 firmware->vendor_id, firmware->product_id, stage);