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

[pandora-u-boot.git] / board / svm_sc8xx / svm_sc8xx.c

diff --git a/board/svm_sc8xx/svm_sc8xx.c b/board/svm_sc8xx/svm_sc8xx.c
index 4390e49..771bb4a 100644 (file)
--- a/board/svm_sc8xx/svm_sc8xx.c
+++ b/board/svm_sc8xx/svm_sc8xx.c
@@ -75,27 +75,26 @@ const uint sdram_table[] =
  * Return 1 for "SC8xx" type, 0 else.
  */
 
-int checkboard (void)
+int checkboard(void)
 {
-    char *s = getenv("serial#");
-    int board_type;
+       char buf[64];
+       int i;
+       int l = getenv_f("serial#", buf, sizeof(buf));
 
-    if (!s || strncmp(s, "SVM8", 4)) {
-       printf ("### No HW ID - assuming SVM SC8xx\n");
-       return (0);
-    }
+       if (l < 0 || strncmp(buf, "SVM8", 4)) {
+               printf("### No HW ID - assuming SVM SC8xx\n");
+               return (0);
+       }
 
-    board_type = 1;
+       for (i = 0; i < l; ++i) {
+               if (buf[i] == ' ')
+                       break;
+               putc(buf[i]);
+       }
 
-    for (; *s; ++s) {
-       if (*s == ' ')
-           break;
-       putc (*s);
-    }
+       putc('\n');
 
-    putc ('\n');
-
-    return (0);
+       return 0;
 }
 
 /* ------------------------------------------------------------------------- */