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
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
drivers
/
net
/
tsec.c
diff --git
a/drivers/net/tsec.c
b/drivers/net/tsec.c
index
e34076f
..
d7da081
100644
(file)
--- a/
drivers/net/tsec.c
+++ b/
drivers/net/tsec.c
@@
-305,8
+305,8
@@
static int init_phy(struct eth_device *dev)
volatile tsec_t *regs = priv->regs;
/* Assign a Physical address to the TBI */
volatile tsec_t *regs = priv->regs;
/* Assign a Physical address to the TBI */
- regs->tbipa = C
FG
_TBIPA_VALUE;
- phyregs->tbipa = C
FG
_TBIPA_VALUE;
+ regs->tbipa = C
ONFIG_SYS
_TBIPA_VALUE;
+ phyregs->tbipa = C
ONFIG_SYS
_TBIPA_VALUE;
asm("sync");
/* Reset MII (due to new addresses) */
asm("sync");
/* Reset MII (due to new addresses) */
@@
-1357,11
+1357,11
@@
struct phy_info phy_info_VSC8601 = {
/* Override PHY config settings */
/* Configure some basic stuff */
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
/* Override PHY config settings */
/* Configure some basic stuff */
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
-#ifdef C
FG
_VSC8601_SKEWFIX
+#ifdef C
ONFIG_SYS
_VSC8601_SKEWFIX
{MIIM_VSC8601_EPHY_CON,MIIM_VSC8601_EPHY_CON_INIT_SKEW,NULL},
{MIIM_VSC8601_EPHY_CON,MIIM_VSC8601_EPHY_CON_INIT_SKEW,NULL},
-#if defined(C
FG_VSC8601_SKEW_TX) && defined(CFG
_VSC8601_SKEW_RX)
+#if defined(C
ONFIG_SYS_VSC8601_SKEW_TX) && defined(CONFIG_SYS
_VSC8601_SKEW_RX)
{MIIM_EXT_PAGE_ACCESS,1,NULL},
{MIIM_EXT_PAGE_ACCESS,1,NULL},
-#define VSC8101_SKEW (C
FG_VSC8601_SKEW_TX<<14)|(CFG
_VSC8601_SKEW_RX<<12)
+#define VSC8101_SKEW (C
ONFIG_SYS_VSC8601_SKEW_TX<<14)|(CONFIG_SYS
_VSC8601_SKEW_RX<<12)
{MIIM_VSC8601_SKEW_CTRL,VSC8101_SKEW,NULL},
{MIIM_EXT_PAGE_ACCESS,0,NULL},
#endif
{MIIM_VSC8601_SKEW_CTRL,VSC8101_SKEW,NULL},
{MIIM_EXT_PAGE_ACCESS,0,NULL},
#endif