Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
ec413b88
Commit
ec413b88
authored
8 years ago
by
davidcunado-arm
Committed by
GitHub
8 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #716 from yatharth-arm/yk/AArch32_porting
AArch32: Fix detection of virtualization support
parents
06fbe472
fabf3017
master
v2.5
v2.5-rc1
v2.5-rc0
v2.4
v2.4-rc2
v2.4-rc1
v2.4-rc0
v2.3
v2.3-rc2
v2.3-rc1
v2.3-rc0
v2.2
v2.2-rc2
v2.2-rc1
v2.2-rc0
v2.1
v2.1-rc1
v2.1-rc0
v2.0
v2.0-rc0
v1.6
v1.6-rc1
v1.6-rc0
v1.5
v1.5-rc3
v1.5-rc2
v1.5-rc1
v1.5-rc0
v1.4
v1.4-rc0
v1.3
v1.3_rc2
v1.3_rc1
arm_cca_v0.2
arm_cca_v0.1
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bl1/aarch32/bl1_context_mgmt.c
+1
-1
bl1/aarch32/bl1_context_mgmt.c
with
1 addition
and
1 deletion
+1
-1
bl1/aarch32/bl1_context_mgmt.c
View file @
ec413b88
...
@@ -142,7 +142,7 @@ void bl1_prepare_next_image(unsigned int image_id)
...
@@ -142,7 +142,7 @@ void bl1_prepare_next_image(unsigned int image_id)
SPSR_E_LITTLE
,
DISABLE_ALL_EXCEPTIONS
);
SPSR_E_LITTLE
,
DISABLE_ALL_EXCEPTIONS
);
}
else
{
}
else
{
/* Use HYP mode if supported else use SVC. */
/* Use HYP mode if supported else use SVC. */
if
(
GET_VIRT_EXT
(
read_id_pfr1
())
==
MODE32_hyp
)
{
if
(
GET_VIRT_EXT
(
read_id_pfr1
()))
{
next_bl_ep
->
spsr
=
SPSR_MODE32
(
MODE32_hyp
,
SPSR_T_ARM
,
next_bl_ep
->
spsr
=
SPSR_MODE32
(
MODE32_hyp
,
SPSR_T_ARM
,
SPSR_E_LITTLE
,
DISABLE_ALL_EXCEPTIONS
);
SPSR_E_LITTLE
,
DISABLE_ALL_EXCEPTIONS
);
}
else
{
}
else
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help