Merge git://git.denx.de/u-boot into x1

[u-boot] / board / mpl / common / common_util.c

diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c
index b171ca51736b427f5102dcca68b7dd62da3081f9..8990fc60580b1dcb9437aa13a7ff53863dbadd54 100644 (file)
--- a/board/mpl/common/common_util.c
+++ b/board/mpl/common/common_util.c
@@ -53,7 +53,7 @@ extern int gunzip(void *, int, uchar *, unsigned long *);
 extern int mem_test(ulong start, ulong ramsize, int quiet);
 
 #define I2C_BACKUP_ADDR 0x7C00         /* 0x200 bytes for backup */
-#define IMAGE_SIZE CFG_MONITOR_LEN     /* ugly, but it works for now */
+#define IMAGE_SIZE CONFIG_SYS_MONITOR_LEN      /* ugly, but it works for now */
 
 extern flash_info_t flash_info[];      /* info for FLASH chips */
 
@@ -74,7 +74,7 @@ mpl_prg(uchar *src, ulong size)
        info = &flash_info[0];
 
 #if defined(CONFIG_PIP405) || defined(CONFIG_MIP405) || defined(CONFIG_PATI)
-       if (image_to_cpu (magic[0]) != IH_MAGIC) {
+       if (uimage_to_cpu (magic[0]) != IH_MAGIC) {
                puts("Bad Magic number\n");
                return -1;
        }
@@ -181,6 +181,13 @@ mpl_prg_image(uchar *ld_addr)
        image_header_t *hdr = (image_header_t *)ld_addr;
        int rc;
 
+#if defined(CONFIG_FIT)
+       if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) {
+               puts ("Non legacy image format not supported\n");
+               return -1;
+       }
+#endif
+
        if (!image_check_magic (hdr)) {
                puts("Bad Magic Number\n");
                return 1;
@@ -212,7 +219,7 @@ mpl_prg_image(uchar *ld_addr)
                uchar *buf;
                /* reserve space for uncompressed image */
                if ((buf = malloc(IMAGE_SIZE)) == NULL) {
-                       puts("Insufficient space for decompression\n");
+                       puts("Insufficient space for decompression\n");
                        return 1;
                }
 
@@ -263,7 +270,7 @@ mpl_prg_image(uchar *ld_addr)
 #if !defined(CONFIG_PATI)
 void get_backup_values(backup_t *buf)
 {
-       i2c_read(CFG_DEF_EEPROM_ADDR, I2C_BACKUP_ADDR,2,(void *)buf,sizeof(backup_t));
+       i2c_read(CONFIG_SYS_DEF_EEPROM_ADDR, I2C_BACKUP_ADDR,2,(void *)buf,sizeof(backup_t));
 }
 
 void set_backup_values(int overwrite)
@@ -291,7 +298,7 @@ void set_backup_values(int overwrite)
                return;
        }
        back.eth_addr[20]=0;
-       i2c_write(CFG_DEF_EEPROM_ADDR, I2C_BACKUP_ADDR,2,(void *)&back,sizeof(backup_t));
+       i2c_write(CONFIG_SYS_DEF_EEPROM_ADDR, I2C_BACKUP_ADDR,2,(void *)&back,sizeof(backup_t));
 }
 
 void clear_env_values(void)
@@ -301,8 +308,8 @@ void clear_env_values(void)
 
        memset(&back,0xff,sizeof(backup_t));
        memset(env_crc,0x00,4);
-       i2c_write(CFG_DEF_EEPROM_ADDR,I2C_BACKUP_ADDR,2,(void *)&back,sizeof(backup_t));
-       i2c_write(CFG_DEF_EEPROM_ADDR,CFG_ENV_OFFSET,2,(void *)env_crc,4);
+       i2c_write(CONFIG_SYS_DEF_EEPROM_ADDR,I2C_BACKUP_ADDR,2,(void *)&back,sizeof(backup_t));
+       i2c_write(CONFIG_SYS_DEF_EEPROM_ADDR,CONFIG_ENV_OFFSET,2,(void *)env_crc,4);
 }
 
 /*
@@ -315,8 +322,8 @@ int check_env_old_size(ulong oldsize)
        uchar buf[64];
 
        /* read old CRC */
