Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
13ef1165
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,发现更多精彩内容 >>
提交
13ef1165
编写于
1月 02, 2020
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '2020-01-02-master-imports'
- Assorted test.py fixes - Other minor changes
上级
6cb87cbb
1785bf54
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
31 addition
and
28 deletion
+31
-28
.gitignore
.gitignore
+1
-0
.mailmap
.mailmap
+1
-0
arch/arm/Kconfig
arch/arm/Kconfig
+26
-26
test/py/tests/test_env.py
test/py/tests/test_env.py
+1
-1
test/py/tests/test_handoff.py
test/py/tests/test_handoff.py
+1
-1
tools/.gitignore
tools/.gitignore
+1
-0
未找到文件。
.gitignore
浏览文件 @
13ef1165
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
#
#
.*
.*
*.a
*.a
*.asn1.[ch]
*.bin
*.bin
*.cfgout
*.cfgout
*.dtb
*.dtb
...
...
.mailmap
浏览文件 @
13ef1165
...
@@ -29,6 +29,7 @@ Jagan Teki <jaganna@gmail.com>
...
@@ -29,6 +29,7 @@ Jagan Teki <jaganna@gmail.com>
Jagan Teki <jaganna@xilinx.com>
Jagan Teki <jaganna@xilinx.com>
Jagan Teki <jagannadh.teki@gmail.com>
Jagan Teki <jagannadh.teki@gmail.com>
Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@linaro.org>
Markus Klotzbuecher <mk@denx.de>
Markus Klotzbuecher <mk@denx.de>
Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
Prabhakar Kushwaha <prabhakar@freescale.com>
Prabhakar Kushwaha <prabhakar@freescale.com>
...
...
arch/arm/Kconfig
浏览文件 @
13ef1165
...
@@ -17,7 +17,7 @@ config POSITION_INDEPENDENT
...
@@ -17,7 +17,7 @@ config POSITION_INDEPENDENT
be loaded to and run from that address. This option lifts that
be loaded to and run from that address. This option lifts that
restriction, thus allowing the code to be loaded to and executed
restriction, thus allowing the code to be loaded to and executed
from almost any address. This logic relies on the relocation
from almost any address. This logic relies on the relocation
information that is embedded in
to
the binary to support U-Boot
information that is embedded in the binary to support U-Boot
relocating itself to the top-of-RAM later during execution.
relocating itself to the top-of-RAM later during execution.
config INIT_SP_RELATIVE
config INIT_SP_RELATIVE
...
@@ -26,7 +26,7 @@ config INIT_SP_RELATIVE
...
@@ -26,7 +26,7 @@ config INIT_SP_RELATIVE
U-Boot typically uses a hard-coded value for the stack pointer
U-Boot typically uses a hard-coded value for the stack pointer
before relocation. Enable this option to instead calculate the
before relocation. Enable this option to instead calculate the
initial SP at run-time. This is useful to avoid hard-coding addresses
initial SP at run-time. This is useful to avoid hard-coding addresses
into U-Boot, so that can be loaded and executed at arbitrary
into U-Boot, so that
it
can be loaded and executed at arbitrary
addresses and thus avoid using arbitrary addresses at runtime.
addresses and thus avoid using arbitrary addresses at runtime.
If this option is enabled, the early stack pointer is set to
If this option is enabled, the early stack pointer is set to
...
@@ -57,7 +57,7 @@ config LNX_KRNL_IMG_TEXT_OFFSET_BASE
...
@@ -57,7 +57,7 @@ config LNX_KRNL_IMG_TEXT_OFFSET_BASE
hex
hex
help
help
The value subtracted from CONFIG_SYS_TEXT_BASE to calculate the
The value subtracted from CONFIG_SYS_TEXT_BASE to calculate the
TEXT_OFFSET value written
in
to the Linux kernel image header.
TEXT_OFFSET value written to the Linux kernel image header.
endif
endif
endif
endif
...
@@ -121,7 +121,7 @@ config SYS_ARM_MMU
...
@@ -121,7 +121,7 @@ config SYS_ARM_MMU
select SYS_ARM_CACHE_CP15
select SYS_ARM_CACHE_CP15
help
help
Select if you want MMU-based virtualised addressing space
Select if you want MMU-based virtualised addressing space
support
by
paged memory management.
support
via
paged memory management.
config SYS_ARM_MPU
config SYS_ARM_MPU
bool 'Use the ARM v7 PMSA Compliant MPU'
bool 'Use the ARM v7 PMSA Compliant MPU'
...
@@ -136,8 +136,8 @@ config SYS_ARM_MPU
...
@@ -136,8 +136,8 @@ config SYS_ARM_MPU
# startup. Note that in general these options force the workarounds to be
# startup. Note that in general these options force the workarounds to be
# applied; no CPU-type/version detection exists, unlike the similar options in
# applied; no CPU-type/version detection exists, unlike the similar options in
# the Linux kernel. Do not set these options unless they apply! Also note that
# the Linux kernel. Do not set these options unless they apply! Also note that
# the following can be machine
specific errata. These do have ability to
# the following can be machine
-
specific errata. These do have ability to
# provide rudimentary version and machine
specific checks, but expect no
# provide rudimentary version and machine
-
specific checks, but expect no
# product checks:
# product checks:
# CONFIG_ARM_ERRATA_430973
# CONFIG_ARM_ERRATA_430973
# CONFIG_ARM_ERRATA_454179
# CONFIG_ARM_ERRATA_454179
...
@@ -332,7 +332,7 @@ config SYS_CACHELINE_SIZE
...
@@ -332,7 +332,7 @@ config SYS_CACHELINE_SIZE
config ARCH_CPU_INIT
config ARCH_CPU_INIT
bool "Enable ARCH_CPU_INIT"
bool "Enable ARCH_CPU_INIT"
help
help
Some architectures require a call to arch_cpu_init()
Some architectures require a call to arch_cpu_init()
.
Say Y here to enable it
Say Y here to enable it
config SYS_ARCH_TIMER
config SYS_ARCH_TIMER
...
@@ -342,7 +342,7 @@ config SYS_ARCH_TIMER
...
@@ -342,7 +342,7 @@ config SYS_ARCH_TIMER
help
help
The ARM Generic Timer (aka arch-timer) provides an architected
The ARM Generic Timer (aka arch-timer) provides an architected
interface to a timer source on an SoC.
interface to a timer source on an SoC.
It is manda
n
tory for ARMv8 implementation and widely available
It is mandatory for ARMv8 implementation and widely available
on ARMv7 systems.
on ARMv7 systems.
config ARM_SMCCC
config ARM_SMCCC
...
@@ -385,7 +385,7 @@ config TPL_SYS_THUMB_BUILD
...
@@ -385,7 +385,7 @@ config TPL_SYS_THUMB_BUILD
default y if SYS_THUMB_BUILD
default y if SYS_THUMB_BUILD
depends on TPL && !ARM64
depends on TPL && !ARM64
help
help
Use this flag to build
S
PL using the Thumb instruction set for
Use this flag to build
T
PL using the Thumb instruction set for
ARM architectures. Thumb instruction set provides better code
ARM architectures. Thumb instruction set provides better code
density. For ARM architectures that support Thumb2 this flag will
density. For ARM architectures that support Thumb2 this flag will
result in Thumb2 code generated by GCC.
result in Thumb2 code generated by GCC.
...
@@ -394,7 +394,7 @@ config TPL_SYS_THUMB_BUILD
...
@@ -394,7 +394,7 @@ config TPL_SYS_THUMB_BUILD
config SYS_L2CACHE_OFF
config SYS_L2CACHE_OFF
bool "L2cache off"
bool "L2cache off"
help
help
If SoC does not support L2CACHE or one do not want to enable
If SoC does not support L2CACHE or one do
es
not want to enable
L2CACHE, choose this option.
L2CACHE, choose this option.
config ENABLE_ARM_SOC_BOOT0_HOOK
config ENABLE_ARM_SOC_BOOT0_HOOK
...
@@ -414,7 +414,7 @@ config USE_ARCH_MEMCPY
...
@@ -414,7 +414,7 @@ config USE_ARCH_MEMCPY
depends on !ARM64
depends on !ARM64
help
help
Enable the generation of an optimized version of memcpy.
Enable the generation of an optimized version of memcpy.
Such implementation may be faster under some conditions
Such
an
implementation may be faster under some conditions
but may increase the binary size.
but may increase the binary size.
config SPL_USE_ARCH_MEMCPY
config SPL_USE_ARCH_MEMCPY
...
@@ -423,7 +423,7 @@ config SPL_USE_ARCH_MEMCPY
...
@@ -423,7 +423,7 @@ config SPL_USE_ARCH_MEMCPY
depends on !ARM64 && SPL
depends on !ARM64 && SPL
help
help
Enable the generation of an optimized version of memcpy.
Enable the generation of an optimized version of memcpy.
Such implementation may be faster under some conditions
Such
an
implementation may be faster under some conditions
but may increase the binary size.
but may increase the binary size.
config TPL_USE_ARCH_MEMCPY
config TPL_USE_ARCH_MEMCPY
...
@@ -432,7 +432,7 @@ config TPL_USE_ARCH_MEMCPY
...
@@ -432,7 +432,7 @@ config TPL_USE_ARCH_MEMCPY
depends on !ARM64 && TPL
depends on !ARM64 && TPL
help
help
Enable the generation of an optimized version of memcpy.
Enable the generation of an optimized version of memcpy.
Such implementation may be faster under some conditions
Such
an
implementation may be faster under some conditions
but may increase the binary size.
but may increase the binary size.
config USE_ARCH_MEMSET
config USE_ARCH_MEMSET
...
@@ -441,7 +441,7 @@ config USE_ARCH_MEMSET
...
@@ -441,7 +441,7 @@ config USE_ARCH_MEMSET
depends on !ARM64
depends on !ARM64
help
help
Enable the generation of an optimized version of memset.
Enable the generation of an optimized version of memset.
Such implementation may be faster under some conditions
Such
an
implementation may be faster under some conditions
but may increase the binary size.
but may increase the binary size.
config SPL_USE_ARCH_MEMSET
config SPL_USE_ARCH_MEMSET
...
@@ -450,7 +450,7 @@ config SPL_USE_ARCH_MEMSET
...
@@ -450,7 +450,7 @@ config SPL_USE_ARCH_MEMSET
depends on !ARM64 && SPL
depends on !ARM64 && SPL
help
help
Enable the generation of an optimized version of memset.
Enable the generation of an optimized version of memset.
Such implementation may be faster under some conditions
Such
an
implementation may be faster under some conditions
but may increase the binary size.
but may increase the binary size.
config TPL_USE_ARCH_MEMSET
config TPL_USE_ARCH_MEMSET
...
@@ -459,7 +459,7 @@ config TPL_USE_ARCH_MEMSET
...
@@ -459,7 +459,7 @@ config TPL_USE_ARCH_MEMSET
depends on !ARM64 && TPL
depends on !ARM64 && TPL
help
help
Enable the generation of an optimized version of memset.
Enable the generation of an optimized version of memset.
Such implementation may be faster under some conditions
Such
an
implementation may be faster under some conditions
but may increase the binary size.
but may increase the binary size.
config SET_STACK_SIZE
config SET_STACK_SIZE
...
@@ -467,14 +467,14 @@ config SET_STACK_SIZE
...
@@ -467,14 +467,14 @@ config SET_STACK_SIZE
default y if ARCH_VERSAL || ARCH_ZYNQMP
default y if ARCH_VERSAL || ARCH_ZYNQMP
help
help
This will enable an option to set max stack size that can be
This will enable an option to set max stack size that can be
used by
u-b
oot.
used by
U-B
oot.
config STACK_SIZE
config STACK_SIZE
hex "Define max stack size that can be used by
u-b
oot"
hex "Define max stack size that can be used by
U-B
oot"
depends on SET_STACK_SIZE
depends on SET_STACK_SIZE
default 0x4000000 if ARCH_VERSAL || ARCH_ZYNQMP
default 0x4000000 if ARCH_VERSAL || ARCH_ZYNQMP
help
help
Define
s Max stack size that can be used by u-b
oot so that the
Define
Max stack size that can be used by U-B
oot so that the
initrd_high will be calculated as base stack pointer minus this
initrd_high will be calculated as base stack pointer minus this
stack size.
stack size.
...
@@ -689,7 +689,7 @@ config TARGET_BCMNS2
...
@@ -689,7 +689,7 @@ config TARGET_BCMNS2
help
help
Support for Broadcom Northstar 2 SoCs. NS2 is a quad-core 64-bit
Support for Broadcom Northstar 2 SoCs. NS2 is a quad-core 64-bit
ARMv8 Cortex-A57 processors targeting a broad range of networking
ARMv8 Cortex-A57 processors targeting a broad range of networking
applications
applications
.
config ARCH_EXYNOS
config ARCH_EXYNOS
bool "Samsung EXYNOS"
bool "Samsung EXYNOS"
...
@@ -1101,8 +1101,8 @@ config TARGET_LS2080A_EMU
...
@@ -1101,8 +1101,8 @@ config TARGET_LS2080A_EMU
select ARMV8_MULTIENTRY
select ARMV8_MULTIENTRY
select FSL_DDR_SYNC_REFRESH
select FSL_DDR_SYNC_REFRESH
help
help
Support for Freescale LS2080A_EMU platform
Support for Freescale LS2080A_EMU platform
.
The LS2080A Development System (EMULATOR) is a pre
silicon
The LS2080A Development System (EMULATOR) is a pre
-
silicon
development platform that supports the QorIQ LS2080A
development platform that supports the QorIQ LS2080A
Layerscape Architecture processor.
Layerscape Architecture processor.
...
@@ -1114,7 +1114,7 @@ config TARGET_LS2080A_SIMU
...
@@ -1114,7 +1114,7 @@ config TARGET_LS2080A_SIMU
select ARMV8_MULTIENTRY
select ARMV8_MULTIENTRY
select BOARD_LATE_INIT
select BOARD_LATE_INIT
help
help
Support for Freescale LS2080A_SIMU platform
Support for Freescale LS2080A_SIMU platform
.
The LS2080A Development System (QDS) is a pre silicon
The LS2080A Development System (QDS) is a pre silicon
development platform that supports the QorIQ LS2080A
development platform that supports the QorIQ LS2080A
Layerscape Architecture processor.
Layerscape Architecture processor.
...
@@ -1130,7 +1130,7 @@ config TARGET_LS1088AQDS
...
@@ -1130,7 +1130,7 @@ config TARGET_LS1088AQDS
select SUPPORT_SPL
select SUPPORT_SPL
select FSL_DDR_INTERACTIVE if !SD_BOOT
select FSL_DDR_INTERACTIVE if !SD_BOOT
help
help
Support for NXP LS1088AQDS platform
Support for NXP LS1088AQDS platform
.
The LS1088A Development System (QDS) is a high-performance
The LS1088A Development System (QDS) is a high-performance
development platform that supports the QorIQ LS1088A
development platform that supports the QorIQ LS1088A
Layerscape Architecture processor.
Layerscape Architecture processor.
...
@@ -1149,7 +1149,7 @@ config TARGET_LS2080AQDS
...
@@ -1149,7 +1149,7 @@ config TARGET_LS2080AQDS
select FSL_DDR_BIST
select FSL_DDR_BIST
select FSL_DDR_INTERACTIVE if !SPL
select FSL_DDR_INTERACTIVE if !SPL
help
help
Support for Freescale LS2080AQDS platform
Support for Freescale LS2080AQDS platform
.
The LS2080A Development System (QDS) is a high-performance
The LS2080A Development System (QDS) is a high-performance
development platform that supports the QorIQ LS2080A
development platform that supports the QorIQ LS2080A
Layerscape Architecture processor.
Layerscape Architecture processor.
...
@@ -1649,7 +1649,7 @@ config TFABOOT
...
@@ -1649,7 +1649,7 @@ config TFABOOT
default n
default n
help
help
Enabling this will make a U-Boot binary that is capable of being
Enabling this will make a U-Boot binary that is capable of being
booted via TF-A.
booted via TF-A
(Trusted Firmware for Cortex-A)
.
config TI_SECURE_DEVICE
config TI_SECURE_DEVICE
bool "HS Device Type Support"
bool "HS Device Type Support"
...
...
test/py/tests/test_env.py
浏览文件 @
13ef1165
...
@@ -49,7 +49,7 @@ class StateTestEnv(object):
...
@@ -49,7 +49,7 @@ class StateTestEnv(object):
for
l
in
response
.
splitlines
():
for
l
in
response
.
splitlines
():
if
not
'='
in
l
:
if
not
'='
in
l
:
continue
continue
(
var
,
value
)
=
l
.
s
trip
().
s
plit
(
'='
,
1
)
(
var
,
value
)
=
l
.
split
(
'='
,
1
)
self
.
env
[
var
]
=
value
self
.
env
[
var
]
=
value
def
get_existent_var
(
self
):
def
get_existent_var
(
self
):
...
...
test/py/tests/test_handoff.py
浏览文件 @
13ef1165
...
@@ -6,7 +6,7 @@ import pytest
...
@@ -6,7 +6,7 @@ import pytest
# Magic number to check that SPL handoff is working
# Magic number to check that SPL handoff is working
TEST_HANDOFF_MAGIC
=
0x14f93c7b
TEST_HANDOFF_MAGIC
=
0x14f93c7b
@
pytest
.
mark
.
boardspec
(
'sandbox'
)
@
pytest
.
mark
.
boardspec
(
'sandbox
_spl
'
)
@
pytest
.
mark
.
buildconfigspec
(
'spl'
)
@
pytest
.
mark
.
buildconfigspec
(
'spl'
)
def
test_handoff
(
u_boot_console
):
def
test_handoff
(
u_boot_console
):
"""Test that of-platdata can be generated and used in sandbox"""
"""Test that of-platdata can be generated and used in sandbox"""
...
...
tools/.gitignore
浏览文件 @
13ef1165
/asn1_compiler
/atmel_pmecc_params
/atmel_pmecc_params
/bin2header
/bin2header
/bmp_logo
/bmp_logo
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录