[PATCH] fixup! ARM64: board-dt-2nd: adopt kernel image header

[PATCH] fixup! ARM64: board-dt-2nd: adopt kernel image header

[Ahmad Fatoum]

No functional change, but code is way simpler.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 arch/arm/cpu/board-dt-2nd-aarch64.S | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/arch/arm/cpu/board-dt-2nd-aarch64.S b/arch/arm/cpu/board-dt-2nd-aarch64.S
index d32b4066cae2..d2c9f132cef6 100644
--- a/arch/arm/cpu/board-dt-2nd-aarch64.S
+++ b/arch/arm/cpu/board-dt-2nd-aarch64.S
@@ -9,8 +9,7 @@
 
 .section .text_head_entry_start_dt_2nd
 ENTRY("start_dt_2nd")
-1:
-	adr x1, 1b		   /* code0 */
+	adr x1, 0	   	   /* code0 */
 	b 2f                       /* code1 */
 	.xword 0x80000             /* Image load offset */
 	.xword _barebox_image_size /* Effective Image size */
@@ -22,13 +21,9 @@ ENTRY("start_dt_2nd")
 	.int   0                   /* reserved (PE-COFF offset) */
 	.asciz "barebox"	   /* unused for now */
 2:
-	ldr x2, linkadr
-	subs x1, x1, x2		    /* get runtime image load offset */
 	mov sp, x1
 	/* Stack now grows into the 0x80000 image load offset specified
 	 * above. This is more than enough until FDT /memory is decoded.
 	 */
 	b dt_2nd_aarch64
-linkadr:
-.xword start_dt_2nd
 ENTRY_PROC_END(start_dt_2nd)
-- 
2.30.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] fixup! ARM64: board-dt-2nd: adopt kernel image header

[Sascha Hauer]

On Mon, Mar 22, 2021 at 08:17:27AM +0100, Ahmad Fatoum wrote:
> No functional change, but code is way simpler.
> 
> Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
> ---

Applied, thanks

Sascha

>  arch/arm/cpu/board-dt-2nd-aarch64.S | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/arch/arm/cpu/board-dt-2nd-aarch64.S b/arch/arm/cpu/board-dt-2nd-aarch64.S
> index d32b4066cae2..d2c9f132cef6 100644
> --- a/arch/arm/cpu/board-dt-2nd-aarch64.S
> +++ b/arch/arm/cpu/board-dt-2nd-aarch64.S
> @@ -9,8 +9,7 @@
>  
>  .section .text_head_entry_start_dt_2nd
>  ENTRY("start_dt_2nd")
> -1:
> -	adr x1, 1b		   /* code0 */
> +	adr x1, 0	   	   /* code0 */
>  	b 2f                       /* code1 */
>  	.xword 0x80000             /* Image load offset */
>  	.xword _barebox_image_size /* Effective Image size */
> @@ -22,13 +21,9 @@ ENTRY("start_dt_2nd")
>  	.int   0                   /* reserved (PE-COFF offset) */
>  	.asciz "barebox"	   /* unused for now */
>  2:
> -	ldr x2, linkadr
> -	subs x1, x1, x2		    /* get runtime image load offset */
>  	mov sp, x1
>  	/* Stack now grows into the 0x80000 image load offset specified
>  	 * above. This is more than enough until FDT /memory is decoded.
>  	 */
>  	b dt_2nd_aarch64
> -linkadr:
> -.xword start_dt_2nd
>  ENTRY_PROC_END(start_dt_2nd)
> -- 
> 2.30.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
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