projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-samsung
[platform/kernel/u-boot.git]
/
board
/
spear
/
spear310
/
spear310.c
diff --git
a/board/spear/spear310/spear310.c
b/board/spear/spear310/spear310.c
index
70f9aa1
..
d07dda3
100644
(file)
--- a/
board/spear/spear310/spear310.c
+++ b/
board/spear/spear310/spear310.c
@@
-12,6
+12,7
@@
#include <nand.h>
#include <asm/io.h>
#include <linux/mtd/fsmc_nand.h>
#include <nand.h>
#include <asm/io.h>
#include <linux/mtd/fsmc_nand.h>
+#include <asm/mach-types.h>
#include <asm/arch/hardware.h>
#include <asm/arch/spr_defs.h>
#include <asm/arch/spr_misc.h>
#include <asm/arch/hardware.h>
#include <asm/arch/spr_defs.h>
#include <asm/arch/spr_misc.h>
@@
-52,10
+53,9
@@
int board_eth_init(bd_t *bis)
{
int ret = 0;
{
int ret = 0;
-#if defined(CONFIG_
DESIGNWARE_ETH
)
+#if defined(CONFIG_
ETH_DESIGNWARE
)
u32 interface = PHY_INTERFACE_MODE_MII;
u32 interface = PHY_INTERFACE_MODE_MII;
- if (designware_initialize(0, CONFIG_SPEAR_ETHBASE, CONFIG_DW0_PHY,
- interface) >= 0)
+ if (designware_initialize(CONFIG_SPEAR_ETHBASE, interface) >= 0)
ret++;
#endif
#if defined(CONFIG_MACB)
ret++;
#endif
#if defined(CONFIG_MACB)