commit 1601ed1b5b841d62a756ce12d3b9d56bf5847aa0
author Dmitry Shmidt <dimitrysh@google.com> Fri Sep 09 22:15:35 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 09 22:15:35 2016 +0000
tree 12774201ceecddaf69b6dea345e74b821448a2d7
parent 05a38ebd5a0d5554e6648eeedff7698a2f1dc1f1
parent 36aa82dda56169333aba6b2c55341404c1d631f0

Merge remote-tracking branch 'aosp/upstream-hikey' into armtf am: 1f3ebb070b am: 4f9328119c am: 01c87cf712
am: 36aa82dda5

Change-Id: Id311c7cb25b4826fa344375d87db358fbaf62e10

plat/hikey/usb.c

diff --git a/plat/hikey/usb.c b/plat/hikey/usb.c
index 0aad84a..57adfbc 100644
--- a/plat/hikey/usb.c
+++ b/plat/hikey/usb.c
@@ -47,6 +47,8 @@
 
 #define USB_BLOCK_HIGH_SPEED_SIZE	512
 
+#define VERSION_BOOTLOADER	"0.4"
+
 struct ep_type {
 	unsigned char		active;
 	unsigned char		busy;
@@ -1271,7 +1273,7 @@
 		tx_status(response);
 		rx_cmd();
 	} else if (!strncmp(cmdbuf + 7, "version-bootloader", 18)) {
-		bytes = sprintf(response, "OKAY%s", version_string);
+		bytes = sprintf(response, "OKAY%s", VERSION_BOOTLOADER);
 		response[bytes] = '\0';
 		tx_status(response);
 		rx_cmd();