diff options
| author | Tom Rini <trini@ti.com> | 2012-09-21 14:53:13 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-21 14:53:13 -0700 |
| commit | 495dbd72dd1172de866ba323263a5b62cf454972 (patch) | |
| tree | 3ecfb8ae44c871055115941890fd93f175f8761d /board/nvidia/seaboard | |
| parent | 50d924b45911b24eeb7623bed11b9297d99b840a (diff) | |
| parent | d193c1b6eb05041c94ad9aacd8c94189d1dbc5f8 (diff) | |
| download | talos-obmc-uboot-495dbd72dd1172de866ba323263a5b62cf454972.tar.gz talos-obmc-uboot-495dbd72dd1172de866ba323263a5b62cf454972.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/nvidia/seaboard')
| -rw-r--r-- | board/nvidia/seaboard/Makefile | 4 | ||||
| -rw-r--r-- | board/nvidia/seaboard/seaboard.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/board/nvidia/seaboard/Makefile b/board/nvidia/seaboard/Makefile index b6efa1c29a..88b9dcf030 100644 --- a/board/nvidia/seaboard/Makefile +++ b/board/nvidia/seaboard/Makefile @@ -24,10 +24,6 @@ include $(TOPDIR)/config.mk -ifneq ($(OBJTREE),$(SRCTREE)) -$(shell mkdir -p $(obj)../common) -endif - LIB = $(obj)lib$(BOARD).o COBJS := $(BOARD).o diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c index 3298a6b3a8..667f60a9bb 100644 --- a/board/nvidia/seaboard/seaboard.c +++ b/board/nvidia/seaboard/seaboard.c @@ -81,11 +81,11 @@ int board_mmc_init(bd_t *bd) debug("board_mmc_init: init eMMC\n"); /* init dev 0, eMMC chip, with 4-bit bus */ /* The board has an 8-bit bus, but 8-bit doesn't work yet */ - tegra20_mmc_init(0, 4, -1, -1); + tegra_mmc_init(0, 4, -1, -1); debug("board_mmc_init: init SD slot\n"); /* init dev 1, SD slot, with 4-bit bus */ - tegra20_mmc_init(1, 4, GPIO_PI6, GPIO_PI5); + tegra_mmc_init(1, 4, GPIO_PI6, GPIO_PI5); return 0; } |
