Commit eb06f476 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc32: drop extra getprop call during boot



It was present only to support the sun4, sun4c boxes which
do not have the "compatible" property in the root-node
of the device tree.
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 142cc039
...@@ -26,11 +26,9 @@ ...@@ -26,11 +26,9 @@
#include <asm/pgtsrmmu.h> /* SRMMU_PGDIR_SHIFT */ #include <asm/pgtsrmmu.h> /* SRMMU_PGDIR_SHIFT */
.data .data
/* /* The following are used with the prom_vector node-ops to figure out
* The following are used with the prom_vector node-ops to figure out
* the cpu-type * the cpu-type
*/ */
.align 4 .align 4
cputyp: cputyp:
.word 1 .word 1
...@@ -38,27 +36,12 @@ cputyp: ...@@ -38,27 +36,12 @@ cputyp:
.align 4 .align 4
.globl cputypval .globl cputypval
cputypval: cputypval:
.asciz "sun4c" .asciz "sun4m"
.ascii " " .ascii " "
cputypvalend: /* Tested on SS-5, SS-10 */
cputypvallen = cputypvar - cputypval
.align 4 .align 4
/*
* Sun people can't spell worth damn. "compatability" indeed.
* At least we *know* we can't spell, and use a spell-checker.
*/
/* Uh, actually Linus it is I who cannot spell. Too much murky
* Sparc assembly will do this to ya.
*/
cputypvar: cputypvar:
.asciz "compatability"
/* Tested on SS-5, SS-10. Probably someone at Sun applied a spell-checker. */
.align 4
cputypvar_sun4m:
.asciz "compatible" .asciz "compatible"
.align 4 .align 4
...@@ -688,28 +671,13 @@ execute_in_high_mem: ...@@ -688,28 +671,13 @@ execute_in_high_mem:
or %o1, %lo(cputypvar), %o1 or %o1, %lo(cputypvar), %o1
sethi %hi(cputypval), %o2 ! information, the string sethi %hi(cputypval), %o2 ! information, the string
or %o2, %lo(cputypval), %o2 or %o2, %lo(cputypval), %o2
ld [%l1], %l0 ! 'compatibility' tells ld [%l1], %l0 ! 'compatible' tells
ld [%l0 + 0xc], %l0 ! that we want 'sun4x' where ld [%l0 + 0xc], %l0 ! that we want 'sun4x' where
call %l0 ! x is one of '', 'c', 'm', call %l0 ! x is one of 'm', 'd' or 'e'.
nop ! 'd' or 'e'. %o2 holds pointer nop ! %o2 holds pointer
! to a buf where above string ! to a buf where above string
! will get stored by the prom. ! will get stored by the prom.
subcc %o0, %g0, %g0
bpos got_prop ! Got the property
nop
or %g6, %g0, %o0
sethi %hi(cputypvar_sun4m), %o1
or %o1, %lo(cputypvar_sun4m), %o1
sethi %hi(cputypval), %o2
or %o2, %lo(cputypval), %o2
ld [%l1], %l0
ld [%l0 + 0xc], %l0
call %l0
nop
got_prop:
#ifdef CONFIG_SPARC_LEON #ifdef CONFIG_SPARC_LEON
/* no cpu-type check is needed, it is a SPARC-LEON */ /* no cpu-type check is needed, it is a SPARC-LEON */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment