sparc32: string and whitespace cleanup in head_32.S

A few strings have been adopted to show more relevant info. Julian Calaby <julian.calaby@gmail.com> pointed out one that I would otherwise have missed. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
author: Sam Ravnborg <sam@ravnborg.org> 2012-05-25 17:20:05 -0400
committer: David S. Miller <davem@davemloft.net> 2012-05-28 02:52:40 -0400
commit: ec24158eac0ae2786ebf1e0afa8f3664891319ba (patch)
tree: 9f6373a92e64121023d60c7084853af210bc721d /arch/sparc/kernel
parent: 492c24e5894c65e23b11e5043c7144c2f2310abf (diff)
1 files changed, 15 insertions, 15 deletions
diff --git a/arch/sparc/kernel/head_32.S b/arch/sparc/kernel/head_32.S
index a0f5c20e4b9c..693fb080f933 100644
--- a/arch/sparc/kernel/head_32.S
+++ b/arch/sparc/kernel/head_32.S
@@ -46,8 +46,8 @@ cputypvar:
        .align 4
-sun4c_notsup:
+notsup:
-        .asciz  "Sparc-Linux sun4/sun4c support does no longer exist.\n\n"
+        .asciz  "Sparc-Linux sun4/sun4c or MMU-less not supported\n\n"
        .align 4
 sun4e_notsup:
@@ -123,7 +123,7 @@ current_pc:
                tst     %o0
                be      no_sun4u_here
                 mov    %g4, %o7                /* Previous %o7. */
-        
                mov     %o0, %l0                ! stash away romvec
                mov     %o0, %g7                ! put it here too
                mov     %o1, %l1                ! stash away debug_vec too
@@ -132,7 +132,7 @@ current_pc:
                set     current_pc, %g5
                cmp     %g3, %g5
                be      already_mapped
-                 nop 
+                 nop
                /* %l6 will hold the offset we have to subtract
                 * from absolute symbols in order to access areas
@@ -194,7 +194,7 @@ copy_prom_done:
 halt_sun4_or_sun4c:
                ld      [%g7 + 0x68], %o1
-                set     sun4c_notsup, %o0
+                set     notsup, %o0
                sub     %o0, %l6, %o0
                call    %o1
                 nop
@@ -230,12 +230,12 @@ srmmu_remap:
                subcc   %g3, 0x0, %g0
                bnz     srmmu_nviking                   ! is in mbus mode
                 nop
-                
                rd      %psr, %g3                       ! DO NOT TOUCH %g3
                andn    %g3, PSR_ET, %g2
                wr      %g2, 0x0, %psr
                WRITE_PAUSE
-                
                /* Get context table pointer, then convert to
                 * a physical address, which is 36 bits.
                 */
@@ -258,12 +258,12 @@ srmmu_remap:
                lda     [%g4] ASI_M_BYPASS, %o1         ! This is a level 1 ptr
                srl     %o1, 0x4, %o1                   ! Clear low 4 bits
                sll     %o1, 0x8, %o1                   ! Make physical
-                
                /* Ok, pull in the PTD. */
                lda     [%o1] ASI_M_BYPASS, %o2         ! This is the 0x0 16MB pgd
                /* Calculate to KERNBASE entry. */
-                add     %o1, KERNBASE >> (SRMMU_PGDIR_SHIFT - 2), %o3           
+                add     %o1, KERNBASE >> (SRMMU_PGDIR_SHIFT - 2), %o3
                /* Poke the entry into the calculated address. */
                sta     %o2, [%o3] ASI_M_BYPASS
@@ -480,7 +480,7 @@ continue_boot:
                set     __bss_start , %o0       ! First address of BSS
                set     _end , %o1              ! Last address of BSS
                add     %o0, 0x1, %o0
-1:      
+1:
                stb     %g0, [%o0]
                subcc   %o0, %o1, %g0
                bl      1b
@@ -546,7 +546,7 @@ continue_boot:
                set     dest, %g2; \
                ld      [%g5], %g4; \
                st      %g4, [%g2];
-        
                /* Patch for window spills... */
                PATCH_INSN(spnwin_patch1_7win, spnwin_patch1)
                PATCH_INSN(spnwin_patch2_7win, spnwin_patch2)
@@ -597,7 +597,7 @@ continue_boot:
                st      %g4, [%g5 + 0x18]
                st      %g4, [%g5 + 0x1c]
-2:              
+2:
                sethi   %hi(nwindows), %g4
                st      %g3, [%g4 + %lo(nwindows)]      ! store final value
                sub     %g3, 0x1, %g3
@@ -626,9 +626,9 @@ continue_boot:
                call    prom_init
                 nop
-                call    start_kernel
+                call    start_kernel
                 nop
-        
                /* We should not get here. */
                call    halt_me
                 nop
@@ -659,7 +659,7 @@ sun4u_5:
                .asciz "write"
                .align  4
 sun4u_6:
-                .asciz  "\n\rOn sun4u you have to use UltraLinux (64bit) kernel\n\rand not a 32bit sun4[cdem] version\n\r\n\r"
+                .asciz  "\n\rOn sun4u you have to use sparc64 kernel\n\rand not a sparc32 version\n\r\n\r"
 sun4u_6e:
                .align  4
 sun4u_7:
author	Sam Ravnborg <sam@ravnborg.org>	2012-05-25 17:20:05 -0400
committer	David S. Miller <davem@davemloft.net>	2012-05-28 02:52:40 -0400
commit	ec24158eac0ae2786ebf1e0afa8f3664891319ba (patch)
tree	9f6373a92e64121023d60c7084853af210bc721d /arch/sparc/kernel
parent	492c24e5894c65e23b11e5043c7144c2f2310abf (diff)

