From c7c9adb7ec54c5686e5ca975cae76a3c3f13d777 Mon Sep 17 00:00:00 2001 From: Sammy He Date: Mon, 24 Jan 2011 08:02:54 +0800 Subject: ENGR00138422-2 Add SATA storage support for android fastboot Add SATA storage support for android fastboot. Signed-off-by: Sammy He --- drivers/fastboot/fastboot.c | 111 ++++++++++++++++++++++++++++---------------- 1 file changed, 72 insertions(+), 39 deletions(-) (limited to 'drivers') diff --git a/drivers/fastboot/fastboot.c b/drivers/fastboot/fastboot.c index ee8d6fc..2eb17cc 100644 --- a/drivers/fastboot/fastboot.c +++ b/drivers/fastboot/fastboot.c @@ -33,6 +33,7 @@ #include #include #include +#include /* * Defines @@ -43,6 +44,24 @@ #define CONFIG_USBD_IN_PKTSIZE 0x200 #define MAX_BUFFER_SIZE 0x200 +/* + * imx family android layout + * mbr - 0 ~ 0x3FF byte + * bootloader - 0x400 ~ 0xFFFFF byte + * kernel - 0x100000 ~ 5FFFFF byte + * uramedisk - 0x600000 ~ 0x6FFFFF supposing 1M temporarily + * SYSTEM partition - /dev/mmcblk0p2 or /dev/sda2 + * RECOVERY parittion - dev/mmcblk0p4 or /dev/sda4 + */ +#define ANDROID_MBR_OFFSET 0 +#define ANDROID_MBR_SIZE 0x200 +#define ANDROID_BOOTLOADER_OFFSET 0x400 +#define ANDROID_BOOTLOADER_SIZE 0xFFC00 +#define ANDROID_KERNEL_OFFSET 0x100000 +#define ANDROID_KERNEL_SIZE 0x500000 +#define ANDROID_URAMDISK_OFFSET 0x600000 +#define ANDROID_URAMDISK_SIZE 0x100000 + #define STR_LANG_INDEX 0x00 #define STR_MANUFACTURER_INDEX 0x01 #define STR_PRODUCT_INDEX 0x02 @@ -190,8 +209,8 @@ static void fastboot_event_handler(struct usb_device_instance *device, static int fastboot_cdc_setup(struct usb_device_request *request, struct urb *urb); static int fastboot_usb_configured(void); -#ifdef CONFIG_FASTBOOT_STORAGE_EMMC -static void fastboot_init_mmc_ptable(void); +#ifdef CONFIG_FASTBOOT_STORAGE_EMMC_SATA +static int fastboot_init_mmc_sata_ptable(void); #endif /* utility function for converting char* to wide string used by USB */ @@ -214,8 +233,9 @@ static void str2wide(char *str, u16 * wide) */ int fastboot_init(struct cmd_fastboot_interface *interface) { - printf("fastboot is in init......"); + char *fastboot_env; + printf("fastboot is in init......"); fastboot_interface = interface; fastboot_interface->product_name = CONFIG_FASTBOOT_PRODUCT_NAME_STR; fastboot_interface->serial_no = CONFIG_FASTBOOT_SERIAL_NUM; @@ -229,8 +249,8 @@ int fastboot_init(struct cmd_fastboot_interface *interface) udc_init(); fastboot_init_instances(); -#ifdef CONFIG_FASTBOOT_STORAGE_EMMC - fastboot_init_mmc_ptable(); +#ifdef CONFIG_FASTBOOT_STORAGE_EMMC_SATA + fastboot_init_mmc_sata_ptable(); #endif udc_startup_events(device_instance); udc_connect(); /* Enable pullup for host detection */ @@ -238,54 +258,65 @@ int fastboot_init(struct cmd_fastboot_interface *interface) return 0; } -#ifdef CONFIG_FASTBOOT_STORAGE_EMMC -static void fastboot_init_mmc_ptable(void) +#ifdef CONFIG_FASTBOOT_STORAGE_EMMC_SATA +static int fastboot_init_mmc_sata_ptable(void) { - int i; + int i, sata_device_no; struct mmc *mmc; block_dev_desc_t *dev_desc; disk_partition_t info; + char *fastboot_env; fastboot_ptentry ptable[PTN_RECOVERY_INDEX + 1]; - mmc = find_mmc_device(CONFIG_FASTBOOT_MMC_NO); - if (mmc && mmc_init(mmc)) - printf("MMC card init failed!\n"); - - dev_desc = get_dev("mmc", CONFIG_FASTBOOT_MMC_NO); - if (NULL == dev_desc) { - printf("** Block device MMC %d not supported\n", - CONFIG_FASTBOOT_MMC_NO); - return; + fastboot_env = getenv("fastboot_dev"); + if ((fastboot_env == NULL) || strcmp(fastboot_env, "sata")) { + puts("flash target is SD card\n"); + mmc = find_mmc_device(CONFIG_FASTBOOT_MMC_NO); + if (mmc && mmc_init(mmc)) + printf("MMC card init failed!\n"); + + dev_desc = get_dev("mmc", CONFIG_FASTBOOT_MMC_NO); + if (NULL == dev_desc) { + printf("** Block device MMC %d not supported\n", + CONFIG_FASTBOOT_MMC_NO); + return -1; + } + } else { +#ifdef CONFIG_CMD_SATA + puts("flash target is SATA\n"); + if (sata_initialize()) + return -1; + sata_device_no = CONFIG_FASTBOOT_SATA_NO; + if (sata_device_no >= CONFIG_SYS_SATA_MAX_DEVICE) { + printf("Unknown SATA(%d) device for fastboot\n", + sata_device_no); + return -1; + } + dev_desc = sata_get_dev(sata_device_no); +#else + puts("SATA isn't buildin\n"); + return -1; +#endif } memset((char *)ptable, 0, sizeof(fastboot_ptentry) * (PTN_RECOVERY_INDEX + 1)); - - /* - * imx family android layout - * mbr - 0 ~ 0x3FF byte - * bootloader - 0x400 ~ 0xFFFFF byte - * kernel - 0x100000 ~ 5FFFFF byte - * uramedisk - 0x600000 ~ 0x6FFFFF supposing 1M temporarily - * SYSTEM partition - /dev/mmcblk0p2 - * RECOVERY parittion - dev/mmcblk0p6 - */ /* MBR */ strcpy(ptable[PTN_MBR_INDEX].name, "mbr"); - ptable[PTN_MBR_INDEX].start = 0; - ptable[PTN_MBR_INDEX].length = 0x200; + ptable[PTN_MBR_INDEX].start = ANDROID_MBR_OFFSET; + ptable[PTN_MBR_INDEX].length = ANDROID_MBR_SIZE; /* Bootloader */ strcpy(ptable[PTN_BOOTLOADER_INDEX].name, "bootloader"); - ptable[PTN_BOOTLOADER_INDEX].start = 0x400; - ptable[PTN_BOOTLOADER_INDEX].length = 0xFFC00; + ptable[PTN_BOOTLOADER_INDEX].start = ANDROID_BOOTLOADER_OFFSET; + ptable[PTN_BOOTLOADER_INDEX].length = ANDROID_BOOTLOADER_SIZE; /* kernel */ strcpy(ptable[PTN_KERNEL_INDEX].name, "kernel"); - ptable[PTN_KERNEL_INDEX].start = 0x100000; /* 1M byte offset */ - ptable[PTN_KERNEL_INDEX].length = 0x500000; /* 5M byte */ + ptable[PTN_KERNEL_INDEX].start = ANDROID_KERNEL_OFFSET; + ptable[PTN_KERNEL_INDEX].length = ANDROID_KERNEL_SIZE; /* uramdisk */ strcpy(ptable[PTN_URAMDISK_INDEX].name, "uramdisk"); - ptable[PTN_URAMDISK_INDEX].start = 0x600000; /* 6M byte offset */ - ptable[PTN_URAMDISK_INDEX].length = 0x100000; + ptable[PTN_URAMDISK_INDEX].start = ANDROID_URAMDISK_OFFSET; + ptable[PTN_URAMDISK_INDEX].length = ANDROID_URAMDISK_SIZE; /* system partition */ strcpy(ptable[PTN_SYSTEM_INDEX].name, "system"); @@ -295,9 +326,9 @@ static void fastboot_init_mmc_ptable(void) CONFIG_ANDROID_SYSTEM_PARTITION_MMC); else { ptable[PTN_SYSTEM_INDEX].start = info.start * - mmc->write_bl_len; + dev_desc->blksz; ptable[PTN_SYSTEM_INDEX].length = info.size * - mmc->write_bl_len; + dev_desc->blksz; } /* recovery partition */ strcpy(ptable[PTN_RECOVERY_INDEX].name, "recovery"); @@ -307,13 +338,15 @@ static void fastboot_init_mmc_ptable(void) CONFIG_ANDROID_RECOVERY_PARTITION_MMC); else { ptable[PTN_RECOVERY_INDEX].start = info.start * - mmc->write_bl_len; + dev_desc->blksz; ptable[PTN_RECOVERY_INDEX].length = info.size * - mmc->write_bl_len; + dev_desc->blksz; } for (i = 0; i <= PTN_RECOVERY_INDEX; i++) fastboot_flash_add_ptn(&ptable[i]); + + return 0; } #endif -- cgit v1.1