summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorji.luo <ji.luo@nxp.com>2017-10-30 20:56:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-30 20:56:41 +0000
commitc12d1d24fe46e781f6415902c4c6ff96b169d07e (patch)
tree5f771883891676594b5afe708724b130db9409d3
parentdaac0ee48df4eef6f43d8af48fe74492856d7fc2 (diff)
parent34ff80d9bb7aa50897e7462ca78941ce978e09ad (diff)
downloaduboot-imx-c12d1d24fe46e781f6415902c4c6ff96b169d07e.tar.gz
[fastboot] Refine erase-block-size and logical-block-size command
am: 34ff80d9bb Change-Id: I01c75d870d703009f9e50d99faaa5f32f859fa1c
-rw-r--r--drivers/usb/gadget/f_fastboot.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 5862e59632..c4dab3878d 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -2961,8 +2961,9 @@ static int get_single_var(char *cmd, char *response)
char *str = cmd;
size_t chars_left;
const char *s;
- int mmc_no = 0;
- struct blk_desc *dev_desc;
+ struct mmc *mmc;
+ int mmc_dev_no;
+ int blksz;
chars_left = FASTBOOT_RESPONSE_LEN - strlen(response) - 1;
@@ -3006,13 +3007,14 @@ static int get_single_var(char *cmd, char *response)
snprintf(response + strlen(response), chars_left, "0x%x", CONFIG_FASTBOOT_BUF_SIZE);
} else if (!strcmp_l1("erase-block-size", cmd)) {
- mmc_no = fastboot_devinfo.dev_id;
- dev_desc = blk_get_dev("mmc", mmc_no);
- snprintf(response + strlen(response), chars_left, "0x%x", (unsigned int)dev_desc->blksz);
+ mmc_dev_no = mmc_get_env_dev();
+ mmc = find_mmc_device(mmc_dev_no);
+ blksz = get_block_size();
+ snprintf(response + strlen(response), chars_left, "0x%x",
+ (blksz * mmc->erase_grp_size));
} else if (!strcmp_l1("logical-block-size", cmd)) {
- mmc_no = fastboot_devinfo.dev_id;
- dev_desc = blk_get_dev("mmc", mmc_no);
- snprintf(response + strlen(response), chars_left, "0x%x", (unsigned int)dev_desc->blksz);
+ blksz = get_block_size();
+ snprintf(response + strlen(response), chars_left, "0x%x", blksz);
} else if (!strcmp_l1("serialno", cmd)) {
s = get_serial();
if (s)