Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
b641fe01
Commit
b641fe01
authored
Dec 12, 2006
by
Paul Mundt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sh: Use early_param() for earlyprintk parsing.
Signed-off-by:
Paul Mundt
<
lethal@linux-sh.org
>
parent
e2dfb912
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
31 deletions
+16
-31
arch/sh/kernel/early_printk.c
arch/sh/kernel/early_printk.c
+11
-9
arch/sh/kernel/setup.c
arch/sh/kernel/setup.c
+5
-22
No files found.
arch/sh/kernel/early_printk.c
View file @
b641fe01
...
...
@@ -144,16 +144,16 @@ static struct console *early_console =
;
static
int
__initdata
keep_early
;
static
int
early_console_initialized
;
int
__init
setup_early_printk
(
char
*
opt
)
int
__init
setup_early_printk
(
char
*
buf
)
{
char
*
space
;
char
buf
[
256
]
;
if
(
!
buf
)
return
0
;
strlcpy
(
buf
,
opt
,
sizeof
(
buf
));
space
=
strchr
(
buf
,
' '
);
if
(
space
)
*
space
=
0
;
if
(
early_console_initialized
)
return
0
;
early_console_initialized
=
1
;
if
(
strstr
(
buf
,
"keep"
))
keep_early
=
1
;
...
...
@@ -175,12 +175,14 @@ int __init setup_early_printk(char *opt)
if
(
likely
(
early_console
))
register_console
(
early_console
);
return
1
;
return
0
;
}
__setup
(
"earlyprintk=
"
,
setup_early_printk
);
early_param
(
"earlyprintk
"
,
setup_early_printk
);
void
__init
disable_early_printk
(
void
)
{
if
(
!
early_console_initialized
||
!
early_console
)
return
;
if
(
!
keep_early
)
{
printk
(
"disabling early console
\n
"
);
unregister_console
(
early_console
);
...
...
arch/sh/kernel/setup.c
View file @
b641fe01
...
...
@@ -84,8 +84,7 @@ unsigned long memory_start, memory_end;
static
inline
void
parse_cmdline
(
char
**
cmdline_p
,
char
mv_name
[
MV_NAME_SIZE
],
struct
sh_machine_vector
**
mvp
,
unsigned
long
*
mv_io_base
,
int
*
mv_mmio_enable
)
unsigned
long
*
mv_io_base
)
{
char
c
=
' '
,
*
to
=
command_line
,
*
from
=
COMMAND_LINE
;
int
len
=
0
;
...
...
@@ -112,23 +111,6 @@ static inline void parse_cmdline (char ** cmdline_p, char mv_name[MV_NAME_SIZE],
}
}
#ifdef CONFIG_EARLY_PRINTK
if
(
c
==
' '
&&
!
memcmp
(
from
,
"earlyprintk="
,
12
))
{
char
*
ep_end
;
if
(
to
!=
command_line
)
to
--
;
from
+=
12
;
ep_end
=
strchr
(
from
,
' '
);
setup_early_printk
(
from
);
printk
(
"early console enabled
\n
"
);
from
=
ep_end
;
}
#endif
if
(
c
==
' '
&&
!
memcmp
(
from
,
"sh_mv="
,
6
))
{
char
*
mv_end
;
char
*
mv_comma
;
...
...
@@ -145,7 +127,6 @@ static inline void parse_cmdline (char ** cmdline_p, char mv_name[MV_NAME_SIZE],
int
ints
[
3
];
get_options
(
mv_comma
+
1
,
ARRAY_SIZE
(
ints
),
ints
);
*
mv_io_base
=
ints
[
1
];
*
mv_mmio_enable
=
ints
[
2
];
mv_len
=
mv_comma
-
from
;
}
else
{
mv_len
=
mv_end
-
from
;
...
...
@@ -158,6 +139,7 @@ static inline void parse_cmdline (char ** cmdline_p, char mv_name[MV_NAME_SIZE],
*
mvp
=
get_mv_byname
(
mv_name
);
}
c
=
*
(
from
++
);
if
(
!
c
)
break
;
...
...
@@ -177,9 +159,8 @@ static int __init sh_mv_setup(char **cmdline_p)
struct
sh_machine_vector
*
mv
=
NULL
;
char
mv_name
[
MV_NAME_SIZE
]
=
""
;
unsigned
long
mv_io_base
=
0
;
int
mv_mmio_enable
=
0
;
parse_cmdline
(
cmdline_p
,
mv_name
,
&
mv
,
&
mv_io_base
,
&
mv_mmio_enable
);
parse_cmdline
(
cmdline_p
,
mv_name
,
&
mv
,
&
mv_io_base
);
#ifdef CONFIG_SH_UNKNOWN
if
(
mv
==
NULL
)
{
...
...
@@ -258,6 +239,7 @@ void __init setup_arch(char **cmdline_p)
sh_mv_setup
(
cmdline_p
);
/*
* Find the highest page frame number we have available
*/
...
...
@@ -305,6 +287,7 @@ void __init setup_arch(char **cmdline_p)
PFN_PHYS
(
pages
));
}
/*
* Reserve the kernel text and
* Reserve the bootmem bitmap. We do this in two steps (first step
...
...
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