Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
09572880
U
U-Boot.Mirror
项目概览
OS
/
U-Boot.Mirror
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
U-Boot.Mirror
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
09572880
编写于
12月 17, 2012
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.denx.de/u-boot-net
上级
e80e588b
e3bb3254
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
35 addition
and
17 deletion
+35
-17
README
README
+0
-3
drivers/net/e1000.c
drivers/net/e1000.c
+10
-0
drivers/net/e1000.h
drivers/net/e1000.h
+1
-0
drivers/net/phy/marvell.c
drivers/net/phy/marvell.c
+11
-0
drivers/net/sh_eth.c
drivers/net/sh_eth.c
+2
-2
drivers/net/sh_eth.h
drivers/net/sh_eth.h
+2
-2
include/configs/CRAYL1.h
include/configs/CRAYL1.h
+0
-1
include/configs/GEN860T.h
include/configs/GEN860T.h
+0
-5
include/configs/TOP860.h
include/configs/TOP860.h
+0
-1
include/configs/ep8260.h
include/configs/ep8260.h
+0
-1
include/configs/utx8245.h
include/configs/utx8245.h
+0
-1
net/link_local.c
net/link_local.c
+1
-1
net/tftp.c
net/tftp.c
+8
-0
未找到文件。
README
浏览文件 @
09572880
...
...
@@ -2975,9 +2975,6 @@ Configuration Settings:
non page size aligned address and this could cause major
problems.
- CONFIG_SYS_TFTP_LOADADDR:
Default load address for network file downloads
- CONFIG_SYS_LOADS_BAUD_CHANGE:
Enable temporary baudrate change while serial download
...
...
drivers/net/e1000.c
浏览文件 @
09572880
...
...
@@ -1688,6 +1688,16 @@ e1000_init_hw(struct eth_device *nic)
E1000_WRITE_REG
(
hw
,
TXDCTL
,
ctrl
);
}
/* Set the receive descriptor write back policy */
if
(
hw
->
mac_type
>=
e1000_82571
)
{
ctrl
=
E1000_READ_REG
(
hw
,
RXDCTL
);
ctrl
=
(
ctrl
&
~
E1000_RXDCTL_WTHRESH
)
|
E1000_RXDCTL_FULL_RX_DESC_WB
;
E1000_WRITE_REG
(
hw
,
RXDCTL
,
ctrl
);
}
switch
(
hw
->
mac_type
)
{
default:
break
;
...
...
drivers/net/e1000.h
浏览文件 @
09572880
...
...
@@ -1551,6 +1551,7 @@ struct e1000_hw {
#define E1000_RXDCTL_HTHRESH 0x00003F00
/* RXDCTL Host Threshold */
#define E1000_RXDCTL_WTHRESH 0x003F0000
/* RXDCTL Writeback Threshold */
#define E1000_RXDCTL_GRAN 0x01000000
/* RXDCTL Granularity */
#define E1000_RXDCTL_FULL_RX_DESC_WB 0x01010000
/* GRAN=1, WTHRESH=1 */
/* Transmit Descriptor Control */
#define E1000_TXDCTL_PTHRESH 0x0000003F
/* TXDCTL Prefetch Threshold */
...
...
drivers/net/phy/marvell.c
浏览文件 @
09572880
...
...
@@ -425,6 +425,16 @@ static struct phy_driver M88E1118_driver = {
.
shutdown
=
&
genphy_shutdown
,
};
static
struct
phy_driver
M88E1118R_driver
=
{
.
name
=
"Marvell 88E1118R"
,
.
uid
=
0x1410e40
,
.
mask
=
0xffffff0
,
.
features
=
PHY_GBIT_FEATURES
,
.
config
=
&
m88e1118_config
,
.
startup
=
&
m88e1118_startup
,
.
shutdown
=
&
genphy_shutdown
,
};
static
struct
phy_driver
M88E1121R_driver
=
{
.
name
=
"Marvell 88E1121R"
,
.
uid
=
0x1410cb0
,
...
...
@@ -461,6 +471,7 @@ int phy_marvell_init(void)
phy_register
(
&
M88E1145_driver
);
phy_register
(
&
M88E1121R_driver
);
phy_register
(
&
M88E1118_driver
);
phy_register
(
&
M88E1118R_driver
);
phy_register
(
&
M88E1111S_driver
);
phy_register
(
&
M88E1011S_driver
);
...
...
drivers/net/sh_eth.c
浏览文件 @
09572880
...
...
@@ -417,7 +417,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd)
printf
(
SHETHER_NAME
": 100Base/"
);
#if defined(SH_ETH_TYPE_GETHER)
sh_eth_write
(
eth
,
GECMR_100B
,
GECMR
);
#elif defined(CONFIG_CPU_SH7757)
#elif defined(CONFIG_CPU_SH7757)
|| defined(CONFIG_CPU_SH7752)
sh_eth_write
(
eth
,
1
,
RTRATE
);
#elif defined(CONFIG_CPU_SH7724)
val
=
ECMR_RTM
;
...
...
@@ -426,7 +426,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd)
printf
(
SHETHER_NAME
": 10Base/"
);
#if defined(SH_ETH_TYPE_GETHER)
sh_eth_write
(
eth
,
GECMR_10B
,
GECMR
);
#elif defined(CONFIG_CPU_SH7757)
#elif defined(CONFIG_CPU_SH7757)
|| defined(CONFIG_CPU_SH7752)
sh_eth_write
(
eth
,
0
,
RTRATE
);
#endif
}
...
...
drivers/net/sh_eth.h
浏览文件 @
09572880
...
...
@@ -288,7 +288,7 @@ static const u16 sh_eth_offset_fast_sh4[SH_ETH_MAX_REGISTER_OFFSET] = {
#if defined(CONFIG_CPU_SH7763) || defined(CONFIG_CPU_SH7734)
#define SH_ETH_TYPE_GETHER
#define BASE_IO_ADDR 0xfee00000
#elif defined(CONFIG_CPU_SH7757)
#elif defined(CONFIG_CPU_SH7757)
|| defined(CONFIG_CPU_SH7752)
#if defined(CONFIG_SH_ETHER_USE_GETHER)
#define SH_ETH_TYPE_GETHER
#define BASE_IO_ADDR 0xfee00000
...
...
@@ -346,7 +346,7 @@ enum DMAC_T_BIT {
/* GECMR */
enum
GECMR_BIT
{
#if defined(CONFIG_CPU_SH7757)
#if defined(CONFIG_CPU_SH7757)
|| defined(CONFIG_CPU_SH7752)
GECMR_1000B
=
0x20
,
GECMR_100B
=
0x01
,
GECMR_10B
=
0x00
,
#else
GECMR_1000B
=
0x01
,
GECMR_100B
=
0x04
,
GECMR_10B
=
0x00
,
...
...
include/configs/CRAYL1.h
浏览文件 @
09572880
...
...
@@ -153,7 +153,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x100000
/* where to load what we get from TFTP */
#define CONFIG_SYS_TFTP_LOADADDR CONFIG_SYS_LOAD_ADDR
#define CONFIG_SYS_EXTBDINFO 1
/* To use extended board_into (bd_t) */
#define CONFIG_SYS_DRAM_TEST 1
...
...
include/configs/GEN860T.h
浏览文件 @
09572880
...
...
@@ -95,11 +95,6 @@
#undef CONFIG_LOADS_ECHO
#define CONFIG_SYS_LOADS_BAUD_CHANGE
/*
* Set default load address for tftp network downloads
*/
#define CONFIG_SYS_TFTP_LOADADDR 0x01000000
/*
* Turn off the watchdog timer
*/
...
...
include/configs/TOP860.h
浏览文件 @
09572880
...
...
@@ -416,7 +416,6 @@
#define CONFIG_IPADDR 10.0.4.111
#define CONFIG_SYS_LOAD_ADDR 0x00100000
/* default load address */
#define CONFIG_SYS_TFTP_LOADADDR 0x00100000
/*
* For booting Linux, the board info and command line data
...
...
include/configs/ep8260.h
浏览文件 @
09572880
...
...
@@ -371,7 +371,6 @@
#define CONFIG_CLOCKS_IN_MHZ 1
/* clocks passsed to Linux in MHz */
#define CONFIG_SYS_LOAD_ADDR 0x00100000
/* default load address */
#define CONFIG_SYS_TFTP_LOADADDR 0x00100000
/* default load address for network file downloads */
#define CONFIG_SYS_HZ 1000
/* decrementer freq: 1 ms ticks */
...
...
include/configs/utx8245.h
浏览文件 @
09572880
...
...
@@ -65,7 +65,6 @@
#define CONFIG_BOOTARGS "root=/dev/ram console=ttyS0,57600"
/* RAMdisk */
#define CONFIG_ETHADDR 00:AA:00:14:00:05
/* UTX5 */
#define CONFIG_SERVERIP 10.8.17.105
/* Spree */
#define CONFIG_SYS_TFTP_LOADADDR 10000
#define CONFIG_EXTRA_ENV_SETTINGS \
"kernel_addr=FFA00000\0" \
...
...
net/link_local.c
浏览文件 @
09572880
...
...
@@ -103,7 +103,7 @@ static void configure_wait(void)
void
link_local_start
(
void
)
{
ip
=
getenv_IPaddr
(
"llipaddr"
);
if
(
ip
!=
0
&&
(
ip
&
IN_CLASSB_NET
)
!=
LINKLOCAL_ADDR
)
{
if
(
ip
!=
0
&&
(
ntohl
(
ip
)
&
IN_CLASSB_NET
)
!=
LINKLOCAL_ADDR
)
{
puts
(
"invalid link address"
);
net_set_state
(
NETLOOP_FAIL
);
return
;
...
...
net/tftp.c
浏览文件 @
09572880
...
...
@@ -40,6 +40,7 @@
static
ulong
TftpTimeoutMSecs
=
TIMEOUT
;
static
int
TftpTimeoutCountMax
=
TIMEOUT_COUNT
;
static
ulong
time_start
;
/* Record time we started tftp */
/*
* These globals govern the timeout behavior when attempting a connection to a
...
...
@@ -299,6 +300,12 @@ static void tftp_complete(void)
TftpNumchars
++
;
}
#endif
time_start
=
get_timer
(
time_start
);
if
(
time_start
>
0
)
{
puts
(
"
\n\t
"
);
/* Line up with "Loading: " */
print_size
(
NetBootFileXferSize
/
time_start
*
1000
,
"/s"
);
}
puts
(
"
\n
done
\n
"
);
net_set_state
(
NETLOOP_SUCCESS
);
}
...
...
@@ -775,6 +782,7 @@ void TftpStart(enum proto_t protocol)
TftpState
=
STATE_SEND_RRQ
;
}
time_start
=
get_timer
(
0
);
TftpTimeoutCountMax
=
TftpRRQTimeoutCountMax
;
NetSetTimeout
(
TftpTimeoutMSecs
,
TftpTimeout
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录