projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
44c42dd
)
powerpc: bsc9132qds: Do not wrap pci_eth_init() with CONFIG_TSEC_ENET
author
Bin Meng
<
[email protected]
>
Tue, 12 Jan 2016 06:41:12 +0000
(22:41 -0800)
committer
Joe Hershberger
<
[email protected]
>
Thu, 28 Jan 2016 18:22:27 +0000
(12:22 -0600)
The call to pci_eth_init() should not be wrapped with CONFIG_TSEC_ENET.
Signed-off-by: Bin Meng <
[email protected]
>
Acked-by: Joe Hershberger <
[email protected]
>
board/freescale/bsc9132qds/bsc9132qds.c
patch
|
blob
|
history
diff --git
a/board/freescale/bsc9132qds/bsc9132qds.c
b/board/freescale/bsc9132qds/bsc9132qds.c
index 586daccb4a0ba16c5a7b04fae1876d90328b5d66..71a7bb55c48a6e0d8e0c368810de65b9dceb15d6 100644
(file)
--- a/
board/freescale/bsc9132qds/bsc9132qds.c
+++ b/
board/freescale/bsc9132qds/bsc9132qds.c
@@
-227,9
+227,9
@@
int checkboard(void)
return 0;
}
-#ifdef CONFIG_TSEC_ENET
int board_eth_init(bd_t *bis)
{
+#ifdef CONFIG_TSEC_ENET
struct fsl_pq_mdio_info mdio_info;
struct tsec_info_struct tsec_info[4];
int num = 0;
@@
-250,6
+250,7
@@
int board_eth_init(bd_t *bis)
fsl_pq_mdio_init(bis, &mdio_info);
tsec_eth_init(bis, tsec_info, num);
+#endif
#ifdef CONFIG_PCI
pci_eth_init(bis);
@@
-257,7
+258,6
@@
int board_eth_init(bd_t *bis)
return 0;
}
-#endif
#define USBMUX_SEL_MASK 0xc0
#define USBMUX_SEL_UART2 0xc0