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

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

diff --git a/board/pb1x00/pb1x00.c b/board/pb1x00/pb1x00.c
index 34814c47cb8ce3936a0d425b96abef42756ed4b8..f3e6110077522b0fcb10b7a597047031261cb686 100644 (file)
--- a/board/pb1x00/pb1x00.c
+++ b/board/pb1x00/pb1x00.c
@@ -1,21 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2003
  * Thomas.Lange@corelatus.se
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <command.h>
-#include <asm/au1x00.h>
+#include <mach/au1x00.h>
 #include <asm/mipsregs.h>
 #include <asm/io.h>
 
-phys_size_t initdram(int board_type)
+DECLARE_GLOBAL_DATA_PTR;
+
+int dram_init(void)
 {
        /* Sdram is setup by assembler code */
        /* If memory could be changed, we should return the true value here */
-       return 64*1024*1024;
+       gd->ram_size = 64 * 1024 * 1024;
+
+       return 0;
 }
 
 #define BCSR_PCMCIA_PC0DRVEN           0x0010