diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
| commit | cb5473205206c7f14cbb1e747f28ec75b48826e2 (patch) | |
| tree | 8f4808d60917100b18a10b05230f7638a0a9bbcc /board/kup/common/load_sernum_ethaddr.c | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h
Diffstat (limited to 'board/kup/common/load_sernum_ethaddr.c')
| -rw-r--r-- | board/kup/common/load_sernum_ethaddr.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/board/kup/common/load_sernum_ethaddr.c b/board/kup/common/load_sernum_ethaddr.c index b7b749985..741e9a536 100644 --- a/board/kup/common/load_sernum_ethaddr.c +++ b/board/kup/common/load_sernum_ethaddr.c @@ -33,8 +33,8 @@ * The KUP Hardware Information Block is defined as * follows: * - located in first flash bank - * - starts at offset CFG_HWINFO_OFFSET - * - size CFG_HWINFO_SIZE + * - starts at offset CONFIG_SYS_HWINFO_OFFSET + * - size CONFIG_SYS_HWINFO_SIZE * * Internal structure: * - sequence of ASCII character lines @@ -55,15 +55,15 @@ void load_sernum_ethaddr (void) { unsigned char *hwi; char *var; - unsigned char hwi_stack[CFG_HWINFO_SIZE]; + unsigned char hwi_stack[CONFIG_SYS_HWINFO_SIZE]; char *p; - hwi = (unsigned char *) (CFG_FLASH_BASE + CFG_HWINFO_OFFSET); - if (*((unsigned long *) hwi) != (unsigned long) CFG_HWINFO_MAGIC) { + hwi = (unsigned char *) (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_HWINFO_OFFSET); + if (*((unsigned long *) hwi) != (unsigned long) CONFIG_SYS_HWINFO_MAGIC) { printf ("HardwareInfo not found!\n"); return; } - memcpy (hwi_stack, hwi, CFG_HWINFO_SIZE); + memcpy (hwi_stack, hwi, CONFIG_SYS_HWINFO_SIZE); /* ** ethaddr @@ -72,7 +72,7 @@ void load_sernum_ethaddr (void) if (var) { var += sizeof (ETHADDR_TOKEN) - 1; p = strchr (var, '\r'); - if ((unsigned char *)p < hwi + CFG_HWINFO_SIZE) { + if ((unsigned char *)p < hwi + CONFIG_SYS_HWINFO_SIZE) { *p = '\0'; setenv ("ethaddr", var); *p = '\r'; @@ -85,7 +85,7 @@ void load_sernum_ethaddr (void) if (var) { var += sizeof (LCD_TOKEN) - 1; p = strchr (var, '\r'); - if ((unsigned char *)p < hwi + CFG_HWINFO_SIZE) { + if ((unsigned char *)p < hwi + CONFIG_SYS_HWINFO_SIZE) { *p = '\0'; setenv ("lcd", var); *p = '\r'; |