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

[karo-tx-uboot.git] / board / cray / L1 / L1.c

diff --git a/board/cray/L1/L1.c b/board/cray/L1/L1.c
index 1656e8ac03cab826eaea4e1b9083b2227e5141e9..d87b6ef90633b274384e04c34ed1ae120959001c 100644 (file)
--- a/board/cray/L1/L1.c
+++ b/board/cray/L1/L1.c
@@ -23,7 +23,7 @@
 
 #include <common.h>
 #include <asm/processor.h>
-#include <4xx_i2c.h>
+#include <asm/ppc4xx-i2c.h>
 #include <command.h>
 #include <rtc.h>
 #include <post.h>
@@ -169,12 +169,6 @@ int misc_init_r (void)
        return (0);
 }
 
-/* ------------------------------------------------------------------------- */
-phys_size_t initdram (int board_type)
-{
-       return (L1_MEMSIZE);
-}
-
 /* ------------------------------------------------------------------------- */
 /* stubs so we can print dates w/o any nvram RTC.*/
 int rtc_get (struct rtc_time *tmp)
@@ -245,7 +239,7 @@ int testdram (void)
        uint *pend = (uint *) L1_MEMSIZE;
        uint *p;
 
-       if (getenv_r("booted",NULL,0) <= 0)
+       if (getenv_f("booted",NULL,0) <= 0)
        {
                printf ("testdram..");
        /*AA*/