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 git://git.denx.de/u-boot-imx
[oweals/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc85xx
/
t4240_serdes.c
diff --git
a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c
index 7b43b282bb6f5014c6f13933777aeb56bcf5d993..a8c0c47f4af1720d7c0971f3c00e9416956d1f01 100644
(file)
--- a/
arch/powerpc/cpu/mpc85xx/t4240_serdes.c
+++ b/
arch/powerpc/cpu/mpc85xx/t4240_serdes.c
@@
-1,7
+1,6
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2012 Freescale Semiconductor, Inc.
/*
* Copyright 2012 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-15,7
+14,7
@@
struct serdes_config {
u8 lanes[SRDS_MAX_LANES];
};
u8 lanes[SRDS_MAX_LANES];
};
-#ifdef CONFIG_
PPC
_T4240
+#ifdef CONFIG_
ARCH
_T4240
static const struct serdes_config serdes1_cfg_tbl[] = {
/* SerDes 1 */
{1, {XAUI_FM1_MAC9, XAUI_FM1_MAC9,
static const struct serdes_config serdes1_cfg_tbl[] = {
/* SerDes 1 */
{1, {XAUI_FM1_MAC9, XAUI_FM1_MAC9,
@@
-263,7
+262,7
@@
static const struct serdes_config serdes4_cfg_tbl[] = {
{18, {PCIE3, PCIE3, PCIE3, PCIE3, AURORA, AURORA, AURORA, AURORA}},
{}
};
{18, {PCIE3, PCIE3, PCIE3, PCIE3, AURORA, AURORA, AURORA, AURORA}},
{}
};
-#elif defined(CONFIG_
PPC_T4160) || defined(CONFIG_PPC_T408
0)
+#elif defined(CONFIG_
ARCH_T416
0)
static const struct serdes_config serdes1_cfg_tbl[] = {
/* SerDes 1 */
{1, {NONE, NONE, NONE, NONE,
static const struct serdes_config serdes1_cfg_tbl[] = {
/* SerDes 1 */
{1, {NONE, NONE, NONE, NONE,