Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
66f30bf9
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,发现更多精彩内容 >>
提交
66f30bf9
编写于
4月 11, 2013
作者:
B
Benoît Thébaudeau
提交者:
Albert ARIBAUD
4月 12, 2013
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
arm: Remove deprecated and now unused NAND SPL
Signed-off-by:
N
Benoît Thébaudeau
<
benoit.thebaudeau@advansee.com
>
上级
e5323225
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
24 deletion
+6
-24
arch/arm/config.mk
arch/arm/config.mk
+0
-2
arch/arm/cpu/arm1176/start.S
arch/arm/cpu/arm1176/start.S
+4
-8
arch/arm/lib/crt0.S
arch/arm/lib/crt0.S
+2
-14
未找到文件。
arch/arm/config.mk
浏览文件 @
66f30bf9
...
...
@@ -87,9 +87,7 @@ endif
endif
# needed for relocation
ifndef
CONFIG_NAND_SPL
LDFLAGS_u-boot
+=
-pie
endif
#
# FIXME: binutils versions < 2.22 have a bug in the assembler where
...
...
arch/arm/cpu/arm1176/start.S
浏览文件 @
66f30bf9
...
...
@@ -51,7 +51,7 @@
.
globl
_start
_start
:
b
reset
#ifndef CONFIG_
NAND_SPL
#ifndef CONFIG_
SPL_BUILD
ldr
pc
,
_undefined_instruction
ldr
pc
,
_software_interrupt
ldr
pc
,
_prefetch_abort
...
...
@@ -98,15 +98,11 @@ _end_vect:
.
globl
_TEXT_BASE
_TEXT_BASE
:
#ifdef CONFIG_NAND_SPL /* deprecated, use instead CONFIG_SPL_BUILD */
.
word
CONFIG_SYS_TEXT_BASE
#else
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE)
.
word
CONFIG_SPL_TEXT_BASE
#else
.
word
CONFIG_SYS_TEXT_BASE
#endif
#endif
/*
*
Below
variable
is
very
important
because
we
use
MMU
in
U
-
Boot
.
...
...
@@ -176,7 +172,7 @@ cpu_init_crit:
*
When
booting
from
NAND
-
it
has
definitely
been
a
reset
,
so
,
no
need
*
to
flush
caches
and
disable
the
MMU
*/
#ifndef CONFIG_
NAND_SPL
#ifndef CONFIG_
SPL_BUILD
/
*
*
flush
v4
I
/
D
caches
*/
...
...
@@ -361,7 +357,7 @@ c_runtime_cpu_setup:
mov
pc
,
lr
#ifndef CONFIG_
NAND_SPL
#ifndef CONFIG_
SPL_BUILD
/*
*
we
assume
that
cache
operation
is
done
before
.
(
eg
.
cleanup_before_linux
())
*
actually
,
we
don
't need to do anything about cache if not use d-cache in
...
...
@@ -539,4 +535,4 @@ fiq:
get_bad_stack
bad_save_user_regs
bl
do_fiq
#endif /* CONFIG_
NAND_SPL
*/
#endif /* CONFIG_
SPL_BUILD
*/
arch/arm/lib/crt0.S
浏览文件 @
66f30bf9
...
...
@@ -64,7 +64,7 @@
*
have
some
work
left
to
do
at
this
point
regarding
memory
,
so
*
call
c_runtime_cpu_setup
.
*
*
6
.
Branch
to
either
nand_boot
()
or
board_init_r
()
.
*
6
.
Branch
to
board_init_r
()
.
*/
/*
...
...
@@ -77,10 +77,7 @@ ENTRY(_main)
*
Set
up
initial
C
runtime
environment
and
call
board_init_f
(
0
)
.
*/
#if defined(CONFIG_NAND_SPL)
/
*
deprecated
,
use
instead
CONFIG_SPL_BUILD
*/
ldr
sp
,
=(
CONFIG_SYS_INIT_SP_ADDR
)
#elif defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_STACK)
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_STACK)
ldr
sp
,
=(
CONFIG_SPL_STACK
)
#else
ldr
sp
,
=(
CONFIG_SYS_INIT_SP_ADDR
)
...
...
@@ -129,21 +126,12 @@ clbss_l:cmp r0, r1 /* while not at end of BSS */
bl
coloured_LED_init
bl
red_led_on
#if defined(CONFIG_NAND_SPL)
/
*
call
_nand_boot
()
*/
ldr
pc
,
=
nand_boot
#else
/
*
call
board_init_r
(
gd_t
*
id
,
ulong
dest_addr
)
*/
mov
r0
,
r8
/*
gd_t
*/
ldr
r1
,
[
r8
,
#
GD_RELOCADDR
]
/*
dest_addr
*/
/
*
call
board_init_r
*/
ldr
pc
,
=
board_init_r
/*
this
is
auto
-
relocated
!
*/
#endif
/
*
we
should
not
return
here
.
*/
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录