-       eeprom_read (CFG_DEF_EEPROM_ADDR,
-                    CFG_ENV_OFFSET,
+       eeprom_read (CONFIG_SYS_DEF_EEPROM_ADDR,
+                    CONFIG_ENV_OFFSET,
                     (uchar *)&crc, sizeof(ulong));
 
        new = 0;
@@ -326,7 +333,7 @@ int check_env_old_size(ulong oldsize)
        while (len > 0) {
                int n = (len > sizeof(buf)) ? sizeof(buf) : len;
 
-               eeprom_read (CFG_DEF_EEPROM_ADDR, CFG_ENV_OFFSET+off, buf, n);
+               eeprom_read (CONFIG_SYS_DEF_EEPROM_ADDR, CONFIG_ENV_OFFSET+off, buf, n);
                new = crc32 (new, buf, n);
                len -= n;
                off += n;
@@ -350,12 +357,12 @@ void copy_old_env(ulong size)
        unsigned off;
        uchar *name, *value;
 
-       name=&name_buf[0];
-       value=&value_buf[0];
+       name = &name_buf[0];
+       value = &value_buf[0];
        len=size;
        off = sizeof(long);
        while (len > off) {
-               eeprom_read (CFG_DEF_EEPROM_ADDR, CFG_ENV_OFFSET+off, &c, 1);
+               eeprom_read (CONFIG_SYS_DEF_EEPROM_ADDR, CONFIG_ENV_OFFSET+off, &c, 1);
                if(c != '=') {
                        *name++=c;
                        off++;
@@ -364,14 +371,14 @@ void copy_old_env(ulong size)
                        *name++='\0';
                        off++;
                        do {
-                               eeprom_read (CFG_DEF_EEPROM_ADDR, CFG_ENV_OFFSET+off, &c, 1);
+                               eeprom_read (CONFIG_SYS_DEF_EEPROM_ADDR, CONFIG_ENV_OFFSET+off, &c, 1);
                                *value++=c;
                                off++;
                                if(c == '\0')
                                        break;
                        } while(len > off);
-                       name=&name_buf[0];
-                       value=&value_buf[0];
+                       name = &name_buf[0];
+                       value = &value_buf[0];
                        if(strncmp((char *)name,"baudrate",8)!=0) {
                                setenv((char *)name,(char *)value);
                        }
@@ -454,7 +461,7 @@ void show_stdio_dev(void)
 
 int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-       ulong size,src,ld_addr;
+       ulong size,src,ld_addr;
        int result;
 #if !defined(CONFIG_PATI)
        backup_t back;
@@ -466,11 +473,11 @@ int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        {
 #if defined(CONFIG_CMD_FDC)
                if (strcmp(argv[2], "floppy") == 0) {
-                       char *local_args[3];
+                       char *local_args[3];
                        extern int do_fdcboot (cmd_tbl_t *, int, int, char *[]);
                        puts("\nupdating bootloader image from floppy\n");
                        local_args[0] = argv[0];
-                       if(argc==4) {
+                       if(argc==4) {
                                local_args[1] = argv[3];
                                local_args[2] = NULL;
                                ld_addr=simple_strtoul(argv[3], NULL, 16);
@@ -478,7 +485,7 @@ int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        }
                        else {
                                local_args[1] = NULL;
-                               ld_addr=CFG_LOAD_ADDR;
+                               ld_addr=CONFIG_SYS_LOAD_ADDR;
                                result=do_fdcboot(cmdtp, 0, 1, local_args);
                        }
                        result=mpl_prg_image((uchar *)ld_addr);
@@ -486,7 +493,7 @@ int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                }
 #endif
                if (strcmp(argv[2], "mem") == 0) {
-                       if(argc==4) {
+                       if(argc==4) {
                                ld_addr=simple_strtoul(argv[3], NULL, 16);
                        }
                        else {
@@ -512,14 +519,14 @@ int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        result = (int)simple_strtol(argv[2], NULL, 16);
            }
            src=(unsigned long)&result;
-           src-=CFG_MEMTEST_START;
+           src-=CONFIG_SYS_MEMTEST_START;
            src-=(100*1024); /* - 100k */
            src&=0xfff00000;
            size=0;
            do {
-               size++;
+               size++;
                        printf("\n\nPass %ld\n",size);
-                       mem_test(CFG_MEMTEST_START,src,1);
+                       mem_test(CONFIG_SYS_MEMTEST_START,src,1);
                        if(ctrlc())
                                break;
                        if(result>0)
@@ -531,7 +538,7 @@ int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #if !defined(CONFIG_PATI)
        if (strcmp(argv[1], "clearenvvalues") == 0)
        {
-               if (strcmp(argv[2], "yes") == 0)
+               if (strcmp(argv[2], "yes") == 0)
                {
                        clear_env_values();
                        return 0;
@@ -558,7 +565,6 @@ int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 
 #if defined(CONFIG_CMD_DOC)
-extern void doc_probe(ulong physadr);
 void doc_init (void)
 {
   doc_probe(MULTI_PURPOSE_SOCKET_ADDR);
@@ -629,12 +635,12 @@ void video_get_info_str (int line_number, char *info)
                                        ++s;
                                        break;
                                }
-                               buf[i++]=*s;
+                               buf[i++] = *s;
                        }
                        sprintf(&buf[i]," SN ");
                        i+=4;
                        for (; s < e; ++s) {
-                               buf[i++]=*s;
+                               buf[i++] = *s;
                        }
                        buf[i++]=0;
                }