Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e51dadb8 authored by Tom Cherry's avatar Tom Cherry
Browse files

fastboot: remove 'verify' 

This isn't sent by the fastboot client.
This isn't in our bootloader requirement document.
Neither my hikey nor sailfish respond to this.

Test: fastboot still works
Change-Id: I11ff0aed818d98f3427ed427605d99b3c76ccb06
parent 56675144

fastboot/README.md

+0 −4
Original line number Diff line number Diff line
@@ -136,10 +136,6 @@ The various currently defined commands are: 
                       should not support "upload" unless it supports an

                       oem command that requires "upload" capabilities.



    verify:%08x        Send a digital signature to verify the downloaded

                       data.  Required if the bootloader is "secure"

                       otherwise "flash" and "boot" will be ignored.



    flash:%s           Write the previously downloaded image to the

                       named partition (if possible).

fastboot/constants.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#define FB_CMD_GETVAR "getvar"

#define FB_CMD_DOWNLOAD "download"

#define FB_CMD_UPLOAD "upload"

#define FB_CMD_VERIFY "verify"

#define FB_CMD_FLASH "flash"

#define FB_CMD_ERASE "erase"

#define FB_CMD_BOOT "boot"

fastboot/fastboot_driver.cpp

+0 −6
Original line number Diff line number Diff line
@@ -103,11 +103,6 @@ RetCode FastBootDriver::SetActive(const std::string& part, std::string* response 
    return RawCommand(Commands::SET_ACTIVE + part, response, info);

}



RetCode FastBootDriver::Verify(uint32_t num, std::string* response, std::vector<std::string>* info) {

    std::string cmd = android::base::StringPrintf("%s%08" PRIx32, Commands::VERIFY.c_str(), num);

    return RawCommand(cmd, response, info);

}



RetCode FastBootDriver::FlashPartition(const std::string& part, const std::vector<char>& data) {

    RetCode ret;

    if ((ret = Download(data))) {
@@ -435,7 +430,6 @@ const std::string FastBootDriver::Commands::GET_VAR = "getvar:"; 
const std::string FastBootDriver::Commands::REBOOT = "reboot";

const std::string FastBootDriver::Commands::SET_ACTIVE = "set_active:";

const std::string FastBootDriver::Commands::UPLOAD = "upload";

const std::string FastBootDriver::Commands::VERIFY = "verify:";



/******************************* PRIVATE **************************************/

RetCode FastBootDriver::SendBuffer(int fd, size_t size) {

fastboot/fastboot_driver.h

+0 −3
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ class FastBootDriver { 
                      std::vector<std::string>* info = nullptr);

    RetCode Upload(const std::string& outfile, std::string* response = nullptr,

                   std::vector<std::string>* info = nullptr);

    RetCode Verify(uint32_t num, std::string* response = nullptr,

                   std::vector<std::string>* info = nullptr);



    /* HIGHER LEVEL COMMANDS -- Composed of the commands above */

    RetCode FlashPartition(const std::string& part, const std::vector<char>& data);
@@ -138,7 +136,6 @@ class FastBootDriver { 
        static const std::string REBOOT;

        static const std::string SET_ACTIVE;

        static const std::string UPLOAD;

        static const std::string VERIFY;

    };



    Transport* transport_;

fastboot/fuzzy_fastboot/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ std::vector<std::pair<std::string, extension::Configuration::PartitionInfo>> 
const std::string DEFAULT_OUPUT_NAME = "out.img";

// const char scratch_partition[] = "userdata";

const std::vector<std::string> CMDS{"boot",    "continue", "download:",   "erase:", "flash:",

                                    "getvar:", "reboot",   "set_active:", "upload", "verify"};

                                    "getvar:", "reboot",   "set_active:", "upload"};



// For pretty printing we need all these overloads

::std::ostream& operator<<(::std::ostream& os, const RetCode& ret) {