Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
d797ebd3
Commit
d797ebd3
authored
May 07, 2002
by
Russell King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ARM] Localise old param_struct to arch/arm/kernel/compat.c.
parent
1688e82a
Changes
41
Hide whitespace changes
Inline
Side-by-side
Showing
41 changed files
with
182 additions
and
194 deletions
+182
-194
arch/arm/kernel/compat.c
arch/arm/kernel/compat.c
+110
-13
arch/arm/kernel/setup.c
arch/arm/kernel/setup.c
+31
-22
arch/arm/mach-adifcc/arch.c
arch/arm/mach-adifcc/arch.c
+1
-1
arch/arm/mach-anakin/arch.c
arch/arm/mach-anakin/arch.c
+1
-1
arch/arm/mach-clps711x/cdb89712.c
arch/arm/mach-clps711x/cdb89712.c
+1
-1
arch/arm/mach-clps711x/clep7312.c
arch/arm/mach-clps711x/clep7312.c
+1
-1
arch/arm/mach-clps711x/edb7211-arch.c
arch/arm/mach-clps711x/edb7211-arch.c
+1
-1
arch/arm/mach-clps711x/fortunet.c
arch/arm/mach-clps711x/fortunet.c
+1
-1
arch/arm/mach-clps711x/p720t.c
arch/arm/mach-clps711x/p720t.c
+1
-3
arch/arm/mach-epxa10db/arch.c
arch/arm/mach-epxa10db/arch.c
+1
-1
arch/arm/mach-footbridge/arch.c
arch/arm/mach-footbridge/arch.c
+3
-32
arch/arm/mach-integrator/arch.c
arch/arm/mach-integrator/arch.c
+1
-1
arch/arm/mach-iop310/arch.c
arch/arm/mach-iop310/arch.c
+1
-1
arch/arm/mach-l7200/core.c
arch/arm/mach-l7200/core.c
+1
-1
arch/arm/mach-pxa/idp.c
arch/arm/mach-pxa/idp.c
+1
-1
arch/arm/mach-pxa/lubbock.c
arch/arm/mach-pxa/lubbock.c
+1
-1
arch/arm/mach-rpc/riscpc.c
arch/arm/mach-rpc/riscpc.c
+1
-1
arch/arm/mach-sa1100/adsbitsy.c
arch/arm/mach-sa1100/adsbitsy.c
+1
-1
arch/arm/mach-sa1100/assabet.c
arch/arm/mach-sa1100/assabet.c
+2
-10
arch/arm/mach-sa1100/badge4.c
arch/arm/mach-sa1100/badge4.c
+0
-8
arch/arm/mach-sa1100/brutus.c
arch/arm/mach-sa1100/brutus.c
+1
-1
arch/arm/mach-sa1100/cerf.c
arch/arm/mach-sa1100/cerf.c
+1
-1
arch/arm/mach-sa1100/empeg.c
arch/arm/mach-sa1100/empeg.c
+1
-1
arch/arm/mach-sa1100/flexanet.c
arch/arm/mach-sa1100/flexanet.c
+1
-5
arch/arm/mach-sa1100/freebird.c
arch/arm/mach-sa1100/freebird.c
+1
-1
arch/arm/mach-sa1100/graphicsclient.c
arch/arm/mach-sa1100/graphicsclient.c
+1
-1
arch/arm/mach-sa1100/graphicsmaster.c
arch/arm/mach-sa1100/graphicsmaster.c
+1
-1
arch/arm/mach-sa1100/huw_webpanel.c
arch/arm/mach-sa1100/huw_webpanel.c
+1
-1
arch/arm/mach-sa1100/itsy.c
arch/arm/mach-sa1100/itsy.c
+1
-1
arch/arm/mach-sa1100/jornada720.c
arch/arm/mach-sa1100/jornada720.c
+1
-1
arch/arm/mach-sa1100/nanoengine.c
arch/arm/mach-sa1100/nanoengine.c
+1
-1
arch/arm/mach-sa1100/omnimeter.c
arch/arm/mach-sa1100/omnimeter.c
+1
-1
arch/arm/mach-sa1100/pangolin.c
arch/arm/mach-sa1100/pangolin.c
+1
-1
arch/arm/mach-sa1100/pfs168.c
arch/arm/mach-sa1100/pfs168.c
+1
-1
arch/arm/mach-sa1100/pleb.c
arch/arm/mach-sa1100/pleb.c
+1
-1
arch/arm/mach-sa1100/sherman.c
arch/arm/mach-sa1100/sherman.c
+1
-1
arch/arm/mach-sa1100/simpad.c
arch/arm/mach-sa1100/simpad.c
+1
-1
arch/arm/mach-sa1100/system3.c
arch/arm/mach-sa1100/system3.c
+2
-4
arch/arm/mach-sa1100/victor.c
arch/arm/mach-sa1100/victor.c
+1
-1
arch/arm/mach-sa1100/xp860.c
arch/arm/mach-sa1100/xp860.c
+1
-1
include/asm-arm/setup.h
include/asm-arm/setup.h
+0
-65
No files found.
arch/arm/kernel/compat.c
View file @
d797ebd3
...
@@ -9,6 +9,11 @@
...
@@ -9,6 +9,11 @@
*
*
* We keep the old params compatibility cruft in one place (here)
* We keep the old params compatibility cruft in one place (here)
* so we don't end up with lots of mess around other places.
* so we don't end up with lots of mess around other places.
*
* NOTE:
* The old struct param_struct is deprecated, but it will be kept in
* the kernel for 5 years from now (2001). This will allow boot loaders
* to convert to the new struct tag way.
*/
*/
#include <linux/config.h>
#include <linux/config.h>
#include <linux/types.h>
#include <linux/types.h>
...
@@ -22,6 +27,59 @@
...
@@ -22,6 +27,59 @@
#include <asm/mach/arch.h>
#include <asm/mach/arch.h>
/*
* Usage:
* - do not go blindly adding fields, add them at the end
* - when adding fields, don't rely on the address until
* a patch from me has been released
* - unused fields should be zero (for future expansion)
* - this structure is relatively short-lived - only
* guaranteed to contain useful data in setup_arch()
*
* This is the old deprecated way to pass parameters to the kernel
*/
struct
param_struct
{
union
{
struct
{
unsigned
long
page_size
;
/* 0 */
unsigned
long
nr_pages
;
/* 4 */
unsigned
long
ramdisk_size
;
/* 8 */
unsigned
long
flags
;
/* 12 */
#define FLAG_READONLY 1
#define FLAG_RDLOAD 4
#define FLAG_RDPROMPT 8
unsigned
long
rootdev
;
/* 16 */
unsigned
long
video_num_cols
;
/* 20 */
unsigned
long
video_num_rows
;
/* 24 */
unsigned
long
video_x
;
/* 28 */
unsigned
long
video_y
;
/* 32 */
unsigned
long
memc_control_reg
;
/* 36 */
unsigned
char
sounddefault
;
/* 40 */
unsigned
char
adfsdrives
;
/* 41 */
unsigned
char
bytes_per_char_h
;
/* 42 */
unsigned
char
bytes_per_char_v
;
/* 43 */
unsigned
long
pages_in_bank
[
4
];
/* 44 */
unsigned
long
pages_in_vram
;
/* 60 */
unsigned
long
initrd_start
;
/* 64 */
unsigned
long
initrd_size
;
/* 68 */
unsigned
long
rd_start
;
/* 72 */
unsigned
long
system_rev
;
/* 76 */
unsigned
long
system_serial_low
;
/* 80 */
unsigned
long
system_serial_high
;
/* 84 */
unsigned
long
mem_fclk_21285
;
/* 88 */
}
s
;
char
unused
[
256
];
}
u1
;
union
{
char
paths
[
8
][
128
];
struct
{
unsigned
long
magic
;
char
n
[
1024
-
sizeof
(
unsigned
long
)];
}
s
;
}
u2
;
char
commandline
[
COMMAND_LINE_SIZE
];
};
static
struct
tag
*
__init
memtag
(
struct
tag
*
tag
,
unsigned
long
start
,
unsigned
long
size
)
static
struct
tag
*
__init
memtag
(
struct
tag
*
tag
,
unsigned
long
start
,
unsigned
long
size
)
{
{
tag
=
tag_next
(
tag
);
tag
=
tag_next
(
tag
);
...
@@ -33,7 +91,7 @@ static struct tag * __init memtag(struct tag *tag, unsigned long start, unsigned
...
@@ -33,7 +91,7 @@ static struct tag * __init memtag(struct tag *tag, unsigned long start, unsigned
return
tag
;
return
tag
;
}
}
static
void
__init
build_tag_list
(
struct
param_struct
*
params
,
void
*
taglist
,
int
mem_init
)
static
void
__init
build_tag_list
(
struct
param_struct
*
params
,
void
*
taglist
)
{
{
struct
tag
*
tag
=
taglist
;
struct
tag
*
tag
=
taglist
;
...
@@ -44,6 +102,22 @@ static void __init build_tag_list(struct param_struct *params, void *taglist, in
...
@@ -44,6 +102,22 @@ static void __init build_tag_list(struct param_struct *params, void *taglist, in
"trying to continue
\n
"
);
"trying to continue
\n
"
);
return
;
return
;
}
}
#ifdef CONFIG_ARCH_NETWINDER
if
(
params
->
u1
.
s
.
nr_pages
!=
0x02000
&&
params
->
u1
.
s
.
nr_pages
!=
0x04000
&&
params
->
u1
.
s
.
nr_pages
!=
0x08000
&&
params
->
u1
.
s
.
nr_pages
!=
0x10000
)
{
printk
(
KERN_WARNING
"Warning: bad NeTTrom parameters "
"detected, using defaults
\n
"
);
params
->
u1
.
s
.
nr_pages
=
0x1000
;
/* 16MB */
params
->
u1
.
s
.
ramdisk_size
=
0
;
params
->
u1
.
s
.
flags
=
FLAG_READONLY
;
params
->
u1
.
s
.
initrd_start
=
0
;
params
->
u1
.
s
.
initrd_size
=
0
;
params
->
u1
.
s
.
rd_start
=
0
;
}
#endif
tag
->
hdr
.
tag
=
ATAG_CORE
;
tag
->
hdr
.
tag
=
ATAG_CORE
;
tag
->
hdr
.
size
=
tag_size
(
tag_core
);
tag
->
hdr
.
size
=
tag_size
(
tag_core
);
...
@@ -76,17 +150,15 @@ static void __init build_tag_list(struct param_struct *params, void *taglist, in
...
@@ -76,17 +150,15 @@ static void __init build_tag_list(struct param_struct *params, void *taglist, in
tag
->
hdr
.
size
=
tag_size
(
tag_revision
);
tag
->
hdr
.
size
=
tag_size
(
tag_revision
);
tag
->
u
.
revision
.
rev
=
params
->
u1
.
s
.
system_rev
;
tag
->
u
.
revision
.
rev
=
params
->
u1
.
s
.
system_rev
;
if
(
mem_init
)
{
#ifdef CONFIG_ARCH_ACORN
#ifdef CONFIG_ARCH_ACORN
if
(
machine_is_riscpc
())
{
if
(
machine_is_riscpc
())
{
int
i
;
int
i
;
for
(
i
=
0
;
i
<
4
;
i
++
)
for
(
i
=
0
;
i
<
4
;
i
++
)
tag
=
memtag
(
tag
,
PHYS_OFFSET
+
(
i
<<
26
),
tag
=
memtag
(
tag
,
PHYS_OFFSET
+
(
i
<<
26
),
params
->
u1
.
s
.
pages_in_bank
[
i
]
*
PAGE_SIZE
);
params
->
u1
.
s
.
pages_in_bank
[
i
]
*
PAGE_SIZE
);
}
else
}
else
#endif
#endif
tag
=
memtag
(
tag
,
PHYS_OFFSET
,
params
->
u1
.
s
.
nr_pages
*
PAGE_SIZE
);
tag
=
memtag
(
tag
,
PHYS_OFFSET
,
params
->
u1
.
s
.
nr_pages
*
PAGE_SIZE
);
}
#ifdef CONFIG_FOOTBRIDGE
#ifdef CONFIG_FOOTBRIDGE
if
(
params
->
u1
.
s
.
mem_fclk_21285
)
{
if
(
params
->
u1
.
s
.
mem_fclk_21285
)
{
...
@@ -97,6 +169,23 @@ static void __init build_tag_list(struct param_struct *params, void *taglist, in
...
@@ -97,6 +169,23 @@ static void __init build_tag_list(struct param_struct *params, void *taglist, in
}
}
#endif
#endif
#ifdef CONFIG_ARCH_EBSA285
if
(
machine_is_ebsa285
())
{
tag
=
tag_next
(
tag
);
tag
->
hdr
.
tag
=
ATAG_VIDEOTEXT
;
tag
->
hdr
.
size
=
tag_size
(
tag_videotext
);
tag
->
u
.
videotext
.
x
=
params
->
u1
.
s
.
video_x
;
tag
->
u
.
videotext
.
y
=
params
->
u1
.
s
.
video_y
;
tag
->
u
.
videotext
.
video_page
=
0
;
tag
->
u
.
videotext
.
video_mode
=
0
;
tag
->
u
.
videotext
.
video_cols
=
params
->
u1
.
s
.
video_num_cols
;
tag
->
u
.
videotext
.
video_ega_bx
=
0
;
tag
->
u
.
videotext
.
video_lines
=
params
->
u1
.
s
.
video_num_rows
;
tag
->
u
.
videotext
.
video_isvga
=
1
;
tag
->
u
.
videotext
.
video_points
=
8
;
}
#endif
#ifdef CONFIG_ARCH_ACORN
#ifdef CONFIG_ARCH_ACORN
tag
=
tag_next
(
tag
);
tag
=
tag_next
(
tag
);
tag
->
hdr
.
tag
=
ATAG_ACORN
;
tag
->
hdr
.
tag
=
ATAG_ACORN
;
...
@@ -114,14 +203,22 @@ static void __init build_tag_list(struct param_struct *params, void *taglist, in
...
@@ -114,14 +203,22 @@ static void __init build_tag_list(struct param_struct *params, void *taglist, in
strcpy
(
tag
->
u
.
cmdline
.
cmdline
,
params
->
commandline
);
strcpy
(
tag
->
u
.
cmdline
.
cmdline
,
params
->
commandline
);
tag
=
tag_next
(
tag
);
tag
=
tag_next
(
tag
);
tag
->
hdr
.
tag
=
0
;
tag
->
hdr
.
tag
=
ATAG_NONE
;
tag
->
hdr
.
size
=
0
;
tag
->
hdr
.
size
=
0
;
memmove
(
params
,
taglist
,
((
int
)
tag
)
-
((
int
)
taglist
)
+
memmove
(
params
,
taglist
,
((
int
)
tag
)
-
((
int
)
taglist
)
+
sizeof
(
struct
tag_header
));
sizeof
(
struct
tag_header
));
}
}
void
__init
convert_to_tag_list
(
struct
param_struct
*
params
,
int
mem_init
)
void
__init
convert_to_tag_list
(
struct
tag
*
tags
)
{
struct
param_struct
*
params
=
(
struct
param_struct
*
)
tags
;
build_tag_list
(
params
,
&
params
->
u2
);
}
void
__init
squash_mem_tags
(
struct
tag
*
tag
)
{
{
build_tag_list
(
params
,
&
params
->
u2
,
mem_init
);
for
(;
tag
->
hdr
.
size
;
tag
=
tag_next
(
tag
))
if
(
tag
->
hdr
.
tag
==
ATAG_MEM
)
tag
->
hdr
.
tag
=
ATAG_NONE
;
}
}
arch/arm/kernel/setup.c
View file @
d797ebd3
...
@@ -57,7 +57,8 @@ __setup("fpe=", fpe_setup);
...
@@ -57,7 +57,8 @@ __setup("fpe=", fpe_setup);
extern
unsigned
int
mem_fclk_21285
;
extern
unsigned
int
mem_fclk_21285
;
extern
void
paging_init
(
struct
meminfo
*
,
struct
machine_desc
*
desc
);
extern
void
paging_init
(
struct
meminfo
*
,
struct
machine_desc
*
desc
);
extern
void
convert_to_tag_list
(
struct
param_struct
*
params
,
int
mem_init
);
extern
void
convert_to_tag_list
(
struct
tag
*
tags
);
extern
void
squash_mem_tags
(
struct
tag
*
tag
);
extern
void
bootmem_init
(
struct
meminfo
*
);
extern
void
bootmem_init
(
struct
meminfo
*
);
extern
void
reboot_setup
(
char
*
str
);
extern
void
reboot_setup
(
char
*
str
);
extern
int
root_mountflags
;
extern
int
root_mountflags
;
...
@@ -589,14 +590,29 @@ static void __init parse_tags(const struct tag *t)
...
@@ -589,14 +590,29 @@ static void __init parse_tags(const struct tag *t)
t
->
hdr
.
tag
);
t
->
hdr
.
tag
);
}
}
/*
* This holds our defaults.
*/
static
struct
init_tags
{
struct
tag_header
hdr1
;
struct
tag_core
core
;
struct
tag_header
hdr2
;
struct
tag_mem32
mem
;
struct
tag_header
hdr3
;
}
init_tags
__initdata
=
{
{
tag_size
(
tag_core
),
ATAG_CORE
},
{
1
,
PAGE_SIZE
,
0xff
},
{
tag_size
(
tag_mem32
),
ATAG_MEM
},
{
MEM_SIZE
,
PHYS_OFFSET
},
{
0
,
ATAG_NONE
}
};
void
__init
setup_arch
(
char
**
cmdline_p
)
void
__init
setup_arch
(
char
**
cmdline_p
)
{
{
struct
tag
*
tags
=
NULL
;
struct
tag
*
tags
=
(
struct
tag
*
)
&
init_tags
;
struct
machine_desc
*
mdesc
;
struct
machine_desc
*
mdesc
;
char
*
from
=
default_command_line
;
char
*
from
=
default_command_line
;
ROOT_DEV
=
mk_kdev
(
0
,
255
);
setup_processor
();
setup_processor
();
mdesc
=
setup_machine
(
machine_arch_type
);
mdesc
=
setup_machine
(
machine_arch_type
);
machine_name
=
mdesc
->
name
;
machine_name
=
mdesc
->
name
;
...
@@ -607,29 +623,22 @@ void __init setup_arch(char **cmdline_p)
...
@@ -607,29 +623,22 @@ void __init setup_arch(char **cmdline_p)
if
(
mdesc
->
param_offset
)
if
(
mdesc
->
param_offset
)
tags
=
phys_to_virt
(
mdesc
->
param_offset
);
tags
=
phys_to_virt
(
mdesc
->
param_offset
);
/*
* Do the machine-specific fixups before we parse the
* parameters or tags.
*/
if
(
mdesc
->
fixup
)
mdesc
->
fixup
(
mdesc
,
(
struct
param_struct
*
)
tags
,
&
from
,
&
meminfo
);
/*
/*
* If we have the old style parameters, convert them to
* If we have the old style parameters, convert them to
* a tag list
before
.
* a tag list.
*/
*/
if
(
tags
&&
tags
->
hdr
.
tag
!=
ATAG_CORE
)
if
(
tags
->
hdr
.
tag
!=
ATAG_CORE
)
convert_to_tag_list
((
struct
param_struct
*
)
tags
,
convert_to_tag_list
(
tags
);
meminfo
.
nr_banks
==
0
);
if
(
tags
->
hdr
.
tag
!=
ATAG_CORE
)
tags
=
(
struct
tag
*
)
&
init_tags
;
if
(
tags
&&
tags
->
hdr
.
tag
==
ATAG_CORE
)
if
(
mdesc
->
fixup
)
parse_tags
(
tags
);
mdesc
->
fixup
(
mdesc
,
tags
,
&
from
,
&
meminfo
);
if
(
meminfo
.
nr_banks
==
0
)
{
if
(
tags
->
hdr
.
tag
==
ATAG_CORE
)
{
meminfo
.
nr_banks
=
1
;
if
(
meminfo
.
nr_banks
!=
0
)
meminfo
.
bank
[
0
].
start
=
PHYS_OFFSET
;
squash_mem_tags
(
tags
)
;
meminfo
.
bank
[
0
].
size
=
MEM_SIZE
;
parse_tags
(
tags
)
;
}
}
init_mm
.
start_code
=
(
unsigned
long
)
&
_text
;
init_mm
.
start_code
=
(
unsigned
long
)
&
_text
;
...
...
arch/arm/mach-adifcc/arch.c
View file @
d797ebd3
...
@@ -22,7 +22,7 @@ extern void adifcc_map_io(void);
...
@@ -22,7 +22,7 @@ extern void adifcc_map_io(void);
extern
void
adifcc_init_irq
(
void
);
extern
void
adifcc_init_irq
(
void
);
static
void
__init
static
void
__init
fixup_adifcc
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_adifcc
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
#ifdef CONFIG_ARCH_ADI_EVB
#ifdef CONFIG_ARCH_ADI_EVB
...
...
arch/arm/mach-anakin/arch.c
View file @
d797ebd3
...
@@ -27,7 +27,7 @@ extern void anakin_map_io(void);
...
@@ -27,7 +27,7 @@ extern void anakin_map_io(void);
extern
void
genarch_init_irq
(
void
);
extern
void
genarch_init_irq
(
void
);
static
void
__init
static
void
__init
fixup_anakin
(
struct
machine_desc
*
desc
,
struct
param_struct
*
unused
,
fixup_anakin
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
ROOT_DEV
=
mk_kdev
(
RAMDISK_MAJOR
,
0
);
ROOT_DEV
=
mk_kdev
(
RAMDISK_MAJOR
,
0
);
...
...
arch/arm/mach-clps711x/cdb89712.c
View file @
d797ebd3
...
@@ -45,7 +45,7 @@ static struct map_desc cdb89712_io_desc[] __initdata = {
...
@@ -45,7 +45,7 @@ static struct map_desc cdb89712_io_desc[] __initdata = {
};
};
static
void
__init
static
void
__init
fixup_cdb89712
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_cdb89712
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
}
}
...
...
arch/arm/mach-clps711x/clep7312.c
View file @
d797ebd3
...
@@ -27,7 +27,7 @@ extern void clps711x_init_irq(void);
...
@@ -27,7 +27,7 @@ extern void clps711x_init_irq(void);
extern
void
clps711x_map_io
(
void
);
extern
void
clps711x_map_io
(
void
);
static
void
__init
static
void
__init
fixup_clep7312
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_clep7312
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
mi
->
nr_banks
=
1
;
mi
->
nr_banks
=
1
;
...
...
arch/arm/mach-clps711x/edb7211-arch.c
View file @
d797ebd3
...
@@ -29,7 +29,7 @@ extern void clps711x_init_irq(void);
...
@@ -29,7 +29,7 @@ extern void clps711x_init_irq(void);
extern
void
edb7211_map_io
(
void
);
extern
void
edb7211_map_io
(
void
);
static
void
__init
static
void
__init
fixup_edb7211
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_edb7211
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
/*
/*
...
...
arch/arm/mach-clps711x/fortunet.c
View file @
d797ebd3
...
@@ -53,7 +53,7 @@ typedef struct tag_IMAGE_PARAMS
...
@@ -53,7 +53,7 @@ typedef struct tag_IMAGE_PARAMS
#define IMAGE_PARAMS_PHYS 0xC01F0000
#define IMAGE_PARAMS_PHYS 0xC01F0000
static
void
__init
static
void
__init
fortunet_fixup
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fortunet_fixup
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
IMAGE_PARAMS
*
ip
;
IMAGE_PARAMS
*
ip
;
...
...
arch/arm/mach-clps711x/p720t.c
View file @
d797ebd3
...
@@ -49,11 +49,9 @@ static struct map_desc p720t_io_desc[] __initdata = {
...
@@ -49,11 +49,9 @@ static struct map_desc p720t_io_desc[] __initdata = {
};
};
static
void
__init
static
void
__init
fixup_p720t
(
struct
machine_desc
*
desc
,
struct
param_struct
*
params
,
fixup_p720t
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
struct
tag
*
tag
=
(
struct
tag
*
)
params
;
/*
/*
* Our bootloader doesn't setup any tags (yet).
* Our bootloader doesn't setup any tags (yet).
*/
*/
...
...
arch/arm/mach-epxa10db/arch.c
View file @
d797ebd3
...
@@ -35,7 +35,7 @@ extern void epxa10db_init_irq(void);
...
@@ -35,7 +35,7 @@ extern void epxa10db_init_irq(void);
static
void
__init
static
void
__init
epxa10db_fixup
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
epxa10db_fixup
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
...
...
arch/arm/mach-footbridge/arch.c
View file @
d797ebd3
...
@@ -36,25 +36,11 @@ static int __init parse_tag_memclk(const struct tag *tag)
...
@@ -36,25 +36,11 @@ static int __init parse_tag_memclk(const struct tag *tag)
__tagtable
(
ATAG_MEMCLK
,
parse_tag_memclk
);
__tagtable
(
ATAG_MEMCLK
,
parse_tag_memclk
);
#ifdef CONFIG_ARCH_EBSA285
#ifdef CONFIG_ARCH_EBSA285
static
void
__init
fixup_ebsa285
(
struct
machine_desc
*
desc
,
struct
param_struct
*
params
,
char
**
cmdline
,
struct
meminfo
*
mi
)
{
#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)
ORIG_X
=
params
->
u1
.
s
.
video_x
;
ORIG_Y
=
params
->
u1
.
s
.
video_y
;
ORIG_VIDEO_COLS
=
params
->
u1
.
s
.
video_num_cols
;
ORIG_VIDEO_LINES
=
params
->
u1
.
s
.
video_num_rows
;
#endif
}
MACHINE_START
(
EBSA285
,
"EBSA285"
)
MACHINE_START
(
EBSA285
,
"EBSA285"
)
MAINTAINER
(
"Russell King"
)
MAINTAINER
(
"Russell King"
)
BOOT_MEM
(
0x00000000
,
DC21285_ARMCSR_BASE
,
0xfe000000
)
BOOT_MEM
(
0x00000000
,
DC21285_ARMCSR_BASE
,
0xfe000000
)
BOOT_PARAMS
(
0x00000100
)
BOOT_PARAMS
(
0x00000100
)
VIDEO
(
0x000a0000
,
0x000bffff
)
VIDEO
(
0x000a0000
,
0x000bffff
)
FIXUP
(
fixup_ebsa285
)
MAPIO
(
footbridge_map_io
)
MAPIO
(
footbridge_map_io
)
INITIRQ
(
footbridge_init_irq
)
INITIRQ
(
footbridge_init_irq
)
MACHINE_END
MACHINE_END
...
@@ -67,7 +53,7 @@ MACHINE_END
...
@@ -67,7 +53,7 @@ MACHINE_END
* the parameter page.
* the parameter page.
*/
*/
static
void
__init
static
void
__init
fixup_netwinder
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_netwinder
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
#ifdef CONFIG_ISAPNP
#ifdef CONFIG_ISAPNP
...
@@ -80,21 +66,6 @@ fixup_netwinder(struct machine_desc *desc, struct param_struct *params,
...
@@ -80,21 +66,6 @@ fixup_netwinder(struct machine_desc *desc, struct param_struct *params,
*/
*/
isapnp_disable
=
1
;
isapnp_disable
=
1
;
#endif
#endif
if
(
params
->
u1
.
s
.
nr_pages
!=
0x02000
&&
params
->
u1
.
s
.
nr_pages
!=
0x04000
&&
params
->
u1
.
s
.
nr_pages
!=
0x08000
&&
params
->
u1
.
s
.
nr_pages
!=
0x10000
)
{
printk
(
KERN_WARNING
"Warning: bad NeTTrom parameters "
"detected, using defaults
\n
"
);
params
->
u1
.
s
.
nr_pages
=
0x1000
;
/* 16MB */
params
->
u1
.
s
.
ramdisk_size
=
0
;
params
->
u1
.
s
.
flags
=
FLAG_READONLY
;
params
->
u1
.
s
.
initrd_start
=
0
;
params
->
u1
.
s
.
initrd_size
=
0
;
params
->
u1
.
s
.
rd_start
=
0
;
}
}
}
MACHINE_START
(
NETWINDER
,
"Rebel-NetWinder"
)
MACHINE_START
(
NETWINDER
,
"Rebel-NetWinder"
)
...
@@ -116,7 +87,7 @@ MACHINE_END
...
@@ -116,7 +87,7 @@ MACHINE_END
* hard reboots fail on early boards.
* hard reboots fail on early boards.
*/
*/
static
void
__init
static
void
__init
fixup_cats
(
struct
machine_desc
*
desc
,
struct
param_struct
*
unused
,
fixup_cats
(
struct
machine_desc
*
desc
,
struct
tag
*
tags
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
ORIG_VIDEO_LINES
=
25
;
ORIG_VIDEO_LINES
=
25
;
...
@@ -138,7 +109,7 @@ MACHINE_END
...
@@ -138,7 +109,7 @@ MACHINE_END
#ifdef CONFIG_ARCH_CO285
#ifdef CONFIG_ARCH_CO285
static
void
__init
static
void
__init
fixup_coebsa285
(
struct
machine_desc
*
desc
,
struct
param_struct
*
unused
,
fixup_coebsa285
(
struct
machine_desc
*
desc
,
struct
tag
*
tags
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
extern
unsigned
long
boot_memory_end
;
extern
unsigned
long
boot_memory_end
;
...
...
arch/arm/mach-integrator/arch.c
View file @
d797ebd3
...
@@ -51,7 +51,7 @@ static struct kmi_info integrator_mouse __initdata = {
...
@@ -51,7 +51,7 @@ static struct kmi_info integrator_mouse __initdata = {
#endif
#endif
static
void
__init
static
void
__init
integrator_fixup
(
struct
machine_desc
*
desc
,
struct
param_struct
*
unused
,
integrator_fixup
(
struct
machine_desc
*
desc
,
struct
tag
*
tags
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
#ifdef CONFIG_KMI_KEYB
#ifdef CONFIG_KMI_KEYB
...
...
arch/arm/mach-iop310/arch.c
View file @
d797ebd3
...
@@ -26,7 +26,7 @@ extern void iq80310_map_io(void);
...
@@ -26,7 +26,7 @@ extern void iq80310_map_io(void);
extern
void
iq80310_init_irq
(
void
);
extern
void
iq80310_init_irq
(
void
);
static
void
__init
static
void
__init
fixup_iq80310
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_iq80310
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
system_rev
=
(
*
(
volatile
unsigned
int
*
)
0xfe830000
)
&
0x0f
;
system_rev
=
(
*
(
volatile
unsigned
int
*
)
0xfe830000
)
&
0x0f
;
...
...
arch/arm/mach-l7200/core.c
View file @
d797ebd3
...
@@ -83,7 +83,7 @@ static void __init l7200_map_io(void)
...
@@ -83,7 +83,7 @@ static void __init l7200_map_io(void)
}
}
static
void
__init
static
void
__init
fixup_l7200
(
struct
machine_desc
*
desc
,
struct
param_struct
*
unused
,
fixup_l7200
(
struct
machine_desc
*
desc
,
struct
tag
*
tags
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
mi
->
nr_banks
=
1
;
mi
->
nr_banks
=
1
;
...
...
arch/arm/mach-pxa/idp.c
View file @
d797ebd3
...
@@ -69,7 +69,7 @@ static void __init idp_init_irq(void)
...
@@ -69,7 +69,7 @@ static void __init idp_init_irq(void)
}
}
static
void
__init
static
void
__init
fixup_idp
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_idp
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
#ifdef PXA_IDP_REV02
#ifdef PXA_IDP_REV02
...
...
arch/arm/mach-pxa/lubbock.c
View file @
d797ebd3
...
@@ -120,7 +120,7 @@ static int __init lubbock_init(void)
...
@@ -120,7 +120,7 @@ static int __init lubbock_init(void)
__initcall
(
lubbock_init
);
__initcall
(
lubbock_init
);
static
void
__init
static
void
__init
fixup_lubbock
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_lubbock
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
SET_BANK
(
0
,
0xa0000000
,
64
*
1024
*
1024
);
SET_BANK
(
0
,
0xa0000000
,
64
*
1024
*
1024
);
...
...
arch/arm/mach-rpc/riscpc.c
View file @
d797ebd3
...
@@ -61,7 +61,7 @@ __tagtable(ATAG_ACORN, parse_tag_acorn);
...
@@ -61,7 +61,7 @@ __tagtable(ATAG_ACORN, parse_tag_acorn);
#endif
#endif
static
void
__init
static
void
__init
fixup_riscpc
(
struct
machine_desc
*
desc
,
struct
param_struct
*
unusd
,
fixup_riscpc
(
struct
machine_desc
*
desc
,
struct
tag
*
tags
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
/*
/*
...
...
arch/arm/mach-sa1100/adsbitsy.c
View file @
d797ebd3
...
@@ -82,7 +82,7 @@ static void __init adsbitsy_init_irq(void)
...
@@ -82,7 +82,7 @@ static void __init adsbitsy_init_irq(void)
*/
*/
static
void
__init
static
void
__init
fixup_adsbitsy
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_adsbitsy
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
SET_BANK
(
0
,
0xc0000000
,
32
*
1024
*
1024
);
SET_BANK
(
0
,
0xc0000000
,
32
*
1024
*
1024
);
...
...
arch/arm/mach-sa1100/assabet.c
View file @
d797ebd3
...
@@ -159,13 +159,11 @@ static void __init get_assabet_scr(void)
...
@@ -159,13 +159,11 @@ static void __init get_assabet_scr(void)
SCR_value
=
scr
;
SCR_value
=
scr
;
}
}
extern
void
convert_to_tag_list
(
struct
param_struct
*
params
,
int
mem_init
);
static
void
__init
static
void
__init
fixup_assabet
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_assabet
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
struct
tag
*
t
=
(
struct
tag
*
)
param
s
;
struct
tag
*
t
=
tag
s
;
/* This must be done before any call to machine_has_neponset() */
/* This must be done before any call to machine_has_neponset() */
map_sa1100_gpio_regs
();
map_sa1100_gpio_regs
();
...
@@ -174,12 +172,6 @@ fixup_assabet(struct machine_desc *desc, struct param_struct *params,
...
@@ -174,12 +172,6 @@ fixup_assabet(struct machine_desc *desc, struct param_struct *params,
if
(
machine_has_neponset
())
if
(
machine_has_neponset
())
printk
(
"Neponset expansion board detected
\n
"
);
printk
(
"Neponset expansion board detected
\n
"
);
/*
* Apparantly bootldr uses a param_struct. Groan.
*/
if
(
t
->
hdr
.
tag
!=
ATAG_CORE
)
convert_to_tag_list
(
params
,
1
);
if
(
t
->
hdr
.
tag
!=
ATAG_CORE
)
{
if
(
t
->
hdr
.
tag
!=
ATAG_CORE
)
{
t
->
hdr
.
tag
=
ATAG_CORE
;
t
->
hdr
.
tag
=
ATAG_CORE
;
t
->
hdr
.
size
=
tag_size
(
tag_core
);
t
->
hdr
.
size
=
tag_size
(
tag_core
);
...
...
arch/arm/mach-sa1100/badge4.c
View file @
d797ebd3
...
@@ -143,13 +143,6 @@ void badge4_set_5V(unsigned subsystem, int on)
...
@@ -143,13 +143,6 @@ void badge4_set_5V(unsigned subsystem, int on)
EXPORT_SYMBOL
(
badge4_set_5V
);
EXPORT_SYMBOL
(
badge4_set_5V
);
static
void
__init
fixup_badge4
(
struct
machine_desc
*
desc
,
struct
param_struct
*
params
,
char
**
cmdline
,
struct
meminfo
*
mi
)
{
/* nothing needed here */
}
static
struct
map_desc
badge4_io_desc
[]
__initdata
=
{
static
struct
map_desc
badge4_io_desc
[]
__initdata
=
{
/* virtual physical length domain r w c b */
/* virtual physical length domain r w c b */
{
0xf1000000
,
0x08000000
,
0x00100000
,
DOMAIN_IO
,
0
,
1
,
0
,
0
},
/* SRAM bank 1 */
{
0xf1000000
,
0x08000000
,
0x00100000
,
DOMAIN_IO
,
0
,
1
,
0
,
0
},
/* SRAM bank 1 */
...
@@ -170,7 +163,6 @@ static void __init badge4_map_io(void)
...
@@ -170,7 +163,6 @@ static void __init badge4_map_io(void)
MACHINE_START
(
BADGE4
,
"Hewlett-Packard Laboratories BadgePAD 4"
)
MACHINE_START
(
BADGE4
,
"Hewlett-Packard Laboratories BadgePAD 4"
)
BOOT_MEM
(
0xc0000000
,
0x80000000
,
0xf8000000
)
BOOT_MEM
(
0xc0000000
,
0x80000000
,
0xf8000000
)
BOOT_PARAMS
(
0xc0000100
)
BOOT_PARAMS
(
0xc0000100
)
FIXUP
(
fixup_badge4
)
MAPIO
(
badge4_map_io
)
MAPIO
(
badge4_map_io
)
INITIRQ
(
sa1100_init_irq
)
INITIRQ
(
sa1100_init_irq
)
MACHINE_END
MACHINE_END
arch/arm/mach-sa1100/brutus.c
View file @
d797ebd3
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
static
void
__init
static
void
__init
fixup_brutus
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_brutus
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
SET_BANK
(
0
,
0xc0000000
,
4
*
1024
*
1024
);
SET_BANK
(
0
,
0xc0000000
,
4
*
1024
*
1024
);
...
...
arch/arm/mach-sa1100/cerf.c
View file @
d797ebd3
...
@@ -36,7 +36,7 @@ static void __init cerf_init_irq(void)
...
@@ -36,7 +36,7 @@ static void __init cerf_init_irq(void)
}
}
static
void
__init
static
void
__init
fixup_cerf
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_cerf
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
#if defined(CONFIG_SA1100_CERF_64MB)
#if defined(CONFIG_SA1100_CERF_64MB)
...
...
arch/arm/mach-sa1100/empeg.c
View file @
d797ebd3
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
static
void
__init
static
void
__init
fixup_empeg
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_empeg
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
SET_BANK
(
0
,
0xc0000000
,
4
*
1024
*
1024
);
SET_BANK
(
0
,
0xc0000000
,
4
*
1024
*
1024
);
...
...
arch/arm/mach-sa1100/flexanet.c
View file @
d797ebd3
...
@@ -152,13 +152,9 @@ __initcall(flexanet_init);
...
@@ -152,13 +152,9 @@ __initcall(flexanet_init);
static
void
__init
static
void
__init
fixup_flexanet
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_flexanet
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
int
status
;
unsigned
long
now
;
/* fixed RAM size, by now (64MB) */
/* fixed RAM size, by now (64MB) */
SET_BANK
(
0
,
0xc0000000
,
64
*
1024
*
1024
);
SET_BANK
(
0
,
0xc0000000
,
64
*
1024
*
1024
);
mi
->
nr_banks
=
1
;
mi
->
nr_banks
=
1
;
...
...
arch/arm/mach-sa1100/freebird.c
View file @
d797ebd3
...
@@ -52,7 +52,7 @@ static int __init freebird_init(void)
...
@@ -52,7 +52,7 @@ static int __init freebird_init(void)
__initcall
(
freebird_init
);
__initcall
(
freebird_init
);
static
void
__init
static
void
__init
fixup_freebird
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_freebird
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
#ifdef CONFIG_SA1100_FREEBIRD_OLD
#ifdef CONFIG_SA1100_FREEBIRD_OLD
...
...
arch/arm/mach-sa1100/graphicsclient.c
View file @
d797ebd3
...
@@ -125,7 +125,7 @@ static void __init graphicsclient_init_irq(void)
...
@@ -125,7 +125,7 @@ static void __init graphicsclient_init_irq(void)
*/
*/
static
void
__init
static
void
__init
fixup_graphicsclient
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_graphicsclient
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
SET_BANK
(
0
,
0xc0000000
,
16
*
1024
*
1024
);
SET_BANK
(
0
,
0xc0000000
,
16
*
1024
*
1024
);
...
...
arch/arm/mach-sa1100/graphicsmaster.c
View file @
d797ebd3
...
@@ -157,7 +157,7 @@ static void __init graphicsmaster_init_irq(void)
...
@@ -157,7 +157,7 @@ static void __init graphicsmaster_init_irq(void)
*/
*/
static
void
__init
static
void
__init
fixup_graphicsmaster
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_graphicsmaster
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
SET_BANK
(
0
,
0xc0000000
,
16
*
1024
*
1024
);
SET_BANK
(
0
,
0xc0000000
,
16
*
1024
*
1024
);
...
...
arch/arm/mach-sa1100/huw_webpanel.c
View file @
d797ebd3
...
@@ -55,7 +55,7 @@ __initcall(init_huw_cs3);
...
@@ -55,7 +55,7 @@ __initcall(init_huw_cs3);
static
void
__init
static
void
__init
fixup_huw_webpanel
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_huw_webpanel
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
/**
/**
...
...
arch/arm/mach-sa1100/itsy.c
View file @
d797ebd3
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
static
void
__init
static
void
__init
fixup_itsy
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_itsy
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
SET_BANK
(
0
,
0xc0000000
,
16
*
1024
*
1024
);
SET_BANK
(
0
,
0xc0000000
,
16
*
1024
*
1024
);
...
...
arch/arm/mach-sa1100/jornada720.c
View file @
d797ebd3
...
@@ -57,7 +57,7 @@ __initcall(jornada720_init);
...
@@ -57,7 +57,7 @@ __initcall(jornada720_init);
static
void
__init
static
void
__init
fixup_jornada720
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_jornada720
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
SET_BANK
(
0
,
0xc0000000
,
32
*
1024
*
1024
);
SET_BANK
(
0
,
0xc0000000
,
32
*
1024
*
1024
);
...
...
arch/arm/mach-sa1100/nanoengine.c
View file @
d797ebd3
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
static
void
__init
static
void
__init
fixup_nanoengine
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_nanoengine
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
SET_BANK
(
0
,
0xc0000000
,
32
*
1024
*
1024
);
SET_BANK
(
0
,
0xc0000000
,
32
*
1024
*
1024
);
...
...
arch/arm/mach-sa1100/omnimeter.c
View file @
d797ebd3
...
@@ -41,7 +41,7 @@ static int __init omnimeter_init(void)
...
@@ -41,7 +41,7 @@ static int __init omnimeter_init(void)
__initcall
(
omnimeter_init
);
__initcall
(
omnimeter_init
);
static
void
__init
static
void
__init
fixup_omnimeter
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_omnimeter
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
SET_BANK
(
0
,
0xc0000000
,
16
*
1024
*
1024
);
SET_BANK
(
0
,
0xc0000000
,
16
*
1024
*
1024
);
...
...
arch/arm/mach-sa1100/pangolin.c
View file @
d797ebd3
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
static
void
__init
static
void
__init
fixup_pangolin
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_pangolin
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
SET_BANK
(
0
,
0xc0000000
,
128
*
1024
*
1024
);
SET_BANK
(
0
,
0xc0000000
,
128
*
1024
*
1024
);
...
...
arch/arm/mach-sa1100/pfs168.c
View file @
d797ebd3
...
@@ -57,7 +57,7 @@ static void __init pfs168_init_irq(void)
...
@@ -57,7 +57,7 @@ static void __init pfs168_init_irq(void)
static
void
__init
static
void
__init
fixup_pfs168
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_pfs168
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
SET_BANK
(
0
,
0xc0000000
,
16
*
1024
*
1024
);
SET_BANK
(
0
,
0xc0000000
,
16
*
1024
*
1024
);
...
...
arch/arm/mach-sa1100/pleb.c
View file @
d797ebd3
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
#include "generic.h"
#include "generic.h"
static
void
__init
static
void
__init
fixup_pleb
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_pleb
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
SET_BANK
(
0
,
0xc0000000
,
16
*
1024
*
1024
);
SET_BANK
(
0
,
0xc0000000
,
16
*
1024
*
1024
);
...
...
arch/arm/mach-sa1100/sherman.c
View file @
d797ebd3
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
static
void
__init
static
void
__init
fixup_sherman
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_sherman
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
SET_BANK
(
0
,
0xc0000000
,
64
*
1024
*
1024
);
SET_BANK
(
0
,
0xc0000000
,
64
*
1024
*
1024
);
...
...
arch/arm/mach-sa1100/simpad.c
View file @
d797ebd3
...
@@ -41,7 +41,7 @@ void clear_cs3_bit(int value)
...
@@ -41,7 +41,7 @@ void clear_cs3_bit(int value)
}
}
static
void
__init
static
void
__init
fixup_simpad
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_simpad
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
#ifdef CONFIG_SA1100_SIMPAD_DRAM_64MB
/* DRAM */
#ifdef CONFIG_SA1100_SIMPAD_DRAM_64MB
/* DRAM */
...
...
arch/arm/mach-sa1100/system3.c
View file @
d797ebd3
...
@@ -74,7 +74,7 @@
...
@@ -74,7 +74,7 @@
/* init funcs */
/* init funcs */
static
void
__init
fixup_system3
(
struct
machine_desc
*
desc
,
static
void
__init
fixup_system3
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
char
**
cmdline
,
struct
meminfo
*
mi
);
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
);
static
int
__init
system3_init
(
void
);
static
int
__init
system3_init
(
void
);
static
void
__init
system3_init_irq
(
void
);
static
void
__init
system3_init_irq
(
void
);
static
void
__init
system3_map_io
(
void
);
static
void
__init
system3_map_io
(
void
);
...
@@ -87,8 +87,6 @@ static int sdram_notifier(struct notifier_block *nb, unsigned long event, void *
...
@@ -87,8 +87,6 @@ static int sdram_notifier(struct notifier_block *nb, unsigned long event, void *
static
void
system3_lcd_power
(
int
on
);
static
void
system3_lcd_power
(
int
on
);
static
void
system3_backlight_power
(
int
on
);
static
void
system3_backlight_power
(
int
on
);
extern
void
convert_to_tag_list
(
struct
param_struct
*
params
,
int
mem_init
);
/**********************************************************************
/**********************************************************************
* global data
* global data
...
@@ -239,7 +237,7 @@ static int sdram_notifier(struct notifier_block *nb, unsigned long event,
...
@@ -239,7 +237,7 @@ static int sdram_notifier(struct notifier_block *nb, unsigned long event,
*
*
*/
*/
static
void
__init
fixup_system3
(
struct
machine_desc
*
desc
,
static
void
__init
fixup_system3
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
DPRINTK
(
"%s
\n
"
,
"START"
);
DPRINTK
(
"%s
\n
"
,
"START"
);
...
...
arch/arm/mach-sa1100/victor.c
View file @
d797ebd3
...
@@ -42,7 +42,7 @@ __initcall(victor_init);
...
@@ -42,7 +42,7 @@ __initcall(victor_init);
static
void
__init
static
void
__init
fixup_victor
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_victor
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
SET_BANK
(
0
,
0xc0000000
,
4
*
1024
*
1024
);
SET_BANK
(
0
,
0xc0000000
,
4
*
1024
*
1024
);
...
...
arch/arm/mach-sa1100/xp860.c
View file @
d797ebd3
...
@@ -58,7 +58,7 @@ __initcall(xp860_init);
...
@@ -58,7 +58,7 @@ __initcall(xp860_init);
static
void
__init
static
void
__init
fixup_xp860
(
struct
machine_desc
*
desc
,
struct
param_struct
*
param
s
,
fixup_xp860
(
struct
machine_desc
*
desc
,
struct
tag
*
tag
s
,
char
**
cmdline
,
struct
meminfo
*
mi
)
char
**
cmdline
,
struct
meminfo
*
mi
)
{
{
SET_BANK
(
0
,
0xc0000000
,
32
*
1024
*
1024
);
SET_BANK
(
0
,
0xc0000000
,
32
*
1024
*
1024
);
...
...
include/asm-arm/setup.h
View file @
d797ebd3
...
@@ -10,77 +10,12 @@
...
@@ -10,77 +10,12 @@
* Structure passed to kernel to tell it about the
* Structure passed to kernel to tell it about the
* hardware it's running on. See linux/Documentation/arm/Setup
* hardware it's running on. See linux/Documentation/arm/Setup
* for more info.
* for more info.
*
* NOTE:
* This file contains two ways to pass information from the boot
* loader to the kernel. The old struct param_struct is deprecated,
* but it will be kept in the kernel for 5 years from now
* (2001). This will allow boot loaders to convert to the new struct
* tag way.
*/
*/
#ifndef __ASMARM_SETUP_H
#ifndef __ASMARM_SETUP_H
#define __ASMARM_SETUP_H
#define __ASMARM_SETUP_H
/*
* Usage:
* - do not go blindly adding fields, add them at the end
* - when adding fields, don't rely on the address until
* a patch from me has been released
* - unused fields should be zero (for future expansion)
* - this structure is relatively short-lived - only
* guaranteed to contain useful data in setup_arch()
*/
#define COMMAND_LINE_SIZE 1024
#define COMMAND_LINE_SIZE 1024
/* This is the old deprecated way to pass parameters to the kernel */
struct
param_struct
{
union
{
struct
{
unsigned
long
page_size
;
/* 0 */
unsigned
long
nr_pages
;
/* 4 */
unsigned
long
ramdisk_size
;
/* 8 */
unsigned
long
flags
;
/* 12 */
#define FLAG_READONLY 1
#define FLAG_RDLOAD 4
#define FLAG_RDPROMPT 8
unsigned
long
rootdev
;
/* 16 */
unsigned
long
video_num_cols
;
/* 20 */
unsigned
long
video_num_rows
;
/* 24 */
unsigned
long
video_x
;
/* 28 */
unsigned
long
video_y
;
/* 32 */
unsigned
long
memc_control_reg
;
/* 36 */
unsigned
char
sounddefault
;
/* 40 */
unsigned
char
adfsdrives
;
/* 41 */
unsigned
char
bytes_per_char_h
;
/* 42 */
unsigned
char
bytes_per_char_v
;
/* 43 */
unsigned
long
pages_in_bank
[
4
];
/* 44 */
unsigned
long
pages_in_vram
;
/* 60 */
unsigned
long
initrd_start
;
/* 64 */
unsigned
long
initrd_size
;
/* 68 */
unsigned
long
rd_start
;
/* 72 */
unsigned
long
system_rev
;
/* 76 */
unsigned
long
system_serial_low
;
/* 80 */
unsigned
long
system_serial_high
;
/* 84 */
unsigned
long
mem_fclk_21285
;
/* 88 */
}
s
;
char
unused
[
256
];
}
u1
;
union
{
char
paths
[
8
][
128
];
struct
{
unsigned
long
magic
;
char
n
[
1024
-
sizeof
(
unsigned
long
)];
}
s
;
}
u2
;
char
commandline
[
COMMAND_LINE_SIZE
];
};
/*
* The new way of passing information: a list of tagged entries
*/
/* The list ends with an ATAG_NONE node. */
/* The list ends with an ATAG_NONE node. */
#define ATAG_NONE 0x00000000
#define ATAG_NONE 0x00000000
...
...
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