Skip to contentSkip to conversation

sh: Rename romimage-macros.h to partner-jet-macros.h

PATCH In review Magnus Damm 1 participant 1 message Oct 29, 2009 SuperH

lore
Share & tools
lore
#0 lore raw

PATCH 1/7 sh: Rename romimage-macros.h to partner-jet-macros.h

From: Magnus Damm <[email protected]>

Since we will use the macros outside of romimage, rename the file <asm/romimage-macros.h> to <asm/partner-jet-macros.h>.

---

 arch/sh/include/asm/partner-jet-macros.h      |   73 +++++++++++++++++++++++++
 arch/sh/include/asm/romimage-macros.h         |   73 -------------------------
 arch/sh/include/mach-ecovec24/mach/romimage.h |    2 
 arch/sh/include/mach-kfr2r09/mach/romimage.h  |    2 
 4 files changed, 75 insertions(+), 75 deletions(-)
arch/sh/include/asm/partner-jet-macros.h new file +73 -0
@@ -0,0 +1,73 @@
+#ifndef __ROMIMAGE_MACRO_H
+#define __ROMIMAGE_MACRO_H
+
+/* The LIST command is used to include comments in the script */
+.macro	LIST comment
+.endm
+
+/* The ED command is used to write a 32-bit word */
+.macro  ED, addr, data
+	mov.l 1f, r1
+	mov.l 2f, r0
+	mov.l r0, @r1
+	bra 3f
+	 nop
+	.align 2
+1 :	.long \addr
+2 :	.long \data
+3 :
+.endm
+
+/* The EW command is used to write a 16-bit word */
+.macro  EW, addr, data
+	mov.l 1f, r1
+	mov.l 2f, r0
+	mov.w r0, @r1
+	bra 3f
+	 nop
+	.align 2
+1 :	.long \addr
+2 :	.long \data
+3 :
+.endm
+
+/* The EB command is used to write an 8-bit word */
+.macro  EB, addr, data
+	mov.l 1f, r1
+	mov.l 2f, r0
+	mov.b r0, @r1
+	bra 3f
+	 nop
+	.align 2
+1 :	.long \addr
+2 :	.long \data
+3 :
+.endm
+
+/* The WAIT command is used to delay the execution */
+.macro  WAIT, time
+	mov.l  2f, r3
+1 :
+	nop
+	tst     r3, r3
+	bf/s    1b
+	dt      r3
+	bra	3f
+	 nop
+	.align 2
+2 :	.long \time * 100
+3 :
+.endm
+
+/* The DD command is used to read a 32-bit word */
+.macro  DD, addr, addr2, nr
+	mov.l 1f, r1
+	mov.l @r1, r0
+	bra 2f
+	 nop
+	.align 2
+1 :	.long \addr
+2 :
+.endm
+
+#endif /* __ROMIMAGE_MACRO_H */
arch/sh/include/asm/romimage-macros.h deleted +0 -73

73 lines not on this page · raw message

arch/sh/include/mach-ecovec24/mach/romimage.h +1 -1
@@ -3,7 +3,7 @@
  * the assembly code is the first code to be executed in the romImage
  */
 
-#include <asm/romimage-macros.h>
+#include <asm/partner-jet-macros.h>
 #include "partner-jet-setup.txt"
 
 	/* execute icbi after enabling cache */
arch/sh/include/mach-kfr2r09/mach/romimage.h +1 -1
@@ -3,7 +3,7 @@
  * the assembly code is the first code to be executed in the romImage
  */
 
-#include <asm/romimage-macros.h>
+#include <asm/partner-jet-macros.h>
 #include "partner-jet-setup.txt"
 
 	/* execute icbi after enabling cache */