recovery: update is modified to support various image

[kernel/u-boot.git] / recovery / usbd.c

diff --git a/recovery/usbd.c b/recovery/usbd.c
index bd4f7cc..811b788 100644 (file)
--- a/recovery/usbd.c
+++ b/recovery/usbd.c
@@ -9,10 +9,9 @@
 #include <common.h>
 #include "recovery.h"
 #include "usbd.h"
-#include "onenand.h"
 
 #ifdef RECOVERY_DEBUG
-#define        PUTS(s) serial_puts (DEBUG_MARK"usb: "s)
+#define        PUTS(s) serial_puts(DEBUG_MARK"usb: "s)
 #else
 #define PUTS(s)
 #endif
@@ -20,28 +19,6 @@
 static struct usbd_ops usbd_ops;
 static unsigned long down_ram_addr;
 
-int update_boot_image(void)
-{
-       struct onenand_op *onenand_ops = onenand_get_interface();
-       ulong len, offset;
-
-#if 1
-       /* case: IPL, Recovery, u-boot are one file */
-       offset = 0;
-       len = CONFIG_RECOVERY_SIZE + CONFIG_RECOVERY_ADDR;
-#else
-       /* case: IPL, Recover are one file and u-boot is another */
-       offset = CONFIG_RECOVERY_ADDR;
-       len = CONFIG_RECOVERY_SIZE;
-#endif
-       /* Erase */
-       onenand_ops->erase(offset, len, 0);
-       /* Write */
-       onenand_ops->write(offset, len, NULL, (u_char *)down_ram_addr);
-
-       return 0;
-}
-
 /* Parsing received data packet and Process data */
 static int process_data(struct usbd_ops *usbd)
 {
@@ -74,8 +51,7 @@ static int process_data(struct usbd_ops *usbd)
                if (recvlen < len) {
                        PUTS("Error: wrong image size\n");
                        *((ulong *) usbd->tx_data) = STATUS_RETRY;
-               }
-               else
+               } else
                        *((ulong *) usbd->tx_data) = STATUS_DONE;
 
                usbd->send_data(usbd->tx_data, usbd->tx_len);
@@ -118,7 +94,7 @@ static int process_data(struct usbd_ops *usbd)
        /* Erase and Write to NAND */
        switch (img_type) {
        case IMG_BOOT:
-               update_boot_image();
+               ret = board_update_image((u32 *)down_ram_addr, len);
                break;
 
        default: