* [PATCH 1/3] MIPS: pbl: remove extra LONGSIZE definition
2013-06-17 16:35 [PATCH 0/3] MIPS pbl fixes Antony Pavlov
@ 2013-06-17 16:35 ` Antony Pavlov
2013-06-17 16:35 ` [PATCH 2/3] MIPS: pbl: use generated label in ADR macro Antony Pavlov
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Antony Pavlov @ 2013-06-17 16:35 UTC (permalink / raw)
To: barebox
We already have the LONGSIZE macro definition in <asm/asm.h>.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
arch/mips/include/asm/pbl_macros.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/mips/include/asm/pbl_macros.h b/arch/mips/include/asm/pbl_macros.h
index c32a229..6a48ca4 100644
--- a/arch/mips/include/asm/pbl_macros.h
+++ b/arch/mips/include/asm/pbl_macros.h
@@ -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
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 2/3] MIPS: pbl: use generated label in ADR macro
2013-06-17 16:35 [PATCH 0/3] MIPS pbl fixes Antony Pavlov
2013-06-17 16:35 ` [PATCH 1/3] MIPS: pbl: remove extra LONGSIZE definition Antony Pavlov
@ 2013-06-17 16:35 ` Antony Pavlov
2013-06-17 16:35 ` [PATCH 3/3] MIPS: pbl: remove extra copyrights Antony Pavlov
2013-06-18 7:17 ` [PATCH 0/3] MIPS pbl fixes Sascha Hauer
3 siblings, 0 replies; 5+ messages in thread
From: Antony Pavlov @ 2013-06-17 16:35 UTC (permalink / raw)
To: barebox
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
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
arch/mips/include/asm/pbl_macros.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/mips/include/asm/pbl_macros.h b/arch/mips/include/asm/pbl_macros.h
index 6a48ca4..3971b61 100644
--- a/arch/mips/include/asm/pbl_macros.h
+++ b/arch/mips/include/asm/pbl_macros.h
@@ -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
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 3/3] MIPS: pbl: remove extra copyrights
2013-06-17 16:35 [PATCH 0/3] MIPS pbl fixes Antony Pavlov
2013-06-17 16:35 ` [PATCH 1/3] MIPS: pbl: remove extra LONGSIZE definition Antony Pavlov
2013-06-17 16:35 ` [PATCH 2/3] MIPS: pbl: use generated label in ADR macro Antony Pavlov
@ 2013-06-17 16:35 ` Antony Pavlov
2013-06-18 7:17 ` [PATCH 0/3] MIPS pbl fixes Sascha Hauer
3 siblings, 0 replies; 5+ messages in thread
From: Antony Pavlov @ 2013-06-17 16:35 UTC (permalink / raw)
To: barebox
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.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
arch/mips/boot/start-pbl.S | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/mips/boot/start-pbl.S b/arch/mips/boot/start-pbl.S
index 702e291..b6d127a 100644
--- a/arch/mips/boot/start-pbl.S
+++ b/arch/mips/boot/start-pbl.S
@@ -2,7 +2,6 @@
* Startup Code for MIPS CPU
*
* Copyright (C) 2011, 2012 Antony Pavlov <antonynpavlov@gmail.com>
- * ADR macro copyrighted (C) 2009 by Shinya Kuribayashi <skuribay@pobox.com>
*
* This file is part of barebox.
* See file CREDITS for list of people who contributed to this project.
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] MIPS pbl fixes
2013-06-17 16:35 [PATCH 0/3] MIPS pbl fixes Antony Pavlov
` (2 preceding siblings ...)
2013-06-17 16:35 ` [PATCH 3/3] MIPS: pbl: remove extra copyrights Antony Pavlov
@ 2013-06-18 7:17 ` Sascha Hauer
3 siblings, 0 replies; 5+ messages in thread
From: Sascha Hauer @ 2013-06-18 7:17 UTC (permalink / raw)
To: Antony Pavlov; +Cc: barebox
On Mon, Jun 17, 2013 at 08:35:17PM +0400, Antony Pavlov wrote:
> [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
--
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
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread