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

[karo-tx-uboot.git] / board / esd / vme8349 / vme8349.c

diff --git a/board/esd/vme8349/vme8349.c b/board/esd/vme8349/vme8349.c
index e9a25786cd148ff8bcb26b15d3a5a0b05ec12546..f8f1834b59c119a1669fd453ef1eb2360a798a25 100644 (file)
--- a/board/esd/vme8349/vme8349.c
+++ b/board/esd/vme8349/vme8349.c
@@ -74,13 +74,15 @@ int board_eth_init(bd_t *bis)
 #endif
 
 #if defined(CONFIG_OF_BOARD_SETUP)
-void ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, bd_t *bd)
 {
        ft_cpu_setup(blob, bd);
 
 #ifdef CONFIG_PCI
        ft_pci_setup(blob, bd);
 #endif
+
+       return 0;
 }
 #endif
 
@@ -169,11 +171,11 @@ static spd_eeprom_t default_spd_eeprom = {
 
 int vme8349_read_spd(uchar chip, uint addr, int alen, uchar *buffer, int len)
 {
-       int old_bus = I2C_GET_BUS();
+       int old_bus = i2c_get_bus_num();
        unsigned int l, sum;
        int valid = 0;
 
-       I2C_SET_BUS(0);
+       i2c_set_bus_num(0);
 
        if (i2c_read(chip, addr, alen, buffer, len) == 0)
                if (memcmp(&buffer[64], &default_spd_eeprom.mid[0], 8) == 0) {
@@ -198,7 +200,7 @@ int vme8349_read_spd(uchar chip, uint addr, int alen, uchar *buffer, int len)
                buffer[63] = sum;
        }
 
-       I2C_SET_BUS(old_bus);
+       i2c_set_bus_num(old_bus);
 
        return 0;
 }