svn commit: r275519 - head/sys/arm/xscale/ixp425

[Andrew Turner]

Author: andrew
Date: Fri Dec  5 19:04:08 2014
New Revision: 275519
URL: https://svnweb.freebsd.org/changeset/base/275519

Log:
  Add missing END macros to some of the xscale functions.
  
  MFC after:	1 week
  Sponsored by:	ABT Systems Ltd

Modified:
  head/sys/arm/xscale/ixp425/ixp425_a4x_io.S
  head/sys/arm/xscale/ixp425/ixp425_pci_asm.S

Modified: head/sys/arm/xscale/ixp425/ixp425_a4x_io.S
==============================================================================
--- head/sys/arm/xscale/ixp425/ixp425_a4x_io.S	Fri Dec  5 19:00:55 2014	(r275518)
+++ head/sys/arm/xscale/ixp425/ixp425_a4x_io.S	Fri Dec  5 19:04:08 2014	(r275519)
@@ -56,6 +56,7 @@ ENTRY(a4x_bs_r_1)
 	ldr	r0, [r1, r2, LSL #2]
 	and	r0, r0, #0xff
 	mov	pc, lr
+END(a4x_bs_r_1)
 
 ENTRY(a4x_bs_r_2)
 	ldr	r0, [r1, r2, LSL #2]
@@ -63,10 +64,12 @@ ENTRY(a4x_bs_r_2)
 	orr	r1, r1, r1, lsl #8
 	and	r0, r0, r1
 	mov	pc, lr
+END(a4x_bs_r_2)
 
 ENTRY(a4x_bs_r_4)
 	ldr	r0, [r1, r2, LSL #2]
 	mov	pc, lr
+END(a4x_bs_r_4)
 
 /*
  * Write single
@@ -75,6 +78,7 @@ ENTRY(a4x_bs_w_1)
 	and	r3, r3, #0xff
 	str	r3, [r1, r2, LSL #2]
 	mov	pc, lr
+END(a4x_bs_w_1)
 
 ENTRY(a4x_bs_w_2)
 	mov	r0, #0xff
@@ -82,10 +86,12 @@ ENTRY(a4x_bs_w_2)
 	and	r3, r3, r0
 	str	r3, [r1, r2, LSL #2]
 	mov	pc, lr
+END(a4x_bs_w_2)
 
 ENTRY(a4x_bs_w_4)
 	str	r3, [r1, r2, LSL #2]
 	mov	pc, lr
+END(a4x_bs_w_4)
 
 /*
  * Read multiple
@@ -101,6 +107,7 @@ ENTRY(a4x_bs_rm_1)
 	strb	r3, [r1], #1
 	bne	1b
 	mov	pc, lr
+END(a4x_bs_rm_1)
 
 ENTRY(a4x_bs_rm_2)
 	add	r0, r1, r2, lsl #2
@@ -113,6 +120,7 @@ ENTRY(a4x_bs_rm_2)
 	strh	r3, [r1], #2
 	bne	1b
 	mov	pc, lr
+END(a4x_bs_rm_2)
 
 /*
  * Write multiple
@@ -128,6 +136,7 @@ ENTRY(a4x_bs_wm_1)
 	str	r3, [r0]
 	bne	1b
 	mov	pc, lr
+END(a4x_bs_wm_1)
 
 ENTRY(a4x_bs_wm_2)
 	add	r0, r1, r2, lsl #2
@@ -140,3 +149,4 @@ ENTRY(a4x_bs_wm_2)
 	str	r3, [r0]
 	bne	1b
 	mov	pc, lr
+END(a4x_bs_wm_2)

Modified: head/sys/arm/xscale/ixp425/ixp425_pci_asm.S
==============================================================================
--- head/sys/arm/xscale/ixp425/ixp425_pci_asm.S	Fri Dec  5 19:00:55 2014	(r275518)
+++ head/sys/arm/xscale/ixp425/ixp425_pci_asm.S	Fri Dec  5 19:04:08 2014	(r275519)
@@ -58,6 +58,7 @@ ENTRY(ixp425_pci_mem_bs_r_1)
 	ldrb	r0, [r1, r2]
 #endif /* __ARMEB__ */
 	mov	pc, lr
+END(ixp425_pci_mem_bs_r_1)
 
 ENTRY(ixp425_pci_mem_bs_r_2)
 #ifdef __ARMEB__
@@ -68,10 +69,12 @@ ENTRY(ixp425_pci_mem_bs_r_2)
 	ldrh	r0, [r1, r2]
 #endif /* __ARMEB__ */
 	mov	pc, lr
+END(ixp425_pci_mem_bs_r_2)
 
 ENTRY(ixp425_pci_mem_bs_r_4)
 	ldr	r0, [r1, r2]
 	mov	pc, lr
+END(ixp425_pci_mem_bs_r_4)
 
 /*
  * write single
@@ -86,6 +89,7 @@ ENTRY(ixp425_pci_mem_bs_w_1)
 	strb	r3, [r1, r2]
 #endif /* __ARMEB__ */
 	mov	pc, lr
+END(ixp425_pci_mem_bs_w_1)
 
 ENTRY(ixp425_pci_mem_bs_w_2)
 #ifdef __ARMEB__
@@ -96,7 +100,9 @@ ENTRY(ixp425_pci_mem_bs_w_2)
 	strh	r3, [r1, r2]
 #endif /* __ARMEB__ */
 	mov	pc, lr
+END(ixp425_pci_mem_bs_w_2)
 
 ENTRY(ixp425_pci_mem_bs_w_4)
 	str	r3, [r1, r2]
 	mov	pc, lr
+END(ixp425_pci_mem_bs_w_4)