diff --git a/arch/sparc/kernel/head_32.S b/arch/sparc/kernel/head_32.S index a0f5c20e4b9c..693fb080f933 100644 --- a/arch/sparc/kernel/head_32.S +++ b/arch/sparc/kernel/head_32.S
@@ -46,8 +46,8 @@ cputypvar:
46		46
47	.align 4	47	.align 4
48		48
49	sun4c_notsup:	49	notsup:
50	.asciz "Sparc-Linux sun4/sun4c support does no longer exist.\n\n"	50	.asciz "Sparc-Linux sun4/sun4c or MMU-less not supported\n\n"
51	.align 4	51	.align 4
52		52
53	sun4e_notsup:	53	sun4e_notsup:
@@ -123,7 +123,7 @@ current_pc:
123	tst %o0	123	tst %o0
124	be no_sun4u_here	124	be no_sun4u_here
125	mov %g4, %o7 /* Previous %o7. */	125	mov %g4, %o7 /* Previous %o7. */
126		126
127	mov %o0, %l0 ! stash away romvec	127	mov %o0, %l0 ! stash away romvec
128	mov %o0, %g7 ! put it here too	128	mov %o0, %g7 ! put it here too
129	mov %o1, %l1 ! stash away debug_vec too	129	mov %o1, %l1 ! stash away debug_vec too
@@ -132,7 +132,7 @@ current_pc:
132	set current_pc, %g5	132	set current_pc, %g5
133	cmp %g3, %g5	133	cmp %g3, %g5
134	be already_mapped	134	be already_mapped
135	nop	135	nop
136		136
137	/* %l6 will hold the offset we have to subtract	137	/* %l6 will hold the offset we have to subtract
138	* from absolute symbols in order to access areas	138	* from absolute symbols in order to access areas
@@ -194,7 +194,7 @@ copy_prom_done:
194		194
195	halt_sun4_or_sun4c:	195	halt_sun4_or_sun4c:
196	ld [%g7 + 0x68], %o1	196	ld [%g7 + 0x68], %o1
197	set sun4c_notsup, %o0	197	set notsup, %o0
198	sub %o0, %l6, %o0	198	sub %o0, %l6, %o0
199	call %o1	199	call %o1
200	nop	200	nop
@@ -230,12 +230,12 @@ srmmu_remap:
230	subcc %g3, 0x0, %g0	230	subcc %g3, 0x0, %g0
231	bnz srmmu_nviking ! is in mbus mode	231	bnz srmmu_nviking ! is in mbus mode
232	nop	232	nop
233		233
234	rd %psr, %g3 ! DO NOT TOUCH %g3	234	rd %psr, %g3 ! DO NOT TOUCH %g3
235	andn %g3, PSR_ET, %g2	235	andn %g3, PSR_ET, %g2
236	wr %g2, 0x0, %psr	236	wr %g2, 0x0, %psr
237	WRITE_PAUSE	237	WRITE_PAUSE
238		238
239	/* Get context table pointer, then convert to	239	/* Get context table pointer, then convert to
240	* a physical address, which is 36 bits.	240	* a physical address, which is 36 bits.
241	*/	241	*/
@@ -258,12 +258,12 @@ srmmu_remap:
258	lda [%g4] ASI_M_BYPASS, %o1 ! This is a level 1 ptr	258	lda [%g4] ASI_M_BYPASS, %o1 ! This is a level 1 ptr
259	srl %o1, 0x4, %o1 ! Clear low 4 bits	259	srl %o1, 0x4, %o1 ! Clear low 4 bits
260	sll %o1, 0x8, %o1 ! Make physical	260	sll %o1, 0x8, %o1 ! Make physical
261		261
262	/* Ok, pull in the PTD. */	262	/* Ok, pull in the PTD. */
263	lda [%o1] ASI_M_BYPASS, %o2 ! This is the 0x0 16MB pgd	263	lda [%o1] ASI_M_BYPASS, %o2 ! This is the 0x0 16MB pgd
264		264
265	/* Calculate to KERNBASE entry. */	265	/* Calculate to KERNBASE entry. */
266	add %o1, KERNBASE >> (SRMMU_PGDIR_SHIFT - 2), %o3	266	add %o1, KERNBASE >> (SRMMU_PGDIR_SHIFT - 2), %o3
267		267
268	/* Poke the entry into the calculated address. */	268	/* Poke the entry into the calculated address. */
269	sta %o2, [%o3] ASI_M_BYPASS	269	sta %o2, [%o3] ASI_M_BYPASS
@@ -480,7 +480,7 @@ continue_boot:
480	set __bss_start , %o0 ! First address of BSS	480	set __bss_start , %o0 ! First address of BSS
481	set _end , %o1 ! Last address of BSS	481	set _end , %o1 ! Last address of BSS
482	add %o0, 0x1, %o0	482	add %o0, 0x1, %o0
483	1:	483	1:
484	stb %g0, [%o0]	484	stb %g0, [%o0]
485	subcc %o0, %o1, %g0	485	subcc %o0, %o1, %g0
486	bl 1b	486	bl 1b
@@ -546,7 +546,7 @@ continue_boot:
546	set dest, %g2; \	546	set dest, %g2; \
547	ld [%g5], %g4; \	547	ld [%g5], %g4; \
548	st %g4, [%g2];	548	st %g4, [%g2];
549		549
550	/* Patch for window spills... */	550	/* Patch for window spills... */
551	PATCH_INSN(spnwin_patch1_7win, spnwin_patch1)	551	PATCH_INSN(spnwin_patch1_7win, spnwin_patch1)
552	PATCH_INSN(spnwin_patch2_7win, spnwin_patch2)	552	PATCH_INSN(spnwin_patch2_7win, spnwin_patch2)
@@ -597,7 +597,7 @@ continue_boot:
597	st %g4, [%g5 + 0x18]	597	st %g4, [%g5 + 0x18]
598	st %g4, [%g5 + 0x1c]	598	st %g4, [%g5 + 0x1c]
599		599
600	2:	600	2:
601	sethi %hi(nwindows), %g4	601	sethi %hi(nwindows), %g4
602	st %g3, [%g4 + %lo(nwindows)] ! store final value	602	st %g3, [%g4 + %lo(nwindows)] ! store final value
603	sub %g3, 0x1, %g3	603	sub %g3, 0x1, %g3
@@ -626,9 +626,9 @@ continue_boot:
626	call prom_init	626	call prom_init
627	nop	627	nop
628		628
629	call start_kernel	629	call start_kernel
630	nop	630	nop
631		631
632	/* We should not get here. */	632	/* We should not get here. */
633	call halt_me	633	call halt_me
634	nop	634	nop
@@ -659,7 +659,7 @@ sun4u_5:
659	.asciz "write"	659	.asciz "write"
660	.align 4	660	.align 4
661	sun4u_6:	661	sun4u_6:
662	.asciz "\n\rOn sun4u you have to use UltraLinux (64bit) kernel\n\rand not a 32bit sun4[cdem] version\n\r\n\r"	662	.asciz "\n\rOn sun4u you have to use sparc64 kernel\n\rand not a sparc32 version\n\r\n\r"
663	sun4u_6e:	663	sun4u_6e:
664	.align 4	664	.align 4
665	sun4u_7:	665	sun4u_7: