Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
206c00f2
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,发现更多精彩内容 >>
提交
206c00f2
编写于
12月 07, 2009
作者:
W
Wolfgang Denk
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into next
Conflicts: lib_generic/zlib.c Signed-off-by:
N
Wolfgang Denk
<
wd@denx.de
>
上级
39ff7d5f
f8450829
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
32 addition
and
21 deletion
+32
-21
Makefile
Makefile
+1
-0
README
README
+5
-5
board/atmel/at91sam9261ek/at91sam9261ek.c
board/atmel/at91sam9261ek/at91sam9261ek.c
+5
-4
board/mucmc52/mucmc52.c
board/mucmc52/mucmc52.c
+2
-0
board/uc101/uc101.c
board/uc101/uc101.c
+2
-0
common/cmd_bootm.c
common/cmd_bootm.c
+2
-2
cpu/arm920t/s3c24x0/timer.c
cpu/arm920t/s3c24x0/timer.c
+2
-0
cpu/arm_cortexa8/omap3/board.c
cpu/arm_cortexa8/omap3/board.c
+1
-1
drivers/mtd/nand/nand_util.c
drivers/mtd/nand/nand_util.c
+1
-1
drivers/net/smc911x.c
drivers/net/smc911x.c
+2
-2
lib_generic/zlib.c
lib_generic/zlib.c
+2
-0
net/nfs.c
net/nfs.c
+7
-6
未找到文件。
Makefile
浏览文件 @
206c00f2
...
...
@@ -3266,6 +3266,7 @@ zylonite_config :
#########################################################################
apollon_config
:
unconfig
@
mkdir
-p
$(obj)
include
@
echo
"#define CONFIG_ONENAND_U_BOOT"
>
$(obj)
include/config.h
@
$(MKCONFIG)
$
(
@:_config
=)
arm arm1136 apollon NULL omap24xx
@
echo
"CONFIG_ONENAND_U_BOOT = y"
>>
$(obj)
include/config.mk
...
...
README
浏览文件 @
206c00f2
...
...
@@ -846,20 +846,20 @@ The following options need to be configured:
Define this to use i/o functions instead of macros
(some hardware wont work with macros)
CONFIG_
DRIVER_
SMC911X
CONFIG_SMC911X
Support for SMSC's LAN911x and LAN921x chips
CONFIG_
DRIVER_
SMC911X_BASE
CONFIG_SMC911X_BASE
Define this to hold the physical address
of the device (I/O space)
CONFIG_
DRIVER_
SMC911X_32_BIT
CONFIG_SMC911X_32_BIT
Define this if data bus is 32 bits
CONFIG_
DRIVER_
SMC911X_16_BIT
CONFIG_SMC911X_16_BIT
Define this if data bus is 16 bits. If your processor
automatically converts one 32 bit word to two 16 bit
words you may also try CONFIG_
DRIVER_
SMC911X_32_BIT.
words you may also try CONFIG_SMC911X_32_BIT.
- USB Support:
At the moment only the UHCI host controller is
...
...
board/atmel/at91sam9261ek/at91sam9261ek.c
浏览文件 @
206c00f2
...
...
@@ -265,11 +265,12 @@ int board_init(void)
}
#ifdef CONFIG_DRIVER_DM9000
int
board_eth_init
(
bd_t
*
bis
)
{
int
board_eth_init
(
bd_t
*
bis
)
{
return
dm9000_initialize
(
bis
);
}
#endif
}
#endif
int
dram_init
(
void
)
{
gd
->
bd
->
bi_dram
[
0
].
start
=
PHYS_SDRAM
;
...
...
board/mucmc52/mucmc52.c
浏览文件 @
206c00f2
...
...
@@ -31,6 +31,7 @@
*/
#include <common.h>
#include <fdt_support.h>
#include <mpc5xxx.h>
#include <pci.h>
#include <malloc.h>
...
...
@@ -403,5 +404,6 @@ void pci_init_board (void)
void
ft_board_setup
(
void
*
blob
,
bd_t
*
bd
)
{
ft_cpu_setup
(
blob
,
bd
);
fdt_fixup_memory
(
blob
,
(
u64
)
bd
->
bi_memstart
,
(
u64
)
bd
->
bi_memsize
);
}
#endif
/* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
board/uc101/uc101.c
浏览文件 @
206c00f2
...
...
@@ -31,6 +31,7 @@
*/
#include <common.h>
#include <fdt_support.h>
#include <mpc5xxx.h>
#include <pci.h>
#include <malloc.h>
...
...
@@ -376,5 +377,6 @@ void hw_watchdog_reset(void)
void
ft_board_setup
(
void
*
blob
,
bd_t
*
bd
)
{
ft_cpu_setup
(
blob
,
bd
);
fdt_fixup_memory
(
blob
,
(
u64
)
bd
->
bi_memstart
,
(
u64
)
bd
->
bi_memsize
);
}
#endif
/* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
common/cmd_bootm.c
浏览文件 @
206c00f2
...
...
@@ -475,8 +475,8 @@ cmd_tbl_t cmd_bootm_sub[] = {
#ifdef CONFIG_OF_LIBFDT
U_BOOT_CMD_MKENT
(
fdt
,
0
,
1
,
(
void
*
)
BOOTM_STATE_FDT
,
""
,
""
),
#endif
U_BOOT_CMD_MKENT
(
bdt
,
0
,
1
,
(
void
*
)
BOOTM_STATE_OS_BD_T
,
""
,
""
),
U_BOOT_CMD_MKENT
(
cmdline
,
0
,
1
,
(
void
*
)
BOOTM_STATE_OS_CMDLINE
,
""
,
""
),
U_BOOT_CMD_MKENT
(
bdt
,
0
,
1
,
(
void
*
)
BOOTM_STATE_OS_BD_T
,
""
,
""
),
U_BOOT_CMD_MKENT
(
prep
,
0
,
1
,
(
void
*
)
BOOTM_STATE_OS_PREP
,
""
,
""
),
U_BOOT_CMD_MKENT
(
go
,
0
,
1
,
(
void
*
)
BOOTM_STATE_OS_GO
,
""
,
""
),
};
...
...
@@ -1022,8 +1022,8 @@ U_BOOT_CMD(
#if defined(CONFIG_OF_LIBFDT)
"
\t
fdt - relocate flat device tree
\n
"
#endif
"
\t
bdt - OS specific bd_t processing
\n
"
"
\t
cmdline - OS specific command line processing/setup
\n
"
"
\t
bdt - OS specific bd_t processing
\n
"
"
\t
prep - OS specific prep before relocation or go
\n
"
"
\t
go - start OS"
);
...
...
cpu/arm920t/s3c24x0/timer.c
浏览文件 @
206c00f2
...
...
@@ -198,6 +198,8 @@ void reset_cpu(ulong ignored)
struct
s3c24x0_watchdog
*
watchdog
;
#ifdef CONFIG_TRAB
extern
void
disable_vfd
(
void
);
disable_vfd
();
#endif
...
...
cpu/arm_cortexa8/omap3/board.c
浏览文件 @
206c00f2
...
...
@@ -328,7 +328,7 @@ usage:
U_BOOT_CMD
(
nandecc
,
2
,
1
,
do_switch_ecc
,
"
nandecc - switch OMAP3 NAND ECC calculation algorithm
\n
"
,
"
switch OMAP3 NAND ECC calculation algorithm
"
,
"[hw/sw] - Switch between NAND hardware (hw) or software (sw) ecc algorithm"
);
...
...
drivers/mtd/nand/nand_util.c
浏览文件 @
206c00f2
...
...
@@ -452,7 +452,7 @@ static size_t get_len_incl_bad (nand_info_t *nand, loff_t offset,
len_incl_bad
+=
block_len
;
offset
+=
block_len
;
if
(
(
offset
+
len_incl_bad
)
>=
nand
->
size
)
if
(
offset
>=
nand
->
size
)
break
;
}
...
...
drivers/net/smc911x.c
浏览文件 @
206c00f2
...
...
@@ -37,7 +37,7 @@ void pkt_data_push(struct eth_device *dev, u32 addr, u32 val) \
#define mdelay(n) udelay((n)*1000)
static
void
sm
x
911x_handle_mac_address
(
struct
eth_device
*
dev
)
static
void
sm
c
911x_handle_mac_address
(
struct
eth_device
*
dev
)
{
unsigned
long
addrh
,
addrl
;
uchar
*
m
=
dev
->
enetaddr
;
...
...
@@ -155,7 +155,7 @@ static int smc911x_init(struct eth_device *dev, bd_t * bd)
/* Configure the PHY, initialize the link state */
smc911x_phy_configure
(
dev
);
sm
x
911x_handle_mac_address
(
dev
);
sm
c
911x_handle_mac_address
(
dev
);
/* Turn on Tx + Rx */
smc911x_enable
(
dev
);
...
...
lib_generic/zlib.c
浏览文件 @
206c00f2
...
...
@@ -30,6 +30,8 @@
#include <compiler.h>
#include <asm/unaligned.h>
#include "u-boot/zlib.h"
#undef OFF
/* avoid conflicts */
/* To avoid a build time warning */
#ifdef STDC
#include <malloc.h>
...
...
net/nfs.c
浏览文件 @
206c00f2
...
...
@@ -516,7 +516,7 @@ nfs_readlink_reply (uchar *pkt, unsigned len)
strcat
(
nfs_path
,
"/"
);
pathlen
=
strlen
(
nfs_path
);
memcpy
(
nfs_path
+
pathlen
,
(
uchar
*
)
&
(
rpc_pkt
.
u
.
reply
.
data
[
2
]),
rlen
);
nfs_path
[
pathlen
+
rlen
+
1
]
=
0
;
nfs_path
[
pathlen
+
rlen
]
=
0
;
}
else
{
memcpy
(
nfs_path
,
(
uchar
*
)
&
(
rpc_pkt
.
u
.
reply
.
data
[
2
]),
rlen
);
nfs_path
[
rlen
]
=
0
;
...
...
@@ -571,13 +571,14 @@ Interfaces of U-BOOT
static
void
NfsTimeout
(
void
)
{
if
(
NfsTimeoutCount
++
<
NFS_RETRY_COUNT
)
{
if
(
++
NfsTimeoutCount
>
NFS_RETRY_COUNT
)
{
puts
(
"
\n
Retry count exceeded; starting again
\n
"
);
NetStartAgain
();
}
else
{
puts
(
"T "
);
NetSetTimeout
(
NFS_TIMEOUT
,
NfsTimeout
);
NfsSend
();
return
;
}
puts
(
"Timeout
\n
"
);
NetState
=
NETLOOP_FAIL
;
return
;
}
static
void
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录