Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
c72d9c52
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,发现更多精彩内容 >>
提交
c72d9c52
编写于
8月 13, 2006
作者:
W
Wolfgang Denk
浏览文件
操作
浏览文件
下载
差异文件
Merge with /home/sr/git/u-boot/denx
上级
7213859d
d8f961bb
变更
13
显示空白变更内容
内联
并排
Showing
13 changed file
with
129 addition
and
29 deletion
+129
-29
CHANGELOG
CHANGELOG
+13
-0
board/amcc/common/flash.c
board/amcc/common/flash.c
+30
-0
common/cmd_mii.c
common/cmd_mii.c
+0
-4
common/main.c
common/main.c
+3
-2
include/configs/bamboo.h
include/configs/bamboo.h
+6
-8
include/configs/bubinga.h
include/configs/bubinga.h
+2
-1
include/configs/ebony.h
include/configs/ebony.h
+10
-2
include/configs/luan.h
include/configs/luan.h
+14
-0
include/configs/ocotea.h
include/configs/ocotea.h
+13
-6
include/configs/walnut.h
include/configs/walnut.h
+15
-6
include/configs/yellowstone.h
include/configs/yellowstone.h
+7
-0
include/configs/yosemite.h
include/configs/yosemite.h
+7
-0
include/configs/yucca.h
include/configs/yucca.h
+9
-0
未找到文件。
CHANGELOG
浏览文件 @
c72d9c52
...
...
@@ -2,6 +2,19 @@
Changes since U-Boot 1.1.4:
======================================================================
* Fix control-c handing in CONFIG_CMDLINE_EDITING
Properly pass break code back from readline.
Patch by Roger Blofeld, 31 Jul 2006
* Add commandline history support to all AMCC eval boards
Patch by Stefan Roese, 07 Aug 2006
* Add Macronix MXLV320T flash support for AMCC Bamboo
Patch by Stefan Roese, 07 Aug 2006
* Change "mii info" to not print an error upon missing PHY at address
Patch by Stefan Roese, 07 Aug 2006
* Fix PCI-Express on PPC440SPe rev. A.
* Fix preboot message on TQM85xx after switching to hush parser.
...
...
board/amcc/common/flash.c
浏览文件 @
c72d9c52
...
...
@@ -76,6 +76,9 @@ void flash_print_info(flash_info_t * info)
case
FLASH_MAN_SST
:
printf
(
"SST "
);
break
;
case
FLASH_MAN_MX
:
printf
(
"MACRONIX "
);
break
;
default:
printf
(
"Unknown Vendor "
);
break
;
...
...
@@ -124,6 +127,9 @@ void flash_print_info(flash_info_t * info)
case
FLASH_STMW320DT
:
printf
(
"M29W320DT (32 M, top sector)
\n
"
);
break
;
case
FLASH_MXLV320T
:
printf
(
"MXLV320T (32 Mbit, top sector)
\n
"
);
break
;
default:
printf
(
"Unknown Chip Type
\n
"
);
break
;
...
...
@@ -375,6 +381,7 @@ int flash_erase(flash_info_t * info, int s_first, int s_last)
{
if
(((
info
->
flash_id
&
FLASH_TYPEMASK
)
==
FLASH_AM320B
)
||
((
info
->
flash_id
&
FLASH_TYPEMASK
)
==
FLASH_AM320T
)
||
((
info
->
flash_id
&
FLASH_TYPEMASK
)
==
FLASH_MXLV320T
)
||
((
info
->
flash_id
&
FLASH_TYPEMASK
)
==
FLASH_STMW320DT
))
{
return
flash_erase_2
(
info
,
s_first
,
s_last
);
}
else
{
...
...
@@ -555,6 +562,7 @@ static int write_word(flash_info_t * info, ulong dest, ulong data)
{
if
(((
info
->
flash_id
&
FLASH_TYPEMASK
)
==
FLASH_AM320B
)
||
((
info
->
flash_id
&
FLASH_TYPEMASK
)
==
FLASH_AM320T
)
||
((
info
->
flash_id
&
FLASH_TYPEMASK
)
==
FLASH_MXLV320T
)
||
((
info
->
flash_id
&
FLASH_TYPEMASK
)
==
FLASH_STMW320DT
))
{
return
write_word_2
(
info
,
dest
,
data
);
}
else
{
...
...
@@ -648,6 +656,9 @@ static ulong flash_get_size_2(vu_long * addr, flash_info_t * info)
case
(
CFG_FLASH_WORD_SIZE
)
STM_MANUFACT
:
info
->
flash_id
=
FLASH_MAN_STM
;
break
;
case
(
CFG_FLASH_WORD_SIZE
)
MX_MANUFACT
:
info
->
flash_id
=
FLASH_MAN_MX
;
break
;
default:
info
->
flash_id
=
FLASH_UNKNOWN
;
info
->
sector_count
=
0
;
...
...
@@ -676,6 +687,12 @@ static ulong flash_get_size_2(vu_long * addr, flash_info_t * info)
info
->
sector_count
=
67
;
info
->
size
=
0x00400000
;
break
;
/* => 4 MB */
case
(
CFG_FLASH_WORD_SIZE
)
MX_ID_LV320T
:
info
->
flash_id
+=
FLASH_MXLV320T
;
info
->
sector_count
=
71
;
info
->
size
=
0x00400000
;
break
;
/* => 4 MB */
default:
info
->
flash_id
=
FLASH_UNKNOWN
;
return
(
0
);
/* => no or unknown flash */
...
...
@@ -711,6 +728,19 @@ static ulong flash_get_size_2(vu_long * addr, flash_info_t * info)
--
i
;
info
->
start
[
i
]
=
base
;
}
}
else
if
((
info
->
flash_id
&
FLASH_TYPEMASK
)
==
FLASH_MXLV320T
)
{
i
=
info
->
sector_count
-
1
;
info
->
start
[
i
--
]
=
base
+
info
->
size
-
0x00002000
;
info
->
start
[
i
--
]
=
base
+
info
->
size
-
0x00004000
;
info
->
start
[
i
--
]
=
base
+
info
->
size
-
0x00006000
;
info
->
start
[
i
--
]
=
base
+
info
->
size
-
0x00008000
;
info
->
start
[
i
--
]
=
base
+
info
->
size
-
0x0000a000
;
info
->
start
[
i
--
]
=
base
+
info
->
size
-
0x0000c000
;
info
->
start
[
i
--
]
=
base
+
info
->
size
-
0x0000e000
;
info
->
start
[
i
--
]
=
base
+
info
->
size
-
0x00010000
;
for
(;
i
>=
0
;
i
--
)
info
->
start
[
i
]
=
base
+
i
*
0x00010000
;
}
else
{
if
(
info
->
flash_id
&
FLASH_BTYPE
)
{
/* set sector offsets for bottom boot block type */
...
...
common/cmd_mii.c
浏览文件 @
c72d9c52
...
...
@@ -117,8 +117,6 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
miiphy_speed
(
devname
,
j
),
(
miiphy_duplex
(
devname
,
j
)
==
FULL
)
?
"FDX"
:
"HDX"
);
}
else
{
puts
(
"Error reading info from the PHY
\n
"
);
}
}
}
else
if
(
op
==
'r'
)
{
...
...
@@ -503,8 +501,6 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
miiphy_speed
(
devname
,
j
),
(
miiphy_duplex
(
devname
,
j
)
==
FULL
)
?
"FDX"
:
"HDX"
);
}
else
{
puts
(
"Error reading info from the PHY
\n
"
);
}
}
}
else
if
(
op
[
0
]
==
'r'
)
{
...
...
common/main.c
浏览文件 @
c72d9c52
...
...
@@ -937,6 +937,7 @@ int readline (const char *const prompt)
#ifdef CONFIG_CMDLINE_EDITING
char
*
p
=
console_buffer
;
unsigned
int
len
=
MAX_CMDBUF_SIZE
;
int
rc
;
static
int
initted
=
0
;
if
(
!
initted
)
{
...
...
@@ -946,8 +947,8 @@ int readline (const char *const prompt)
puts
(
prompt
);
cread_line
(
p
,
&
len
);
return
len
;
rc
=
cread_line
(
p
,
&
len
);
return
rc
<
0
?
rc
:
len
;
#else
char
*
p
=
console_buffer
;
int
n
=
0
;
/* buffer index */
...
...
include/configs/bamboo.h
浏览文件 @
c72d9c52
...
...
@@ -310,11 +310,11 @@
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
CFG_CMD_ASKENV | \
CFG_CMD_EEPROM | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \
CFG_CMD_DIAG | \
CFG_CMD_ELF | \
CFG_CMD_EEPROM | \
CFG_CMD_I2C | \
CFG_CMD_IRQ | \
CFG_CMD_MII | \
...
...
@@ -358,13 +358,11 @@
#define CFG_HZ 1000
/* decrementer freq: 1 ms ticks */
#define CONFIG_CMDLINE_EDITING
#ifdef CONFIG_CMDLINE_EDITING
#undef CONFIG_AUTO_COMPLETE
#else
#define CONFIG_AUTO_COMPLETE
#endif
#define CONFIG_CMDLINE_EDITING 1
/* add command line history */
#define CONFIG_LOOPW 1
/* enable loopw command */
#define CONFIG_MX_CYCLIC 1
/* enable mdc/mwc commands */
#define CONFIG_ZERO_BOOTDELAY_CHECK
/* check for keypress on bootdelay==0 */
#define CONFIG_VERSION_VARIABLE 1
/* include version env variable */
/*-----------------------------------------------------------------------
* PCI stuff
...
...
include/configs/bubinga.h
浏览文件 @
c72d9c52
...
...
@@ -200,8 +200,9 @@
#define CFG_HZ 1000
/* decrementer freq: 1 ms ticks */
#define CONFIG_
AUTO_COMPLETE 1
/* add autocompletion support
*/
#define CONFIG_
CMDLINE_EDITING 1
/* add command line history
*/
#define CONFIG_LOOPW 1
/* enable loopw command */
#define CONFIG_MX_CYCLIC 1
/* enable mdc/mwc commands */
#define CONFIG_ZERO_BOOTDELAY_CHECK
/* check for keypress on bootdelay==0 */
#define CONFIG_VERSION_VARIABLE 1
/* include version env variable */
...
...
include/configs/ebony.h
浏览文件 @
c72d9c52
...
...
@@ -143,7 +143,13 @@
#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_MULTI_EEPROMS
#define CFG_I2C_EEPROM_ADDR (0xa8>>1)
#define CFG_I2C_EEPROM_ADDR_LEN 1
#define CFG_EEPROM_PAGE_WRITE_ENABLE
#define CFG_EEPROM_PAGE_WRITE_BITS 3
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
#define CONFIG_PREBOOT "echo;" \
"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
...
...
@@ -205,6 +211,7 @@
CFG_CMD_DHCP | \
CFG_CMD_DIAG | \
CFG_CMD_ELF | \
CFG_CMD_EEPROM | \
CFG_CMD_I2C | \
CFG_CMD_IRQ | \
CFG_CMD_MII | \
...
...
@@ -243,8 +250,9 @@
#define CFG_HZ 1000
/* decrementer freq: 1 ms ticks */
#define CONFIG_
AUTO_COMPLETE 1
/* add autocompletion support
*/
#define CONFIG_
CMDLINE_EDITING 1
/* add command line history
*/
#define CONFIG_LOOPW 1
/* enable loopw command */
#define CONFIG_MX_CYCLIC 1
/* enable mdc/mwc commands */
#define CONFIG_ZERO_BOOTDELAY_CHECK
/* check for keypress on bootdelay==0 */
#define CONFIG_VERSION_VARIABLE 1
/* include version env variable */
...
...
include/configs/luan.h
浏览文件 @
c72d9c52
...
...
@@ -145,6 +145,13 @@
#define CFG_I2C_SPEED 400000
/* I2C speed and slave address */
#define CFG_I2C_SLAVE 0x7F
#define CFG_I2C_MULTI_EEPROMS
#define CFG_I2C_EEPROM_ADDR (0xa8>>1)
#define CFG_I2C_EEPROM_ADDR_LEN 1
#define CFG_EEPROM_PAGE_WRITE_ENABLE
#define CFG_EEPROM_PAGE_WRITE_BITS 3
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
#define CONFIG_PREBOOT "echo;" \
"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
"echo"
...
...
@@ -215,6 +222,7 @@
CFG_CMD_DHCP | \
CFG_CMD_DIAG | \
CFG_CMD_ELF | \
CFG_CMD_EEPROM | \
CFG_CMD_I2C | \
CFG_CMD_IRQ | \
CFG_CMD_MII | \
...
...
@@ -253,6 +261,12 @@
#define CFG_HZ 1000
/* decrementer freq: 1 ms ticks */
#define CONFIG_CMDLINE_EDITING 1
/* add command line history */
#define CONFIG_LOOPW 1
/* enable loopw command */
#define CONFIG_MX_CYCLIC 1
/* enable mdc/mwc commands */
#define CONFIG_ZERO_BOOTDELAY_CHECK
/* check for keypress on bootdelay==0 */
#define CONFIG_VERSION_VARIABLE 1
/* include version env variable */
/*-----------------------------------------------------------------------
* PCI stuff
*-----------------------------------------------------------------------
...
...
include/configs/ocotea.h
浏览文件 @
c72d9c52
...
...
@@ -158,7 +158,13 @@
#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_MULTI_EEPROMS
#define CFG_I2C_EEPROM_ADDR (0xa8>>1)
#define CFG_I2C_EEPROM_ADDR_LEN 1
#define CFG_EEPROM_PAGE_WRITE_ENABLE
#define CFG_EEPROM_PAGE_WRITE_BITS 3
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
#define CONFIG_PREBOOT "echo;" \
"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
...
...
@@ -219,6 +225,9 @@
#define CONFIG_PHY_GIGE 1
/* Include GbE speed/duplex detection */
#define CONFIG_PHY_RESET 1
/* reset phy upon startup */
#define CONFIG_PHY_RESET_DELAY 1000
#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 | \
...
...
@@ -226,6 +235,7 @@
CFG_CMD_DHCP | \
CFG_CMD_DIAG | \
CFG_CMD_ELF | \
CFG_CMD_EEPROM | \
CFG_CMD_I2C | \
CFG_CMD_IRQ | \
CFG_CMD_MII | \
...
...
@@ -264,15 +274,12 @@
#define CFG_HZ 1000
/* decrementer freq: 1 ms ticks */
#define CONFIG_
AUTO_COMPLETE 1
/* add autocompletion support
*/
#define CONFIG_
CMDLINE_EDITING 1
/* add command line history
*/
#define CONFIG_LOOPW 1
/* enable loopw command */
#define CONFIG_MX_CYCLIC 1
/* enable mdc/mwc commands */
#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 CONFIG_NETCONSOLE
/* include NetConsole support */
/*-----------------------------------------------------------------------
* PCI stuff
*-----------------------------------------------------------------------
...
...
include/configs/walnut.h
浏览文件 @
c72d9c52
...
...
@@ -90,6 +90,11 @@
#define CONFIG_MII 1
/* MII PHY management */
#define CONFIG_PHY_ADDR 1
/* PHY address */
#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 */
#define CONFIG_RTC_DS174x 1
/* use DS1743 RTC in Walnut */
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
...
...
@@ -97,6 +102,7 @@
CFG_CMD_DATE | \
CFG_CMD_DHCP | \
CFG_CMD_DIAG | \
CFG_CMD_EEPROM | \
CFG_CMD_ELF | \
CFG_CMD_I2C | \
CFG_CMD_IRQ | \
...
...
@@ -156,16 +162,12 @@
#define CFG_HZ 1000
/* decrementer freq: 1 ms ticks */
#define CONFIG_
AUTO_COMPLETE 1
/* add autocompletion support
*/
#define CONFIG_
CMDLINE_EDITING 1
/* add command line history
*/
#define CONFIG_LOOPW 1
/* enable loopw command */
#define CONFIG_MX_CYCLIC 1
/* enable mdc/mwc commands */
#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 16
/* use 16 rx buffer on 405 emac */
#define CONFIG_NETCONSOLE
/* include NetConsole support */
#define CONFIG_NET_MULTI
/* needed for NetConsole */
/*-----------------------------------------------------------------------
* I2C stuff
*-----------------------------------------------------------------------
...
...
@@ -175,6 +177,13 @@
#define CFG_I2C_SPEED 400000
/* I2C speed and slave address */
#define CFG_I2C_SLAVE 0x7F
#define CFG_I2C_MULTI_EEPROMS
#define CFG_I2C_EEPROM_ADDR (0xa8>>1)
#define CFG_I2C_EEPROM_ADDR_LEN 1
#define CFG_EEPROM_PAGE_WRITE_ENABLE
#define CFG_EEPROM_PAGE_WRITE_BITS 3
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
/*-----------------------------------------------------------------------
* PCI stuff
*-----------------------------------------------------------------------
...
...
include/configs/yellowstone.h
浏览文件 @
c72d9c52
...
...
@@ -229,6 +229,7 @@
CFG_CMD_DHCP | \
CFG_CMD_DIAG | \
CFG_CMD_ELF | \
CFG_CMD_EEPROM | \
CFG_CMD_I2C | \
CFG_CMD_IRQ | \
CFG_CMD_MII | \
...
...
@@ -265,6 +266,12 @@
#define CFG_HZ 1000
/* decrementer freq: 1 ms ticks */
#define CONFIG_CMDLINE_EDITING 1
/* add command line history */
#define CONFIG_LOOPW 1
/* enable loopw command */
#define CONFIG_MX_CYCLIC 1
/* enable mdc/mwc commands */
#define CONFIG_ZERO_BOOTDELAY_CHECK
/* check for keypress on bootdelay==0 */
#define CONFIG_VERSION_VARIABLE 1
/* include version env variable */
/*-----------------------------------------------------------------------
* PCI stuff
*-----------------------------------------------------------------------
...
...
include/configs/yosemite.h
浏览文件 @
c72d9c52
...
...
@@ -231,6 +231,7 @@
CFG_CMD_DHCP | \
CFG_CMD_DIAG | \
CFG_CMD_ELF | \
CFG_CMD_EEPROM | \
CFG_CMD_I2C | \
CFG_CMD_IRQ | \
CFG_CMD_MII | \
...
...
@@ -272,6 +273,12 @@
#define CFG_HZ 1000
/* decrementer freq: 1 ms ticks */
#define CONFIG_CMDLINE_EDITING 1
/* add command line history */
#define CONFIG_LOOPW 1
/* enable loopw command */
#define CONFIG_MX_CYCLIC 1
/* enable mdc/mwc commands */
#define CONFIG_ZERO_BOOTDELAY_CHECK
/* check for keypress on bootdelay==0 */
#define CONFIG_VERSION_VARIABLE 1
/* include version env variable */
/*-----------------------------------------------------------------------
* PCI stuff
*-----------------------------------------------------------------------
...
...
include/configs/yucca.h
浏览文件 @
c72d9c52
...
...
@@ -223,6 +223,9 @@
#define CONFIG_PHY_GIGE 1
/* Include GbE speed/duplex detection */
#define CFG_RX_ETH_BUFFER 32
/* Number of ethernet rx buffers & descriptors */
#define CONFIG_NETCONSOLE
/* include NetConsole support */
#define CONFIG_NET_MULTI
/* needed for NetConsole */
#undef CONFIG_WATCHDOG
/* watchdog disabled */
/*
...
...
@@ -248,6 +251,12 @@
#define CFG_HZ 1000
/* decrementer freq: 1 ms ticks */
#define CONFIG_CMDLINE_EDITING 1
/* add command line history */
#define CONFIG_LOOPW 1
/* enable loopw command */
#define CONFIG_MX_CYCLIC 1
/* enable mdc/mwc commands */
#define CONFIG_ZERO_BOOTDELAY_CHECK
/* check for keypress on bootdelay==0 */
#define CONFIG_VERSION_VARIABLE 1
/* include version env variable */
/*-----------------------------------------------------------------------
* FLASH related
*----------------------------------------------------------------------*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录