rename CFG_ macros to CONFIG_SYS

[karo-tx-uboot.git] / board / xilinx / xilinx_iic / iic_adapter.c

diff --git a/board/xilinx/xilinx_iic/iic_adapter.c b/board/xilinx/xilinx_iic/iic_adapter.c
index 5ad4a0c11945cd78a0cff1df9379c297b9295218..58aaeb76956e0930e29ec49a714109cd0d31e65a 100644 (file)
--- a/board/xilinx/xilinx_iic/iic_adapter.c
+++ b/board/xilinx/xilinx_iic/iic_adapter.c
@@ -37,13 +37,12 @@
 *
 ******************************************************************************/
 
+#include <config.h>
 #include <common.h>
 #include <environment.h>
 #include <net.h>
-#include <configs/ml300.h>
-#include "xparameters.h"
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #include <i2c.h>
 #include "xiic_l.h"
 
@@ -73,7 +72,7 @@ send(u32 adr, u8 * data, u32 len)
                memcpy(&sendBuf[2], &data[pos], wlen);
 
                /* Send to EEPROM through iic bus */
-               ret = XIic_Send(XPAR_IIC_0_BASEADDR, CFG_I2C_EEPROM_ADDR >> 1,
+               ret = XIic_Send(XPAR_IIC_0_BASEADDR, CONFIG_SYS_I2C_EEPROM_ADDR >> 1,
                                sendBuf, wlen + 2);
 
                udelay(IIC_DELAY);
@@ -94,11 +93,11 @@ receive(u32 adr, u8 * data, u32 len)
 
        /* Provide EEPROM address */
        ret =
-           XIic_Send(XPAR_IIC_0_BASEADDR, CFG_I2C_EEPROM_ADDR >> 1, address,
+           XIic_Send(XPAR_IIC_0_BASEADDR, CONFIG_SYS_I2C_EEPROM_ADDR >> 1, address,
                      2);
        /* Receive data from EEPROM */
        ret =
-           XIic_Recv(XPAR_IIC_0_BASEADDR, CFG_I2C_EEPROM_ADDR >> 1, data, len);
+           XIic_Recv(XPAR_IIC_0_BASEADDR, CONFIG_SYS_I2C_EEPROM_ADDR >> 1, data, len);
 }
 
 /************************************************************************
@@ -222,7 +221,7 @@ read_crc(uchar * buffer, int len)
        u8 pre;                 /* previous EEPROM data bit */
        int i, loc;
 
-       addr = CFG_ENV_OFFSET;  /* start from first env address */
+       addr = CONFIG_ENV_OFFSET;       /* start from first env address */
        n = 0;
        pre = 1;
        stop = 1;
@@ -230,7 +229,7 @@ read_crc(uchar * buffer, int len)
 
        /* calculate runtime CRC according to ML300 and read back
           old CRC stored in the EEPROM */
-       while (n < CFG_ENV_SIZE) {
+       while (n < CONFIG_ENV_SIZE) {
                receive(addr, buffer, len);
 
                /* found two null chars, end of env */
@@ -271,7 +270,7 @@ read_crc(uchar * buffer, int len)
                crc = 0;
                n = 0;
                addr =
-                   CFG_ENV_OFFSET - offsetof(env_t, crc) + offsetof(env_t,
+                   CONFIG_ENV_OFFSET - offsetof(env_t, crc) + offsetof(env_t,
                                                                     data);
                /* calculate u-boot crc */
                while (n < ENV_SIZE) {
@@ -291,15 +290,15 @@ read_crc(uchar * buffer, int len)
 static void
 ip_ml300(uchar * s, uchar * res)
 {
-       uchar temp[2];
+       char temp[2];
        u8 i;
 
        res[0] = 0x00;
 
        for (i = 0; i < 4; i++) {
                sprintf(temp, "%02x", atoi(s));
-               s = strchr(s, '.') + 1;
-               strcat(res, temp);
+               s = (uchar *)strchr((char *)s, '.') + 1;
+               strcat((char *)res, temp);
        }
 }
 
@@ -310,8 +309,8 @@ static void
 change_null(uchar * s)
 {
        if (s != NULL) {
-               change_null(strchr(s + 1, 255));
-               *(strchr(s, 255)) = '\0';
+               change_null((uchar *)strchr((char *)s + 1, 255));
+               *(strchr((char *)s, 255)) = '\0';
        }
 }
 
@@ -321,8 +320,8 @@ change_null(uchar * s)
 void
 convert_env(void)
 {
-       uchar *s;               /* pointer to env value */
-       uchar temp[20];         /* temp storage for addresses */
+       char *s;                /* pointer to env value */
+       char temp[20];          /* temp storage for addresses */
 
        /* E -> ethaddr */
        s = getenv("E");
@@ -345,8 +344,8 @@ convert_env(void)
        /* I -> ipaddr */
        s = getenv("I");
        if (s != NULL) {
-               sprintf(temp, "%d.%d.%d.%d", axtoi(s), axtoi(s + 2),
-                       axtoi(s + 4), axtoi(s + 6));
+               sprintf(temp, "%d.%d.%d.%d", axtoi((u8 *)s), axtoi((u8 *)(s + 2)),
+                       axtoi((u8 *)(s + 4)), axtoi((u8 *)(s + 6)));
                setenv("ipaddr", temp);
                setenv("I", NULL);
        }
@@ -354,8 +353,8 @@ convert_env(void)
        /* S -> serverip */
        s = getenv("S");
        if (s != NULL) {
-               sprintf(temp, "%d.%d.%d.%d", axtoi(s), axtoi(s + 2),
-                       axtoi(s + 4), axtoi(s + 6));
+               sprintf(temp, "%d.%d.%d.%d", axtoi((u8 *)s), axtoi((u8 *)(s + 2)),
+                       axtoi((u8 *)(s + 4)), axtoi((u8 *)(s + 6)));
                setenv("serverip", temp);
                setenv("S", NULL);
        }
@@ -391,9 +390,9 @@ convert_env(void)
 static void
 save_env(void)
 {
-       uchar eprom[ENV_SIZE];  /* buffer to be written back to EEPROM */
-       uchar *s, temp[20];
-       uchar ff[] = { 0xff, 0x00 };    /* dummy null value */
+       char eprom[ENV_SIZE];   /* buffer to be written back to EEPROM */
+       char *s, temp[20];
+       char ff[] = { 0xff, 0x00 };     /* dummy null value */
        u32 len;                /* length of env to be written to EEPROM */
 
        eprom[0] = 0x00;
@@ -422,7 +421,7 @@ save_env(void)
        s = getenv("ipaddr");
        if (s != NULL) {
                strcat(eprom, "I=");
-               ip_ml300(s, temp);
+               ip_ml300((uchar *)s, (uchar *)temp);
                strcat(eprom, temp);
                strcat(eprom, ff);
        }
@@ -431,7 +430,7 @@ save_env(void)
        s = getenv("serverip");
        if (s != NULL) {
                strcat(eprom, "S=");
-               ip_ml300(s, temp);
+               ip_ml300((uchar *)s, (uchar *)temp);
                strcat(eprom, temp);
                strcat(eprom, ff);
        }
@@ -461,11 +460,11 @@ save_env(void)
        }
 
        len = strlen(eprom);    /* find env length without crc */
-       change_null(eprom);     /* change 0xff to 0x00 */
+       change_null((uchar *)eprom);    /* change 0xff to 0x00 */
 
        /* update EEPROM env values if there is enough space */
-       if (update_crc(len, eprom) == 0)
-               send(CFG_ENV_OFFSET, eprom, len + 6);
+       if (update_crc(len, (uchar *)eprom) == 0)
+               send(CONFIG_ENV_OFFSET, (uchar *)eprom, len + 6);
 }
 
 /************************************************************************
@@ -484,7 +483,7 @@ i2c_read(uchar chip, uint addr, int alen, uchar * buffer, int len)
                /* then read out EEPROM content for runtime u-boot CRC calculation */
                receive(addr, buffer, len);
 
-               if (addr + len - CFG_ENV_OFFSET == CFG_ENV_SIZE)
+               if (addr + len - CONFIG_ENV_OFFSET == CONFIG_ENV_SIZE)
                        /* end of runtime crc read */
                        ++envStep;
                return 0;
@@ -493,7 +492,7 @@ i2c_read(uchar chip, uint addr, int alen, uchar * buffer, int len)
        if (len < 2) {
                /* when call getenv_r */
                receive(addr, buffer, len);
-       } else if (addr + len < CFG_ENV_OFFSET + CFG_ENV_SIZE) {
+       } else if (addr + len < CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) {
                /* calling env_relocate(), but don't read out
                   crc value from EEPROM */
                receive(addr, buffer + 4, len);
@@ -512,7 +511,7 @@ int
 i2c_write(uchar chip, uint addr, int alen, uchar * buffer, int len)
 {
        /* save env on last page write called by u-boot */
-       if (addr + len >= CFG_ENV_OFFSET + CFG_ENV_SIZE)
+       if (addr + len >= CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
                save_env();
 
        return 0;