ppc4xx: Add lcd4_lwmon5 support

[u-boot] / board / mcc200 / auto_update.c

diff --git a/board/mcc200/auto_update.c b/board/mcc200/auto_update.c
index 49213d0b388f87f07d38c28d2cf61ae6ed525c20..b9ff311eb90504170e105217009f113fe1bd3fd1 100644 (file)
--- a/board/mcc200/auto_update.c
+++ b/board/mcc200/auto_update.c
@@ -284,7 +284,7 @@ int au_do_update(int idx, long sz)
         */
        debug ("flash_sect_erase(%lx, %lx);\n", start, end);
        flash_sect_erase(start, end);
-       wait_ms(100);
+       mdelay(100);
 #ifdef CONFIG_PROGRESSBAR
        show_progress(end - start, totsize);
 #endif
@@ -341,7 +341,7 @@ int do_auto_update(void)
 {
        block_dev_desc_t *stor_dev;
        long sz;
-       int i, res = 0, bitmap_first, cnt, old_ctrlc, got_ctrlc;
+       int i, res = 0, cnt, old_ctrlc;
        char *env;
        long start, end;
 
@@ -352,7 +352,7 @@ int do_auto_update(void)
         * Read keypad status
         */
        i2c_read(I2C_PSOC_KEYPAD_ADDR, 0, 0, keypad_status1, 2);
-       wait_ms(500);
+       mdelay(500);
        i2c_read(I2C_PSOC_KEYPAD_ADDR, 0, 0, keypad_status2, 2);
 
        /*
@@ -450,8 +450,6 @@ int do_auto_update(void)
        /* make sure that we see CTRL-C and save the old state */
        old_ctrlc = disable_ctrlc(0);
 
-       bitmap_first = 0;
-
        /* validate the images first */
        for (i = 0; i < AU_MAXFILES; i++) {
                ulong imsize;
@@ -506,14 +504,11 @@ int do_auto_update(void)
                /* this is really not a good idea, but it's what the */
                /* customer wants. */
                cnt = 0;
-               got_ctrlc = 0;
                do {
                        res = au_do_update(i, sz);
                        /* let the user break out of the loop */
                        if (ctrlc() || had_ctrlc()) {
                                clear_ctrlc();
-                               if (res < 0)
-                                       got_ctrlc = 1;
                                break;
                        }
                        cnt++;