diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2012-05-11 21:43:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-12 14:31:59 -0400 |
commit | 142cc039bdb3263e765a9a28e10048d9d9949df7 (patch) | |
tree | 25a92cebfa0be8cc7aedb47feccaf80611a60e9f /arch | |
parent | 1b4cb70ec81b2c3a01e040afc969193c7a816604 (diff) |
sparc32: drop prom version check in head_32.S
We already sorted out if we are a sun4/sun4c and halted.
So no need to check the prom version as we know this is
a v2 or v3 as sun4m, sun4d etc. does not use a v1 prom.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc/kernel/head_32.S | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/sparc/kernel/head_32.S b/arch/sparc/kernel/head_32.S index 10830b5a9f4a..56e32a209bb4 100644 --- a/arch/sparc/kernel/head_32.S +++ b/arch/sparc/kernel/head_32.S | |||
@@ -675,19 +675,6 @@ execute_in_high_mem: | |||
675 | sethi %hi(linux_dbvec), %g1 | 675 | sethi %hi(linux_dbvec), %g1 |
676 | st %o1, [%g1 + %lo(linux_dbvec)] | 676 | st %o1, [%g1 + %lo(linux_dbvec)] |
677 | 677 | ||
678 | ld [%o0 + 0x4], %o3 | ||
679 | and %o3, 0x3, %o5 ! get the version | ||
680 | |||
681 | cmp %o3, 0x2 ! a v2 prom? | ||
682 | be found_version | ||
683 | nop | ||
684 | |||
685 | /* paul@sfe.com.au */ | ||
686 | cmp %o3, 0x3 ! a v3 prom? | ||
687 | be found_version | ||
688 | nop | ||
689 | |||
690 | found_version: | ||
691 | /* Get the machine type via the mysterious romvec node operations. */ | 678 | /* Get the machine type via the mysterious romvec node operations. */ |
692 | 679 | ||
693 | add %g7, 0x1c, %l1 | 680 | add %g7, 0x1c, %l1 |