Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
reform-boundary-uboot
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jack Humbert
reform-boundary-uboot
Commits
4d13b1b7
Commit
4d13b1b7
authored
10 years ago
by
Masahiro Yamada
Browse files
Options
Downloads
Patches
Plain Diff
ARM: UniPhier: fix typos in comments
Signed-off-by:
Masahiro Yamada
<
yamada.masahiro@socionext.com
>
parent
def3feb8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
arch/arm/mach-uniphier/lowlevel_init.S
+7
-7
7 additions, 7 deletions
arch/arm/mach-uniphier/lowlevel_init.S
arch/arm/mach-uniphier/support_card.c
+6
-5
6 additions, 5 deletions
arch/arm/mach-uniphier/support_card.c
with
13 additions
and
12 deletions
arch/arm/mach-uniphier/lowlevel_init.S
+
7
−
7
View file @
4d13b1b7
...
@@ -25,8 +25,8 @@ ENTRY(lowlevel_init)
...
@@ -25,8 +25,8 @@ ENTRY(lowlevel_init)
*
First
we
need
to
turn
on
MMU
and
Dcache
again
to
get
back
*
First
we
need
to
turn
on
MMU
and
Dcache
again
to
get
back
*
data
access
to
L2
.
*
data
access
to
L2
.
*/
*/
mrc
p15
,
0
,
r0
,
c1
,
c0
,
0
@
SCTLR
(
System
Contrl
Register
)
mrc
p15
,
0
,
r0
,
c1
,
c0
,
0
@
SCTLR
(
System
Contr
o
l
Register
)
orr
r0
,
r0
,
#(
CR_C
|
CR_M
)
@
enable
MMU
and
Dcache
orr
r0
,
r0
,
#(
CR_C
|
CR_M
)
@
enable
MMU
and
Dcache
mcr
p15
,
0
,
r0
,
c1
,
c0
,
0
mcr
p15
,
0
,
r0
,
c1
,
c0
,
0
#ifdef CONFIG_DEBUG_LL
#ifdef CONFIG_DEBUG_LL
...
@@ -41,7 +41,7 @@ ENTRY(lowlevel_init)
...
@@ -41,7 +41,7 @@ ENTRY(lowlevel_init)
ldr
r3
,
=
init_page_table
@
page
table
must
be
16
KB
aligned
ldr
r3
,
=
init_page_table
@
page
table
must
be
16
KB
aligned
/
*
Disable
MMU
and
Dcache
before
switching
Page
Table
*/
/
*
Disable
MMU
and
Dcache
before
switching
Page
Table
*/
mrc
p15
,
0
,
r0
,
c1
,
c0
,
0
@
SCTLR
(
System
Contrl
Register
)
mrc
p15
,
0
,
r0
,
c1
,
c0
,
0
@
SCTLR
(
System
Contr
o
l
Register
)
bic
r0
,
r0
,
#(
CR_C
|
CR_M
)
@
disable
MMU
and
Dcache
bic
r0
,
r0
,
#(
CR_C
|
CR_M
)
@
disable
MMU
and
Dcache
mcr
p15
,
0
,
r0
,
c1
,
c0
,
0
mcr
p15
,
0
,
r0
,
c1
,
c0
,
0
...
@@ -55,7 +55,7 @@ ENTRY(lowlevel_init)
...
@@ -55,7 +55,7 @@ ENTRY(lowlevel_init)
*
bit
[
7
]
EXCL
(
Exclusive
cache
bit
)
*
bit
[
7
]
EXCL
(
Exclusive
cache
bit
)
*
bit
[
6
]
SMP
*
bit
[
6
]
SMP
*
bit
[
3
]
Write
full
line
of
zeros
mode
*
bit
[
3
]
Write
full
line
of
zeros
mode
*
bit
[
2
]
L1
P
refetch
enable
*
bit
[
2
]
L1
p
refetch
enable
*
bit
[
1
]
L2
prefetch
enable
*
bit
[
1
]
L2
prefetch
enable
*
bit
[
0
]
FW
(
Cache
and
TLB
maintenance
broadcast
)
*
bit
[
0
]
FW
(
Cache
and
TLB
maintenance
broadcast
)
*/
*/
...
@@ -81,7 +81,7 @@ primary_cpu:
...
@@ -81,7 +81,7 @@ primary_cpu:
ldr
r0
,
=
_start
@
entry
for
the
secondary
CPU
ldr
r0
,
=
_start
@
entry
for
the
secondary
CPU
str
r0
,
[
r1
]
str
r0
,
[
r1
]
ldr
r0
,
[
r1
]
@
make
sure
str
is
complete
before
sev
ldr
r0
,
[
r1
]
@
make
sure
str
is
complete
before
sev
sev
@
kick
the
se
d
on
c
ary
CPU
sev
@
kick
the
se
c
on
d
ary
CPU
mrc
p15
,
4
,
r1
,
c15
,
c0
,
0
@
Configuration
Base
Address
Register
mrc
p15
,
4
,
r1
,
c15
,
c0
,
0
@
Configuration
Base
Address
Register
bfc
r1
,
#
0
,
#
13
@
clear
bit
12
-
0
bfc
r1
,
#
0
,
#
13
@
clear
bit
12
-
0
mov
r0
,
#-
1
mov
r0
,
#-
1
...
@@ -118,7 +118,7 @@ ENTRY(enable_mmu)
...
@@ -118,7 +118,7 @@ ENTRY(enable_mmu)
*
TLBs
was
already
invalidated
in
"../start.S"
*
TLBs
was
already
invalidated
in
"../start.S"
*
So
,
we
don
't need to invalidate it here.
*
So
,
we
don
't need to invalidate it here.
*/
*/
mrc
p15
,
0
,
r0
,
c1
,
c0
,
0
@
SCTLR
(
System
Contrl
Register
)
mrc
p15
,
0
,
r0
,
c1
,
c0
,
0
@
SCTLR
(
System
Contr
o
l
Register
)
orr
r0
,
r0
,
#(
CR_C
|
CR_M
)
@
MMU
and
Dcache
enable
orr
r0
,
r0
,
#(
CR_C
|
CR_M
)
@
MMU
and
Dcache
enable
mcr
p15
,
0
,
r0
,
c1
,
c0
,
0
mcr
p15
,
0
,
r0
,
c1
,
c0
,
0
...
@@ -155,7 +155,7 @@ ENTRY(setup_init_ram)
...
@@ -155,7 +155,7 @@ ENTRY(setup_init_ram)
ldr
r1
,
=
SSCOPPQSEF
ldr
r1
,
=
SSCOPPQSEF
ldr
r0
,
[
r1
]
ldr
r0
,
[
r1
]
cmp
r0
,
#
0
@
check
if
the
command
is
successfully
set
cmp
r0
,
#
0
@
check
if
the
command
is
successfully
set
bne
0
b
@
try
again
if
an
error
occur
re
s
bne
0
b
@
try
again
if
an
error
occurs
ldr
r1
,
=
SSCOLPQS
ldr
r1
,
=
SSCOLPQS
1
:
1
:
...
...
This diff is collapsed.
Click to expand it.
arch/arm/mach-uniphier/support_card.c
+
6
−
5
View file @
4d13b1b7
/*
/*
* Copyright (C) 2012-2014 Panasonic Corporation
* Copyright (C) 2012-2015 Panasonic Corporation
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
* Copyright (C) 2015 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*
*
* SPDX-License-Identifier: GPL-2.0+
* SPDX-License-Identifier: GPL-2.0+
*/
*/
...
@@ -94,7 +95,7 @@ void support_card_init(void)
...
@@ -94,7 +95,7 @@ void support_card_init(void)
/*
/*
* After power on, we need to keep the LAN controller in reset state
* After power on, we need to keep the LAN controller in reset state
* for a while. (200 usec)
* for a while. (200 usec)
* Fortunatel
l
y, enough wait time is already inserted in pll_init()
* Fortunately, enough wait time is already inserted in pll_init()
* function. So we do not have to wait here.
* function. So we do not have to wait here.
*/
*/
support_card_reset_deassert
();
support_card_reset_deassert
();
...
@@ -213,11 +214,11 @@ static void detect_num_flash_banks(void)
...
@@ -213,11 +214,11 @@ static void detect_num_flash_banks(void)
debug
(
"number of flash banks: %d
\n
"
,
cfi_flash_num_flash_banks
);
debug
(
"number of flash banks: %d
\n
"
,
cfi_flash_num_flash_banks
);
}
}
#else
/* ONFIG_SYS_NO_FLASH */
#else
/*
C
ONFIG_SYS_NO_FLASH */
void
detect_num_flash_banks
(
void
)
void
detect_num_flash_banks
(
void
)
{
{
};
};
#endif
/* ONFIG_SYS_NO_FLASH */
#endif
/*
C
ONFIG_SYS_NO_FLASH */
void
support_card_late_init
(
void
)
void
support_card_late_init
(
void
)
{
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment