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

Commit 3626bdc8 authored by Matt Mower's avatar Matt Mower
Browse files

bldrmsg: Only emmc /misc is supported 

Change-Id: Ic0716557a87ec0638e2dbed1c3f743231e8b2f8e
parent c39b1b4e

bootloader_message/bootloader_message.cpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 


static std::string misc_blkdev;



void set_misc_device(const char* type, const char* name) {

void set_misc_device(std::string name) {

    misc_blkdev = name;

}

bootloader_message/include/bootloader_message/bootloader_message.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ bool clear_bootloader_message(std::string* err); 
bool read_wipe_package(std::string* package_data, size_t size, std::string* err);

bool write_wipe_package(const std::string& package_data, std::string* err);



void set_misc_device(const char* type, const char* name);

void set_misc_device(std::string name);

void get_args(int *argc, char ***argv);



#else

twrp.cpp

+2 −4
Original line number Diff line number Diff line
@@ -176,11 +176,9 @@ int main(int argc, char **argv) { 
		TWPartition* misc = PartitionManager.Find_Partition_By_Path("/misc");

		if (misc != NULL) {

			if (misc->Current_File_System == "emmc") {

				set_misc_device("emmc", misc->Actual_Block_Device.c_str());

			} else if (misc->Current_File_System == "mtd") {

				set_misc_device("mtd", misc->MTD_Name.c_str());

				set_misc_device(misc->Actual_Block_Device);

			} else {

				LOGERR("Unknown file system for /misc\n");

				LOGERR("Only emmc /misc is supported\n");

			}

		}

		get_args(&argc, &argv);