Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
2bb6a104
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,发现更多精彩内容 >>
提交
2bb6a104
编写于
7月 31, 2008
作者:
W
Wolfgang Denk
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
ssh://10.10.0.7/home/wd/git/u-boot/master
上级
c37207d7
a4831155
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
50 addition
and
18 deletion
+50
-18
Makefile
Makefile
+2
-2
common/cmd_bootm.c
common/cmd_bootm.c
+2
-3
common/lcd.c
common/lcd.c
+13
-0
drivers/video/atmel_lcdfb.c
drivers/video/atmel_lcdfb.c
+4
-0
onenand_ipl/board/apollon/Makefile
onenand_ipl/board/apollon/Makefile
+29
-13
未找到文件。
Makefile
浏览文件 @
2bb6a104
...
...
@@ -346,10 +346,9 @@ $(U_BOOT_NAND): $(NAND_SPL) $(obj)u-boot.bin $(obj)include/autoconf.mk
cat
$(obj)
nand_spl/u-boot-spl-16k.bin
$(obj)
u-boot.bin
>
$(obj)
u-boot-nand.bin
$(ONENAND_IPL)
:
$(VERSION_FILE) $(obj)include/autoconf.mk
$(MAKE)
-C
$(obj)
onenand_ipl/board/
$(BOARDDIR)
all
$(MAKE)
-C
onenand_ipl/board/
$(BOARDDIR)
all
$(U_BOOT_ONENAND)
:
$(ONENAND_IPL) $(obj)u-boot.bin $(obj)include/autoconf.mk
$(MAKE)
-C
$(obj)
onenand_ipl/board/
$(BOARDDIR)
all
cat
$(obj)
onenand_ipl/onenand-ipl-2k.bin
$(obj)
u-boot.bin
>
$(obj)
u-boot-onenand.bin
cat
$(obj)
onenand_ipl/onenand-ipl-4k.bin
$(obj)
u-boot.bin
>
$(obj)
u-boot-flexonenand.bin
...
...
@@ -2661,6 +2660,7 @@ zylonite_config :
apollon_config
:
unconfig
@
mkdir
-p
$(obj)
include
@
mkdir
-p
$(obj)
onenand_ipl/board/apollon
@
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
...
...
common/cmd_bootm.c
浏览文件 @
2bb6a104
...
...
@@ -251,10 +251,9 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
memmove_wd
((
void
*
)
load_start
,
(
void
*
)
os_data
,
os_len
,
CHUNKSZ
);
load_end
=
load_start
+
os_len
;
puts
(
"OK
\n
"
);
}
load_end
=
load_start
+
os_len
;
puts
(
"OK
\n
"
);
break
;
case
IH_COMP_GZIP
:
printf
(
" Uncompressing %s ... "
,
type_name
);
...
...
common/lcd.c
浏览文件 @
2bb6a104
...
...
@@ -740,6 +740,9 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
}
#endif
#ifdef CONFIG_VIDEO_BMP_GZIP
extern
bmp_image_t
*
gunzip_bmp
(
unsigned
long
addr
,
unsigned
long
*
lenp
);
#endif
static
void
*
lcd_logo
(
void
)
{
...
...
@@ -761,6 +764,16 @@ static void *lcd_logo (void)
addr
=
simple_strtoul
(
s
,
NULL
,
16
);
do_splash
=
0
;
#ifdef CONFIG_VIDEO_BMP_GZIP
bmp_image_t
*
bmp
=
(
bmp_image_t
*
)
addr
;
unsigned
long
len
;
if
(
!
((
bmp
->
header
.
signature
[
0
]
==
'B'
)
&&
(
bmp
->
header
.
signature
[
1
]
==
'M'
)))
{
addr
=
(
ulong
)
gunzip_bmp
(
addr
,
&
len
);
}
#endif
if
(
lcd_display_bitmap
(
addr
,
0
,
0
)
==
0
)
{
return
((
void
*
)
lcd_base
);
}
...
...
drivers/video/atmel_lcdfb.c
浏览文件 @
2bb6a104
...
...
@@ -100,7 +100,11 @@ void lcd_ctrl_init(void *lcdbase)
value
<<
ATMEL_LCDC_CLKVAL_OFFSET
);
/* Initialize control register 2 */
#ifdef CONFIG_AVR32
value
=
ATMEL_LCDC_MEMOR_BIG
|
ATMEL_LCDC_CLKMOD_ALWAYSACTIVE
;
#else
value
=
ATMEL_LCDC_MEMOR_LITTLE
|
ATMEL_LCDC_CLKMOD_ALWAYSACTIVE
;
#endif
if
(
panel_info
.
vl_tft
)
value
|=
ATMEL_LCDC_DISTYPE_TFT
;
...
...
onenand_ipl/board/apollon/Makefile
浏览文件 @
2bb6a104
include
$(TOPDIR)/config.mk
include
$(TOPDIR)/include/config.mk
include
$(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/config.mk
LDSCRIPT
=
$(TOPDIR)
/onenand_ipl/board/
$(BOARDDIR)
/u-boot.onenand.lds
...
...
@@ -9,8 +8,11 @@ AFLAGS += -DCONFIG_ONENAND_IPL
CFLAGS
+=
-DCONFIG_ONENAND_IPL
OBJCLFAGS
+=
--gap-fill
=
0x00
SOBJS
=
start.o low_levelinit.o
COBJS
=
apollon.o onenand_read.o onenand_boot.o
SOBJS
:=
low_levelinit.o
SOBJS
+=
start.o
COBJS
:=
apollon.o
COBJS
+=
onenand_read.o
COBJS
+=
onenand_boot.o
SRCS
:=
$(
addprefix
$(obj)
,
$(SOBJS:.o=.S)
$(COBJS:.o=.c)
)
OBJS
:=
$(
addprefix
$(obj)
,
$(SOBJS)
$(COBJS)
)
...
...
@@ -34,28 +36,39 @@ $(onenandobj)onenand-ipl.bin: $(onenandobj)onenand-ipl
$(onenandobj)onenand-ipl
:
$(OBJS)
cd
$(LNDIR)
&&
$(LD)
$(LDFLAGS)
$$
UNDEF_SYM
$(__OBJS)
\
-Map
$(onenandobj)
onenand-ipl.map
\
-o
$(onenandobj)
onenand-ipl
-Map
$@
.map
-o
$@
# create symbolic links from common files
# from cpu directory
$(obj)start.S
:
rm
-f
$(obj)
start.S
ln
-s
$(SRCTREE)
/cpu/
$(CPU)
/start.S
$
(obj)
start.S
@
rm
-f
$@
ln
-s
$(SRCTREE)
/cpu/
$(CPU)
/start.S
$
@
# from onenand_ipl directory
$(obj)onenand_ipl.h
:
rm
-f
$(obj)
onenand_ipl.h
ln
-s
$(SRCTREE)
/onenand_ipl/onenand_ipl.h
$
(obj)
onenand_ipl.h
@
rm
-f
$@
ln
-s
$(SRCTREE)
/onenand_ipl/onenand_ipl.h
$
@
$(obj)onenand_boot.c
:
$(obj)onenand_ipl.h
rm
-f
$(obj)
onenand_boot.c
ln
-s
$(SRCTREE)
/onenand_ipl/onenand_boot.c
$
(obj)
onenand_boot.c
@
rm
-f
$@
ln
-s
$(SRCTREE)
/onenand_ipl/onenand_boot.c
$
@
$(obj)onenand_read.c
:
$(obj)onenand_ipl.h
rm
-f
$(obj)
onenand_read.c
ln
-s
$(SRCTREE)
/onenand_ipl/onenand_read.c
$(obj)
onenand_read.c
@
rm
-f
$@
ln
-s
$(SRCTREE)
/onenand_ipl/onenand_read.c
$@
ifneq
($(OBJTREE), $(SRCTREE))
$(obj)apollon.c
:
@
rm
-f
$@
ln
-s
$(SRCTREE)
/onenand_ipl/board/
$(BOARDDIR)
/apollon.c
$@
$(obj)low_levelinit.S
:
@
rm
-f
$@
ln
-s
$(SRCTREE)
/onenand_ipl/board/
$(BOARDDIR)
/low_levelinit.S
$@
endif
#########################################################################
$(obj)%.o
:
$(obj)%.S
$(CC)
$(AFLAGS)
-c
-o
$@
$<
...
...
@@ -63,6 +76,9 @@ $(obj)%.o: $(obj)%.S
$(obj)%.o
:
$(obj)$.c
$(CC)
$(CFLAGS)
-c
-o
$@
$<
# defines $(obj).depend target
include
$(SRCTREE)/rules.mk
sinclude
$(obj).depend
#########################################################################
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录