aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/entry.S
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-05-11 23:59:57 -0400
committerDavid S. Miller <davem@davemloft.net>2012-05-11 23:59:57 -0400
commit288e58cd03a75d66fdea0c666edf7d6bd3d112e7 (patch)
tree93f121aacf9e2faae3ae788de337e8738aa5fe1c /arch/sparc/kernel/entry.S
parent59a0c3d91e038f97be5df5243a41a0e33db53122 (diff)
sparc32: Remove sun4c floppy assembler.
There were two blocks of code for the two ways to twiddle the terminal count pin in the AUXIO register, one for sun4c and one for sun4m. Kill the former. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/entry.S')
-rw-r--r--arch/sparc/kernel/entry.S11
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index b7a543cfeff8..1b87ea088e1a 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -125,20 +125,11 @@ floppy_tdone:
125 125
126 set sparc_cpu_model, %l5 126 set sparc_cpu_model, %l5
127 ld [%l5], %l5 127 ld [%l5], %l5
128 subcc %l5, 1, %g0 /* enum { sun4c = 1 }; */ 128 ldub [%l7], %l5
129 be 1f
130 ldub [%l7], %l5
131 129
132 or %l5, 0xc2, %l5 130 or %l5, 0xc2, %l5
133 stb %l5, [%l7] 131 stb %l5, [%l7]
134 andn %l5, 0x02, %l5 132 andn %l5, 0x02, %l5
135 b 2f
136 nop
137
1381:
139 or %l5, 0xf4, %l5
140 stb %l5, [%l7]
141 andn %l5, 0x04, %l5
142 133
1432: 1342:
144 /* Kill some time so the bits set */ 135 /* Kill some time so the bits set */