Merge branch 'master' of /home/wd/git/u-boot/custodians

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

diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c
index 11d4345..8454420 100644 (file)
--- a/board/mpl/common/common_util.c
+++ b/board/mpl/common/common_util.c
@@ -309,7 +309,7 @@ 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(CFG_DEF_EEPROM_ADDR,CONFIG_ENV_OFFSET,2,(void *)env_crc,4);
 }
 
 /*
@@ -323,7 +323,7 @@ int check_env_old_size(ulong oldsize)
 
        /* read old CRC */
        eeprom_read (CFG_DEF_EEPROM_ADDR,
-                    CFG_ENV_OFFSET,
+                    CONFIG_ENV_OFFSET,
                     (uchar *)&crc, sizeof(ulong));
 
        new = 0;
@@ -333,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 (CFG_DEF_EEPROM_ADDR, CONFIG_ENV_OFFSET+off, buf, n);
                new = crc32 (new, buf, n);
                len -= n;
                off += n;
@@ -357,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 (CFG_DEF_EEPROM_ADDR, CONFIG_ENV_OFFSET+off, &c, 1);
                if(c != '=') {
                        *name++=c;
                        off++;
@@ -371,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 (CFG_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);
                        }
@@ -565,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);
@@ -636,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;
                }