Cleanup for GCC-4.x

[oweals/u-boot.git] / 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..b7b74998578f3a992781e8c8be45f7f2ec39c917 100644 (file)
--- a/board/kup/common/load_sernum_ethaddr.c
+++ b/board/kup/common/load_sernum_ethaddr.c
@@ -54,9 +54,9 @@
 void load_sernum_ethaddr (void)
 {
        unsigned char *hwi;
-       unsigned char *var;
+       char *var;
        unsigned char hwi_stack[CFG_HWINFO_SIZE];
-       unsigned char *p;
+       char *p;
 
        hwi = (unsigned char *) (CFG_FLASH_BASE + CFG_HWINFO_OFFSET);
        if (*((unsigned long *) hwi) != (unsigned long) CFG_HWINFO_MAGIC) {
@@ -68,11 +68,11 @@ void load_sernum_ethaddr (void)
        /*
         ** 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 + CFG_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 + CFG_HWINFO_SIZE) {
                        *p = '\0';
                        setenv ("lcd", var);
                        *p = '\r';