As per [1], there is no such fastboot variable as "bootloader-version". Only "version-bootloader" is supported. Let's reflect this and not confuse users further.
[1] https://android.googlesource.com/platform/system/core/+/master/fastboot/READ...
Signed-off-by: Sam Protsenko semen.protsenko@linaro.org --- doc/README.android-fastboot | 4 ++-- drivers/fastboot/fb_getvar.c | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/doc/README.android-fastboot b/doc/README.android-fastboot index 431191c473..ce852a4fd1 100644 --- a/doc/README.android-fastboot +++ b/doc/README.android-fastboot @@ -169,8 +169,8 @@ On the client side you can fetch the bootloader version for instance:
::
- $ fastboot getvar bootloader-version - bootloader-version: U-Boot 2014.04-00005-gd24cabc + $ fastboot getvar version-bootloader + version-bootloader: U-Boot 2014.04-00005-gd24cabc finished. total time: 0.000s
or initiate a reboot: diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index fd0823b2bf..ebe5c8a104 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -12,7 +12,7 @@ #include <version.h>
static void getvar_version(char *var_parameter, char *response); -static void getvar_bootloader_version(char *var_parameter, char *response); +static void getvar_version_bootloader(char *var_parameter, char *response); static void getvar_downloadsize(char *var_parameter, char *response); static void getvar_serialno(char *var_parameter, char *response); static void getvar_version_baseband(char *var_parameter, char *response); @@ -37,12 +37,9 @@ static const struct { { .variable = "version", .dispatch = getvar_version - }, { - .variable = "bootloader-version", - .dispatch = getvar_bootloader_version }, { .variable = "version-bootloader", - .dispatch = getvar_bootloader_version + .dispatch = getvar_version_bootloader }, { .variable = "downloadsize", .dispatch = getvar_downloadsize @@ -131,7 +128,7 @@ static void getvar_version(char *var_parameter, char *response) fastboot_okay(FASTBOOT_VERSION, response); }
-static void getvar_bootloader_version(char *var_parameter, char *response) +static void getvar_version_bootloader(char *var_parameter, char *response) { fastboot_okay(U_BOOT_VERSION, response); }