[PATCH] reformat m68knommu 68360/uCquicc crt0_rom.S

This patch reformats the 68360 crt_rom.S file to make it consistent
with the other m68knommu assembler files, and generally to good
style standards :-)

arch/m68knommu/platform/68360/uCquicc/crt0_rom.S

@@ -11,11 +11,10 @@
  * Copyright (C) 1998  D. Jeff Dionne <jeff@uclinux.org>,
  *
  */
-#define ASSEMBLY
 #include <linux/config.h>
 
 .global _stext
-.global __bss_start
+.global _sbss
 .global _start
 
 .global _rambase
@@ -26,7 +25,6 @@
 
 .global _quicc_base
 .global _periph_base
-.global _dprbase
 
 #define REGB                        0x1000
 #define PEPAR                       (_dprbase + REGB + 0x0016)
@@ -78,7 +76,6 @@
 #define SIM_OR0_MASK                0x20000000
 #define SIM_BR0_MASK                0x00000001
 
-
 /* Defines for chip select one - the RAM */
 #define SIM_OR1_MASK                0x10000000
 #define SIM_BR1_MASK                0x00000001
@@ -107,8 +104,10 @@
 #include <asm/m68360_regs.h>
 
 	
-/* By the time this RAM specific code begins to execute, DPRAM
- * and DRAM should already be mapped and accessible. */
+/*
+ * By the time this RAM specific code begins to execute, DPRAM
+ * and DRAM should already be mapped and accessible.
+ */
 
 	.text
 _start:
@@ -116,7 +115,7 @@ _stext:
 	nop
 	ori.w	#MCU_DISABLE_INTRPTS, %sr	/* disable interrupts: */
 	/* We should not need to setup the boot stack the reset should do it. */
-    movea.l	#_boot_stack,           %sp     /*set up stack at the end of DRAM:*/
+	movea.l	#__ramend, %sp		/* set up stack at the end of DRAM:*/
 
 
 set_mbar_register:
@@ -132,14 +131,13 @@ set_mbar_register:
 	moveq.l	#0x05, %d1
 	movec.l	%d1, %dfc
 
-/* Now we can begin to access registers in DPRAM */
+	/* Now we can begin to access registers in DPRAM */
 
 set_sim_mcr:
 	/* Set Module Configuration Register */
 	move.l	#MCU_SIM_MCR, MCR
 
-/* to do:	Determine cause of reset */
-
+	/* to do:	Determine cause of reset */
 
 	/*
 	 *	configure system clock MC68360 p. 6-40
@@ -153,20 +151,19 @@ set_sim_clock:
 	move.b	#MCU_SIM_CLKOCR, CLKOCR
 	move.w	#MCU_SIM_CDVCR, CDVCR
 
-    // Wait for the PLL to settle
+	/* Wait for the PLL to settle */
 	move.w	#16384, %d0
 pll_settle_wait:
 	subi.w	#1, %d0
 	bne	pll_settle_wait
 
 	/* Setup the system protection register, and watchdog timer register */
-
 	move.b	#MCU_SIM_SWIV, SWIV
 	move.w	#MCU_SIM_PICR, PICR
 	move.w	#MCU_SIM_PITR, PITR
 	move.w	#MCU_SIM_SYPCR, SYPCR
 
-/* Clear DPRAM - system + parameter */
+	/* Clear DPRAM - system + parameter */
 	movea.l	#_dprbase, %a0
 	movea.l	#_dprbase+0x2000, %a1
 
@@ -177,9 +174,7 @@ clear_dpram:
 	bhi	clear_dpram
 
 configure_memory_controller:    
-    /*
-    *   Set up Global Memory Register (GMR)
-    */
+	/* Set up Global Memory Register (GMR) */
 	move.l	#MCU_SIM_GMR, %d0
 	move.l	%d0, GMR
 
@@ -190,7 +185,7 @@ configure_chip_select_0:
 	ori.l	#SIM_OR0_MASK, %d0
 	move.l	%d0, OR0
 
-    move.l      #__flashstart,  %d0
+	move.l	#__rom_start, %d0
 	ori.l	#SIM_BR0_MASK, %d0
 	move.l	%d0, BR0
 
@@ -204,7 +199,7 @@ configure_chip_select_0:
 
 	move.w	#MCU_SIM_PEPAR, PEPAR 
 
-/* point to vector table: */
+	/* point to vector table: */
 	move.l	#_romvec, %a0
 	move.l	#_ramvec, %a1
 copy_vectors:
@@ -221,9 +216,9 @@ copy_vectors:
 
 
 	/* Copy data segment from ROM to RAM */
-	moveal	#__data_rom_start, %a0
-	moveal	#__data_start, %a1
-	moveal	#__data_end, %a2
+	moveal	#_etext, %a0
+	moveal	#_sdata, %a1
+	moveal	#_edata, %a2
 
 	/* Copy %a0 to %a1 until %a1 == %a2 */
 LD1:
@@ -231,11 +226,11 @@ LD1:
 	addq.l	#0x04, %a0
 	move.l	%d0, %a1@
 	addq.l	#0x04, %a1
-    cmp.l   #__data_end,    %a1
+	cmp.l	#_edata, %a1
 	blt	LD1
 
-	moveal	#__bss_start, %a0
-	moveal	#end, %a1
+	moveal	#_sbss, %a0
+	moveal	#_ebss, %a1
 
 	/* Copy 0 to %a0 until %a0 == %a1 */
 L1:
@@ -249,15 +244,15 @@ load_quicc:
 store_ram_size:
 	/* Set ram size information */
 	move.l	#_sdata, _rambase
-    move.l  #end,       _ramstart
+	move.l	#_ebss, _ramstart
 	move.l	#__ramend, %d0
 	sub.l	#0x1000, %d0			/* Reserve 4K for stack space.*/
 	move.l	%d0, _ramend			/* Different from __ramend.*/
 
 store_flash_size:
 	/* Set rom size information */
-    move.l  #__flashend,    %d0
-    sub.l   #__flashstart,  %d0
+	move.l	#__rom_end, %d0
+	sub.l	#__rom_start, %d0
 	move.l	%d0, rom_length
     
 	pea	0
@@ -270,14 +265,11 @@ store_flash_size:
 
 lp:
 	jsr	start_kernel
- /*   jmp lp */
 
 _exit:
-
 	jmp	_exit
 
 
-
 	.data
 	.align 4
 env:
@@ -294,6 +286,10 @@ _ramstart:
 	.long   0
 _ramend:
 	.long   0
+_dprbase:
+	.long	0xffffe000
+
+
 	.text
 
     /*
@@ -302,7 +298,7 @@ _ramend:
      */
  
 .section ".data.initvect","awx"
-    .long   _boot_stack /* Reset: Initial Stack Pointer                 - 0.  */
+    .long   __ramend	/* Reset: Initial Stack Pointer                 - 0.  */
     .long   _start      /* Reset: Initial Program Counter               - 1.  */
     .long   buserr      /* Bus Error                                    - 2.  */
     .long   trap        /* Address Error                                - 3.  */