summaryrefslogtreecommitdiffstats
path: root/board/sandburst/metrobox
diff options
context:
space:
mode:
authorDirk Eibach <dirk.eibach@gdsys.cc>2013-04-25 02:40:01 +0000
committerHeiko Schocher <hs@denx.de>2013-07-23 08:34:56 +0200
commit880540decfb855e96bc14ac84ac7784669e4b382 (patch)
tree771220f0de64d8cf1496ed9191f04793ec330804 /board/sandburst/metrobox
parent1f2ba722ac06393d6abe6d4734824d3b98ea9108 (diff)
downloadblackbird-obmc-uboot-880540decfb855e96bc14ac84ac7784669e4b382.tar.gz
blackbird-obmc-uboot-880540decfb855e96bc14ac84ac7784669e4b382.zip
i2c, ppc4xx_i2c: switch to new multibus/multiadapter support
Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc> Cc: Heiko Schocher <hs@denx.de> Cc: Stefan Roese <sr@denx.de> Tested-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board/sandburst/metrobox')
-rw-r--r--board/sandburst/metrobox/Makefile3
-rw-r--r--board/sandburst/metrobox/metrobox.c6
2 files changed, 1 insertions, 8 deletions
diff --git a/board/sandburst/metrobox/Makefile b/board/sandburst/metrobox/Makefile
index 6019d5963c..3f19bf2bd6 100644
--- a/board/sandburst/metrobox/Makefile
+++ b/board/sandburst/metrobox/Makefile
@@ -39,8 +39,7 @@ CFLAGS += -DBUILDUSER='"$(BUILDUSER)"'
LIB = $(obj)lib$(BOARD).o
-COBJS = $(BOARD).o ../common/flash.o ../common/ppc440gx_i2c.o \
- ../common/sb_common.o
+COBJS = $(BOARD).o ../common/flash.o ../common/sb_common.o
SOBJS = init.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
diff --git a/board/sandburst/metrobox/metrobox.c b/board/sandburst/metrobox/metrobox.c
index 76d8293fd6..ce4a0296ec 100644
--- a/board/sandburst/metrobox/metrobox.c
+++ b/board/sandburst/metrobox/metrobox.c
@@ -30,7 +30,6 @@
#include <asm/io.h>
#include <spd_sdram.h>
#include <i2c.h>
-#include "../common/ppc440gx_i2c.h"
#include "../common/sb_common.h"
#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) || \
defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3)
@@ -305,11 +304,6 @@ int checkboard (void)
************************************************************************/
int misc_init_f (void)
{
- /* Turn on i2c bus 1 */
- puts ("I2C1: ");
- i2c1_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
- puts ("ready\n");
-
/* Turn on fans */
sbcommon_fans();
OpenPOWER on IntegriCloud