Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
4e0c8abc
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,发现更多精彩内容 >>
提交
4e0c8abc
编写于
2月 24, 2014
作者:
M
Masahiro Yamada
提交者:
Tom Rini
2月 25, 2014
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
kbuild: use shorten logs for IMX images
Signed-off-by:
N
Masahiro Yamada
<
yamada.m@jp.panasonic.com
>
上级
04a34c96
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
58 addition
and
41 deletion
+58
-41
Makefile
Makefile
+2
-2
arch/arm/cpu/arm1136/config.mk
arch/arm/cpu/arm1136/config.mk
+1
-1
arch/arm/cpu/arm926ejs/config.mk
arch/arm/cpu/arm926ejs/config.mk
+1
-1
arch/arm/cpu/armv7/config.mk
arch/arm/cpu/armv7/config.mk
+1
-1
arch/arm/imx-common/Makefile
arch/arm/imx-common/Makefile
+51
-34
spl/Makefile
spl/Makefile
+2
-2
未找到文件。
Makefile
浏览文件 @
4e0c8abc
...
@@ -815,7 +815,7 @@ u-boot.img u-boot.kwb u-boot.pbl: u-boot.bin FORCE
...
@@ -815,7 +815,7 @@ u-boot.img u-boot.kwb u-boot.pbl: u-boot.bin FORCE
$(
call
if_changed,mkimage
)
$(
call
if_changed,mkimage
)
u-boot.imx
:
u-boot.bin
u-boot.imx
:
u-boot.bin
$(Q)$(MAKE)
$(build)
=
arch
/arm/imx-common
$
(objtree)
/
$
@
$(Q)$(MAKE)
$(build)
=
arch
/arm/imx-common
$@
u-boot.sha1
:
u-boot.bin
u-boot.sha1
:
u-boot.bin
tools/ubsha1 u-boot.bin
tools/ubsha1 u-boot.bin
...
@@ -840,7 +840,7 @@ tpl/u-boot-with-tpl.bin: tpl/u-boot-tpl.bin u-boot.bin FORCE
...
@@ -840,7 +840,7 @@ tpl/u-boot-with-tpl.bin: tpl/u-boot-tpl.bin u-boot.bin FORCE
$(
call
if_changed,pad_cat
)
$(
call
if_changed,pad_cat
)
u-boot-with-spl.imx u-boot-with-nand-spl.imx
:
spl/u-boot-spl.bin u-boot.bin
u-boot-with-spl.imx u-boot-with-nand-spl.imx
:
spl/u-boot-spl.bin u-boot.bin
$(Q)$(MAKE)
$(build)
=
arch
/arm/imx-common
$
(objtree)
/
$
@
$(Q)$(MAKE)
$(build)
=
arch
/arm/imx-common
$@
MKIMAGEFLAGS_u-boot.ubl
=
-n
$(UBL_CONFIG)
-T
ublimage
-e
$(CONFIG_SYS_TEXT_BASE)
MKIMAGEFLAGS_u-boot.ubl
=
-n
$(UBL_CONFIG)
-T
ublimage
-e
$(CONFIG_SYS_TEXT_BASE)
...
...
arch/arm/cpu/arm1136/config.mk
浏览文件 @
4e0c8abc
...
@@ -11,7 +11,7 @@ PLATFORM_CPPFLAGS += -march=armv5
...
@@ -11,7 +11,7 @@ PLATFORM_CPPFLAGS += -march=armv5
ifneq
($(CONFIG_IMX_CONFIG),)
ifneq
($(CONFIG_IMX_CONFIG),)
ifdef
CONFIG_SPL
ifdef
CONFIG_SPL
ifdef
CONFIG_SPL_BUILD
ifdef
CONFIG_SPL_BUILD
ALL-y
+=
$(OBJTREE)
/
SPL
ALL-y
+=
SPL
endif
endif
else
else
ALL-y
+=
u-boot.imx
ALL-y
+=
u-boot.imx
...
...
arch/arm/cpu/arm926ejs/config.mk
浏览文件 @
4e0c8abc
...
@@ -10,7 +10,7 @@ PLATFORM_CPPFLAGS += -march=armv5te
...
@@ -10,7 +10,7 @@ PLATFORM_CPPFLAGS += -march=armv5te
ifneq
($(CONFIG_IMX_CONFIG),)
ifneq
($(CONFIG_IMX_CONFIG),)
ifdef
CONFIG_SPL
ifdef
CONFIG_SPL
ifdef
CONFIG_SPL_BUILD
ifdef
CONFIG_SPL_BUILD
ALL-y
+=
$(OBJTREE)
/
SPL
ALL-y
+=
SPL
endif
endif
else
else
ALL-y
+=
u-boot.imx
ALL-y
+=
u-boot.imx
...
...
arch/arm/cpu/armv7/config.mk
浏览文件 @
4e0c8abc
...
@@ -17,7 +17,7 @@ PLATFORM_NO_UNALIGNED := $(PF_NO_UNALIGNED)
...
@@ -17,7 +17,7 @@ PLATFORM_NO_UNALIGNED := $(PF_NO_UNALIGNED)
ifneq
($(CONFIG_IMX_CONFIG),)
ifneq
($(CONFIG_IMX_CONFIG),)
ifdef
CONFIG_SPL
ifdef
CONFIG_SPL
ifdef
CONFIG_SPL_BUILD
ifdef
CONFIG_SPL_BUILD
ALL-y
+=
$(OBJTREE)
/
SPL
ALL-y
+=
SPL
endif
endif
else
else
ALL-y
+=
u-boot.imx
ALL-y
+=
u-boot.imx
...
...
arch/arm/imx-common/Makefile
浏览文件 @
4e0c8abc
...
@@ -23,37 +23,54 @@ endif
...
@@ -23,37 +23,54 @@ endif
obj-$(CONFIG_CMD_BMODE)
+=
cmd_bmode.o
obj-$(CONFIG_CMD_BMODE)
+=
cmd_bmode.o
obj-$(CONFIG_CMD_HDMIDETECT)
+=
cmd_hdmidet.o
obj-$(CONFIG_CMD_HDMIDETECT)
+=
cmd_hdmidet.o
$(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp
:
$(OBJTREE)/%.cfgtmp : $(SRCTREE)/%
quiet_cmd_cpp_cfg
=
CFGS
$@
mkdir
-p
$(
dir
$@
)
cmd_cpp_cfg
=
$(CPP)
$(cpp_flags)
-x
c
-o
$@
$<
$(CPP)
$(cpp_flags)
-x
c
-o
$@
$<
IMX_CONFIG
=
$
(
CONFIG_IMX_CONFIG:
"%"
=
%
)
.cfgtmp
$(OBJTREE)/u-boot.imx
:
$(OBJTREE)/u-boot.bin $(OBJTREE)/$(patsubst "%"
,
%
,
$(CONFIG_IMX_CONFIG)).cfgtmp
$(OBJTREE)
/tools/mkimage
-n
$(
filter-out
%.bin,
$^
)
-T
imximage
\
$(IMX_CONFIG)
:
%.cfgtmp: % FORCE
-e
$(CONFIG_SYS_TEXT_BASE)
-d
$<
$@
$(Q)
mkdir
-p
$(
dir
$@
)
$(
call
if_changed_dep,cpp_cfg
)
$(OBJTREE)/SPL
:
$(OBJTREE)/spl/u-boot-spl.bin $(OBJTREE)/$(patsubst "%"
,
%
,
$(CONFIG_IMX_CONFIG)).cfgtmp
$(OBJTREE)
/tools/mkimage
-n
$(
filter-out
%.bin,
$^
)
-T
imximage
\
quiet_cmd_mkimage
=
UIMAGE
$@
-e
$(CONFIG_SPL_TEXT_BASE)
-d
$<
$@
cmd_mkimage
=
$(objtree)
/tools/mkimage
$
(
MKIMAGEFLAGS_
$
(
@F
))
-d
$<
$@
\
$(
if
$(KBUILD_VERBOSE:1=)
,
>
/dev/null
)
$(OBJTREE)/u-boot-with-spl.imx
:
$(OBJTREE)/SPL $(OBJTREE)/u-boot.bin
$(OBJCOPY)
$(OBJCOPYFLAGS)
--pad-to
=
$(CONFIG_SPL_PAD_TO)
\
MKIMAGEFLAGS_u-boot.imx
=
-n
$(
filter-out
$<
$(PHONY)
,
$^
)
-T
imximage
\
-I
binary
-O
binary
$<
$(OBJTREE)
/spl/u-boot-spl-pad.imx
-e
$(CONFIG_SYS_TEXT_BASE)
$(OBJTREE)
/tools/mkimage
-A
arm
-O
U-Boot
-a
$(CONFIG_SYS_TEXT_BASE)
\
-e
$(CONFIG_SYS_TEXT_BASE)
-C
none
-d
$(OBJTREE)
/u-boot.bin
\
u-boot.imx
:
u-boot.bin $(IMX_CONFIG) FORCE
$(OBJTREE)
/u-boot.uim
$(
call
if_changed,mkimage
)
cat
$(OBJTREE)
/spl/u-boot-spl-pad.imx
$(OBJTREE)
/u-boot.uim
>
$@
rm
$(OBJTREE)
/spl/u-boot-spl-pad.imx
$(OBJTREE)
/u-boot.uim
MKIMAGEFLAGS_SPL
=
-n
$(
filter-out
$<
$(PHONY)
,
$^
)
-T
imximage
\
-e
$(CONFIG_SPL_TEXT_BASE)
$(OBJTREE)/u-boot-with-nand-spl.imx
:
$(OBJTREE)/SPL $(OBJTREE)/u-boot.bin
(
echo
-ne
'\x00\x00\x00\x00\x46\x43\x42\x20\x01'
&&
\
SPL
:
spl/u-boot-spl.bin $(IMX_CONFIG) FORCE
dd
bs
=
1015
count
=
1
if
=
/dev/zero 2>/dev/null
)
|
\
$(
call
if_changed,mkimage
)
cat
-
$<
>
$(OBJTREE)
/spl/u-boot-nand-spl.imx
$(OBJCOPY)
$(OBJCOPYFLAGS)
--pad-to
=
$(CONFIG_SPL_PAD_TO)
\
MKIMAGEFLAGS_u-boot.uim
=
-A
arm
-O
U-Boot
-a
$(CONFIG_SYS_TEXT_BASE)
\
-I
binary
-O
binary
$(OBJTREE)
/spl/u-boot-nand-spl.imx
\
-e
$(CONFIG_SYS_TEXT_BASE)
-C
none
$(OBJTREE)
/spl/u-boot-nand-spl-pad.imx
rm
$(OBJTREE)
/spl/u-boot-nand-spl.imx
u-boot.uim
:
u-boot.bin FORCE
$(OBJTREE)
/tools/mkimage
-A
arm
-O
U-Boot
-a
$(CONFIG_SYS_TEXT_BASE)
\
$(
call
if_changed,mkimage
)
-e
$(CONFIG_SYS_TEXT_BASE)
-C
none
-d
$(OBJTREE)
/u-boot.bin
\
$(OBJTREE)
/u-boot.uim
OBJCOPYFLAGS
+=
-I
binary
-O
binary
--pad-to
=
$(CONFIG_SPL_PAD_TO)
cat
$(OBJTREE)
/spl/u-boot-nand-spl-pad.imx
$(OBJTREE)
/u-boot.uim
>
$@
append
=
cat
$(
filter-out
$<
$(PHONY)
,
$^
)
>>
$@
rm
$(OBJTREE)
/spl/u-boot-nand-spl-pad.imx
$(OBJTREE)
/u-boot.uim
quiet_cmd_pad_cat
=
CAT
$@
cmd_pad_cat
=
$(cmd_objcopy)
&&
$(append)
||
rm
-f
$@
u-boot-with-spl.imx
:
SPL u-boot.uim FORCE
$(
call
if_changed,pad_cat
)
u-boot-with-nand-spl.imx
:
spl/u-boot-nand-spl.imx u-boot.uim FORCE
$(
call
if_changed,pad_cat
)
quiet_cmd_u-boot-nand-spl_imx
=
GEN
$@
cmd_u-boot-nand-spl_imx
=
(
echo
-ne
'\x00\x00\x00\x00\x46\x43\x42\x20\x01'
&&
\
dd
bs
=
1015
count
=
1
if
=
/dev/zero 2>/dev/null
)
|
cat
-
$<
>
$@
spl/u-boot-nand-spl.imx
:
SPL FORCE
$(
call
if_changed,u-boot-nand-spl_imx
)
targets
+=
$(
addprefix
../../../,
$(IMX_CONFIG)
SPL u-boot.uim spl/u-boot-nand-spl.imx
)
spl/Makefile
浏览文件 @
4e0c8abc
...
@@ -180,8 +180,8 @@ MKIMAGEFLAGS_MLO.byteswap = -T omapimage -n byteswap -a $(CONFIG_SPL_TEXT_BASE)
...
@@ -180,8 +180,8 @@ MKIMAGEFLAGS_MLO.byteswap = -T omapimage -n byteswap -a $(CONFIG_SPL_TEXT_BASE)
MLO MLO.byteswap
:
$(obj)/u-boot-spl.bin
MLO MLO.byteswap
:
$(obj)/u-boot-spl.bin
$(
call
if_changed,mkimage
)
$(
call
if_changed,mkimage
)
$(objtree)/
SPL
:
$(obj)/u-boot-spl.bin
SPL
:
$(obj)/u-boot-spl.bin
$(Q)$(MAKE)
$(build)
=
spl/
arch/arm/imx-common
$@
$(Q)$(MAKE)
$(build)
=
arch
/arm/imx-common
$@
ALL-y
+=
$(obj)
/
$(SPL_BIN)
.bin
ALL-y
+=
$(obj)
/
$(SPL_BIN)
.bin
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录