diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-01-17 20:31:46 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-01-17 20:31:46 +0100 |
| commit | e1ccf97c5d7651664d37c0c5aa243874b8851b2d (patch) | |
| tree | 666d8970fcb8744ddefb039fc49a7d1a5a1d09e7 /board/freescale/p1_p2_rdb/p1_p2_rdb.c | |
| parent | aad813a342aca1a8127a283c64813e4ae4464d9c (diff) | |
| parent | f133796da8ec87ccbafc9c492636def619d99401 (diff) | |
| download | u-boot-imx-e1ccf97c5d7651664d37c0c5aa243874b8851b2d.zip u-boot-imx-e1ccf97c5d7651664d37c0c5aa243874b8851b2d.tar.gz u-boot-imx-e1ccf97c5d7651664d37c0c5aa243874b8851b2d.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'board/freescale/p1_p2_rdb/p1_p2_rdb.c')
| -rw-r--r-- | board/freescale/p1_p2_rdb/p1_p2_rdb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/board/freescale/p1_p2_rdb/p1_p2_rdb.c b/board/freescale/p1_p2_rdb/p1_p2_rdb.c index 1c4c020..440fcb9 100644 --- a/board/freescale/p1_p2_rdb/p1_p2_rdb.c +++ b/board/freescale/p1_p2_rdb/p1_p2_rdb.c @@ -26,6 +26,7 @@ #include <asm/mmu.h> #include <asm/cache.h> #include <asm/immap_85xx.h> +#include <asm/fsl_serdes.h> #include <asm/io.h> #include <miiphy.h> #include <libfdt.h> @@ -166,10 +167,8 @@ int board_early_init_r(void) int board_eth_init(bd_t *bis) { struct tsec_info_struct tsec_info[4]; - volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); int num = 0; char *tmp; - u32 pordevsr; unsigned int vscfw_addr; #ifdef CONFIG_TSEC1 @@ -182,9 +181,10 @@ int board_eth_init(bd_t *bis) #endif #ifdef CONFIG_TSEC3 SET_STD_TSEC_INFO(tsec_info[num], 3); - pordevsr = in_be32(&gur->pordevsr); - if (!(pordevsr & MPC85xx_PORDEVSR_SGMII3_DIS)) + if (is_serdes_configured(SGMII_TSEC3)) { + puts("eTSEC3 is in sgmii mode.\n"); tsec_info[num].flags |= TSEC_SGMII; + } num++; #endif if (!num) { |