app: aboot: Modify erase size from 1 block to 4k
fastboot erase command only erase 1 block currently. But ext4's super
block is placed after 1k. So erase 1 block will make no sense. It also
fails when target is EFS. So modify the size from 1 block to 4k.
CRs-fixed: 526528
Change-Id: I0811e54be6aa74871e3862aa2d1c7067650227b8
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
old mode 100644
new mode 100755
index 2f8aff1..7f9d0d1
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -93,6 +93,9 @@
#define RECOVERY_MODE 0x77665502
#define FASTBOOT_MODE 0x77665500
+/* make 4096 as default size to ensure EFS,EXT4's erasing */
+#define DEFAULT_ERASE_SIZE 4096
+
static const char *emmc_cmdline = " androidboot.emmc=true";
static const char *usb_sn_cmdline = " androidboot.serialno=";
static const char *androidboot_mode = " androidboot.mode=";
@@ -1494,8 +1497,9 @@
void cmd_erase_mmc(const char *arg, void *data, unsigned sz)
{
- BUF_DMA_ALIGN(out, 512);
+ BUF_DMA_ALIGN(out, DEFAULT_ERASE_SIZE);
unsigned long long ptn = 0;
+ unsigned long long size;
int index = INVALID_PTN;
index = partition_get_index(arg);
@@ -1505,9 +1509,14 @@
fastboot_fail("Partition table doesn't exist\n");
return;
}
+
+ size = partition_get_size(index);
+ if (size > DEFAULT_ERASE_SIZE)
+ size = DEFAULT_ERASE_SIZE;
+
/* Simple inefficient version of erase. Just writing
- 0 in first block */
- if (mmc_write(ptn , 512, (unsigned int *)out)) {
+ 0 in first several blocks */
+ if (mmc_write(ptn , size, (unsigned int *)out)) {
fastboot_fail("failed to erase partition");
return;
}