Skip to contentSkip to conversation

MIPS pbl fixes

PATCH Applied Antony Pavlov 2 participants 5 messages Jun 17, 2013 – Jun 18, 2013 MIPS

lore
Share & tools
lore
#1 lore raw

PATCH 1/3 MIPS: pbl: remove extra LONGSIZE definition

We already have the LONGSIZE macro definition in <asm/asm.h>.

---
 arch/mips/include/asm/pbl_macros.h |    2 --
 1 file changed, 2 deletions(-)
arch/mips/include/asm/pbl_macros.h +0 -2
index c32a229..6a48ca4 100644
@@ -48,8 +48,6 @@ _pc:	addiu	\rd, ra, \label - _pc		# label is assumed to be
 	.set	pop
 	.endm
 
-#define LONGSIZE	4
-
 	.macro	copy_to_link_location start_addr
 	.set	push
 	.set	noreorder
Signature · 7 lines
1.7.10.4


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#2 lore raw

PATCH 2/3 MIPS: pbl: use generated label in ADR macro

In reply to Antony Pavlov

The generated label usage make possible
to use the ADR macro many times.

If we don't use a generated label and we try
to use the ADR macro second time then we get

Error: symbol `_pc' is already defined

---
 arch/mips/include/asm/pbl_macros.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/mips/include/asm/pbl_macros.h +2 -2
index 6a48ca4..3971b61 100644
@@ -41,9 +41,9 @@
 	.set	push
 	.set	noreorder
 	move	\temp, ra			# preserve ra beforehand
-	bal	_pc
+	bal	255f
 	 nop
-_pc:	addiu	\rd, ra, \label - _pc		# label is assumed to be
+255:	addiu	\rd, ra, \label - 255b		# label is assumed to be
 	move	ra, \temp			# within pc +/- 32KB
 	.set	pop
 	.endm
Signature · 7 lines
1.7.10.4


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#3 lore raw

PATCH 3/3 MIPS: pbl: remove extra copyrights

In reply to Antony Pavlov

Remove Shinya Kuribayashi's copyright on the ADR macro in start-pbl.S as we don't define this macro in this file or even use it where.

---
 arch/mips/boot/start-pbl.S |    1 -
 1 file changed, 1 deletion(-)
arch/mips/boot/start-pbl.S +0 -1
index 702e291..b6d127a 100644
@@ -2,7 +2,6 @@
  * Startup Code for MIPS CPU
  *
  * Copyright (C) 2011, 2012 Antony Pavlov <[email protected]>
- * ADR macro copyrighted (C) 2009 by Shinya Kuribayashi <[email protected]>
  *
  * This file is part of barebox.
  * See file CREDITS for list of people who contributed to this project.
Signature · 7 lines
1.7.10.4


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Applied
#4 lore raw
In reply to Antony Pavlov
Quoted 3 lines · Antony Pavlov

[PATCH 1/3] MIPS: pbl: remove extra LONGSIZE definition [PATCH 2/3] MIPS: pbl: use generated label in ADR macro [PATCH 3/3] MIPS: pbl: remove extra copyrights

Applied all, thanks

Sascha

Signature · 9 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox