Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
fed4de01
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,发现更多精彩内容 >>
提交
fed4de01
编写于
4月 30, 2008
作者:
W
Wolfgang Denk
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git+ssh://10.10.0.7/home/wd/git/u-boot/master
上级
42ffcec3
12bc4e94
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
59 addition
and
21 deletion
+59
-21
common/env_nand.c
common/env_nand.c
+3
-3
cpu/mcf5227x/config.mk
cpu/mcf5227x/config.mk
+1
-1
cpu/mcf523x/config.mk
cpu/mcf523x/config.mk
+1
-1
cpu/mcf52x2/config.mk
cpu/mcf52x2/config.mk
+1
-1
cpu/mcf532x/config.mk
cpu/mcf532x/config.mk
+1
-1
cpu/mcf5445x/config.mk
cpu/mcf5445x/config.mk
+1
-1
cpu/mcf547x_8x/config.mk
cpu/mcf547x_8x/config.mk
+1
-1
cpu/mpc86xx/speed.c
cpu/mpc86xx/speed.c
+13
-1
drivers/net/fsl_mcdmafec.c
drivers/net/fsl_mcdmafec.c
+21
-1
include/asm-m68k/global_data.h
include/asm-m68k/global_data.h
+4
-0
include/configs/M5475EVB.h
include/configs/M5475EVB.h
+1
-0
include/configs/M5485EVB.h
include/configs/M5485EVB.h
+1
-0
include/net.h
include/net.h
+4
-4
post/board/lwmon5/sysmon.c
post/board/lwmon5/sysmon.c
+6
-6
未找到文件。
common/env_nand.c
浏览文件 @
fed4de01
...
...
@@ -102,7 +102,7 @@ uchar env_get_char_spec (int index)
int
env_init
(
void
)
{
#if defined(ENV_IS_EMBEDDED)
ulong
total
;
size_t
total
;
int
crc1_ok
=
0
,
crc2_ok
=
0
;
env_t
*
tmp_env1
,
*
tmp_env2
;
...
...
@@ -188,7 +188,7 @@ int saveenv(void)
#else
/* ! CFG_ENV_OFFSET_REDUND */
int
saveenv
(
void
)
{
ulong
total
;
size_t
total
;
int
ret
=
0
;
puts
(
"Erasing Nand..."
);
...
...
@@ -268,7 +268,7 @@ void env_relocate_spec (void)
void
env_relocate_spec
(
void
)
{
#if !defined(ENV_IS_EMBEDDED)
ulong
total
;
size_t
total
;
int
ret
;
total
=
CFG_ENV_SIZE
;
...
...
cpu/mcf5227x/config.mk
浏览文件 @
fed4de01
...
...
@@ -24,7 +24,7 @@
#
PLATFORM_RELFLAGS
+=
-ffixed-d7
-msep-data
ifeq
($(findstring 4.2,$(shell $(C
C)
--version)),4.2)
ifeq
($(findstring 4.2,$(shell $(C
ROSS_COMPILE)gcc
--version)),4.2)
PLATFORM_CPPFLAGS
+=
-mcpu
=
5208
-fPIC
else
PLATFORM_CPPFLAGS
+=
-m5307
-fPIC
...
...
cpu/mcf523x/config.mk
浏览文件 @
fed4de01
...
...
@@ -24,7 +24,7 @@
#
PLATFORM_RELFLAGS
+=
-ffixed-d7
-msep-data
ifeq
($(findstring 4.2,$(shell $(C
C)
--version)),4.2)
ifeq
($(findstring 4.2,$(shell $(C
ROSS_COMPILE)gcc
--version)),4.2)
PLATFORM_CPPFLAGS
+=
-mcpu
=
5235
-fPIC
else
PLATFORM_CPPFLAGS
+=
-m5307
-fPIC
...
...
cpu/mcf52x2/config.mk
浏览文件 @
fed4de01
...
...
@@ -34,7 +34,7 @@ is5275:=$(shell grep CONFIG_M5275 $(TOPDIR)/include/$(cfg))
is5282
:=
$(
shell
grep
CONFIG_M5282
$(TOPDIR)
/include/
$(cfg)
)
ifeq
($(findstring 4.2,$(shell $(C
C)
--version)),4.2)
ifeq
($(findstring 4.2,$(shell $(C
ROSS_COMPILE)gcc
--version)),4.2)
ifneq
(,$(findstring CONFIG_M5249,$(is5249)))
PLATFORM_CPPFLAGS
+=
-mcpu
=
5249
...
...
cpu/mcf532x/config.mk
浏览文件 @
fed4de01
...
...
@@ -24,7 +24,7 @@
#
PLATFORM_RELFLAGS
+=
-ffixed-d7
-msep-data
ifeq
($(findstring 4.2,$(shell $(C
C)
--version)),4.2)
ifeq
($(findstring 4.2,$(shell $(C
ROSS_COMPILE)gcc
--version)),4.2)
PLATFORM_CPPFLAGS
+=
-mcpu
=
5329
-fPIC
else
PLATFORM_CPPFLAGS
+=
-m5307
-fPIC
...
...
cpu/mcf5445x/config.mk
浏览文件 @
fed4de01
...
...
@@ -24,7 +24,7 @@
#
PLATFORM_RELFLAGS
+=
-ffixed-d7
-msep-data
ifeq
($(findstring 4.2,$(shell $(C
C)
--version)),4.2)
ifeq
($(findstring 4.2,$(shell $(C
ROSS_COMPILE)gcc
--version)),4.2)
PLATFORM_CPPFLAGS
+=
-mcpu
=
54455
-fPIC
else
PLATFORM_CPPFLAGS
+=
-m5407
-fPIC
...
...
cpu/mcf547x_8x/config.mk
浏览文件 @
fed4de01
...
...
@@ -24,7 +24,7 @@
#
PLATFORM_RELFLAGS
+=
-ffixed-d7
-msep-data
ifeq
($(findstring 4.2,$(shell $(C
C)
--version)),4.2)
ifeq
($(findstring 4.2,$(shell $(C
ROSS_COMPILE)gcc
--version)),4.2)
PLATFORM_CPPFLAGS
+=
-mcpu
=
5485
-fPIC
else
PLATFORM_CPPFLAGS
+=
-m5407
-fPIC
...
...
cpu/mpc86xx/speed.c
浏览文件 @
fed4de01
...
...
@@ -105,8 +105,20 @@ int get_clocks(void)
get_sys_info
(
&
sys_info
);
gd
->
cpu_clk
=
sys_info
.
freqProcessor
;
gd
->
bus_clk
=
sys_info
.
freqSystemBus
;
/*
* The base clock for I2C depends on the actual SOC. Unfortunately,
* there is no pattern that can be used to determine the frequency, so
* the only choice is to look up the actual SOC number and use the value
* for that SOC. This information is taken from application note
* AN2919.
*/
#ifdef CONFIG_MPC8610
gd
->
i2c1_clk
=
sys_info
.
freqSystemBus
;
gd
->
i2c2_clk
=
sys_info
.
freqSystemBus
;
#else
gd
->
i2c1_clk
=
sys_info
.
freqSystemBus
/
2
;
#endif
gd
->
i2c2_clk
=
gd
->
i2c1_clk
;
if
(
gd
->
cpu_clk
!=
0
)
return
0
;
...
...
drivers/net/fsl_mcdmafec.c
浏览文件 @
fed4de01
...
...
@@ -95,7 +95,11 @@ struct fec_info_dma fec_info[] = {
0
,
/* duplex and speed */
0
,
/* phy name */
0
,
/* phy name init */
#ifdef CFG_DMA_USE_INTSRAM
DBUF_LENGTH
,
/* RX BD */
#else
0
,
/* RX BD */
#endif
0
,
/* TX BD */
0
,
/* rx Index */
0
,
/* tx Index */
...
...
@@ -164,7 +168,8 @@ static void dbg_fec_regs(struct eth_device *dev)
}
#endif
static
void
set_fec_duplex_speed
(
volatile
fecdma_t
*
fecp
,
bd_t
*
bd
,
int
dup_spd
)
static
void
set_fec_duplex_speed
(
volatile
fecdma_t
*
fecp
,
bd_t
*
bd
,
int
dup_spd
)
{
if
((
dup_spd
>>
16
)
==
FULL
)
{
/* Set maximum frame length */
...
...
@@ -513,6 +518,9 @@ int mcdmafec_initialize(bd_t * bis)
{
struct
eth_device
*
dev
;
int
i
;
#ifdef CFG_DMA_USE_INTSRAM
u32
tmp
=
CFG_INTSRAM
+
0x2000
;
#endif
for
(
i
=
0
;
i
<
sizeof
(
fec_info
)
/
sizeof
(
fec_info
[
0
]);
i
++
)
{
...
...
@@ -533,6 +541,17 @@ int mcdmafec_initialize(bd_t * bis)
dev
->
recv
=
fec_recv
;
/* setup Receive and Transmit buffer descriptor */
#ifdef CFG_DMA_USE_INTSRAM
fec_info
[
i
].
rxbd
=
(
int
)
fec_info
[
i
].
rxbd
+
tmp
;
tmp
=
fec_info
[
i
].
rxbd
;
fec_info
[
i
].
txbd
=
(
int
)
fec_info
[
i
].
txbd
+
tmp
+
(
PKTBUFSRX
*
sizeof
(
cbd_t
));
tmp
=
fec_info
[
i
].
txbd
;
fec_info
[
i
].
txbuf
=
(
int
)
fec_info
[
i
].
txbuf
+
tmp
+
(
CFG_TX_ETH_BUFFER
*
sizeof
(
cbd_t
));
tmp
=
fec_info
[
i
].
txbuf
;
#else
fec_info
[
i
].
rxbd
=
(
cbd_t
*
)
memalign
(
CFG_CACHELINE_SIZE
,
(
PKTBUFSRX
*
sizeof
(
cbd_t
)));
...
...
@@ -541,6 +560,7 @@ int mcdmafec_initialize(bd_t * bis)
(
CFG_TX_ETH_BUFFER
*
sizeof
(
cbd_t
)));
fec_info
[
i
].
txbuf
=
(
char
*
)
memalign
(
CFG_CACHELINE_SIZE
,
DBUF_LENGTH
);
#endif
#ifdef ET_DEBUG
printf
(
"rxbd %x txbd %x
\n
"
,
...
...
include/asm-m68k/global_data.h
浏览文件 @
fed4de01
...
...
@@ -46,6 +46,10 @@ typedef struct global_data {
unsigned
long
inp_clk
;
unsigned
long
vco_clk
;
unsigned
long
flb_clk
;
#endif
#ifdef CONFIG_FSL_I2C
unsigned
long
i2c1_clk
;
unsigned
long
i2c2_clk
;
#endif
unsigned
long
ram_size
;
/* RAM size */
unsigned
long
reloc_off
;
/* Relocation Offset */
...
...
include/configs/M5475EVB.h
浏览文件 @
fed4de01
...
...
@@ -72,6 +72,7 @@
# define CONFIG_MII_INIT 1
# define CONFIG_HAS_ETH1
# define CFG_DMA_USE_INTSRAM 1
# define CFG_DISCOVER_PHY
# define CFG_RX_ETH_BUFFER 32
# define CFG_TX_ETH_BUFFER 48
...
...
include/configs/M5485EVB.h
浏览文件 @
fed4de01
...
...
@@ -72,6 +72,7 @@
# define CONFIG_MII_INIT 1
# define CONFIG_HAS_ETH1
# define CFG_DMA_USE_INTSRAM 1
# define CFG_DISCOVER_PHY
# define CFG_RX_ETH_BUFFER 32
# define CFG_TX_ETH_BUFFER 48
...
...
include/net.h
浏览文件 @
fed4de01
...
...
@@ -412,10 +412,10 @@ extern void print_IPaddr (IPaddr_t);
* footprint in our tests.
*/
/* return IP *in network byteorder* */
static
inline
IPaddr_t
NetReadIP
(
void
*
from
)
static
inline
IPaddr_t
NetReadIP
(
vo
latile
vo
id
*
from
)
{
IPaddr_t
ip
;
memcpy
((
void
*
)
&
ip
,
from
,
sizeof
(
ip
));
memcpy
((
void
*
)
&
ip
,
(
void
*
)
from
,
sizeof
(
ip
));
return
ip
;
}
...
...
@@ -434,9 +434,9 @@ static inline void NetWriteIP(void *to, IPaddr_t ip)
}
/* copy IP */
static
inline
void
NetCopyIP
(
void
*
to
,
void
*
from
)
static
inline
void
NetCopyIP
(
vo
latile
vo
id
*
to
,
void
*
from
)
{
memcpy
(
to
,
from
,
sizeof
(
IPaddr_t
));
memcpy
(
(
void
*
)
to
,
from
,
sizeof
(
IPaddr_t
));
}
/* copy ulong */
...
...
post/board/lwmon5/sysmon.c
浏览文件 @
fed4de01
...
...
@@ -132,17 +132,17 @@ static sysmon_table_t sysmon_table[] =
{
"+ 5 V"
,
"V"
,
&
sysmon_dspic
,
NULL
,
NULL
,
100
,
1000
,
0
,
0xF
FFF
,
0xFFFF
,
VOLTAGE_5V_MIN
,
VOLTAGE_5V_MAX
,
0
,
VOLTAGE_5V_MIN
,
VOLTAGE_5V_MAX
,
0
,
100
,
1000
,
-
0x8000
,
0x7
FFF
,
0xFFFF
,
0x8000
+
VOLTAGE_5V_MIN
,
0x8000
+
VOLTAGE_5V_MAX
,
0
,
0x8000
+
VOLTAGE_5V_MIN
,
0x8000
+
VOLTAGE_5V_MAX
,
0
,
REG_VOLTAGE_5V
,
},
{
"+ 5 V standby"
,
"V"
,
&
sysmon_dspic
,
NULL
,
NULL
,
100
,
1000
,
0
,
0xF
FFF
,
0xFFFF
,
VOLTAGE_5V_STANDBY_MIN
,
VOLTAGE_5V_STANDBY_MAX
,
0
,
VOLTAGE_5V_STANDBY_MIN
,
VOLTAGE_5V_STANDBY_MAX
,
0
,
100
,
1000
,
-
0x8000
,
0x7
FFF
,
0xFFFF
,
0x8000
+
VOLTAGE_5V_STANDBY_MIN
,
0x8000
+
VOLTAGE_5V_STANDBY_MAX
,
0
,
0x8000
+
VOLTAGE_5V_STANDBY_MIN
,
0x8000
+
VOLTAGE_5V_STANDBY_MAX
,
0
,
REG_VOLTAGE_5V_STANDBY
,
},
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录