android/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_bootable_recovery into gingerbread

Browse Source
This commit is contained in:
root 2011-05-31 03:00:05 +01:00
commit 8d2e1defb8
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bmlutils/bmlutils.c
View File

@ -58,16 +58,20 @@ static int restore_internal(const char* bml, const char* filename)
int cmd_bml_restore_raw_partition(const char *partition, const char *filename)
{
if (strcmp(partition, "boot") != 0 && strcmp(partition, "recovery") != 0)
if (strcmp(partition, "boot") != 0 && strcmp(partition, "recovery") != 0 && strcmp(partition, "recoveryonly") != 0)
return 6;
// always restore boot, regardless of whether recovery or boot is flashed.
// this is because boot and recovery are the same on some samsung phones.
int ret = restore_internal("/dev/block/bml7", filename);
if (ret != 0)
return ret;
int ret = -1;
if (strcmp(partition, "recoveryonly") != 0) {
// always restore boot, regardless of whether recovery or boot is flashed.
// this is because boot and recovery are the same on some samsung phones.
// unless of course, recoveryonly is explictly chosen (bml8)
ret = restore_internal("/dev/block/bml7", filename);
if (ret != 0)
return ret;
}
if (strcmp(partition, "recovery") == 0)
if (strcmp(partition, "recovery") == 0 || strcmp(partition, "recoveryonly") == 0)
ret = restore_internal("/dev/block/bml8", filename);
return ret;
}

5
flashutils/flashutils.c
View File

@ -71,7 +71,6 @@ __system(const char *command)
}
int get_flash_type(const char* partitionType) {
printf("get_flash_type partitionType: %s\n", partitionType);
int type = UNSUPPORTED;
if (strcmp(partitionType, "mtd") == 0)
type = MTD;
@ -79,7 +78,6 @@ int get_flash_type(const char* partitionType) {
type = MMC;
else if (strcmp(partitionType, "bml") == 0)
type = BML;
printf("get_flash_type type: %d\n", type);
return type;
}
@ -97,9 +95,6 @@ static int detect_partition(const char *partitionType, const char *partition)
type = get_flash_type(partitionType);
}
printf("partitionType: %s\n", partitionType);
printf("partition: %s\n", partition);
printf("detected type: %d\n", type);
return type;
}
int restore_raw_partition(const char* partitionType, const char *partition, const char *filename)