fastboot: Remove "bootloader-version" variable

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/+/refs/tags/android-q-preview-4/fastboot/README.md

Fixes: 3aab70afc531d1 ("usb/gadget: add the fastboot gadget")
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Eugeniu Rosca <erosca@de.adit-jv.com>

diff --git a/doc/android/fastboot.txt b/doc/android/fastboot.txt
index ea0d1da1fdc1c7d00271944099ed955bf5858752..9de13223f84e28c86468e5b4d309825cdb282f88 100644 (file)
--- a/doc/android/fastboot.txt
+++ b/doc/android/fastboot.txt
@@ -169,9 +169,9 @@ On the client side you can fetch the bootloader version for instance:
 
 ::
 
-   $ fastboot getvar bootloader-version
-   bootloader-version: U-Boot 2014.04-00005-gd24cabc
-   finished. total time: 0.000s
+   $ fastboot getvar version-bootloader
+   version-bootloader: U-Boot 2019.07-rc4-00240-g00c9f2a2ec
+   Finished. Total time: 0.005s
 
 or initiate a reboot:
 

diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index fd0823b2bfe1800f4b586211c13de4456e58ad3d..ebe5c8a1043685df302a9e7f155e96a39a2c5273 100644 (file)
--- 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);
 }