From 160102d112ce6e94b2c924fe2aaafff79808dcba Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Tue, 18 Jun 2019 17:55:25 +0300 Subject: fastboot: Remove "slot-suffixes" variable "slot-suffixes" variable was dropped in fastboot tool (in [1]). Let's track AOSP/master and drop this variable in U-Boot as well. [1] https://android.googlesource.com/platform/system/core/+/42b18a518bac85c3eea14206f6cbafbd1e98a31f Signed-off-by: Sam Protsenko [lukma: Remove getvar_slot_suffixes() declaration] Signed-off-by: Lukasz Majewski --- drivers/fastboot/fb_getvar.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'drivers/fastboot/fb_getvar.c') diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index bf957e8326..9ee5054485 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -19,7 +19,6 @@ static void getvar_version_baseband(char *var_parameter, char *response); static void getvar_product(char *var_parameter, char *response); static void getvar_platform(char *var_parameter, char *response); static void getvar_current_slot(char *var_parameter, char *response); -static void getvar_slot_suffixes(char *var_parameter, char *response); #if CONFIG_IS_ENABLED(FASTBOOT_FLASH) static void getvar_has_slot(char *var_parameter, char *response); #endif @@ -64,9 +63,6 @@ static const struct { }, { .variable = "current-slot", .dispatch = getvar_current_slot - }, { - .variable = "slot-suffixes", - .dispatch = getvar_slot_suffixes #if CONFIG_IS_ENABLED(FASTBOOT_FLASH) }, { .variable = "has-slot", @@ -182,11 +178,6 @@ static void getvar_current_slot(char *var_parameter, char *response) fastboot_okay("a", response); } -static void getvar_slot_suffixes(char *var_parameter, char *response) -{ - fastboot_okay("a,b", response); -} - #if CONFIG_IS_ENABLED(FASTBOOT_FLASH) static void getvar_has_slot(char *part_name, char *response) { -- cgit v1.2.3 From 139db354b18014e224068a4f2b3b95e025812b17 Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Wed, 3 Jul 2019 19:00:22 +0300 Subject: fastboot: getvar: Add "is-userspace" variable As per documentation [1], Android-Q requires for bootloader to provide "is-userspace" variable. "no" value should be always returned. This patch implements this fastboot variable. [1] https://android.googlesource.com/platform/system/core/+/refs/tags/android-q-preview-4/fastboot/README.md Signed-off-by: Sam Protsenko Reviewed-by: Eugeniu Rosca --- drivers/fastboot/fb_getvar.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'drivers/fastboot/fb_getvar.c') diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index 9ee5054485..fd0823b2bf 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -28,6 +28,7 @@ static void getvar_partition_type(char *part_name, char *response); #if CONFIG_IS_ENABLED(FASTBOOT_FLASH) static void getvar_partition_size(char *part_name, char *response); #endif +static void getvar_is_userspace(char *var_parameter, char *response); static const struct { const char *variable; @@ -78,6 +79,9 @@ static const struct { .variable = "partition-size", .dispatch = getvar_partition_size #endif + }, { + .variable = "is-userspace", + .dispatch = getvar_is_userspace } }; @@ -243,6 +247,11 @@ static void getvar_partition_size(char *part_name, char *response) } #endif +static void getvar_is_userspace(char *var_parameter, char *response) +{ + fastboot_okay("no", response); +} + /** * fastboot_getvar() - Writes variable indicated by cmd_parameter to response. * -- cgit v1.2.3 From 29a81142be960a07761f50ccae6cde766e3696d9 Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Wed, 3 Jul 2019 19:34:07 +0300 Subject: 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 Reviewed-by: Eugeniu Rosca --- doc/android/fastboot.txt | 6 +++--- drivers/fastboot/fb_getvar.c | 9 +++------ 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'drivers/fastboot/fb_getvar.c') diff --git a/doc/android/fastboot.txt b/doc/android/fastboot.txt index ea0d1da1fd..9de13223f8 100644 --- 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 fd0823b2bf..ebe5c8a104 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -12,7 +12,7 @@ #include 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); } -- cgit v1.2.3