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
nexedi
linux
Commits
6cfe79b7
Commit
6cfe79b7
authored
Dec 14, 2002
by
Anton Blanchard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ppc64: remove yaboot hooks, we dont use them on ppc64
parent
5882eeaf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
83 deletions
+3
-83
arch/ppc64/kernel/head.S
arch/ppc64/kernel/head.S
+0
-6
arch/ppc64/kernel/prom.c
arch/ppc64/kernel/prom.c
+2
-67
include/asm-ppc64/prom.h
include/asm-ppc64/prom.h
+1
-10
No files found.
arch/ppc64/kernel/head.S
View file @
6cfe79b7
...
...
@@ -1248,9 +1248,6 @@ _GLOBAL(__start_initialization_pSeries)
mr
r29
,
r5
mr
r28
,
r6
mr
r27
,
r7
mr
r26
,
r8
/*
YABOOT
:
debug_print
()
routine
*/
mr
r25
,
r9
/*
YABOOT
:
debug_delay
()
routine
*/
mr
r24
,
r10
/*
YABOOT
:
debug_prom
()
routine
*/
bl
.
enable_64b_mode
...
...
@@ -1295,9 +1292,6 @@ _GLOBAL(__start_initialization_pSeries)
mr
r5
,
r29
mr
r6
,
r28
mr
r7
,
r27
mr
r8
,
r26
mr
r9
,
r25
mr
r10
,
r24
bl
.
prom_init
...
...
arch/ppc64/kernel/prom.c
View file @
6cfe79b7
...
...
@@ -15,10 +15,6 @@
* 2 of the License, or (at your option) any later version.
*/
#if 0
#define DEBUG_YABOOT
#endif
#if 0
#define DEBUG_PROM
#endif
...
...
@@ -32,22 +28,6 @@
#include <linux/threads.h>
#include <linux/spinlock.h>
#include <linux/blk.h>
#ifdef DEBUG_YABOOT
#define call_yaboot(FUNC,...) \
do { \
if (FUNC) { \
struct prom_t *_prom = PTRRELOC(&prom); \
unsigned long prom_entry = _prom->entry;\
_prom->entry = (unsigned long)(FUNC); \
enter_prom(__VA_ARGS__); \
_prom->entry = prom_entry; \
} \
} while (0)
#else
#define call_yaboot(FUNC,...) do { ; } while (0)
#endif
#include <linux/types.h>
#include <linux/pci.h>
#include <asm/prom.h>
...
...
@@ -65,16 +45,14 @@
#include <asm/bitops.h>
#include <asm/naca.h>
#include <asm/pci.h>
#include "open_pic.h"
#include <asm/bootinfo.h>
#include <asm/ppcdebug.h>
#include "open_pic.h"
#ifdef CONFIG_FB
#include <asm/linux_logo.h>
#endif
extern
char
_end
[];
/*
* prom_init() is called very early on, before the kernel text
* and data have been mapped to KERNELBASE. At this point the code
...
...
@@ -131,12 +109,7 @@ struct pci_intr_map {
typedef
unsigned
long
interpret_func
(
struct
device_node
*
,
unsigned
long
,
int
,
int
);
#if 0
static
interpret_func
interpret_pci_props
;
#endif
static
unsigned
long
interpret_pci_props
(
struct
device_node
*
,
unsigned
long
,
int
,
int
);
static
interpret_func
interpret_isa_props
;
static
interpret_func
interpret_root_props
;
...
...
@@ -156,9 +129,6 @@ struct prom_t prom = {
0
,
/* version */
32
,
/* encode_phys_size */
0
/* bi_rec pointer */
#ifdef DEBUG_YABOOT
,
NULL
/* yaboot */
#endif
};
...
...
@@ -1213,7 +1183,7 @@ prom_hold_cpus(unsigned long mem)
unsigned
long
__init
prom_init
(
unsigned
long
r3
,
unsigned
long
r4
,
unsigned
long
pp
,
unsigned
long
r6
,
unsigned
long
r7
,
yaboot_debug_t
*
yaboot
)
unsigned
long
r6
,
unsigned
long
r7
)
{
int
chrp
=
0
;
unsigned
long
mem
;
...
...
@@ -1241,33 +1211,13 @@ prom_init(unsigned long r3, unsigned long r4, unsigned long pp,
RELOC
(
klimit
)
=
PTRUNRELOC
((
unsigned
long
)
_prom
->
bi_recs
+
_prom
->
bi_recs
->
data
[
1
]);
}
#ifdef DEBUG_YABOOT
call_yaboot
(
yaboot
->
dummy
,
offset
>>
32
,
offset
&
0xffffffff
);
call_yaboot
(
yaboot
->
printf
,
RELOC
(
"offset = 0x%08x%08x
\n
"
),
LONG_MSW
(
offset
),
LONG_LSW
(
offset
));
#endif
/* Default */
phys
=
KERNELBASE
-
offset
;
#ifdef DEBUG_YABOOT
call_yaboot
(
yaboot
->
printf
,
RELOC
(
"phys = 0x%08x%08x
\n
"
),
LONG_MSW
(
phys
),
LONG_LSW
(
phys
));
#endif
#ifdef DEBUG_YABOOT
_prom
->
yaboot
=
yaboot
;
call_yaboot
(
yaboot
->
printf
,
RELOC
(
"pp = 0x%08x%08x
\n
"
),
LONG_MSW
(
pp
),
LONG_LSW
(
pp
));
call_yaboot
(
yaboot
->
printf
,
RELOC
(
"prom = 0x%08x%08x
\n
"
),
LONG_MSW
(
_prom
->
entry
),
LONG_LSW
(
_prom
->
entry
));
#endif
/* First get a handle for the stdout device */
_prom
->
chosen
=
(
ihandle
)
call_prom
(
RELOC
(
"finddevice"
),
1
,
1
,
RELOC
(
"/chosen"
));
#ifdef DEBUG_YABOOT
call_yaboot
(
yaboot
->
printf
,
RELOC
(
"prom->chosen = 0x%08x%08x
\n
"
),
LONG_MSW
(
_prom
->
chosen
),
LONG_LSW
(
_prom
->
chosen
));
#endif
if
((
long
)
_prom
->
chosen
<=
0
)
prom_exit
();
...
...
@@ -1278,22 +1228,7 @@ prom_init(unsigned long r3, unsigned long r4, unsigned long pp,
_prom
->
stdout
=
(
ihandle
)(
unsigned
long
)
getprop_rval
;
#ifdef DEBUG_YABOOT
if
(
_prom
->
stdout
==
0
)
{
call_yaboot
(
yaboot
->
printf
,
RELOC
(
"prom->stdout = 0x%08x%08x
\n
"
),
LONG_MSW
(
_prom
->
stdout
),
LONG_LSW
(
_prom
->
stdout
));
}
call_yaboot
(
yaboot
->
printf
,
RELOC
(
"prom->stdout = 0x%08x%08x
\n
"
),
LONG_MSW
(
_prom
->
stdout
),
LONG_LSW
(
_prom
->
stdout
));
#endif
#ifdef DEBUG_YABOOT
call_yaboot
(
yaboot
->
printf
,
RELOC
(
"Location: 0x11
\n
"
));
#endif
mem
=
RELOC
(
klimit
)
-
offset
;
#ifdef DEBUG_YABOOT
call_yaboot
(
yaboot
->
printf
,
RELOC
(
"Location: 0x11b
\n
"
));
#endif
/* Get the full OF pathname of the stdout device */
p
=
(
char
*
)
mem
;
...
...
include/asm-ppc64/prom.h
View file @
6cfe79b7
...
...
@@ -155,12 +155,6 @@ struct prom_args {
prom_arg_t
*
rets
;
/* Pointer to return values in args[16]. */
};
typedef
struct
{
u32
printf
;
/* void (*printf)(char *, ...); */
u32
memdump
;
/* void (*memdump)(unsigned char *, unsigned long); */
u32
dummy
;
/* void (*dummy)(void); */
}
yaboot_debug_t
;
struct
prom_t
{
unsigned
long
entry
;
ihandle
chosen
;
...
...
@@ -171,9 +165,6 @@ struct prom_t {
unsigned
long
version
;
unsigned
long
encode_phys_size
;
struct
bi_record
*
bi_recs
;
#ifdef DEBUG_YABOOT
yaboot_debug_t
*
yaboot
;
#endif
};
extern
struct
prom_t
prom
;
...
...
@@ -183,7 +174,7 @@ extern int boot_cpuid;
/* Prototypes */
extern
void
abort
(
void
);
extern
unsigned
long
prom_init
(
unsigned
long
,
unsigned
long
,
unsigned
long
,
unsigned
long
,
unsigned
long
,
yaboot_debug_t
*
);
unsigned
long
,
unsigned
long
);
extern
void
prom_print
(
const
char
*
msg
);
extern
void
relocate_nodes
(
void
);
extern
void
finish_device_tree
(
void
);
...
...
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