imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

[karo-tx-uboot.git] / board / w7o / vpd.c

diff --git a/board/w7o/vpd.c b/board/w7o/vpd.c
index 2ce15680e1535f6a6907980770402754ee2fda5c..57558e88fa53666a1cc9b0a50767867045365696 100755 (executable)
--- a/board/w7o/vpd.c
+++ b/board/w7o/vpd.c
@@ -24,7 +24,7 @@
 #if defined(VXWORKS)
 # include <stdio.h>
 # include <string.h>
-# define CFG_DEF_EEPROM_ADDR 0xa0
+# define CONFIG_SYS_DEF_EEPROM_ADDR 0xa0
 extern char iicReadByte( char, char );
 extern ulong_t crc32( unsigned char *, unsigned long );
 #else
@@ -47,7 +47,7 @@ vpd_reader(unsigned char *buf, unsigned dev_addr, unsigned off, unsigned count)
      * SDRAM SPD in the first 128 bytes,
      * so skew the offset.
      */
-    if (dev_addr == CFG_DEF_EEPROM_ADDR)
+    if (dev_addr == CONFIG_SYS_DEF_EEPROM_ADDR)
        offset += SDRAM_SPD_DATA_SIZE;
 
     /* Try to read the I2C EEPROM */
@@ -127,7 +127,7 @@ static int vpd_is_valid(unsigned dev_addr, unsigned char *buf)
     /* Check Eyecatcher */
     if (strncmp((char *)(vpd->header.eyecatcher), VPD_EYECATCHER, VPD_EYE_SIZE) != 0) {
        unsigned offset = 0;
-       if (dev_addr == CFG_DEF_EEPROM_ADDR)
+       if (dev_addr == CONFIG_SYS_DEF_EEPROM_ADDR)
            offset += SDRAM_SPD_DATA_SIZE;
        printf("Error: VPD EEPROM 0x%x corrupt @ 0x%x\n", dev_addr, offset);