Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
fb98f94f
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,发现更多精彩内容 >>
提交
fb98f94f
编写于
5月 04, 2008
作者:
W
Wolfgang Denk
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of /home/wd/git/u-boot/master/
上级
bd98ee60
7c0773fd
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
68 addition
and
28 deletion
+68
-28
Makefile
Makefile
+3
-5
board/trizepsiv/eeprom.c
board/trizepsiv/eeprom.c
+0
-1
common/env_flash.c
common/env_flash.c
+2
-0
cpu/mips/cache.S
cpu/mips/cache.S
+16
-0
cpu/mips/config.mk
cpu/mips/config.mk
+1
-1
doc/README.qemu_mips
doc/README.qemu_mips
+18
-0
drivers/net/tsec.c
drivers/net/tsec.c
+6
-0
drivers/net/tsec.h
drivers/net/tsec.h
+7
-4
include/asm-arm/io.h
include/asm-arm/io.h
+1
-1
include/configs/sbc8548.h
include/configs/sbc8548.h
+3
-3
lib_arm/board.c
lib_arm/board.c
+1
-0
lib_m68k/board.c
lib_m68k/board.c
+1
-0
tools/mkimage.c
tools/mkimage.c
+9
-13
未找到文件。
Makefile
浏览文件 @
fb98f94f
...
...
@@ -352,11 +352,9 @@ $(U_BOOT_ONENAND): $(ONENAND_IPL) $(obj)u-boot.bin $(obj)include/autoconf.mk
cat
$(obj)
onenand_ipl/onenand-ipl-4k.bin
$(obj)
u-boot.bin
>
$(obj)
u-boot-flexonenand.bin
$(VERSION_FILE)
:
@
(
echo
-n
"#define U_BOOT_VERSION
\"
U-Boot "
;
\
echo
-n
"
$(U_BOOT_VERSION)
"
;
\
echo
-n
$(
shell
$(CONFIG_SHELL)
$(TOPDIR)
/tools/setlocalversion
\
$(TOPDIR)
)
;
\
echo
"
\"
"
)
>
$@
.tmp
@
(
printf
'#define U_BOOT_VERSION "U-Boot %s%s"\n'
"
$(U_BOOT_VERSION)
"
\
'
$(
shell
$(CONFIG_SHELL)
$(TOPDIR)
/tools/setlocalversion
$(TOPDIR)
)
'
\
)
>
$@
.tmp
@
cmp
-s
$@
$@
.tmp
&&
rm
-f
$@
.tmp
||
mv
-f
$@
.tmp
$@
gdbtools
:
...
...
board/trizepsiv/eeprom.c
浏览文件 @
fb98f94f
...
...
@@ -24,7 +24,6 @@
#include <common.h>
#include <command.h>
static
unsigned
char
srom
[
128
];
extern
u16
read_srom_word
(
int
);
extern
void
write_srom_word
(
int
offset
,
u16
val
);
...
...
common/env_flash.c
浏览文件 @
fb98f94f
...
...
@@ -378,7 +378,9 @@ void env_relocate_spec (void)
puts
(
"*** Warning - some problems detected "
"reading environment; recovered successfully
\n\n
"
);
#endif
/* CFG_ENV_ADDR_REDUND */
#ifdef CMD_SAVEENV
memcpy
(
env_ptr
,
(
void
*
)
flash_addr
,
CFG_ENV_SIZE
);
#endif
#endif
/* ! ENV_IS_EMBEDDED || CFG_ENV_ADDR_REDUND */
}
...
...
cpu/mips/cache.S
浏览文件 @
fb98f94f
...
...
@@ -285,6 +285,22 @@ LEAF(dcache_disable)
jr
ra
END
(
dcache_disable
)
/*******************************************************************************
*
*
dcache_enable
-
enable
cache
*
*
RETURNS
:
N
/
A
*
*/
LEAF
(
dcache_enable
)
mfc0
t0
,
CP0_CONFIG
ori
t0
,
CONF_CM_CMASK
xori
t0
,
CONF_CM_CMASK
ori
t0
,
CONF_CM_CACHABLE_NONCOHERENT
mtc0
t0
,
CP0_CONFIG
jr
ra
END
(
dcache_enable
)
#ifdef CFG_INIT_RAM_LOCK_MIPS
/*******************************************************************************
*
...
...
cpu/mips/config.mk
浏览文件 @
fb98f94f
...
...
@@ -20,7 +20,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
#
v
=
$(
shell
$(AS)
--version
|
grep
"GNU assembler"
|
cut
-d
.
-f2
)
v
=
$(
shell
$(AS)
--version
|
grep
'GNU assembler'
| egrep
-o
'2\.[0-9\.]+'
|
cut
-d
.
-f2
)
MIPSFLAGS
:=
$(
shell
\
if
[
"
$v
"
-lt
"14"
]
;
then
\
echo
"-mcpu=4kc"
;
\
...
...
doc/README.qemu_mips
0 → 100644
浏览文件 @
fb98f94f
Notes for the Qemu MIPS port
Example usage:
# ln -s u-boot.bin mips_bios.bin
start it:
qemu-system-mips -L . /dev/null -nographic
or
if you use a qemu version after commit 4224
create image:
# dd of=flash bs=1k count=4k if=/dev/zero
# dd of=flash bs=1k conv=notrunc if=u-boot.bin
start it:
# qemu-system-mips -pflash flash -monitor null -nographic
drivers/net/tsec.c
浏览文件 @
fb98f94f
...
...
@@ -1277,6 +1277,12 @@ struct phy_info phy_info_VSC8601 = {
{
MIIM_CONTROL
,
MIIM_CONTROL_INIT
,
&
mii_cr_init
},
#ifdef CFG_VSC8601_SKEWFIX
{
MIIM_VSC8601_EPHY_CON
,
MIIM_VSC8601_EPHY_CON_INIT_SKEW
,
NULL
},
#if defined(CFG_VSC8601_SKEW_TX) && defined(CFG_VSC8601_SKEW_RX)
{
MIIM_EXT_PAGE_ACCESS
,
1
,
NULL
},
#define VSC8101_SKEW (CFG_VSC8601_SKEW_TX<<14)|(CFG_VSC8601_SKEW_RX<<12)
{
MIIM_VSC8601_SKEW_CTRL
,
VSC8101_SKEW
,
NULL
},
{
MIIM_EXT_PAGE_ACCESS
,
0
,
NULL
},
#endif
#endif
{
miim_end
,}
},
...
...
drivers/net/tsec.h
浏览文件 @
fb98f94f
...
...
@@ -112,6 +112,8 @@
#define MIIM_GBIT_CONTROL 0x9
#define MIIM_GBIT_CONTROL_INIT 0xe00
#define MIIM_EXT_PAGE_ACCESS 0x1f
/* Broadcom BCM54xx -- taken from linux sungem_phy */
#define MIIM_BCM54xx_AUXSTATUS 0x19
#define MIIM_BCM54xx_AUXSTATUS_LINKMODE_MASK 0x0700
...
...
@@ -161,8 +163,9 @@
/* Entry for Vitesse VSC8601 regs starts here (Not complete) */
/* Vitesse VSC8601 Extended PHY Control Register 1 */
#define MIIM_VSC8601_EPHY_CON
0x17
#define MIIM_VSC8601_EPHY_CON 0x17
#define MIIM_VSC8601_EPHY_CON_INIT_SKEW 0x1120
#define MIIM_VSC8601_SKEW_CTRL 0x1c
/* 88E1011 PHY Status Register */
#define MIIM_88E1011_PHY_STATUS 0x11
...
...
@@ -177,9 +180,9 @@
#define MIIM_88E1011_PHY_MDI_X_AUTO 0x0060
/* 88E1111 PHY LED Control Register */
#define MIIM_88E1111_PHY_LED_CONTROL
24
#define MIIM_88E1111_PHY_LED_DIRECT
0x4100
#define MIIM_88E1111_PHY_LED_COMBINE
0x411C
#define MIIM_88E1111_PHY_LED_CONTROL
24
#define MIIM_88E1111_PHY_LED_DIRECT
0x4100
#define MIIM_88E1111_PHY_LED_COMBINE
0x411C
/* 88E1145 Extended PHY Specific Control Register */
#define MIIM_88E1145_PHY_EXT_CR 20
...
...
include/asm-arm/io.h
浏览文件 @
fb98f94f
...
...
@@ -123,7 +123,7 @@ extern void __raw_readsl(unsigned int addr, void *data, int longlen);
* only. Their primary purpose is to access PCI and ISA peripherals.
*
* Note that for a big endian machine, this implies that the following
* big endian mode connectivity is in place, as described by numer
i
ous
* big endian mode connectivity is in place, as described by numerous
* ARM documents:
*
* PCI: D0-D7 D8-D15 D16-D23 D24-D31
...
...
include/configs/sbc8548.h
浏览文件 @
fb98f94f
...
...
@@ -148,7 +148,7 @@
* 1111 1111 1000 0000 0110 1110 0110 0101 = ff806e65 OR0
*
* OR6:
* Addr Mask = 64M = OR6[0:16] = 1111 1
1
00 0000 0000 0
* Addr Mask = 64M = OR6[0:16] = 1111 1
0
00 0000 0000 0
* XAM = OR6[17:18] = 11
* CSNT = OR6[20] = 1
* ACS = half cycle delay = OR6[21:22] = 11
...
...
@@ -157,7 +157,7 @@
* EAD = use external address latch delay = OR6[31] = 1
*
* 0 4 8 12 16 20 24 28
* 1111 1
100 0000 0000 0110 1110 0110 0101 = fc
006e65 OR6
* 1111 1
000 0000 0000 0110 1110 0110 0101 = f8
006e65 OR6
*/
#define CFG_BOOT_BLOCK 0xff800000
/* start of 8MB Flash */
...
...
@@ -167,7 +167,7 @@
#define CFG_BR6_PRELIM 0xfb801801
#define CFG_OR0_PRELIM 0xff806e65
#define CFG_OR6_PRELIM 0xf
c
006e65
#define CFG_OR6_PRELIM 0xf
8
006e65
#define CFG_FLASH_BANKS_LIST {CFG_FLASH_BASE}
#define CFG_MAX_FLASH_BANKS 1
/* number of banks */
...
...
lib_arm/board.c
浏览文件 @
fb98f94f
...
...
@@ -44,6 +44,7 @@
#include <devices.h>
#include <version.h>
#include <net.h>
#include <serial.h>
#ifdef CONFIG_DRIVER_SMC91111
#include "../drivers/net/smc91111.h"
...
...
lib_m68k/board.c
浏览文件 @
fb98f94f
...
...
@@ -45,6 +45,7 @@
#include <status_led.h>
#endif
#include <net.h>
#include <serial.h>
#if defined(CONFIG_CMD_BEDBUG)
#include <cmd_bedbug.h>
#endif
...
...
tools/mkimage.c
浏览文件 @
fb98f94f
...
...
@@ -28,7 +28,7 @@
extern
int
errno
;
#ifndef MAP_FAILED
#define MAP_FAILED (-1)
#define MAP_FAILED (
void *)(
-1)
#endif
extern
unsigned
long
crc32
(
unsigned
long
crc
,
const
char
*
buf
,
unsigned
int
len
);
...
...
@@ -218,9 +218,8 @@ NXTARG: ;
exit
(
EXIT_FAILURE
);
}
ptr
=
(
unsigned
char
*
)
mmap
(
0
,
sbuf
.
st_size
,
PROT_READ
,
MAP_SHARED
,
ifd
,
0
);
if
((
caddr_t
)
ptr
==
(
caddr_t
)
-
1
)
{
ptr
=
mmap
(
0
,
sbuf
.
st_size
,
PROT_READ
,
MAP_SHARED
,
ifd
,
0
);
if
(
ptr
==
MAP_FAILED
)
{
fprintf
(
stderr
,
"%s: Can't read %s: %s
\n
"
,
cmdname
,
imagefile
,
strerror
(
errno
));
exit
(
EXIT_FAILURE
);
...
...
@@ -330,9 +329,8 @@ NXTARG: ;
exit
(
EXIT_FAILURE
);
}
ptr
=
(
unsigned
char
*
)
mmap
(
0
,
sbuf
.
st_size
,
PROT_READ
|
PROT_WRITE
,
MAP_SHARED
,
ifd
,
0
);
if
(
ptr
==
(
unsigned
char
*
)
MAP_FAILED
)
{
ptr
=
mmap
(
0
,
sbuf
.
st_size
,
PROT_READ
|
PROT_WRITE
,
MAP_SHARED
,
ifd
,
0
);
if
(
ptr
==
MAP_FAILED
)
{
fprintf
(
stderr
,
"%s: Can't map %s: %s
\n
"
,
cmdname
,
imagefile
,
strerror
(
errno
));
exit
(
EXIT_FAILURE
);
...
...
@@ -410,9 +408,8 @@ copy_file (int ifd, const char *datafile, int pad)
exit
(
EXIT_FAILURE
);
}
ptr
=
(
unsigned
char
*
)
mmap
(
0
,
sbuf
.
st_size
,
PROT_READ
,
MAP_SHARED
,
dfd
,
0
);
if
(
ptr
==
(
unsigned
char
*
)
MAP_FAILED
)
{
ptr
=
mmap
(
0
,
sbuf
.
st_size
,
PROT_READ
,
MAP_SHARED
,
dfd
,
0
);
if
(
ptr
==
MAP_FAILED
)
{
fprintf
(
stderr
,
"%s: Can't read %s: %s
\n
"
,
cmdname
,
datafile
,
strerror
(
errno
));
exit
(
EXIT_FAILURE
);
...
...
@@ -594,9 +591,8 @@ static void fit_handle_file (void)
exit
(
EXIT_FAILURE
);
}
ptr
=
(
unsigned
char
*
)
mmap
(
0
,
sbuf
.
st_size
,
PROT_READ
|
PROT_WRITE
,
MAP_SHARED
,
tfd
,
0
);
if
((
caddr_t
)
ptr
==
(
caddr_t
)
-
1
)
{
ptr
=
mmap
(
0
,
sbuf
.
st_size
,
PROT_READ
|
PROT_WRITE
,
MAP_SHARED
,
tfd
,
0
);
if
(
ptr
==
MAP_FAILED
)
{
fprintf
(
stderr
,
"%s: Can't read %s: %s
\n
"
,
cmdname
,
tmpfile
,
strerror
(
errno
));
unlink
(
tmpfile
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录