Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 142cc039 authored May 12, 2012 by Sam Ravnborg Committed by David S. Miller May 12, 2012

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>

parent 1b4cb70e

arch/sparc/kernel/head_32.S

+0 −13

Original line number	Diff line number	Diff line
		@@ -675,19 +675,6 @@ execute_in_high_mem:
		sethi %hi(linux_dbvec), %g1
		st %o1, [%g1 + %lo(linux_dbvec)]

		ld [%o0 + 0x4], %o3
		and %o3, 0x3, %o5 ! get the version

		cmp %o3, 0x2 ! a v2 prom?
		be found_version
		nop

		/* paul@sfe.com.au */
		cmp %o3, 0x3 ! a v3 prom?
		be found_version
		nop

		found_version:
		/* Get the machine type via the mysterious romvec node operations. */

		add %g7, 0x1c, %l1