summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-08-09 20:11:03 (GMT)
committerWolfgang Denk <wd@denx.de>2007-08-09 20:11:03 (GMT)
commit0c4d65e33b91311b053b11c651742944e50b3673 (patch)
tree06e396389f2f6470ce74275d0cd579fe7c318a1f
parentb23b547597ff2375ad13a9ab04e5257a3ad76c99 (diff)
parentdcb84b7208ade0bbebbeb56bec9c2c64f8b2eede (diff)
downloadu-boot-fsl-qoriq-0c4d65e33b91311b053b11c651742944e50b3673.tar.xz
Merge with /home/wd/git/u-boot/work
-rw-r--r--drivers/tsec.c4
-rw-r--r--drivers/tsec.h4
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/tsec.c b/drivers/tsec.c
index 60bef9a..c9e7f97 100644
--- a/drivers/tsec.c
+++ b/drivers/tsec.c
@@ -296,9 +296,9 @@ static int init_phy(struct eth_device *dev)
volatile tsec_t *regs = (volatile tsec_t *)(TSEC_BASE_ADDR);
/* Assign a Physical address to the TBI */
- regs->tbipa = TBIPA_VALUE;
+ regs->tbipa = CFG_TBIPA_VALUE;
regs = (volatile tsec_t *)(TSEC_BASE_ADDR + TSEC_SIZE);
- regs->tbipa = TBIPA_VALUE;
+ regs->tbipa = CFG_TBIPA_VALUE;
asm("sync");
/* Reset MII (due to new addresses) */
diff --git a/drivers/tsec.h b/drivers/tsec.h
index 7bf3dee..2f0092a 100644
--- a/drivers/tsec.h
+++ b/drivers/tsec.h
@@ -70,7 +70,9 @@
#define miim_end -2
#define miim_read -1
-#define TBIPA_VALUE 0x1f
+#ifndef CFG_TBIPA_VALUE
+ #define CFG_TBIPA_VALUE 0x1f
+#endif
#define MIIMCFG_INIT_VALUE 0x00000003
#define MIIMCFG_RESET 0x80000000