commit bdf347a3c9145c0aeeae119fc04a1dfb73235a6b
author Furquan Shaikh <furquan@google.com> Fri Feb 20 01:54:50 2015 -0800
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Sat Feb 21 03:30:26 2015 +0000
tree 37d4aa006763894bfecf56e66c2697c43b0a0359
parent ff9faebfbd38376fc8c5c377d50c566ee234fb3d

ryu: Get bootloader version string using get_active_firmware_id

We need bootloader version string to be constantly increasing for
automated flashing and testing purpose. Use newly added
get_active_firmware_id to extract id from fmap and provide to fastboot
call.

BUG=chrome-os-partner:35861
BRANCH=None
TEST=fastboot getvar version-bootloader reports correct version string.

Change-Id: I7d7fbd0e8615036441782a157636b0ec3012f781
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://chromium-review.googlesource.com/251475
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Commit-Queue: Furquan Shaikh <furquan@chromium.org>
Trybot-Ready: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>

src/board/rush_ryu/fastboot.c

diff --git a/src/board/rush_ryu/fastboot.c b/src/board/rush_ryu/fastboot.c
index 29e9470..0c8eb9b 100644
--- a/src/board/rush_ryu/fastboot.c
+++ b/src/board/rush_ryu/fastboot.c
@@ -27,6 +27,7 @@
 #include "board/rush_ryu/fastboot.h"
 #include "config.h"
 #include "drivers/bus/usb/usb.h"
+#include "vboot/firmware_id.h"
 
 struct bdev_info fb_bdev_list[BDEV_COUNT] = {
 	[MMC_BDEV] = {"mmc", NULL, NULL},
@@ -70,9 +71,14 @@
 	struct fb_buffer *output = &cmd->output;
 
 	switch(var) {
-	case FB_BOOTLOADER_VERSION:
-		fb_add_string(output, "coreboot-%s", lib_sysinfo.cb_version);
+	case FB_BOOTLOADER_VERSION: {
+		const char *version = get_active_fw_id();
+		if (version == NULL)
+			ret = -1;
+		else
+			fb_add_string(output, "%s", version);
 		break;
+	}
 	case FB_PRODUCT:
 		fb_add_number(output, "google,ryu-rev%d", lib_sysinfo.board_id);
 		break;