Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
7b5cac0e
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,发现更多精彩内容 >>
提交
7b5cac0e
编写于
10月 21, 2005
作者:
W
Wolfgang Denk
浏览文件
操作
浏览文件
下载
差异文件
Merge with /home/wd/git/u-boot/master
上级
6902df56
e9f11100
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
74 addition
and
29 deletion
+74
-29
CHANGELOG
CHANGELOG
+15
-0
MAKEALL
MAKEALL
+11
-10
board/esd/common/auto_update.c
board/esd/common/auto_update.c
+1
-1
common/cmd_misc.c
common/cmd_misc.c
+8
-9
cpu/ppc4xx/4xx_enet.c
cpu/ppc4xx/4xx_enet.c
+20
-5
include/configs/bamboo.h
include/configs/bamboo.h
+3
-1
include/configs/bubinga.h
include/configs/bubinga.h
+2
-0
include/configs/ebony.h
include/configs/ebony.h
+2
-0
include/configs/ocotea.h
include/configs/ocotea.h
+3
-1
include/configs/walnut.h
include/configs/walnut.h
+3
-0
include/configs/yellowstone.h
include/configs/yellowstone.h
+3
-1
include/configs/yosemite.h
include/configs/yosemite.h
+3
-1
未找到文件。
CHANGELOG
浏览文件 @
7b5cac0e
...
...
@@ -4,6 +4,21 @@ Changes for U-Boot 1.1.4:
* Add PCI support for the TQM834x board.
* Add missing 4xx board to MAKEALL
Patch by Stefan Roese, 20 Oct 2005
* Fix conflicting types (flash_write()) in esd auto_update.c
Patch by Stefan Roese, 20 Oct 2005
* Fix problem with sleep in NetConsole (use get_timer())
Patch by Stefan Roese, 20 Oct 2005
* Add NetConsole Support for AMCC eval boards
Patch by Stefan Roese, 20 Oct 2005
* Fix NetConsole support on 4xx (only print eth link on 1st transfer)
Patch by Stefan Roese, 18 Oct 2005
* Add fat & ext2 support to AMCC 440EP boards Yosemite & Bamboo.
Fix identation on ext2ls help entry.
Patch by Stefan Roese, 14 Oct 2005
...
...
MAKEALL
浏览文件 @
7b5cac0e
...
...
@@ -63,16 +63,17 @@ LIST_8xx=" \
LIST_4xx
=
"
\
ADCIOP AP1000 AR405 ASH405
\
bubinga CANBT CPCI2DP CPCI405
\
CPCI4052 CPCI405AB CPCI440 CPCIISER4
\
CRAYL1 csb272 csb472 DASA_SIM
\
DP405 DU405 ebony ERIC
\
EXBITGEN G2000 HUB405 JSE
\
KAREF METROBOX MIP405 MIP405T
\
ML2 ml300 ocotea OCRTC
\
ORSG PCI405 PIP405 PLU405
\
PMC405 PPChameleonEVB sbc405 VOH405
\
W7OLMC W7OLMG walnut WUH405
\
XPEDITE1K yellowstone yosemite
\
CPCI4052 CPCI405AB CPCI405DT CPCI440
\
CPCIISER4 CRAYL1 csb272 csb472
\
DASA_SIM DP405 DU405 ebony
\
ERIC EXBITGEN G2000 HH405
\
HUB405 JSE KAREF METROBOX
\
MIP405 MIP405T ML2 ml300
\
ocotea OCRTC ORSG PCI405
\
PIP405 PLU405 PMC405 PPChameleonEVB
\
sbc405 VOH405 W7OLMC W7OLMG
\
walnut WUH405 XPEDITE1K yellowstone
\
yosemite
\
"
#########################################################################
...
...
board/esd/common/auto_update.c
浏览文件 @
7b5cac0e
...
...
@@ -65,7 +65,7 @@ extern int transfer_pic(unsigned char, unsigned char *, int, int);
#endif
extern
int
flash_sect_erase
(
ulong
,
ulong
);
extern
int
flash_sect_protect
(
int
,
ulong
,
ulong
);
extern
int
flash_write
(
u
char
*
,
ulong
,
ulong
);
extern
int
flash_write
(
char
*
,
ulong
,
ulong
);
/* change char* to void* to shutup the compiler */
extern
block_dev_desc_t
*
get_dev
(
char
*
,
int
);
...
...
common/cmd_misc.c
浏览文件 @
7b5cac0e
...
...
@@ -31,6 +31,7 @@
int
do_sleep
(
cmd_tbl_t
*
cmdtp
,
int
flag
,
int
argc
,
char
*
argv
[])
{
ulong
start
=
get_timer
(
0
);
ulong
delay
;
if
(
argc
!=
2
)
{
...
...
@@ -38,20 +39,18 @@ int do_sleep (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return
1
;
}
delay
=
simple_strtoul
(
argv
[
1
],
NULL
,
10
);
delay
=
simple_strtoul
(
argv
[
1
],
NULL
,
10
)
*
CFG_HZ
;
while
(
delay
)
{
int
i
;
for
(
i
=
0
;
i
<
1000
;
++
i
)
{
if
(
ctrlc
())
{
return
(
-
1
);
}
udelay
(
1000
);
while
(
get_timer
(
start
)
<
delay
)
{
if
(
ctrlc
())
{
return
(
-
1
);
}
--
delay
;
udelay
(
100
)
;
}
return
0
;
}
/* Implemented in $(CPU)/interrupts.c */
#if (CONFIG_COMMANDS & CFG_CMD_IRQ)
int
do_irqinfo
(
cmd_tbl_t
*
cmdtp
,
int
flag
,
int
argc
,
char
*
argv
[]);
...
...
cpu/ppc4xx/4xx_enet.c
浏览文件 @
7b5cac0e
...
...
@@ -100,6 +100,10 @@
#error "CONFIG_MII has to be defined!"
#endif
#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_NET_MULTI)
#error "CONFIG_NET_MULTI has to be defined for NetConsole"
#endif
#define EMAC_RESET_TIMEOUT 1000
/* 1000 ms reset timeout */
#define PHY_AUTONEGOTIATE_TIMEOUT 4000
/* 4000 ms autonegotiate timeout */
...
...
@@ -111,10 +115,6 @@
#define ENET_MAX_MTU PKTSIZE
#define ENET_MAX_MTU_ALIGNED PKTSIZE_ALIGN
/* define the number of channels implemented */
#define EMAC_RXCHL EMAC_NUM_DEV
#define EMAC_TXCHL EMAC_NUM_DEV
/*-----------------------------------------------------------------------------+
* Defines for MAL/EMAC interrupt conditions as reported in the UIC (Universal
* Interrupt Controller).
...
...
@@ -142,6 +142,19 @@ static uint32_t mal_ier;
struct
eth_device
*
emac0_dev
=
NULL
;
#endif
/*
* Get count of EMAC devices (doesn't have to be the max. possible number
* supported by the cpu)
*/
#if defined(CONFIG_HAS_ETH3)
#define LAST_EMAC_NUM 4
#elif defined(CONFIG_HAS_ETH2)
#define LAST_EMAC_NUM 3
#elif defined(CONFIG_HAS_ETH1)
#define LAST_EMAC_NUM 2
#else
#define LAST_EMAC_NUM 1
#endif
/*-----------------------------------------------------------------------------+
* Prototypes and externals.
...
...
@@ -186,7 +199,9 @@ static void ppc_4xx_eth_halt (struct eth_device *dev)
/* EMAC RESET */
out32
(
EMAC_M0
+
hw_p
->
hw_addr
,
EMAC_M0_SRST
);
#ifndef CONFIG_NETCONSOLE
hw_p
->
print_speed
=
1
;
/* print speed message again next time */
#endif
return
;
}
...
...
@@ -1343,7 +1358,7 @@ int ppc_4xx_eth_initialize (bd_t * bis)
#endif
#endif
for
(
eth_num
=
0
;
eth_num
<
EMAC_NUM_DEV
;
eth_num
++
)
{
for
(
eth_num
=
0
;
eth_num
<
LAST_EMAC_NUM
;
eth_num
++
)
{
/* See if we can actually bring up the interface, otherwise, skip it */
switch
(
eth_num
)
{
...
...
include/configs/bamboo.h
浏览文件 @
7b5cac0e
...
...
@@ -278,12 +278,14 @@
#define CONFIG_PHY1_ADDR 1
#ifndef CONFIG_BAMBOO_NAND
#define CONFIG_NET_MULTI 1
/* required for netconsole */
#define CONFIG_HAS_ETH1 1
/* add support for "eth1addr" */
#endif
/* CONFIG_BAMBOO_NAND */
#define CFG_RX_ETH_BUFFER 32
/* Number of ethernet rx buffers & descriptors */
#define CONFIG_NETCONSOLE
/* include NetConsole support */
#define CONFIG_NET_MULTI 1
/* required for netconsole */
/* Partitions */
#define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION
...
...
include/configs/bubinga.h
浏览文件 @
7b5cac0e
...
...
@@ -132,6 +132,8 @@
#define CONFIG_NET_MULTI 1
#define CFG_RX_ETH_BUFFER 16
/* Number of ethernet rx buffers & descriptors */
#define CONFIG_NETCONSOLE
/* include NetConsole support */
#define CONFIG_RTC_DS174x 1
/* use DS1743 RTC in Bubinga */
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
...
...
include/configs/ebony.h
浏览文件 @
7b5cac0e
...
...
@@ -197,6 +197,8 @@
#define CONFIG_NET_MULTI 1
#define CFG_RX_ETH_BUFFER 32
/* Number of ethernet rx buffers & descriptors */
#define CONFIG_NETCONSOLE
/* include NetConsole support */
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
...
...
include/configs/ocotea.h
浏览文件 @
7b5cac0e
...
...
@@ -269,7 +269,9 @@
#define CONFIG_ZERO_BOOTDELAY_CHECK
/* check for keypress on bootdelay==0 */
#define CONFIG_VERSION_VARIABLE 1
/* include version env variable */
#define CFG_RX_ETH_BUFFER 32
/* Number of ethernet rx buffers & descriptors */
#define CFG_RX_ETH_BUFFER 32
/* Number of ethernet rx buffers & descriptors */
#define CONFIG_NETCONSOLE
/* include NetConsole support */
/*-----------------------------------------------------------------------
* PCI stuff
...
...
include/configs/walnut.h
浏览文件 @
7b5cac0e
...
...
@@ -163,6 +163,9 @@
#define CFG_RX_ETH_BUFFER 16
/* use 16 rx buffer on 405 emac */
#define CONFIG_NETCONSOLE
/* include NetConsole support */
#define CONFIG_NET_MULTI
/* needed for NetConsole */
/*-----------------------------------------------------------------------
* I2C stuff
*-----------------------------------------------------------------------
...
...
include/configs/yellowstone.h
浏览文件 @
7b5cac0e
...
...
@@ -200,7 +200,9 @@
#define CONFIG_HAS_ETH1 1
/* add support for "eth1addr" */
#define CONFIG_PHY_ADDR 1
/* PHY address, See schematics */
#define CFG_RX_ETH_BUFFER 32
/* Number of ethernet rx buffers & descriptors */
#define CFG_RX_ETH_BUFFER 32
/* Number of ethernet rx buffers & descriptors */
#define CONFIG_NETCONSOLE
/* include NetConsole support */
/* Partitions */
#define CONFIG_MAC_PARTITION
...
...
include/configs/yosemite.h
浏览文件 @
7b5cac0e
...
...
@@ -200,7 +200,9 @@
#define CONFIG_HAS_ETH1 1
/* add support for "eth1addr" */
#define CONFIG_PHY_ADDR 1
/* PHY address, See schematics */
#define CFG_RX_ETH_BUFFER 32
/* Number of ethernet rx buffers & descriptors */
#define CFG_RX_ETH_BUFFER 32
/* Number of ethernet rx buffers & descriptors */
#define CONFIG_NETCONSOLE
/* include NetConsole support */
/* Partitions */
#define CONFIG_MAC_PARTITION
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录