Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
b0639ca3
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,发现更多精彩内容 >>
提交
b0639ca3
编写于
9月 17, 2003
作者:
W
wdenk
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support new configuration of TRAB board with more memory
Minor cleanup of comments
上级
f54ebdfa
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
206 addition
and
78 deletion
+206
-78
CHANGELOG
CHANGELOG
+2
-1
Makefile
Makefile
+14
-2
board/trab/auto_update.c
board/trab/auto_update.c
+153
-41
board/trab/config.mk
board/trab/config.mk
+7
-4
board/trab/memsetup.S
board/trab/memsetup.S
+17
-1
cpu/arm720t/start.S
cpu/arm720t/start.S
+0
-3
cpu/arm920t/start.S
cpu/arm920t/start.S
+0
-3
cpu/arm920t/usb_ohci.c
cpu/arm920t/usb_ohci.c
+1
-1
cpu/arm925t/start.S
cpu/arm925t/start.S
+0
-3
cpu/arm926ejs/start.S
cpu/arm926ejs/start.S
+0
-3
cpu/at91rm9200/start.S
cpu/at91rm9200/start.S
+0
-3
cpu/pxa/start.S
cpu/pxa/start.S
+0
-3
cpu/sa1100/start.S
cpu/sa1100/start.S
+0
-3
include/configs/trab.h
include/configs/trab.h
+11
-6
lib_arm/board.c
lib_arm/board.c
+1
-1
未找到文件。
CHANGELOG
浏览文件 @
b0639ca3
...
...
@@ -2,7 +2,8 @@
Changes for U-Boot 1.0.0:
======================================================================
* Add auto-update code for TRAB board using USB memory sticks
* Add auto-update code for TRAB board using USB memory sticks,
support new configuration with more memory
* disable MPC5200 bus pipelining as workaround for bus contention
...
...
Makefile
浏览文件 @
b0639ca3
...
...
@@ -796,7 +796,7 @@ shannon_config : unconfig
## ARM92xT Systems
#########################################################################
xtract_trab
=
$(
subst
_
old,,
$(
subst
_config,,
$1
))
xtract_trab
=
$(
subst
_
bigram,,
$(
subst
_bigflash,,
$(
subst
_old,,
$(
subst
_config,,
$1
))
))
omap1510inn_config
:
unconfig
@
./mkconfig
$
(
@:_config
=)
arm arm925t omap1510inn
...
...
@@ -811,11 +811,23 @@ smdk2410_config : unconfig
@
./mkconfig
$
(
@:_config
=)
arm arm920t smdk2410
trab_config
\
trab_bigram_config
\
trab_bigflash_config
\
trab_old_config
:
unconfig
@
>
include/config.h
@
[
-z
"
$(
findstring
_bigram,
$@
)
"
]
||
\
{
echo
"#define CONFIG_FLASH_8MB"
>>
include/config.h
;
\
echo
"... with 8 MB Flash, 32 MB RAM"
;
\
}
@
[
-z
"
$(
findstring
_bigflash,
$@
)
"
]
||
\
{
echo
"#define CONFIG_RAM_16MB"
>>
include/config.h
;
\
echo
"... with 16 MB Flash, 16 MB RAM"
;
\
echo
"TEXT_BASE = 0x0CF00000"
>
board/trab/config.tmp
;
\
}
@
[
-z
"
$(
findstring
_old,
$@
)
"
]
||
\
{
echo
"#define CONFIG_OLD_VERSION"
>>
include/config.h
;
\
echo
"... with small memory configuration"
;
\
echo
"TEXT_BASE = 0x0CF00000"
>
board/trab/config.tmp
;
\
}
@
./mkconfig
-a
$(
call
xtract_trab,
$@
)
arm arm920t trab
...
...
@@ -921,7 +933,7 @@ clean:
rm
-f
tools/gdb/astest
tools/gdb/gdbcont
tools/gdb/gdbsend
rm
-f
tools/env/fw_printenv
tools/env/fw_setenv
rm
-f
board/cray/L1/bootscript.c
board/cray/L1/bootscript.image
rm
-f
board/trab/trab_fkt
rm
-f
board/trab/trab_fkt
board/trab/config.tmp
clobber
:
clean
find
.
-type
f
\
...
...
board/trab/auto_update.c
浏览文件 @
b0639ca3
...
...
@@ -53,20 +53,20 @@
/*
* Check whether a USB memory stick is plugged in.
* If one is found:
* 1)
try to do an MSDOS l
s
*
2) if preinst.img is found and is not 0 length, load it into
*
memory and run it (how to check beforehand if it's a
* valid
HUSH command file?)
* 3)
*
4)
*
5)
*
6)
*
7)
*
8)
*
9)
*
10)
*
11)
*
12)
* 1)
if prepare.img ist found load it into memory. If it i
s
*
valid then run it.
*
2) if preinst.img is found load it into memory. If it is
* valid
then run it. Update the EEPROM.
* 3)
if firmware.img is found load it into memory. If it is valid,
*
burn it into FLASH and update the EEPROM.
*
4) if kernel.img is found load it into memory. If it is valid,
*
burn it into FLASH and update the EEPROM.
*
5) if app.img is found load it into memory. If it is valid,
*
burn it into FLASH and update the EEPROM.
*
6) if disk.img is found load it into memory. If it is valid,
*
burn it into FLASH and update the EEPROM.
*
7) if postinst.img is found load it into memory. If it is
*
valid then run it. Update the EEPROM.
*/
#undef AU_DEBUG
...
...
@@ -87,8 +87,14 @@
#define AU_DISK "disk.img"
#define AU_POSTINST "postinst.img"
struct
flash_layout
{
long
start
;
long
end
;
};
/* layout of the FLASH. ST = start address, ND = end address. */
#ifndef CONFIG_
OLD_VERSION
/* 16 MB Flash, 32 MB RAM */
#ifndef CONFIG_
FLASH_8MB
/* 16 MB Flash, 32 MB RAM */
#define AU_FL_FIRMWARE_ST 0x00000000
#define AU_FL_FIRMWARE_ND 0x0009FFFF
#define AU_FL_VFD_ST 0x000A0000
...
...
@@ -110,14 +116,14 @@
#define AU_FL_DISK_ND 0x007DFFFF
#define AU_FL_VFD_ST 0x007E0000
#define AU_FL_VFD_ND 0x007FFFFF
#endif
/* CONFIG_
OLD_VERSION
*/
#endif
/* CONFIG_
FLASH_8MB
*/
/* a structure with the offsets to values in the EEPROM */
struct
eeprom_layout
{
unsigned
int
time
;
unsigned
int
size
;
unsigned
int
dcrc
;
int
time
;
int
size
;
int
dcrc
;
};
/* layout of the EEPROM - offset from the start. All entries are 32 bit. */
...
...
@@ -141,6 +147,15 @@ struct eeprom_layout
#define AU_EEPROM_DCRC_POSTINST 132
static
int
au_usb_stor_curr_dev
;
/* current device */
/* index of each file in the following arrays */
#define IDX_PREPARE 0
#define IDX_PREINST 1
#define IDX_FIRMWARE 2
#define IDX_KERNEL 3
#define IDX_APP 4
#define IDX_DISK 5
#define IDX_POSTINST 6
/* max. number of files which could interest us */
#define AU_MAXFILES 7
/* pointers to file names */
...
...
@@ -157,16 +172,20 @@ struct eeprom_layout auee_off[AU_MAXFILES] = { \
{
AU_EEPROM_TIME_DISK
,
AU_EEPROM_SIZE_DISK
,
AU_EEPROM_DCRC_DISK
,},
\
{
AU_EEPROM_TIME_POSTINST
,
AU_EEPROM_SIZE_POSTINST
,
AU_EEPROM_DCRC_POSTINST
,}
\
};
/* index of each file in the above array */
#define IDX_PREPARE 0
#define IDX_PREINST 1
#define IDX_FIRMWARE 2
#define IDX_KERNEL 3
#define IDX_APP 4
#define IDX_DISK 5
#define IDX_POSTINST 6
/* array of flash areas start and end addresses */
struct
flash_layout
aufl_layout
[
AU_MAXFILES
-
3
]
=
{
\
{
AU_FL_FIRMWARE_ST
,
AU_FL_FIRMWARE_ND
,},
\
{
AU_FL_KERNEL_ST
,
AU_FL_KERNEL_ND
,},
\
{
AU_FL_APP_ST
,
AU_FL_APP_ND
,},
\
{
AU_FL_DISK_ST
,
AU_FL_DISK_ND
,},
\
};
/* convert the index into aufile[] to an index into aufl_layout[] */
#define FIDX_TO_LIDX(idx) ((idx) - 2)
/* where to load files into memory */
#define LOAD_ADDR ((unsigned char *)0x0c100000)
#define LOAD_ADDR ((unsigned char *)0x0C100100)
/* where to build strings in memory - 256 bytes should be enough */
#define STRING_ADDR ((char *)0x0C100000)
/* the disk is the largest image */
#define MAX_LOADSZ ausize[IDX_DISK]
...
...
@@ -180,9 +199,9 @@ extern int i2c_write (uchar, uint, int , uchar* , int);
extern
int
trab_vfd
(
ulong
);
extern
int
transfer_pic
(
unsigned
char
,
unsigned
char
*
,
int
,
int
);
#endif
extern
int
i2c_write_multiple
(
uchar
,
uint
,
int
,
uchar
*
,
int
);
extern
int
i2c_
read_multiple
(
uchar
,
uint
,
int
,
uchar
*
,
int
);
/* change char* to void* to shutup the compiler */
extern
int
i2c_
write_multiple
(
uchar
,
uint
,
int
,
void
*
,
int
);
extern
int
i2c_read_multiple
(
uchar
,
uint
,
int
,
void
*
,
int
);
int
au_check_valid
(
int
idx
,
long
nbytes
)
...
...
@@ -193,6 +212,7 @@ au_check_valid(int idx, long nbytes)
hdr
=
(
image_header_t
*
)
LOAD_ADDR
;
/* check the easy ones first */
#undef CHECK_VALID_DEBUG
#ifdef CHECK_VALID_DEBUG
printf
(
"magic %#x %#x "
,
ntohl
(
hdr
->
ih_magic
),
IH_MAGIC
);
printf
(
"arch %#x %#x "
,
hdr
->
ih_arch
,
IH_CPU_ARM
);
...
...
@@ -202,7 +222,7 @@ au_check_valid(int idx, long nbytes)
if
(
ntohl
(
hdr
->
ih_magic
)
!=
IH_MAGIC
||
hdr
->
ih_arch
!=
IH_CPU_ARM
||
nbytes
<
ntohl
(
hdr
->
ih_size
))
{
printf
(
"Image %s
B
ad MAGIC or ARCH or SIZE
\n
"
,
aufile
[
idx
]);
printf
(
"Image %s
b
ad MAGIC or ARCH or SIZE
\n
"
,
aufile
[
idx
]);
return
-
1
;
}
/* check the hdr CRC */
...
...
@@ -210,7 +230,7 @@ au_check_valid(int idx, long nbytes)
hdr
->
ih_hcrc
=
0
;
if
(
crc32
(
0
,
(
char
*
)
hdr
,
sizeof
(
*
hdr
))
!=
checksum
)
{
printf
(
"Image %s
Bad Header C
hecksum
\n
"
,
aufile
[
idx
]);
printf
(
"Image %s
bad header c
hecksum
\n
"
,
aufile
[
idx
]);
return
-
1
;
}
/* check the data CRC */
...
...
@@ -219,28 +239,28 @@ au_check_valid(int idx, long nbytes)
if
(
crc32
(
0
,
(
char
*
)(
LOAD_ADDR
+
sizeof
(
*
hdr
)),
ntohl
(
hdr
->
ih_size
))
!=
checksum
)
{
printf
(
"Image %s
Bad Data C
hecksum
\n
"
,
aufile
[
idx
]);
printf
(
"Image %s
bad data c
hecksum
\n
"
,
aufile
[
idx
]);
return
-
1
;
}
/* check the type - could do this all in one gigantic if() */
if
((
idx
==
IDX_FIRMWARE
)
&&
(
hdr
->
ih_type
!=
IH_TYPE_FIRMWARE
))
{
printf
(
"Image %s
Wrong T
ype
\n
"
,
aufile
[
idx
]);
printf
(
"Image %s
wrong t
ype
\n
"
,
aufile
[
idx
]);
return
-
1
;
}
if
((
idx
==
IDX_KERNEL
)
&&
(
hdr
->
ih_type
!=
IH_TYPE_KERNEL
))
{
printf
(
"Image %s
Wrong T
ype
\n
"
,
aufile
[
idx
]);
printf
(
"Image %s
wrong t
ype
\n
"
,
aufile
[
idx
]);
return
-
1
;
}
if
((
idx
==
IDX_DISK
||
idx
==
IDX_APP
)
&&
(
hdr
->
ih_type
!=
IH_TYPE_RAMDISK
))
{
printf
(
"Image %s
Wrong T
ype
\n
"
,
aufile
[
idx
]);
printf
(
"Image %s
wrong t
ype
\n
"
,
aufile
[
idx
]);
return
-
1
;
}
if
((
idx
==
IDX_PREPARE
||
idx
==
IDX_PREINST
||
idx
==
IDX_POSTINST
)
&&
(
hdr
->
ih_type
!=
IH_TYPE_SCRIPT
))
{
printf
(
"Image %s
Wrong T
ype
\n
"
,
aufile
[
idx
]);
printf
(
"Image %s
wrong t
ype
\n
"
,
aufile
[
idx
]);
return
-
1
;
}
/* special case for prepare.img */
...
...
@@ -272,14 +292,20 @@ buf[0], buf[1], buf[2], buf[3], *((unsigned int *)buf), ntohl(hdr->ih_time));
#define POWER_OFF (1 << 1)
int
au_do_update
(
int
idx
)
au_do_update
(
int
idx
,
long
sz
)
{
image_header_t
*
hdr
;
char
*
addr
;
long
start
,
end
;
char
*
strbuf
=
STRING_ADDR
;
int
off
;
uint
nbytes
;
hdr
=
(
image_header_t
*
)
LOAD_ADDR
;
/* disable the power switch */
*
CPLD_VFD_BK
|=
POWER_OFF
;
/* execute a script */
if
(
hdr
->
ih_type
==
IH_TYPE_SCRIPT
)
{
addr
=
(
char
*
)((
char
*
)
hdr
+
sizeof
(
*
hdr
)
+
8
);
...
...
@@ -287,6 +313,68 @@ au_do_update(int idx)
FLAG_PARSE_SEMICOLON
|
FLAG_EXIT_FROM_LOOP
);
return
0
;
}
start
=
aufl_layout
[
FIDX_TO_LIDX
(
idx
)].
start
;
end
=
aufl_layout
[
FIDX_TO_LIDX
(
idx
)].
end
;
/* unprotect the address range */
/* this assumes that ONLY the firmware is protected! */
if
(
idx
==
IDX_FIRMWARE
)
{
#undef AU_UPDATE_TEST
#ifdef AU_UPDATE_TEST
/* erase it where Linux goes */
start
=
aufl_layout
[
1
].
start
;
end
=
aufl_layout
[
1
].
end
;
#endif
debug
(
"protect off %lx %lx
\n
"
,
start
,
end
);
sprintf
(
strbuf
,
"protect off %lx %lx
\n
"
,
start
,
end
);
parse_string_outer
(
strbuf
,
FLAG_PARSE_SEMICOLON
|
FLAG_EXIT_FROM_LOOP
);
}
/* erase the address range */
debug
(
"erase %lx %lx
\n
"
,
start
,
end
);
sprintf
(
strbuf
,
"erase %lx %lx
\n
"
,
start
,
end
);
parse_string_outer
(
strbuf
,
FLAG_PARSE_SEMICOLON
|
FLAG_EXIT_FROM_LOOP
);
/* strip the header - except for the kernel */
if
(
idx
==
IDX_FIRMWARE
||
idx
==
IDX_DISK
||
idx
==
IDX_APP
)
{
addr
=
(
char
*
)((
char
*
)
hdr
+
sizeof
(
*
hdr
));
#ifdef AU_UPDATE_TEST
/* copy it to where Linux goes */
if
(
idx
==
IDX_FIRMWARE
)
start
=
aufl_layout
[
1
].
start
;
#endif
off
=
0
;
nbytes
=
ntohl
(
hdr
->
ih_size
);
}
else
{
addr
=
(
char
*
)
hdr
;
off
=
sizeof
(
*
hdr
);
nbytes
=
sizeof
(
*
hdr
)
+
ntohl
(
hdr
->
ih_size
);
}
/* copy the data from RAM to FLASH */
debug
(
"cp.b %p %lx %x
\n
"
,
addr
,
start
,
nbytes
);
sprintf
(
strbuf
,
"cp.b %p %lx %x
\n
"
,
addr
,
start
,
nbytes
);
parse_string_outer
(
strbuf
,
FLAG_PARSE_SEMICOLON
|
FLAG_EXIT_FROM_LOOP
);
/* check the dcrc of the copy */
if
(
crc32
(
0
,
(
char
*
)(
start
+
off
),
ntohl
(
hdr
->
ih_size
))
!=
ntohl
(
hdr
->
ih_dcrc
))
{
printf
(
"Image %s Bad Data Checksum After COPY
\n
"
,
aufile
[
idx
]);
return
-
1
;
}
/* protect the address range */
/* this assumes that ONLY the firmware is protected! */
if
(
idx
==
IDX_FIRMWARE
)
{
printf
(
"protect on %lx %lx
\n
"
,
start
,
end
);
sprintf
(
strbuf
,
"protect on %lx %lx
\n
"
,
start
,
end
);
parse_string_outer
(
strbuf
,
FLAG_PARSE_SEMICOLON
|
FLAG_EXIT_FROM_LOOP
);
}
return
0
;
}
...
...
@@ -294,8 +382,22 @@ int
au_update_eeprom
(
int
idx
)
{
image_header_t
*
hdr
;
int
off
;
uint32_t
val
;
hdr
=
(
image_header_t
*
)
LOAD_ADDR
;
/* write the time field into EEPROM */
off
=
auee_off
[
idx
].
time
;
val
=
ntohl
(
hdr
->
ih_time
);
i2c_write_multiple
(
0x54
,
off
,
1
,
&
val
,
sizeof
(
val
));
/* write the size field into EEPROM */
off
=
auee_off
[
idx
].
size
;
val
=
ntohl
(
hdr
->
ih_size
);
i2c_write_multiple
(
0x54
,
off
,
1
,
&
val
,
sizeof
(
val
));
/* write the dcrc field into EEPROM */
off
=
auee_off
[
idx
].
dcrc
;
val
=
ntohl
(
hdr
->
ih_dcrc
);
i2c_write_multiple
(
0x54
,
off
,
1
,
&
val
,
sizeof
(
val
));
/* enable the power switch */
*
CPLD_VFD_BK
&=
~
POWER_OFF
;
return
0
;
...
...
@@ -311,9 +413,10 @@ do_auto_update(void)
{
block_dev_desc_t
*
stor_dev
;
long
sz
;
int
i
,
res
,
bitmap_first
;
int
i
,
res
,
bitmap_first
,
cnt
;
char
*
env
;
#undef ERASE_EEPROM
#ifdef ERASE_EEPROM
int
arr
[
18
];
memset
(
arr
,
0
,
sizeof
(
arr
));
...
...
@@ -352,6 +455,7 @@ do_auto_update(void)
if
(
file_fat_detectfs
()
!=
0
)
{
debug
(
"file_fat_detectfs failed
\n
"
);
}
/* initialize the array of file names */
memset
(
aufile
,
0
,
sizeof
(
aufile
));
aufile
[
IDX_PREPARE
]
=
AU_PREPARE
;
...
...
@@ -404,11 +508,19 @@ do_auto_update(void)
#endif
/* this is really not a good idea, but it's what the */
/* customer wants. */
cnt
=
0
;
do
{
res
=
au_do_update
(
i
);
res
=
au_do_update
(
i
,
sz
);
#ifdef AU_TEST_ONLY
cnt
++
;
}
while
(
res
<
0
&&
cnt
<
3
);
if
(
cnt
<
3
)
#else
}
while
(
res
<
0
);
#endif
au_update_eeprom
(
i
);
}
usb_stop
();
return
0
;
}
#endif
/* CONFIG_AUTO_UPDATE */
board/trab/config.mk
浏览文件 @
b0639ca3
...
...
@@ -8,16 +8,19 @@
#
#
# TRAB has 1 bank of 16 MB DRAM
# TRAB has 1 bank of 16 MB
or 32 MB
DRAM
#
# 0c00'0000 to 0e00'0000
#
# Linux-Kernel is expected to be at 0c00'8000, entry 0c00'8000
#
# we load ourself to 0
cf
0'0000
# we load ourself to 0
CF0'0000 / 0DF
0'0000
#
# download areas is 0
c
80'0000
# download areas is 0
C
80'0000
#
sinclude
$(TOPDIR)/board/$(BOARDDIR)/config.tmp
TEXT_BASE
=
0x0cf00000
ifndef
TEXT_BASE
TEXT_BASE
=
0x0DF00000
endif
board/trab/memsetup.S
浏览文件 @
b0639ca3
...
...
@@ -5,7 +5,7 @@
*
Jan
-
Derk
Bakker
(
J
.
D
.
Bakker
@
its
.
tudelft
.
nl
)
*
*
Modified
for
the
TRAB
board
by
*
(
C
)
Copyright
2002
*
(
C
)
Copyright
2002
-
2003
*
Gary
Jennejohn
,
DENX
Software
Engineering
,
<
gj
@
denx
.
de
>
*
*
See
file
CREDITS
for
list
of
people
who
contributed
to
this
...
...
@@ -101,6 +101,17 @@
#define B5_Tacp 0x0
#define B5_PMC 0x0 /* normal */
#ifndef CONFIG_RAM_16MB /* 32 MB RAM */
/*
Bank6
*/
#define B6_MT 0x3 /* SDRAM */
#define B6_Trcd 0x1 /* 3clk */
#define B6_SCAN 0x1 /* 9 bit */
/*
Bank7
*/
#define B7_MT 0x3 /* SDRAM */
#define B7_Trcd 0x1 /* 3clk */
#define B7_SCAN 0x1 /* 9 bit */
#else /* CONFIG_RAM_16MB = 16 MB RAM */
/*
Bank6
*/
#define B6_MT 0x3 /* SDRAM */
#define B6_Trcd 0x1 /* 2clk */
...
...
@@ -110,6 +121,7 @@
#define B7_MT 0x3 /* SDRAM */
#define B7_Trcd 0x1 /* 2clk */
#define B7_SCAN 0x0 /* 8 bit */
#endif /* CONFIG_RAM_16MB */
/*
refresh
parameter
*/
#define REFEN 0x1 /* enable refresh */
...
...
@@ -161,6 +173,10 @@ SMRDATA:
.
word
((
B6_MT
<<
15
)+(
B6_Trcd
<<
2
)+(
B6_SCAN
))
/*
GCS6
*/
.
word
((
B7_MT
<<
15
)+(
B7_Trcd
<<
2
)+(
B7_SCAN
))
/*
GCS7
*/
.
word
((
REFEN
<<
23
)+(
TREFMD
<<
22
)+(
Trp
<<
20
)+(
Trc
<<
18
)+(
Tchr
<<
16
)+
REFCNT
)
#ifndef CONFIG_RAM_16MB /* 32 MB RAM */
.
word
0x10
/*
BUSWIDTH
=
32
,
SCLK
power
saving
mode
,
BANKSIZE
32
M
/
32
M
*/
#else /* CONFIG_RAM_16MB = 16 MB RAM */
.
word
0x17
/*
BUSWIDTH
=
32
,
SCLK
power
saving
mode
,
BANKSIZE
16
M
/
16
M
*/
#endif /* CONFIG_RAM_16MB */
.
word
0x30
/*
MRSR6
,
CL
=
3
clk
*/
.
word
0x30
/*
MRSR7
*/
cpu/arm720t/start.S
浏览文件 @
b0639ca3
...
...
@@ -71,9 +71,6 @@ _fiq: .word fiq
************************************************************************
*
*/
/*
*
CFG_MEM_END
is
in
the
board
dependent
config
-
file
(
configs
/
config_BOARD
.
h
)
*/
_TEXT_BASE
:
.
word
TEXT_BASE
...
...
cpu/arm920t/start.S
浏览文件 @
b0639ca3
...
...
@@ -72,9 +72,6 @@ _fiq: .word fiq
************************************************************************
*
*/
/*
*
CFG_MEM_END
is
in
the
board
dependent
config
-
file
(
configs
/
config_BOARD
.
h
)
*/
_TEXT_BASE
:
.
word
TEXT_BASE
...
...
cpu/arm920t/usb_ohci.c
浏览文件 @
b0639ca3
...
...
@@ -1199,7 +1199,7 @@ int submit_common_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
/* ohci_dump_status(&gohci); */
/* allow more time for a BULK device to react - some are slow */
#define BULK_TO
2
000
/* timeout in milliseconds */
#define BULK_TO
5
000
/* timeout in milliseconds */
if
(
usb_pipetype
(
pipe
)
==
PIPE_BULK
)
timeout
=
BULK_TO
;
else
...
...
cpu/arm925t/start.S
浏览文件 @
b0639ca3
...
...
@@ -81,9 +81,6 @@ _fiq: .word fiq
************************************************************************
*
*/
/*
*
CFG_MEM_END
is
in
the
board
dependent
config
-
file
(
configs
/
config_BOARD
.
h
)
*/
_TEXT_BASE
:
.
word
TEXT_BASE
...
...
cpu/arm926ejs/start.S
浏览文件 @
b0639ca3
...
...
@@ -90,9 +90,6 @@ _fiq:
************************************************************************
*
*/
/*
*
CFG_MEM_END
is
in
the
board
dependent
config
-
file
(
configs
/
config_BOARD
.
h
)
*/
_TEXT_BASE
:
.
word
TEXT_BASE
...
...
cpu/at91rm9200/start.S
浏览文件 @
b0639ca3
...
...
@@ -71,9 +71,6 @@ _fiq: .word fiq
************************************************************************
*
*/
/*
*
CFG_MEM_END
is
in
the
board
dependent
config
-
file
(
configs
/
config_BOARD
.
h
)
*/
_TEXT_BASE
:
.
word
TEXT_BASE
...
...
cpu/pxa/start.S
浏览文件 @
b0639ca3
...
...
@@ -61,9 +61,6 @@ _fiq: .word fiq
*
-
jump
to
second
stage
*/
/*
*
CFG_MEM_END
is
in
the
board
dependent
config
-
file
(
configs
/
config_BOARD
.
h
)
*/
_TEXT_BASE
:
.
word
TEXT_BASE
...
...
cpu/sa1100/start.S
浏览文件 @
b0639ca3
...
...
@@ -73,9 +73,6 @@ _fiq: .word fiq
************************************************************************
*
*/
/*
*
CFG_MEM_END
is
in
the
board
dependent
config
-
file
(
configs
/
config_BOARD
.
h
)
*/
_TEXT_BASE
:
.
word
TEXT_BASE
...
...
include/configs/trab.h
浏览文件 @
b0639ca3
...
...
@@ -26,6 +26,11 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#ifdef CONFIG_OLD_VERSION
/* Old configuration: */
#define CONFIG_RAM_16MB
/* 16 MB SDRAM */
#define CONFIG_FLASH_8MB
/* 8 MB Flash */
#endif
/*
* If we are developing, we might want to start armboot from ram
* so we MUST NOT initialize critical regs like mem-timing ...
...
...
@@ -179,7 +184,7 @@
#define CONFIG_SERVERIP 192.168.3.1
#define CONFIG_BOOTCOMMAND "run flash_nfs"
#ifndef CONFIG_
OLD_VERSION
/* current config: 16 MB flash, 32 MB RAM
*/
#ifndef CONFIG_
FLASH_8MB
/* current config: 16 MB flash
*/
#ifdef CFG_HUSH_PARSER
#define CONFIG_EXTRA_ENV_SETTINGS \
"nfs_args=setenv bootargs root=/dev/nfs rw " \
...
...
@@ -225,7 +230,7 @@
"mdm_init2=ATS0=1\0" \
"mdm_flow_control=rts/cts\0"
#endif
/* CFG_HUSH_PARSER */
#else
/* CONFIG_OLD_VERSION => 8 MB flash, 16 MB RAM
*/
#else
/* CONFIG_FLASH_8MB => 8 MB flash
*/
#ifdef CFG_HUSH_PARSER
#define CONFIG_EXTRA_ENV_SETTINGS \
"nfs_args=setenv bootargs root=/dev/nfs rw " \
...
...
@@ -273,7 +278,7 @@
"mdm_init2=ATS0=1\0" \
"mdm_flow_control=rts/cts\0"
#endif
/* CFG_HUSH_PARSER */
#endif
/* CONFIG_
OLD_VERSION
*/
#endif
/* CONFIG_
FLASH_8MB
*/
#if 0 /* disabled for development */
#define CONFIG_AUTOBOOT_KEYED /* Enable password protection */
...
...
@@ -346,7 +351,7 @@
*/
#define CONFIG_NR_DRAM_BANKS 1
/* we have 1 bank of DRAM */
#define PHYS_SDRAM_1 0x0C000000
/* SDRAM Bank #1 */
#ifndef CONFIG_
OLD_VERSION
#ifndef CONFIG_
RAM_16MB
#define PHYS_SDRAM_1_SIZE 0x02000000
/* 32 MB */
#else
#define PHYS_SDRAM_1_SIZE 0x01000000
/* 16 MB */
...
...
@@ -362,7 +367,7 @@
* FLASH and environment organization
*/
#define CFG_MAX_FLASH_BANKS 1
/* max number of memory banks */
#ifndef CONFIG_
OLD_VERSION
#ifndef CONFIG_
FLASH_8MB
#define CFG_MAX_FLASH_SECT 128
/* max number of sectors on one chip */
#else
#define CFG_MAX_FLASH_SECT 71
/* max number of sectors on one chip */
...
...
@@ -375,7 +380,7 @@
#define CFG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
#ifndef CONFIG_
OLD_VERSION
#ifndef CONFIG_
FLASH_8MB
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x60000)
#define CFG_ENV_SIZE 0x4000
#define CFG_ENV_SECT_SIZE 0x20000
...
...
lib_arm/board.c
浏览文件 @
b0639ca3
...
...
@@ -157,7 +157,7 @@ static void display_flash_config (ulong size)
/*
* Breath some life into the board...
*
* Initialize a
n SMC for serial comms
, and carry out some hardware
* Initialize a
serial port as console
, and carry out some hardware
* tests.
*
* The first part of initialization is running from Flash memory;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录