diff options
| author | zhang sanshan <sanshan.zhang@nxp.com> | 2017-05-18 21:43:19 +0800 |
|---|---|---|
| committer | Zhang Bo <bo.zhang@nxp.com> | 2017-06-21 12:21:03 +0800 |
| commit | 61d4dcbd1862a4a77a527df3fd8853787cfe0c0c (patch) | |
| tree | acc327577b5d57f5650c6782ec0fd5bbcf5d2ba5 /drivers/usb | |
| parent | 0a69b314b60b19aa308be1c978222de70b9e7eab (diff) | |
| download | u-boot-imx-61d4dcbd1862a4a77a527df3fd8853787cfe0c0c.zip u-boot-imx-61d4dcbd1862a4a77a527df3fd8853787cfe0c0c.tar.gz u-boot-imx-61d4dcbd1862a4a77a527df3fd8853787cfe0c0c.tar.bz2 | |
MA-9382 [Android]uboot: fix compiler issue and command line issue.
Fix compile error when enable CONFIG_NAND_BOOT.
Fix data abort issue in uboot.
Change-Id: If41a7fafa40a2c851882c723a201ac5cdf31284f
Signed-off-by: zhang sanshan <sanshan.zhang@nxp.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/command.c | 4 | ||||
| -rw-r--r-- | drivers/usb/gadget/f_fastboot.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/usb/gadget/command.c b/drivers/usb/gadget/command.c index e66e033..543b99e 100644 --- a/drivers/usb/gadget/command.c +++ b/drivers/usb/gadget/command.c @@ -73,7 +73,7 @@ int bcb_read_command(char *command) char *addr_str; char *nand_str; ulong misc_info_size; - nand_info_t *nand = &nand_info[0]; + struct mtd_info *nand = &nand_info[0]; if (command == NULL) return -1; memset(read_cmd, 0, 128); @@ -97,7 +97,7 @@ int bcb_write_command(char *command) char *addr_str; char *nand_str; ulong misc_info_size; - nand_info_t *nand = &nand_info[0]; + struct mtd_info *nand = &nand_info[0]; if (command == NULL) return -1; memset(cmd, 0, 128); diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 6c1ce07..fdbf2f8 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -424,7 +424,7 @@ static int write_to_ptn(struct fastboot_ptentry *ptn) transfer_buffer should already be aligned */ if (interface.nand_block_size) { if (0 == nand_curr_device) { - nand_info_t *nand; + struct mtd_info *nand; unsigned long off; unsigned int ok_start; @@ -1137,7 +1137,7 @@ static void parameters_setup(void) { interface.nand_block_size = 0; #if defined(CONFIG_FASTBOOT_STORAGE_NAND) - nand_info_t *nand = &nand_info[0]; + struct mtd_info *nand = &nand_info[0]; if (nand) interface.nand_block_size = nand->writesize; #endif @@ -1163,9 +1163,11 @@ static int _fastboot_setup_dev(void) } else if (!strcmp(fastboot_env, "nand")) { fastboot_devinfo.type = DEV_NAND; fastboot_devinfo.dev_id = 0; +#if defined(CONFIG_FASTBOOT_STORAGE_MMC) } else if (!strncmp(fastboot_env, "mmc", 3)) { fastboot_devinfo.type = DEV_MMC; fastboot_devinfo.dev_id = mmc_get_env_dev(); +#endif } } else { return 1; |