Module Name: src
Committed By: skrll
Date: Sat Dec 14 17:04:02 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: start.S
Log Message:
Allow RPI firmware boots to work again
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/aarch64/aarch64/start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/start.S
diff -u src/sys/arch/aarch64/aarch64/start.S:1.3 src/sys/arch/aarch64/aarch64/start.S:1.4
--- src/sys/arch/aarch64/aarch64/start.S:1.3 Wed Dec 4 11:24:31 2019
+++ src/sys/arch/aarch64/aarch64/start.S Sat Dec 14 17:04:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: start.S,v 1.3 2019/12/04 11:24:31 jmcneill Exp $ */
+/* $NetBSD: start.S,v 1.4 2019/12/14 17:04:02 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -32,7 +32,7 @@
#include <aarch64/asm.h>
-RCSID("$NetBSD: start.S,v 1.3 2019/12/04 11:24:31 jmcneill Exp $")
+RCSID("$NetBSD: start.S,v 1.4 2019/12/14 17:04:02 skrll Exp $")
/* load far effective address (pc relative) */
.macro ADDR, reg, addr
@@ -40,10 +40,14 @@ RCSID("$NetBSD: start.S,v 1.3 2019/12/04
add \reg, \reg, #:lo12:\addr
.endm
+rpi_start:
+ b start
+
/*
* Padding at start of kernel image to make room for 64-byte header (non-ELF booting)
*/
-.space 64, 0x0
+
+ .align 6
/*
* Kernel start routine for aarch64 boards.
