p1022ds: use weak CFI flash accessors when DIU is enabled

[u-boot] / board / ml2 / ml2.c

diff --git a/board/ml2/ml2.c b/board/ml2/ml2.c
index 6cc1bec0667b8e21fe8c096a897b145a8aa2c2bb..981e1decda55ca2e11d043eb42b2aec0f38ecddb 100644 (file)
--- a/board/ml2/ml2.c
+++ b/board/ml2/ml2.c
@@ -22,7 +22,7 @@
 #include <asm/processor.h>
 
 
-int board_pre_init (void)
+int board_early_init_f (void)
 {
        return 0;
 }
@@ -30,8 +30,8 @@ int board_pre_init (void)
 
 int checkboard (void)
 {
-       unsigned char *s = getenv ("serial#");
-       unsigned char *e;
+       char *s = getenv ("serial#");
+       char *e;
 
        if (!s || strncmp (s, "ML2", 9)) {
                printf ("### No HW ID - assuming ML2");
@@ -53,7 +53,7 @@ int checkboard (void)
 }
 
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        return 32 * 1024 * 1024;
 }