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
48eccbc2
Unverified
Commit
48eccbc2
authored
6 years ago
by
Antonio Niño Díaz
Committed by
GitHub
6 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #1802 from oscardagrach/master
hikey960: EDMAC: leave channel 0 as secure
parents
f7bf9b0d
96034263
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
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
plat/hisilicon/hikey960/hikey960_bl31_setup.c
+2
-1
plat/hisilicon/hikey960/hikey960_bl31_setup.c
with
2 additions
and
1 deletion
+2
-1
plat/hisilicon/hikey960/hikey960_bl31_setup.c
View file @
48eccbc2
...
...
@@ -154,7 +154,8 @@ static void hikey960_edma_init(void)
non_secure
=
EDMAC_SEC_CTRL_INTR_SEC
|
EDMAC_SEC_CTRL_GLOBAL_SEC
;
mmio_write_32
(
EDMAC_SEC_CTRL
,
non_secure
);
for
(
i
=
0
;
i
<
EDMAC_CHANNEL_NUMS
;
i
++
)
{
/* Channel 0 is reserved for LPM3, keep secure */
for
(
i
=
1
;
i
<
EDMAC_CHANNEL_NUMS
;
i
++
)
{
mmio_write_32
(
EDMAC_AXI_CONF
(
i
),
(
1
<<
6
)
|
(
1
<<
18
));
}
}
...
...
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