i2c: Drop use of CONFIG_I2C_HARD

[u-boot] / board / davedenx / aria / aria.c

diff --git a/board/davedenx/aria/aria.c b/board/davedenx/aria/aria.c
index a15a9edac4569a633e002fa00fb2fde26f5be903..e389819e9d642e243c0f79fef23ca77e203e37c9 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 (int board_type)
+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,
@@ -106,11 +105,11 @@ int checkboard (void)
        return 0;
 }
 
-#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
+#ifdef CONFIG_OF_BOARD_SETUP
 int ft_board_setup(void *blob, bd_t *bd)
 {
        ft_cpu_setup(blob, bd);
 
        return 0;
 }
-#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
+#endif /* CONFIG_OF_BOARD_SETUP */