Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

[u-boot] / board / kup / common / load_sernum_ethaddr.c

diff --git a/board/kup/common/load_sernum_ethaddr.c b/board/kup/common/load_sernum_ethaddr.c
index 39ee124ebc42ccd71a05ac31c85a28fb9a87f4c1..741e9a5369c99d10761e7bf22a620c332bb69d6d 100644 (file)
--- 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
@@ -54,25 +54,25 @@
 void load_sernum_ethaddr (void)
 {
        unsigned char *hwi;
-       unsigned char *var;
-       unsigned char hwi_stack[CFG_HWINFO_SIZE];
-       unsigned char *p;
+       char *var;
+       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
         */
-       var = strstr (hwi_stack, ETHADDR_TOKEN);
+       var = strstr ((char *)hwi_stack, ETHADDR_TOKEN);
        if (var) {
                var += sizeof (ETHADDR_TOKEN) - 1;
                p = strchr (var, '\r');
-               if (p < hwi + CFG_HWINFO_SIZE) {
+               if ((unsigned char *)p < hwi + CONFIG_SYS_HWINFO_SIZE) {
                        *p = '\0';
                        setenv ("ethaddr", var);
                        *p = '\r';
@@ -81,11 +81,11 @@ void load_sernum_ethaddr (void)
        /*
         ** lcd
         */
-       var = strstr (hwi_stack, LCD_TOKEN);
+       var = strstr ((char *)hwi_stack, LCD_TOKEN);
        if (var) {
                var += sizeof (LCD_TOKEN) - 1;
                p = strchr (var, '\r');
-               if (p < hwi + CFG_HWINFO_SIZE) {
+               if ((unsigned char *)p < hwi + CONFIG_SYS_HWINFO_SIZE) {
                        *p = '\0';
                        setenv ("lcd", var);
                        *p = '\r';