projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...
[oweals/u-boot.git]
/
board
/
freescale
/
b4860qds
/
eth_b4860qds.c
diff --git
a/board/freescale/b4860qds/eth_b4860qds.c
b/board/freescale/b4860qds/eth_b4860qds.c
index 4b2303e8496eefc55daf68a30e7ebd9f28a10925..6d5f3d1fda05dc02bb6f6a2353b31047de48d242 100644
(file)
--- a/
board/freescale/b4860qds/eth_b4860qds.c
+++ b/
board/freescale/b4860qds/eth_b4860qds.c
@@
-1,8
+1,7
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2012 Freescale Semiconductor, Inc.
* Author: Sandeep Kumar Singh <sandeep@freescale.com>
/*
* Copyright 2012 Freescale Semiconductor, Inc.
* Author: Sandeep Kumar Singh <sandeep@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* This file is based on board/freescale/corenet_ds/eth_superhydra.c */
*/
/* This file is based on board/freescale/corenet_ds/eth_superhydra.c */
@@
-20,6
+19,8
@@
*/
#include <common.h>
*/
#include <common.h>
+#include <log.h>
+#include <net.h>
#include <netdev.h>
#include <asm/fsl_serdes.h>
#include <fm_eth.h>
#include <netdev.h>
#include <asm/fsl_serdes.h>
#include <fm_eth.h>
@@
-213,7
+214,7
@@
int board_eth_init(bd_t *bis)
fm_info_set_phy_address(FM1_DTSEC6,
CONFIG_SYS_FM1_ONBOARD_PHY2_ADDR);
break;
fm_info_set_phy_address(FM1_DTSEC6,
CONFIG_SYS_FM1_ONBOARD_PHY2_ADDR);
break;
-#ifdef CONFIG_
PPC
_B4420
+#ifdef CONFIG_
ARCH
_B4420
case 0x17:
case 0x18:
/* Serdes 1: A-D SGMII, Configuring on board dual SGMII Phy */
case 0x17:
case 0x18:
/* Serdes 1: A-D SGMII, Configuring on board dual SGMII Phy */
@@
-269,7
+270,7
@@
int board_eth_init(bd_t *bis)
fm_info_set_phy_address(FM1_DTSEC4,
CONFIG_SYS_FM1_DTSEC2_RISER_PHY_ADDR);
/*
fm_info_set_phy_address(FM1_DTSEC4,
CONFIG_SYS_FM1_DTSEC2_RISER_PHY_ADDR);
/*
- * XFI does not need a PHY to work, but to make U-
b
oot
+ * XFI does not need a PHY to work, but to make U-
B
oot
* happy, assign a fake PHY address for a XFI port.
*/
fm_info_set_phy_address(FM1_10GEC1, 0);
* happy, assign a fake PHY address for a XFI port.
*/
fm_info_set_phy_address(FM1_10GEC1, 0);