Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
5d244ea1
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,发现更多精彩内容 >>
提交
5d244ea1
编写于
9月 06, 2005
作者:
W
Wolfgang Denk
浏览文件
操作
浏览文件
下载
差异文件
Merge with /home/sr/git/u-boot:
Add I2C support for TQM85xx
上级
c44ffb9e
9d2a873b
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
106 addition
and
20 deletion
+106
-20
CHANGELOG
CHANGELOG
+3
-0
MAKEALL
MAKEALL
+1
-0
board/tqm8540/tqm8540.c
board/tqm8540/tqm8540.c
+16
-5
board/tqm8560/tqm8560.c
board/tqm8560/tqm8560.c
+16
-5
include/configs/TQM8540.h
include/configs/TQM8540.h
+34
-5
include/configs/TQM8560.h
include/configs/TQM8560.h
+35
-4
net/net.c
net/net.c
+1
-1
未找到文件。
CHANGELOG
浏览文件 @
5d244ea1
...
...
@@ -2,6 +2,9 @@
Changes for U-Boot 1.1.4:
======================================================================
* Add I2C support to TQM8540 and TQM8560 boards (EEPROM, RTC, LM75-DTT).
Patch by Stefan Roese, 31 Aug 2005
* Fix default command set (don't include CFG_CMD_DISPLAY command)
Patch by Pantelis Antoniou, 02 Sep 2005
...
...
MAKEALL
浏览文件 @
5d244ea1
...
...
@@ -126,6 +126,7 @@ LIST_85xx=" \
MPC8540ADS MPC8540EVAL MPC8541CDS MPC8548CDS
\
MPC8555CDS MPC8560ADS PM854 PM856
\
sbc8540 sbc8560 stxgp3 TQM8540
\
TQM8560
\
"
#########################################################################
...
...
board/tqm8540/tqm8540.c
浏览文件 @
5d244ea1
...
...
@@ -74,15 +74,26 @@ long int initdram (int board_type)
#if defined(CONFIG_DDR_DLL)
{
volatile
ccsr_gur_t
*
gur
=
&
immap
->
im_gur
;
uint
temp_ddrdll
=
0
;
volatile
ccsr_gur_t
*
gur
=
&
immap
->
im_gur
;
int
i
,
x
;
x
=
10
;
/*
* Work around to stabilize DDR DLL
*/
temp_ddrdll
=
gur
->
ddrdllcr
;
gur
->
ddrdllcr
=
((
temp_ddrdll
&
0xff
)
<<
16
)
|
0x80000000
;
asm
(
"sync;isync;msync"
);
gur
->
ddrdllcr
=
0x81000000
;
asm
(
"sync;isync;msync"
);
udelay
(
200
);
while
(
gur
->
ddrdllcr
!=
0x81000100
)
{
gur
->
devdisr
=
gur
->
devdisr
|
0x00010000
;
asm
(
"sync;isync;msync"
);
for
(
i
=
0
;
i
<
x
;
i
++
)
;
gur
->
devdisr
=
gur
->
devdisr
&
0xfff7ffff
;
asm
(
"sync;isync;msync"
);
x
++
;
}
}
#endif
...
...
board/tqm8560/tqm8560.c
浏览文件 @
5d244ea1
...
...
@@ -229,15 +229,26 @@ long int initdram (int board_type)
#if defined(CONFIG_DDR_DLL)
{
volatile
ccsr_gur_t
*
gur
=
&
immap
->
im_gur
;
uint
temp_ddrdll
=
0
;
volatile
ccsr_gur_t
*
gur
=
&
immap
->
im_gur
;
int
i
,
x
;
x
=
10
;
/*
* Work around to stabilize DDR DLL
*/
temp_ddrdll
=
gur
->
ddrdllcr
;
gur
->
ddrdllcr
=
((
temp_ddrdll
&
0xff
)
<<
16
)
|
0x80000000
;
asm
(
"sync;isync;msync"
);
gur
->
ddrdllcr
=
0x81000000
;
asm
(
"sync;isync;msync"
);
udelay
(
200
);
while
(
gur
->
ddrdllcr
!=
0x81000100
)
{
gur
->
devdisr
=
gur
->
devdisr
|
0x00010000
;
asm
(
"sync;isync;msync"
);
for
(
i
=
0
;
i
<
x
;
i
++
)
;
gur
->
devdisr
=
gur
->
devdisr
&
0xfff7ffff
;
asm
(
"sync;isync;msync"
);
x
++
;
}
}
#endif
...
...
include/configs/TQM8540.h
浏览文件 @
5d244ea1
...
...
@@ -230,11 +230,33 @@
#endif
/* I2C */
#define
CONFIG_HARD_I2C
/* I2C with hardware support
*/
#undef CONFIG_SOFT_I2C
/* I2C bit-banged
*/
#define CFG_I2C_SPEED 400000
/* I2C speed and slave address
*/
#define
CONFIG_HARD_I2C
/* I2C with hardware support
*/
#undef CONFIG_SOFT_I2C
/* I2C bit-banged
*/
#define CFG_I2C_SPEED 400000
/* I2C speed and slave address
*/
#define CFG_I2C_SLAVE 0x7F
#define CFG_I2C_NOPROBES {0x69}
/* Don't probe these addrs */
#define CFG_I2C_NOPROBES {0x48}
/* Don't probe these addrs */
/* I2C RTC */
#define CONFIG_RTC_DS1337
/* Use ds1337 rtc via i2c */
#define CFG_I2C_RTC_ADDR 0x68
/* at address 0x68 */
/* I2C EEPROM */
/*
* EEPROM configuration for onboard EEPROM M24C32 (M24C64 should work also).
*/
#define CFG_I2C_EEPROM_ADDR 0x50
/* 1010000x */
#define CFG_I2C_EEPROM_ADDR_LEN 2
#define CFG_EEPROM_PAGE_WRITE_BITS 5
/* =32 Bytes per write */
#define CFG_EEPROM_PAGE_WRITE_ENABLE
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 20
#define CFG_I2C_MULTI_EEPROMS 1
/* more than one eeprom */
/* I2C SYSMON (LM75) */
#define CONFIG_DTT_LM75 1
/* ON Semi's LM75 */
#define CONFIG_DTT_SENSORS {0}
/* Sensor addresses */
#define CFG_DTT_MAX_TEMP 70
#define CFG_DTT_LOW_TEMP -30
#define CFG_DTT_HYSTERESIS 3
/* RapidIO MMU */
#define CFG_RIO_MEM_BASE 0xc0000000
/* base address */
...
...
@@ -301,7 +323,6 @@
#endif
/* CONFIG_TSEC_ENET */
/*
* Environment
*/
...
...
@@ -342,6 +363,9 @@
#define CONFIG_COMMANDS (CONFIG_CMD_PRIV | \
ADD_PCI_CMD | \
CFG_CMD_I2C | \
CFG_CMD_DATE | \
CFG_CMD_EEPROM | \
CFG_CMD_DTT | \
CFG_CMD_PING )
#include <cmd_confdefs.h>
...
...
@@ -426,6 +450,11 @@
"bootfile=/tftpboot/tqm8540/uImage\0" \
"kernel_addr=FE000000\0" \
"ramdisk_addr=FE100000\0" \
"load=tftp 100000 /tftpboot/tqm8540/u-boot.bin\0" \
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \
"upd=run load;run update\0" \
""
#define CONFIG_BOOTCOMMAND "run flash_self"
...
...
include/configs/TQM8560.h
浏览文件 @
5d244ea1
...
...
@@ -38,6 +38,7 @@
#define CONFIG_BOOKE 1
/* BOOKE */
#define CONFIG_E500 1
/* BOOKE e500 family */
#define CONFIG_MPC85xx 1
/* MPC8540/MPC8560 */
#define CONFIG_CPM2 1
/* has CPM2 */
#define CONFIG_MPC8560 1
/* MPC8560 specific */
#define CONFIG_TQM8560 1
/* TQM8560 board specific */
...
...
@@ -226,11 +227,33 @@
#endif
/* I2C */
#define
CONFIG_HARD_I2C
/* I2C with hardware support
*/
#undef CONFIG_SOFT_I2C
/* I2C bit-banged
*/
#define CFG_I2C_SPEED 400000
/* I2C speed and slave address
*/
#define
CONFIG_HARD_I2C
/* I2C with hardware support
*/
#undef CONFIG_SOFT_I2C
/* I2C bit-banged
*/
#define CFG_I2C_SPEED 400000
/* I2C speed and slave address
*/
#define CFG_I2C_SLAVE 0x7F
#define CFG_I2C_NOPROBES {0x69}
/* Don't probe these addrs */
#define CFG_I2C_NOPROBES {0x48}
/* Don't probe these addrs */
/* I2C RTC */
#define CONFIG_RTC_DS1337
/* Use ds1337 rtc via i2c */
#define CFG_I2C_RTC_ADDR 0x68
/* at address 0x68 */
/* I2C EEPROM */
/*
* EEPROM configuration for onboard EEPROM M24C32 (M24C64 should work also).
*/
#define CFG_I2C_EEPROM_ADDR 0x50
/* 1010000x */
#define CFG_I2C_EEPROM_ADDR_LEN 2
#define CFG_EEPROM_PAGE_WRITE_BITS 5
/* =32 Bytes per write */
#define CFG_EEPROM_PAGE_WRITE_ENABLE
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 20
#define CFG_I2C_MULTI_EEPROMS 1
/* more than one eeprom */
/* I2C SYSMON (LM75) */
#define CONFIG_DTT_LM75 1
/* ON Semi's LM75 */
#define CONFIG_DTT_SENSORS {0}
/* Sensor addresses */
#define CFG_DTT_MAX_TEMP 70
#define CFG_DTT_LOW_TEMP -30
#define CFG_DTT_HYSTERESIS 3
/* RapidIO MMU */
#define CFG_RIO_MEM_BASE 0xc0000000
/* base address */
...
...
@@ -331,6 +354,9 @@
#define CONFIG_COMMANDS (CONFIG_CMD_PRIV | \
ADD_PCI_CMD | \
CFG_CMD_I2C | \
CFG_CMD_DATE | \
CFG_CMD_EEPROM | \
CFG_CMD_DTT | \
CFG_CMD_PING )
#include <cmd_confdefs.h>
...
...
@@ -415,6 +441,11 @@
"bootfile=/tftpboot/tqm8560/uImage\0" \
"kernel_addr=FE000000\0" \
"ramdisk_addr=FE100000\0" \
"load=tftp 100000 /tftpboot/tqm8560/u-boot.bin\0" \
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \
"upd=run load;run update\0" \
""
#define CONFIG_BOOTCOMMAND "run flash_self"
...
...
net/net.c
浏览文件 @
5d244ea1
...
...
@@ -1574,7 +1574,7 @@ unsigned
NetCksum
(
uchar
*
ptr
,
int
len
)
{
ulong
xsum
;
ushort
*
p
=
(
ushort
*
)
ptr
;
ushort
*
p
=
(
ushort
*
)
ptr
;
xsum
=
0
;
while
(
len
--
>
0
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录