Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
4bfb6320
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,发现更多精彩内容 >>
提交
4bfb6320
编写于
8月 18, 2006
作者:
W
Wolfgang Denk
浏览文件
操作
浏览文件
下载
差异文件
Merge with
git+ssh://fifi/home/wd/git/u-boot/master
上级
0a0f3a46
94568b60
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
91 addition
and
11 deletion
+91
-11
CHANGELOG
CHANGELOG
+15
-0
cpu/i386/sc520.c
cpu/i386/sc520.c
+14
-4
cpu/i386/sc520_asm.S
cpu/i386/sc520_asm.S
+51
-3
drivers/dm9000x.c
drivers/dm9000x.c
+3
-0
include/common.h
include/common.h
+1
-1
include/fat.h
include/fat.h
+6
-2
net/tftp.c
net/tftp.c
+1
-1
未找到文件。
CHANGELOG
浏览文件 @
4bfb6320
...
...
@@ -2,6 +2,21 @@
Changes since U-Boot 1.1.4:
======================================================================
* Update for SC520 board.
Patch by David Updegraff, 02 Dec 2005
* Fixed common.h spelling error.
Patch by Cory Tusar, 30 Nov 2005
* Fix typo.
Patch by Andreas Engel, 28 Nov 2005
* Fix fatload command on FAT32 formatted partitions.
Patch by Joachim Jaeger, 18 Nov 2005
* Fix drivers/dm9000.c when configured in 32 bit mode.
Patch by Eric Benard, 17 Nov 2005
* Cleanup debug code for yucca board.
* MCC200: restrict addressable flash space to 32 MB
...
...
cpu/i386/sc520.c
浏览文件 @
4bfb6320
...
...
@@ -31,7 +31,9 @@
#include <common.h>
#include <config.h>
#include <pci.h>
#ifdef CONFIG_SC520_SSI
#include <ssi.h>
#endif
#include <asm/io.h>
#include <asm/pci.h>
#include <asm/ic/sc520.h>
...
...
@@ -143,7 +145,15 @@ unsigned long init_sc520_dram(void)
u32
dram_present
=
0
;
u32
dram_ctrl
;
#ifdef CFG_SDRAM_DRCTMCTL
/* these memory control registers are set up in the assember part,
* in sc520_asm.S, during 'mem_init'. If we muck with them here,
* after we are running a stack in RAM, we have troubles. Besides,
* these refresh and delay values are better ? simply specified
* outright in the include/configs/{cfg} file since the HW designer
* simply dictates it.
*/
#else
int
val
;
int
cas_precharge_delay
=
CFG_SDRAM_PRECHARGE_DELAY
;
...
...
@@ -162,6 +172,7 @@ unsigned long init_sc520_dram(void)
}
else
{
val
=
3
;
/* 62.4us */
}
write_mmcr_byte
(
SC520_DRCCTL
,
(
read_mmcr_byte
(
SC520_DRCCTL
)
&
0xcf
)
|
(
val
<<
4
));
val
=
read_mmcr_byte
(
SC520_DRCTMCTL
);
...
...
@@ -181,13 +192,12 @@ unsigned long init_sc520_dram(void)
val
|=
1
;
}
write_mmcr_byte
(
SC520_DRCTMCTL
,
val
);
#endif
/* We read-back the configuration of the dram
* controller that the assembly code wrote */
dram_ctrl
=
read_mmcr_long
(
SC520_DRCBENDADR
);
bd
->
bi_dram
[
0
].
start
=
0
;
if
(
dram_ctrl
&
0x80
)
{
/* bank 0 enabled */
...
...
@@ -274,7 +284,7 @@ int pci_sc520_set_irq(int pci_pin, int irq)
{
int
i
;
# if
0
# if
1
printf
(
"set_irq(): map INT%c to IRQ%d
\n
"
,
pci_pin
+
'A'
,
irq
);
#endif
if
(
irq
<
0
||
irq
>
15
)
{
...
...
cpu/i386/sc520_asm.S
浏览文件 @
4bfb6320
...
...
@@ -113,6 +113,7 @@
.
equ
DRCCFG
,
0x0fffef014
/*
DRAM
bank
configuration
register
*/
.
equ
DRCBENDADR
,
0x0fffef018
/*
DRAM
bank
ending
address
register
*/
.
equ
ECCCTL
,
0x0fffef020
/*
DRAM
ECC
control
register
*/
.
equ
ECCINT
,
0x0fffefd18
/*
DRAM
ECC
nmi
-
INT
mapping
*/
.
equ
DBCTL
,
0x0fffef040
/*
DRAM
buffer
control
register
*/
.
equ
CACHELINESZ
,
0x00000010
/*
size
of
our
cache
line
(
read
buffer
)
*/
...
...
@@ -459,6 +460,12 @@ emptybank:
incl
%
edi
loop
cleanuplp
#if defined CFG_SDRAM_DRCTMCTL
/
*
just
have
your
hardware
desinger
_GIVE_
you
what
you
need
here
!
*/
movl
$DRCTMCTL
,
%
edi
movb
$CFG_SDRAM_DRCTMCTL
,%
al
movb
(%
edi
),
%
al
#else
#if defined(CFG_SDRAM_CAS_LATENCY_2T) || defined(CFG_SDRAM_CAS_LATENCY_3T)
/
*
set
the
CAS
latency
now
since
it
is
hard
to
do
*
when
we
run
from
the
RAM
*/
...
...
@@ -471,6 +478,7 @@ emptybank:
orb
$
0x10
,
%
al
#endif
movb
%
al
,
(%
edi
)
#endif
#endif
movl
$DRCCTL
,
%
edi
/*
DRAM
Control
register
*/
movb
$
0x3
,%
al
/*
Load
mode
register
cmd
*/
...
...
@@ -528,9 +536,49 @@ bank0: movl (%edi), %eax
shll
$
22
,
%
eax
movl
%
eax
,
%
ebx
done
:
movl
%
ebx
,
%
eax
jmp
*%
ebp
done
:
movl
%
ebx
,
%
eax
#if CFG_SDRAM_ECC_ENABLE
/
*
A
nominal
memory
test
:
just
a
byte
at
each
address
line
*/
movl
%
eax
,
%
ecx
shrl
$
0x1
,
%
ecx
movl
$
0x1
,
%
edi
memtest0
:
movb
$
0xa5
,
(%
edi
)
cmpb
$
0xa5
,
(%
edi
)
jne
out
shrl
$
1
,
%
ecx
andl
%
ecx
,%
ecx
jz
set_ecc
shll
$
1
,
%
edi
jmp
memtest0
set_ecc
:
/
*
clear
all
ram
with
a
memset
*/
movl
%
eax
,
%
ecx
xorl
%
esi
,
%
esi
xorl
%
edi
,
%
edi
xorl
%
eax
,
%
eax
shrl
$
2
,
%
ecx
cld
rep
stosl
/
*
enable
read
,
write
buffers
*/
movb
$
0x11
,
%
al
movl
$DBCTL
,
%
edi
movb
%
al
,
(%
edi
)
/
*
enable
NMI
mapping
for
ECC
*/
movl
$ECCINT
,
%
edi
mov
$
0x10
,
%
al
movb
%
al
,
(%
edi
)
/
*
Turn
on
ECC
*/
movl
$ECCCTL
,
%
edi
mov
$
0x05
,
%
al
movb
%
al
,
(%
edi
)
#endif
out
:
movl
%
ebx
,
%
eax
jmp
*%
ebp
#endif /* CONFIG_SC520 */
drivers/dm9000x.c
浏览文件 @
4bfb6320
...
...
@@ -436,6 +436,9 @@ eth_rx(void)
u8
rxbyte
,
*
rdptr
=
(
u8
*
)
NetRxPackets
[
0
];
u16
RxStatus
,
RxLen
=
0
;
u32
tmplen
,
i
;
#ifdef CONFIG_DM9000_USE_32BIT
u32
tmpdata
;
#endif
/* Check packet ready or not */
DM9000_ior
(
DM9000_MRCMDX
);
/* Dummy read */
...
...
include/common.h
浏览文件 @
4bfb6320
...
...
@@ -603,7 +603,7 @@ void show_boot_progress (int status);
#endif
#ifdef CONFIG_INIT_CRITICAL
#error CONFIG_INIT_CRITICAL is depr
ac
ted!
#error CONFIG_INIT_CRITICAL is depr
eca
ted!
#error Read section CONFIG_SKIP_LOWLEVEL_INIT in README.
#endif
...
...
include/fat.h
浏览文件 @
4bfb6320
...
...
@@ -175,15 +175,19 @@ typedef struct dir_slot {
__u8
name11_12
[
4
];
/* Last 2 characters in name */
}
dir_slot
;
/* Private filesystem parameters */
/* Private filesystem parameters
*
* Note: FAT buffer has to be 32 bit aligned
* (see FAT32 accesses)
*/
typedef
struct
{
__u8
fatbuf
[
FATBUFSIZE
];
/* Current FAT buffer */
int
fatsize
;
/* Size of FAT in bits */
__u16
fatlength
;
/* Length of FAT in sectors */
__u16
fat_sect
;
/* Starting sector of the FAT */
__u16
rootdir_sect
;
/* Start sector of root directory */
__u16
clust_size
;
/* Size of clusters in sectors */
short
data_begin
;
/* The sector of the first cluster, can be negative */
__u8
fatbuf
[
FATBUFSIZE
];
/* Current FAT buffer */
int
fatbufnum
;
/* Used by get_fatent, init to -1 */
}
fsdata
;
...
...
net/tftp.c
浏览文件 @
4bfb6320
...
...
@@ -225,7 +225,7 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
if
(
TftpBlock
==
0
)
{
TftpBlockWrap
++
;
TftpBlockWrapOffset
+=
TFTP_BLOCK_SIZE
*
TFTP_SEQUENCE_SIZE
;
printf
(
"
\n\t
%lu MB re
v
eived
\n\t
"
,
TftpBlockWrapOffset
>>
20
);
printf
(
"
\n\t
%lu MB re
c
eived
\n\t
"
,
TftpBlockWrapOffset
>>
20
);
}
else
{
if
(((
TftpBlock
-
1
)
%
10
)
==
0
)
{
putc
(
'#'
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录