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

[oweals/u-boot.git] / board / esd / pmc440 / sdram.c

diff --git a/board/esd/pmc440/sdram.c b/board/esd/pmc440/sdram.c
index 624c45791fa41f6823371baae65a161fb97a7569..197857ad097381dfe125e09a2ed3c340b3f7e0e0 100644 (file)
--- a/board/esd/pmc440/sdram.c
+++ b/board/esd/pmc440/sdram.c
@@ -50,7 +50,7 @@ extern void denali_core_search_data_eye(void);
  * initdram -- 440EPx's DDR controller is a DENALI Core
  *
  ************************************************************************/
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
 #if !defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL)
 #if !defined(CONFIG_NAND_SPL)
@@ -111,5 +111,5 @@ long int initdram (int board_type)
         */
        set_mcsr(get_mcsr());
 
-       return (CFG_MBYTES_SDRAM << 20);
+       return (CONFIG_SYS_MBYTES_SDRAM << 20);
 }