summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-06-30 01:02:11 +0200
committerWolfgang Denk <wd@denx.de>2010-06-30 01:02:11 +0200
commit0a9463e93537a68e7246714f43fb69eca0b7b214 (patch)
treecec01ecc6502a65cbbbda406dfac23b93c093899 /include/configs
parent955ea6fc2749a4305395758fc797cf8c11dcbed7 (diff)
parentbde3892edac99bf974e5b9809a112a6ce530be03 (diff)
downloadu-boot-imx-0a9463e93537a68e7246714f43fb69eca0b7b214.zip
u-boot-imx-0a9463e93537a68e7246714f43fb69eca0b7b214.tar.gz
u-boot-imx-0a9463e93537a68e7246714f43fb69eca0b7b214.tar.bz2
Merge branch 'master' into next
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/P1_P2_RDB.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h
index a9b4004..b891730 100644
--- a/include/configs/P1_P2_RDB.h
+++ b/include/configs/P1_P2_RDB.h
@@ -425,6 +425,15 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_ETHPRIME "eTSEC1"
#define CONFIG_PHY_GIGE 1 /* Include GbE speed/duplex detection */
+
+/* TBI PHY configuration for SGMII mode */
+#define CONFIG_TSEC_TBICR_SETTINGS ( \
+ TBICR_PHY_RESET \
+ | TBICR_ANEG_ENABLE \
+ | TBICR_FULL_DUPLEX \
+ | TBICR_SPEED1_SET \
+ )
+
#endif /* CONFIG_TSEC_ENET */
/*
@@ -568,7 +577,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
"netdev=eth0\0" \
"uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \
"loadaddr=1000000\0" \
- "bootfile=uImage\0" \
"tftpflash=tftpboot $loadaddr $uboot; " \
"protect off " MK_STR(TEXT_BASE) " +$filesize; " \
"erase " MK_STR(TEXT_BASE) " +$filesize; " \