projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
board
/
w7o
/
vpd.c
diff --git
a/board/w7o/vpd.c
b/board/w7o/vpd.c
index
2ce1568
..
57558e8
100644
(file)
--- a/
board/w7o/vpd.c
+++ b/
board/w7o/vpd.c
@@
-24,7
+24,7
@@
#if defined(VXWORKS)
# include <stdio.h>
# include <string.h>
#if defined(VXWORKS)
# include <stdio.h>
# include <string.h>
-# define C
FG
_DEF_EEPROM_ADDR 0xa0
+# define C
ONFIG_SYS
_DEF_EEPROM_ADDR 0xa0
extern char iicReadByte( char, char );
extern ulong_t crc32( unsigned char *, unsigned long );
#else
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.
*/
* SDRAM SPD in the first 128 bytes,
* so skew the offset.
*/
- if (dev_addr == C
FG
_DEF_EEPROM_ADDR)
+ if (dev_addr == C
ONFIG_SYS
_DEF_EEPROM_ADDR)
offset += SDRAM_SPD_DATA_SIZE;
/* Try to read the I2C EEPROM */
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;
/* Check Eyecatcher */
if (strncmp((char *)(vpd->header.eyecatcher), VPD_EYECATCHER, VPD_EYE_SIZE) != 0) {
unsigned offset = 0;
- if (dev_addr == C
FG
_DEF_EEPROM_ADDR)
+ if (dev_addr == C
ONFIG_SYS
_DEF_EEPROM_ADDR)
offset += SDRAM_SPD_DATA_SIZE;
printf("Error: VPD EEPROM 0x%x corrupt @ 0x%x\n", dev_addr, offset);
offset += SDRAM_SPD_DATA_SIZE;
printf("Error: VPD EEPROM 0x%x corrupt @ 0x%x\n", dev_addr, offset);