static unsigned int write_part = 0;
static unsigned int fs_offset = 0x0;
-#ifdef CONFIG_USE_YAFFS
-static unsigned int yaffs_len = 0;
-static unsigned char yaffs_data[2112];
-#define YAFFS_PAGE 2112
-#endif
-
#define NAND_PAGE_SIZE 2048
static unsigned long down_ram_addr;
static int down_mode;
-/* cpu/${CPU} dependent */
-extern void do_reset(void);
-
/* common commands */
-extern int do_bootm(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
extern int do_run(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]);
+#ifdef CONFIG_CMD_UBI
+static int check_ubi_mode(void)
+{
+ char *env_ubifs;
+ int ubi_mode;
+
+ env_ubifs = getenv("ubi");
+ ubi_mode = !strcmp(env_ubifs, "enabled");
+
+ return ubi_mode;
+}
+#else
+#define check_ubi_mode() 0
+#endif
+
+#ifdef CONFIG_CMD_MTDPARTS
int mtdparts_init(void);
int find_dev_and_part(const char*, struct mtd_device**, u8*, struct part_info**);
return part_num;
}
-#ifdef CONFIG_CMD_UBI
-static int check_ubi_mode(void)
-{
- char *env_ubifs;
- int ubi_mode;
-
- env_ubifs = getenv("ubi");
- ubi_mode = !strcmp(env_ubifs, "enabled");
-
- return ubi_mode;
-}
-#else
-#define check_ubi_mode() 0
-#endif
-
-#ifdef CONFIG_MTD_PARTITIONS
static int get_part_info(void)
{
struct mtd_device *dev;
do_bootm(NULL, 0, 2, argv);
}
-static void run_cmd(char *cmd)
-{
- char *argv[] = { "run", cmd };
- do_run(NULL, 0, 2, argv);
-}
-
#if defined(CONFIG_CMD_NAND)
extern int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
#elif defined(CONFIG_CMD_ONENAND)
}
#endif
-static unsigned int mbr_offset[16];
-static int mbr_parts = 0;
-
-static unsigned long memsize_parse (const char *const ptr, const char **retptr)
-{
- unsigned long ret = simple_strtoul(ptr, (char **)retptr, 0);
-
- switch (**retptr) {
- case 'G':
- case 'g':
- ret <<= 10;
- case 'M':
- case 'm':
- ret <<= 10;
- case 'K':
- case 'k':
- ret <<= 10;
- (*retptr)++;
- default:
- break;
- }
-
- return ret;
-}
-
-static void set_mbr_info(struct usbd_ops *usbd, char *ramaddr, u32 len)
-{
- char mbr_str[256];
- char save[16][16];
- char *p;
- char *tok;
- unsigned int size[16];
- int i = 0;
-
- strncpy(mbr_str, ramaddr, len);
- p = mbr_str;
-
- for (i = 0; ; i++, p = NULL) {
- tok = strtok(p, ",");
- if (tok == NULL)
- break;
- strcpy(save[i], tok);
- printf("part%d: %s\n", i, save[i]);
- }
-
- mbr_parts = i;
- printf("find %d partitions\n", mbr_parts);
-
- for (i = 0; i < mbr_parts; i++) {
- p = save[i];
- size[i] = memsize_parse(p, (const char **)&p) / 512;
- }
-
- puts("save the MBR Table...\n");
- set_mbr_table(0x800, mbr_parts, size, mbr_offset);
-}
-
static int write_mmc_image(struct usbd_ops *usbd, unsigned int len, int part_num)
{
int ret = 0;
return ret;
}
-static int write_file_system(char *ramaddr, ulong len, char *offset,
- char *length, int part_num, int ubi_update)
+static int write_fat_file(struct usbd_ops *usbd, char *file_name,
+ int part_id, int len)
{
-#ifdef CONFIG_USE_YAFFS
- int actual_len = 0;
- int yaffs_write = 0;
+#ifdef CONFIG_FAT_WRITE
+ int ret;
+
+ ret = fat_register_device(&mmc->block_dev, part_id);
+ if (ret < 0) {
+ printf("error : fat_register_divce\n");
+ return 0;
+ }
+
+ ret = file_fat_write(file_name, (void *)down_ram_addr, len);
+
+ /* format and write again */
+ if (ret == 1) {
+ printf("formatting\n");
+ if (mkfs_vfat(&mmc->block_dev, part_id)) {
+ printf("error : format device\n");
+ return 0;
+ }
+ ret = file_fat_write(file_name, (void *)down_ram_addr, len);
+ }
+
+ if (ret < 0) {
+ printf("error : writing uImage\n");
+ return 0;
+ }
+#else
+ printf("error: doesn't support fat_write\n");
#endif
+ return 0;
+}
+
+
+static int ubi_update = 0;
+
+static int write_file_system(char *ramaddr, ulong len, char *offset,
+ char *length, int part_num)
+{
int ret = 0;
+#ifdef CONFIG_CMD_MTDPARTS
#ifdef CONFIG_CMD_UBI
/* UBI Update */
if (ubi_update) {
nand_cmd(0, offset, length, NULL);
}
-#ifdef CONFIG_USE_YAFFS
- /* if using yaffs, wirte size must be 2112*X
- * so, must have to realloc, and writing */
- if (!strcmp("yaffs", getenv(parts[part_num]->name))) {
- yaffs_write = 1;
-
- memcpy((void *)down_ram_addr, yaffs_data, yaffs_len);
-
- actual_len = len + yaffs_len;
- yaffs_len = actual_len % YAFFS_PAGE;
- len = actual_len - yaffs_len;
-
- memset(yaffs_data, 0x00, YAFFS_PAGE);
- memcpy(yaffs_data, (char *)down_ram_addr + len, yaffs_len);
- }
-#endif
-
sprintf(offset, "0x%x", (uint)(parts[part_num]->offset + fs_offset));
sprintf(length, "0x%x", (uint)len);
-#ifdef CONFIG_USE_YAFFS
- if (yaffs_write)
- ret = nand_cmd(2, ramaddr, offset, length);
- else
- ret = nand_cmd(1, ramaddr, offset, length);
-
- if (!strcmp("yaffs", getenv(parts[part_num]->name)))
- fs_offset += len / YAFFS_PAGE * NAND_PAGE_SIZE;
- else
- fs_offset += len;
-
-#else
fs_offset += len;
ret = nand_cmd(1, ramaddr, offset, length);
#endif
/* Erase the qboot */
static void erase_qboot_area(void)
{
+#ifdef CONFIG_CMD_MTDPARTS
char offset[12], length[12];
int qboot_id;
nand_cmd(0, offset, length, NULL);
qboot_erase = 1;
}
+#endif
}
-/* Parsing received data packet and Process data */
-static int process_data(struct usbd_ops *usbd)
+/* Erase the environment */
+static void erase_env_area(struct usbd_ops *usbd)
{
- unsigned int cmd = 0, arg = 0, ofs = 0, len = 0, flag = 0;
- char offset[12], length[12], ramaddr[12];
- int recvlen = 0;
- unsigned int blocks = 0;
- int ret = 0;
- int ubi_update = 0;
- int ubi_mode = 0;
- int img_type;
-
- sprintf(ramaddr, "0x%x", (uint) down_ram_addr);
-
- /* Parse command */
- cmd = *((ulong *) usbd->rx_data + 0);
- arg = *((ulong *) usbd->rx_data + 1);
- len = *((ulong *) usbd->rx_data + 2);
- flag = *((ulong *) usbd->rx_data + 3);
+#if defined(CONFIG_ENV_IS_IN_NAND) || defined(CONFIG_ENV_IS_IN_ONENAND)
+ int param_id;
+ char offset[12], length[12];
- /* Reset tx buffer */
- memset(usbd->tx_data, 0, sizeof(usbd->tx_data));
+ param_id = get_part_id("params");
- ubi_mode = check_ubi_mode();
+ if (param_id == -1) {
+ sprintf(offset, "%x", CONFIG_ENV_ADDR);
+ sprintf(length, "%x", CONFIG_ENV_SIZE);
+ } else {
+ sprintf(offset, "%x", parts[param_id]->offset);
+ sprintf(length, "%x", parts[param_id]->size);
+ }
+ nand_cmd(0, offset, length, NULL);
+#elif defined(CONFIG_ENV_IS_IN_MMC)
+ char buf[usbd->mmc_blk];
+
+ memset(buf, 0x0, usbd->mmc_blk);
+ mmc_cmd(OPS_WRITE, CONFIG_SYS_MMC_ENV_DEV,
+ CONFIG_ENV_OFFSET / usbd->mmc_blk,
+ 1, (void *)buf);
+#endif
+}
- switch (cmd) {
- case COMMAND_DOWNLOAD_IMAGE:
- printf("\nCOMMAND_DOWNLOAD_IMAGE\n");
+static inline void send_ack(struct usbd_ops *usbd, int data)
+{
+ *((ulong *) usbd->tx_data) = data;
+ usbd->send_data(usbd->tx_data, usbd->tx_len);
+}
-#ifdef CONFIG_USE_YAFFS
- usbd->recv_setup((char *)down_ram_addr + yaffs_len, (int)len);
- printf("Download to 0x%08x, %d bytes\n",
- (uint)down_ram_addr + yaffs_len, (int)len);
-#else
- if (arg)
- down_ram_addr = usbd->ram_addr + 0x1000000;
- else
- down_ram_addr = usbd->ram_addr;
+static inline int check_mmc_device(struct usbd_ops *usbd)
+{
+ if (usbd->mmc_total)
+ return 0;
- usbd->recv_setup((char *)down_ram_addr, (int)len);
- printf("Download to 0x%08x, %d bytes\n",
- (uint)down_ram_addr, (int)len);
-#endif
- /* response */
- usbd->send_data(usbd->tx_data, usbd->tx_len);
+ printf("\nError: Couldn't find the MMC device\n");
+ return 1;
+}
- /* Receive image by using dma */
- recvlen = usbd->recv_data();
- if (recvlen < len) {
- printf("Error: wrong image size -> %d/%d\n",
- (int)recvlen, (int)len);
+static int write_mtd_image(struct usbd_ops *usbd, int img_type,
+ unsigned int len, unsigned int arg)
+{
+ int ret = -1;
+#ifdef CONFIG_CMD_MTDPARTS
+ unsigned int ofs = 0;
+ char offset[12], length[12], ramaddr[12];
- /* Retry this commad */
- *((ulong *) usbd->tx_data) = STATUS_RETRY;
- } else
- *((ulong *) usbd->tx_data) = STATUS_DONE;
+ sprintf(ramaddr, "0x%x", (uint) down_ram_addr);
- usbd->send_data(usbd->tx_data, usbd->tx_len);
- return 1;
+ /* Erase and Write to NAND */
+ switch (img_type) {
+ case IMG_BOOT:
+ ofs = parts[part_id]->offset;
+#ifdef CONFIG_S5PC1XX
+ /* Workaround: for prevent revision mismatch */
+ if (cpu_is_s5pc110() && (down_mode != MODE_FORCE)) {
+ int img_rev = 1;
+ long *img_header = (long *)down_ram_addr;
- /* Report partition info */
- case COMMAND_PARTITION_SYNC:
- part_id = arg;
+ if (*img_header == 0xea000012)
+ img_rev = 0;
+ else if (*(img_header + 0x400) == 0xea000012)
+ img_rev = 2;
-#ifdef CONFIG_CMD_UBI
- if (ubi_mode) {
- if (part_id == RAMDISK_PART_ID ||
- part_id == FILESYSTEM_PART_ID ||
- part_id == FILESYSTEM2_PART_ID) {
- /* change to yaffs style */
- get_part_info();
- }
- } else {
- if (part_id == FILESYSTEM3_PART_ID) {
- /* change ubi style */
- get_part_info();
+ if (img_rev != s5p_get_cpu_rev()) {
+ printf("CPU revision mismatch!\n"
+ "bootloader is %s%s\n"
+ "download image is %s%s\n",
+ s5p_get_cpu_rev() ? "EVT1" : "EVT0",
+ s5p_get_cpu_rev() == 2 ? "-Fused" : "",
+ img_rev ? "EVT1" : "EVT0",
+ img_rev == 2 ? "-Fused" : "");
+ return -1;
}
}
#endif
- if (part_id == FILESYSTEM3_PART_ID)
- part_id = get_part_id("UBI");
- else if (part_id == MODEM_PART_ID)
- part_id = get_part_id("modem");
- else if (part_id == KERNEL_PART_ID)
- part_id = get_part_id("kernel");
- else if (part_id == BOOT_PART_ID)
- part_id = get_part_id("bootloader");
-#ifdef CONFIG_MIRAGE
- if (part_id)
- part_id--;
-#endif
- printf("COMMAND_PARTITION_SYNC - Part%d\n", part_id);
+ erase_env_area(usbd);
- blocks = parts[part_id]->size / 1024 / 128;
- printf("COMMAND_PARTITION_SYNC - Part%d, %d blocks\n",
- part_id, blocks);
+ sprintf(offset, "%x", (uint)ofs);
+ if (ofs != 0)
+ sprintf(length, "%x", parts[part_id]->size - (uint)ofs);
+ else
+ sprintf(length, "%x", parts[part_id]->size);
- *((ulong *) usbd->tx_data) = blocks;
- usbd->send_data(usbd->tx_data, usbd->tx_len);
- return 1;
+ /* Erase */
+ nand_cmd(0, offset, length, NULL);
+ /* Write */
+ sprintf(length, "%x", (unsigned int) len);
+ ret = nand_cmd(1, ramaddr, offset, length);
+ break;
- case COMMAND_WRITE_PART_0:
- /* Do nothing */
- printf("COMMAND_WRITE_PART_0\n");
- return 1;
+ case IMG_KERNEL:
+ sprintf(offset, "%x", parts[part_id]->offset);
+ sprintf(length, "%x", parts[part_id]->size);
- case COMMAND_WRITE_PART_1:
- printf("COMMAND_WRITE_PART_BOOT\n");
- part_id = get_part_id("bootloader");
- img_type = IMG_BOOT;
- break;
+ /* Erase */
+ nand_cmd(0, offset, length, NULL);
+ /* Write */
+ sprintf(length, "%x", (unsigned int) len);
+ ret = nand_cmd(1, ramaddr, offset, length);
- case COMMAND_WRITE_PART_2:
- case COMMAND_ERASE_PARAMETER:
- printf("COMMAND_PARAMETER - not support!\n");
+ erase_qboot_area();
break;
- case COMMAND_WRITE_PART_3:
- printf("COMMAND_WRITE_KERNEL\n");
- part_id = get_part_id("kernel");
- img_type = IMG_KERNEL;
- break;
+ /* File Systems */
+ case IMG_FILESYSTEM:
+ ret = write_file_system(ramaddr, len, offset, length, part_id);
- case COMMAND_WRITE_PART_4:
- printf("COMMAND_WRITE_ROOTFS\n");
- part_id = get_part_id("Root");
- img_type = IMG_FILESYSTEM;
- ubi_update = arg;
+ erase_qboot_area();
break;
- case COMMAND_WRITE_PART_5:
- printf("COMMAND_WRITE_FACTORYFS\n");
- part_id = get_part_id("Fact");
- img_type = IMG_FILESYSTEM;
- ubi_update = arg;
- break;
+ case IMG_MODEM:
+ sprintf(offset, "%x", parts[part_id]->offset);
+ sprintf(length, "%x", parts[part_id]->size);
- case COMMAND_WRITE_PART_6:
- printf("COMMAND_WRITE_DATAFS\n");
+ /* Erase */
+ if (!arg)
+ nand_cmd(0, offset, length, NULL);
+ else
+ printf("CSA Clear will be skipped temporary\n");
+
+ /* Check ubi image, 0x23494255 is UBI# */
+ {
+ long *img_header = (long *)down_ram_addr;
+
+ if (*img_header == 0x23494255)
+ goto ubi_img;
+ }
+
+#ifdef CONFIG_UBIFS_MK
+ void *dest_addr = (void *) down_ram_addr + 0xc00000;
+ void *src_addr = (void *) down_ram_addr;
+ int leb_size, max_leb_cnt, mkfs_min_io_size;
+ unsigned long ubifs_dest_size, ubi_dest_size;
+#ifdef CONFIG_S5PC110
+ mkfs_min_io_size = 4096;
+ leb_size = 248 * 1024;
+ max_leb_cnt = 4096;
+#elif CONFIG_S5PC210
+ mkfs_min_io_size = 2048;
+ leb_size = 126 * 1024;
+ max_leb_cnt = 4096;
+#endif
+ printf("Start making ubifs\n");
+ ret = mkfs(src_addr, len, dest_addr, &ubifs_dest_size,
+ mkfs_min_io_size, leb_size, max_leb_cnt);
+ if (ret) {
+ printf("Error : making ubifs failed\n");
+ goto out;
+ }
+ printf("Complete making ubifs\n");
+#endif
+
+#ifdef CONFIG_UBINIZE
+ int peb_size, ubi_min_io_size, subpage_size, vid_hdr_offs;
+#ifdef CONFIG_S5PC110
+ ubi_min_io_size = 4096;
+ peb_size = 256 * 1024;
+ subpage_size = 4096;
+ vid_hdr_offs = 0;
+#elif CONFIG_S5PC210
+ ubi_min_io_size = 2048;
+ peb_size = 128 * 1024;
+ subpage_size = 512;
+ vid_hdr_offs = 512;
+#endif
+ printf("Start ubinizing\n");
+ ret = ubinize(dest_addr, ubifs_dest_size,
+ src_addr, &ubi_dest_size,
+ peb_size, ubi_min_io_size,
+ subpage_size, vid_hdr_offs);
+ if (ret) {
+ printf("Error : ubinizing failed\n");
+ goto out;
+ }
+ printf("Complete ubinizing\n");
+
+ len = (unsigned int) ubi_dest_size;
+#endif
+
+ubi_img:
+ /* Write : arg (0 Modem) / (1 CSA) */
+ if (!arg) {
+ sprintf(length, "%x", (unsigned int) len);
+ ret = nand_cmd(1, ramaddr, offset, length);
+ }
+out:
+ break;
+
+#ifdef CONFIG_CMD_MMC
+ case IMG_MMC:
+ if (check_mmc_device(usbd))
+ return -1;
+
+ if (mmc_part_write)
+ ret = write_file_mmc_part(usbd, len);
+ else
+ ret = write_file_mmc(usbd, len);
+
+ erase_qboot_area();
+ break;
+#endif
+ default:
+ /* Retry? */
+ write_part--;
+ }
+#endif
+ return ret;
+}
+
+static int write_v2_image(struct usbd_ops *usbd, int img_type,
+ unsigned int len, unsigned int arg)
+{
+ int ret;
+
+ if (check_mmc_device(usbd))
+ return -1;
+
+ switch (img_type) {
+ case IMG_V2:
+ ret = write_mmc_image(usbd, len, part_id);
+ break;
+
+ case IMG_MBR:
+#ifdef CONFIG_CMD_MBR
+ set_mbr_info((char *)down_ram_addr, len);
+#endif
+ break;
+
+ case IMG_BOOTLOADER:
+#ifdef CONFIG_BOOTLOADER_SECTOR
+ erase_env_area(usbd);
+
+ ret = mmc_cmd(OPS_WRITE, usbd->mmc_dev,
+ CONFIG_BOOTLOADER_SECTOR,
+ len / usbd->mmc_blk + 1,
+ (void *)down_ram_addr);
+#endif
+ break;
+
+ case IMG_KERNEL_V2:
+ ret = write_fat_file(usbd, "uImage", part_id, len);
+ break;
+
+ case IMG_MODEM_V2:
+ ret = write_fat_file(usbd, "modem.bin", part_id, len);
+ break;
+
+ default:
+ /* Retry? */
+ write_part--;
+ }
+
+ return ret;
+}
+
+/* Parsing received data packet and Process data */
+static int process_data(struct usbd_ops *usbd)
+{
+ unsigned int cmd = 0, arg = 0, len = 0, flag = 0;
+ char ramaddr[12];
+ int recvlen = 0;
+ unsigned int blocks = 0;
+ int ret = 0;
+ int ubi_mode = 0;
+ int img_type = -1;
+
+ sprintf(ramaddr, "0x%x", (uint) down_ram_addr);
+
+ /* Parse command */
+ cmd = *((ulong *) usbd->rx_data + 0);
+ arg = *((ulong *) usbd->rx_data + 1);
+ len = *((ulong *) usbd->rx_data + 2);
+ flag = *((ulong *) usbd->rx_data + 3);
+
+ /* Reset tx buffer */
+ memset(usbd->tx_data, 0, sizeof(usbd->tx_data));
+
+ ubi_mode = check_ubi_mode();
+
+ switch (cmd) {
+ case COMMAND_DOWNLOAD_IMAGE:
+ printf("\nCOMMAND_DOWNLOAD_IMAGE\n");
+
+ if (arg)
+ down_ram_addr = usbd->ram_addr + 0x1000000;
+ else
+ down_ram_addr = usbd->ram_addr;
+
+ usbd->recv_setup((char *)down_ram_addr, (int)len);
+ printf("Download to 0x%08x, %d bytes\n",
+ (uint)down_ram_addr, (int)len);
+
+ /* response */
+ send_ack(usbd, STATUS_DONE);
+
+ /* Receive image by using dma */
+ recvlen = usbd->recv_data();
+ if (recvlen < 0) {
+ send_ack(usbd, STATUS_ERROR);
+ return -1;
+ } else if (recvlen < len) {
+ printf("Error: wrong image size -> %d/%d\n",
+ (int)recvlen, (int)len);
+
+ /* Retry this commad */
+ send_ack(usbd, STATUS_RETRY);
+ } else
+ send_ack(usbd, STATUS_DONE);
+
+ return 1;
+
+ case COMMAND_DOWNLOAD_SPMODE:
+ printf("\nCOMMAND_DOWNLOAD_SPMODE\n");
+
+ down_ram_addr = usbd->ram_addr + 0x2008000;
+
+ usbd->recv_setup((char *)down_ram_addr, (int)len);
+ printf("Download to 0x%08x, %d bytes\n",
+ (uint)down_ram_addr, (int)len);
+
+ /* response */
+ send_ack(usbd, STATUS_DONE);
+
+ /* Receive image by using dma */
+ recvlen = usbd->recv_data();
+ send_ack(usbd, STATUS_DONE);
+
+ return 0;
+
+ /* Report partition info */
+ case COMMAND_PARTITION_SYNC:
+ part_id = arg;
+
+#ifdef CONFIG_CMD_UBI
+ if (ubi_mode) {
+ if (part_id == RAMDISK_PART_ID ||
+ part_id == FILESYSTEM_PART_ID ||
+ part_id == FILESYSTEM2_PART_ID) {
+ /* change to yaffs style */
+ get_part_info();
+ }
+ } else {
+ if (part_id == FILESYSTEM3_PART_ID) {
+ /* change ubi style */
+ get_part_info();
+ }
+ }
+#endif
+
+ if (part_id == FILESYSTEM3_PART_ID)
+ part_id = get_part_id("UBI");
+ else if (part_id == MODEM_PART_ID)
+ part_id = get_part_id("modem");
+ else if (part_id == KERNEL_PART_ID)
+ part_id = get_part_id("kernel");
+ else if (part_id == BOOT_PART_ID)
+ part_id = get_part_id("bootloader");
+#ifdef CONFIG_MIRAGE
+ if (part_id)
+ part_id--;
+#endif
+ printf("COMMAND_PARTITION_SYNC - Part%d\n", part_id);
+
+#ifdef CONFIG_CMD_MTDPARTS
+ blocks = parts[part_id]->size / 1024 / 128;
+#endif
+ printf("COMMAND_PARTITION_SYNC - Part%d, %d blocks\n",
+ part_id, blocks);
+
+ send_ack(usbd, blocks);
+ return 1;
+
+ case COMMAND_WRITE_PART_0:
+ /* Do nothing */
+ printf("COMMAND_WRITE_PART_0\n");
+ return 1;
+
+ case COMMAND_WRITE_PART_1:
+ printf("COMMAND_WRITE_PART_BOOT\n");
+ part_id = get_part_id("bootloader");
+ img_type = IMG_BOOT;
+ break;
+
+ case COMMAND_WRITE_PART_2:
+ case COMMAND_ERASE_PARAMETER:
+ printf("COMMAND_PARAMETER - not support!\n");
+ break;
+
+ case COMMAND_WRITE_PART_3:
+ printf("COMMAND_WRITE_KERNEL\n");
+ part_id = get_part_id("kernel");
+ img_type = IMG_KERNEL;
+ break;
+
+ case COMMAND_WRITE_PART_4:
+ printf("COMMAND_WRITE_ROOTFS\n");
+ part_id = get_part_id("Root");
+ img_type = IMG_FILESYSTEM;
+ ubi_update = arg;
+ break;
+
+ case COMMAND_WRITE_PART_5:
+ printf("COMMAND_WRITE_FACTORYFS\n");
+ part_id = get_part_id("Fact");
+ img_type = IMG_FILESYSTEM;
+ ubi_update = arg;
+ break;
+
+ case COMMAND_WRITE_PART_6:
+ printf("COMMAND_WRITE_DATAFS\n");
part_id = get_part_id("Data");
img_type = IMG_FILESYSTEM;
ubi_update = arg;
case COMMAND_WRITE_IMG_2:
printf("COMMAND_WRITE_KERNEL\n");
- /* TODO: Not support yet, just return */
- *((ulong *) usbd->tx_data) = STATUS_DONE;
- usbd->send_data(usbd->tx_data, usbd->tx_len);
- return 1;
+ img_type = IMG_KERNEL_V2;
+ part_id = 2;
+ break;
case COMMAND_WRITE_IMG_3:
printf("COMMAND_WRITE_MODEM\n");
- /* TODO: Not support yet, just return */
- *((ulong *) usbd->tx_data) = STATUS_DONE;
- usbd->send_data(usbd->tx_data, usbd->tx_len);
- return 1;
+ img_type = IMG_MODEM_V2;
+ part_id = 2;
+ break;
case COMMAND_WRITE_IMG_4:
printf("COMMAND_WRITE_BOOT_PART\n");
ret = 1;
}
- *((ulong *) usbd->tx_data) = ret;
/* Write image success -> Report status */
- usbd->send_data(usbd->tx_data, usbd->tx_len);
+ send_ack(usbd, ret);
return !ret;
/* Download complete -> reset */
if (usbd->cpu_reset)
usbd->cpu_reset();
else
- do_reset();
+ run_command("reset", 0);
return 0;
/* Stop USB */
usbd->usb_stop();
- return 0;
+ return -1;
case COMMAND_RAM_BOOT:
usbd->usb_stop();
down_ram_addr = usbd->ram_addr;
} else {
down_ram_addr = CONFIG_RAMDISK_ADDR;
- run_cmd("ramboot");
+ run_command("run ramboot", 0);
}
#endif
return 1;
usbd_phone_down();
- *((ulong *) usbd->tx_data) = STATUS_DONE;
- usbd->send_data(usbd->tx_data, usbd->tx_len);
+ send_ack(usbd, STATUS_DONE);
return 1;
case COMMAND_CHANGE_USB:
usbd_path_change();
- do_reset();
+ run_command("reset", 0);
return 0;
#endif
case COMMAND_CSA_CLEAR:
return 1;
}
- /* Erase and Write to NAND */
- switch (img_type) {
- case IMG_BOOT:
- ofs = parts[part_id]->offset;
-#ifdef CONFIG_S5PC1XX
- /* Workaround: for prevent revision mismatch */
- if (cpu_is_s5pc110() && (down_mode != MODE_FORCE)) {
- int img_rev = 1;
- long *img_header = (long *)down_ram_addr;
-
- if (*img_header == 0xea000012)
- img_rev = 0;
- else if (*(img_header + 0x400) == 0xea000012)
- img_rev = 2;
-
- if (img_rev != s5p_get_cpu_rev()) {
- printf("CPU revision mismatch!\n"
- "bootloader is %s%s\n"
- "download image is %s%s\n",
- s5p_get_cpu_rev() ? "EVT1" : "EVT0",
- s5p_get_cpu_rev() == 2 ? "-Fused" : "",
- img_rev ? "EVT1" : "EVT0",
- img_rev == 2 ? "-Fused" : "");
- *((ulong *) usbd->tx_data) = STATUS_ERROR;
- usbd->send_data(usbd->tx_data, usbd->tx_len);
- return 0;
- }
- }
-#endif
-#ifdef CONFIG_SBOOT
- /* Only u-boot.bin is allowed */
- {
- long *img_header = (long *)down_ram_addr;
-
- if (*img_header != 0xea000018) {
- printf("\n!!! ERROR !!!\n"
- "Please download the u-boot.bin.\n"
- "Other images are not allowed.\n\n");
- *((ulong *) usbd->tx_data) = STATUS_ERROR;
- usbd->send_data(usbd->tx_data, usbd->tx_len);
- return 0;
- }
- }
-#endif
-#if defined(CONFIG_ENV_IS_IN_NAND) || defined(CONFIG_ENV_IS_IN_ONENAND)
- /* Erase the environment also when write bootloader */
- {
- int param_id;
- param_id = get_part_id("params");
-
- if (param_id == -1) {
- sprintf(offset, "%x", CONFIG_ENV_ADDR);
- sprintf(length, "%x", CONFIG_ENV_SIZE);
- } else {
- sprintf(offset, "%x", parts[param_id]->offset);
- sprintf(length, "%x", parts[param_id]->size);
- }
- nand_cmd(0, offset, length, NULL);
- }
-#endif
- sprintf(offset, "%x", (uint)ofs);
- if (ofs != 0)
- sprintf(length, "%x", parts[part_id]->size - (uint)ofs);
- else
- sprintf(length, "%x", parts[part_id]->size);
-
- /* Erase */
- nand_cmd(0, offset, length, NULL);
- /* Write */
- sprintf(length, "%x", (unsigned int) len);
- ret = nand_cmd(1, ramaddr, offset, length);
- break;
-
- case IMG_KERNEL:
- sprintf(offset, "%x", parts[part_id]->offset);
- sprintf(length, "%x", parts[part_id]->size);
-
- /* Erase */
- nand_cmd(0, offset, length, NULL);
- /* Write */
- sprintf(length, "%x", (unsigned int) len);
- ret = nand_cmd(1, ramaddr, offset, length);
-
- erase_qboot_area();
- break;
-
- /* File Systems */
- case IMG_FILESYSTEM:
- ret = write_file_system(ramaddr, len, offset, length,
- part_id, ubi_update);
-
- erase_qboot_area();
- break;
-
- case IMG_MODEM:
- sprintf(offset, "%x", parts[part_id]->offset);
- sprintf(length, "%x", parts[part_id]->size);
-
- /* Erase */
- if (!arg)
- nand_cmd(0, offset, length, NULL);
- else
- printf("CSA Clear will be skipped temporary\n");
-
- /* Check ubi image, 0x23494255 is UBI# */
- {
- long *img_header = (long *)down_ram_addr;
-
- if (*img_header == 0x23494255)
- goto ubi_img;
- }
-
-#ifdef CONFIG_UBIFS_MK
- void *dest_addr = (void *) down_ram_addr + 0xc00000;
- void *src_addr = (void *) down_ram_addr;
- int leb_size, max_leb_cnt, mkfs_min_io_size;
- unsigned long ubifs_dest_size, ubi_dest_size;
-#ifdef CONFIG_S5PC110
- mkfs_min_io_size = 4096;
- leb_size = 248 * 1024;
- max_leb_cnt = 4096;
-#elif CONFIG_S5PC210
- mkfs_min_io_size = 2048;
- leb_size = 126 * 1024;
- max_leb_cnt = 4096;
-#endif
- printf("Start making ubifs\n");
- ret = mkfs(src_addr, len, dest_addr, &ubifs_dest_size,
- mkfs_min_io_size, leb_size, max_leb_cnt);
- if (ret) {
- printf("Error : making ubifs failed\n");
- goto out;
- }
- printf("Complete making ubifs\n");
-#endif
-
-#ifdef CONFIG_UBINIZE
- int peb_size, ubi_min_io_size, subpage_size, vid_hdr_offs;
-#ifdef CONFIG_S5PC110
- ubi_min_io_size = 4096;
- peb_size = 256 * 1024;
- subpage_size = 4096;
- vid_hdr_offs = 0;
-#elif CONFIG_S5PC210
- ubi_min_io_size = 2048;
- peb_size = 128 * 1024;
- subpage_size = 512;
- vid_hdr_offs = 512;
-#endif
- printf("Start ubinizing\n");
- ret = ubinize(dest_addr, ubifs_dest_size,
- src_addr, &ubi_dest_size,
- peb_size, ubi_min_io_size,
- subpage_size, vid_hdr_offs);
- if (ret) {
- printf("Error : ubinizing failed\n");
- goto out;
- }
- printf("Complete ubinizing\n");
-
- len = (unsigned int) ubi_dest_size;
-#endif
-
-ubi_img:
- /* Write : arg (0 Modem) / (1 CSA) */
- if (!arg) {
- sprintf(length, "%x", (unsigned int) len);
- ret = nand_cmd(1, ramaddr, offset, length);
- }
-out:
- break;
-
-#ifdef CONFIG_CMD_MMC
- case IMG_MMC:
-
- if (mmc_part_write)
- ret = write_file_mmc_part(usbd, len);
- else
- ret = write_file_mmc(usbd, len);
-
- erase_qboot_area();
- break;
-#endif
- case IMG_V2:
- ret = write_mmc_image(usbd, len, part_id);
- break;
-
- case IMG_MBR:
-#ifdef CONFIG_CMD_MBR
- set_mbr_info(usbd, (char *)down_ram_addr, len);
-#endif
- break;
-
- case IMG_BOOTLOADER:
-#ifdef CONFIG_BOOTLADER_SECTOR
- ret = mmc_cmd(OPS_WRITE, usbd->mmc_dev,
- CONFIG_BOOTLOADER_SECTOR,
- len / usbd->mmc_blk + 1,
- (void *)down_ram_addr);
-#endif
- break;
-
- default:
- /* Retry? */
- write_part--;
- }
+ if (img_type < IMG_V2)
+ ret = write_mtd_image(usbd, img_type, len, arg);
+ else
+ ret = write_v2_image(usbd, img_type, len, arg);
- if (ret) {
+ if (ret < 0) {
+ send_ack(usbd, STATUS_ERROR);
+ return -1;
+ } else if (ret) {
/* Retry this commad */
- *((ulong *) usbd->tx_data) = STATUS_RETRY;
- usbd->send_data(usbd->tx_data, usbd->tx_len);
+ send_ack(usbd, STATUS_RETRY);
return 1;
} else
- *((ulong *) usbd->tx_data) = STATUS_DONE;
-
- /* Write image success -> Report status */
- usbd->send_data(usbd->tx_data, usbd->tx_len);
+ send_ack(usbd, STATUS_DONE);
write_part++;
if (flag) {
write_part = 0;
fs_offset = 0;
-#ifdef CONFIG_USE_YAFFS
- yaffs_len = 0;
-#endif
}
return 1;
{
struct usbd_ops *usbd;
int err;
+ int ret;
if (argc > 1)
down_mode = simple_strtoul(argv[1], NULL, 10);
#ifdef CONFIG_CMD_MBR
/* get mbr info */
mbr_parts = get_mbr_table(mbr_offset);
- if (!mbr_parts) {
- char *mbrparts;
-
- puts("using default MBR\n");
-
- mbrparts = getenv("mbrparts");
- set_mbr_info(usbd, mbrparts, strlen(mbrparts));
- }
+ if (!mbr_parts)
+ run_command("mbr default", 0);
#endif
/* init the usb controller */
if (!usbd->usb_init()) {
- usbd->down_cancel();
+ usbd->down_cancel(END_BOOT);
return 0;
}
mmc = find_mmc_device(usbd->mmc_dev);
usbd->recv_setup(usbd->rx_data, usbd->rx_len);
/* detect the download request from Host PC */
- if (usbd->recv_data()) {
+ ret = usbd->recv_data();
+ if (ret > 0) {
if (strncmp(usbd->rx_data, recv_key, strlen(recv_key)) == 0) {
printf("Download request from the Host PC\n");
msleep(30);
printf("No download request from the Host PC!! 1\n");
return 0;
}
+ } else if (ret < 0) {
+ usbd->down_cancel(END_RETRY);
+ return 0;
} else {
- usbd->down_cancel();
+ usbd->down_cancel(END_BOOT);
return 0;
}
while (1) {
usbd->recv_setup(usbd->rx_data, usbd->rx_len);
- if (usbd->recv_data()) {
- if (process_data(usbd) == 0)
+ ret = usbd->recv_data();
+ if (ret > 0) {
+ ret = process_data(usbd);
+ if (ret < 0) {
+ usbd->down_cancel(END_RETRY);
return 0;
+ } else if (ret == 0) {
+ usbd->down_cancel(END_NORMAL);
+ return 0;
+ }
+ } else if (ret < 0) {
+ usbd->down_cancel(END_RETRY);
+ return 0;
+ } else {
+ usbd->down_cancel(END_BOOT);
+ return 0;
}
}
projects / kernel / u-boot.git / blobdiff