Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[u-boot] / board / esd / plu405 / plu405.c

diff --git a/board/esd/plu405/plu405.c b/board/esd/plu405/plu405.c
index c733587b2a8557016b69ff8e46d32d026140ff6c..b68ffaf77100d12ae630dae8fb590e71fa357e1b 100644 (file)
--- a/board/esd/plu405/plu405.c
+++ b/board/esd/plu405/plu405.c
@@ -32,7 +32,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 extern void lxt971_no_sleep(void);
 
 /* fpga configuration data - gzip compressed and generated by bin2c */
@@ -46,22 +46,6 @@ const unsigned char fpgadata[] =
  */
 #include "../common/fpga.c"
 
-/*
- * include common auto-update code (for esd boards)
- */
-#include "../common/auto_update.h"
-
-au_image_t au_image[] = {
-       {"plu405/preinst.img", 0, -1, AU_SCRIPT},
-       {"plu405/u-boot.img", 0xfffc0000, 0x00040000, AU_FIRMWARE},
-       {"plu405/pImage_${bd_type}", 0x00000000, 0x00100000, AU_NAND},
-       {"plu405/pImage.initrd", 0x00100000, 0x00200000, AU_NAND},
-       {"plu405/yaffsmt2.img", 0x00300000, 0x01c00000, AU_NAND},
-       {"plu405/postinst.img", 0, 0, AU_SCRIPT},
-};
-
-int N_AU_IMAGES = (sizeof(au_image) / sizeof(au_image[0]));
-
 /*
  * generate a short spike on the CAN tx line
  * to bring the couplers in sync
@@ -90,9 +74,6 @@ void init_coupler(u32 addr)
        out_8(&ctrl->cr, CR_RR);
 }
 
-/* Prototypes */
-int gunzip(void *, int, unsigned char *, unsigned long *);
-
 int board_early_init_f(void)
 {
        /*
@@ -259,7 +240,7 @@ int misc_init_r(void)
 int checkboard(void)
 {
        char str[64];
-       int i = getenv_r("serial#", str, sizeof(str));
+       int i = getenv_f("serial#", str, sizeof(str));
 
        puts("Board: ");
 
@@ -341,7 +322,7 @@ int eeprom_write_enable(unsigned dev_addr, int state)
        return state;
 }
 
-int do_eep_wren(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_eep_wren(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int query = argc == 1;
        int state = 0;