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

[platform/kernel/u-boot.git] / board / davedenx / aria / aria.c

diff --git a/board/davedenx/aria/aria.c b/board/davedenx/aria/aria.c
index 709c65b..e389819 100644 (file)
--- a/board/davedenx/aria/aria.c
+++ b/board/davedenx/aria/aria.c
@@ -18,18 +18,17 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-phys_size_t initdram(void)
+int dram_init(void)
 {
-       return fixed_sdram(NULL, NULL, 0);
+       gd->ram_size = fixed_sdram(NULL, NULL, 0);
+
+       return 0;
 }
 
 int misc_init_r(void)
 {
        u32 tmp;
 
-       /* we use I2C-2 for on-board eeprom */
-       i2c_set_bus_num(2);
-
        tmp = in_be32((u32*)CONFIG_SYS_ARIA_FPGA_BASE);
        printf("FPGA:  %u-%u.%u.%u\n",
                (tmp & 0xFF000000) >> 24,