Module Name: src
Committed By: skrll
Date: Fri Sep 14 09:06:13 UTC 2018
Modified Files:
src/sys/arch/evbarm/conf: mk.generic64
Added Files:
src/sys/arch/aarch64/aarch64: start.S
Removed Files:
src/sys/arch/evbarm/fdt: fdt_start.S genassym.cf
Log Message:
Move the aarch64 start stub from sys/arch/evbarm to sys/arch/aarch64.
Delete the unused/empty evbarm/fdt/genassym.cf while I'm here.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/aarch64/aarch64/start.S
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/mk.generic64
cvs rdiff -u -r1.4 -r0 src/sys/arch/evbarm/fdt/fdt_start.S
cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/fdt/genassym.cf
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/evbarm/conf/mk.generic64
diff -u src/sys/arch/evbarm/conf/mk.generic64:1.1 src/sys/arch/evbarm/conf/mk.generic64:1.2
--- src/sys/arch/evbarm/conf/mk.generic64:1.1 Sun Apr 1 04:35:04 2018
+++ src/sys/arch/evbarm/conf/mk.generic64 Fri Sep 14 09:06:12 2018
@@ -1,7 +1,7 @@
-# $NetBSD: mk.generic64,v 1.1 2018/04/01 04:35:04 ryo Exp $
+# $NetBSD: mk.generic64,v 1.2 2018/09/14 09:06:12 skrll Exp $
-SYSTEM_FIRST_OBJ= fdt_start.o
-SYSTEM_FIRST_SFILE= ${THISARM}/fdt/fdt_start.S
+SYSTEM_FIRST_OBJ= start.o
+SYSTEM_FIRST_SFILE= ${ARM}/aarch64/start.S
_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
@@ -10,8 +10,6 @@ BOARDTYPE= evbarm64
MKUBOOTIMAGEARGS= -f arm64
MKKNLIMG= ${THISARM}/compile/rpi-mkknlimg.sh
-GENASSYM_EXTRAS+= ${THISARM}/fdt/genassym.cf
-
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} -S -O binary $@ [email protected]; \
${OBJCOPY} -S -O binary $@ [email protected]; \
Added files:
Index: src/sys/arch/aarch64/aarch64/start.S
diff -u /dev/null src/sys/arch/aarch64/aarch64/start.S:1.1
--- /dev/null Fri Sep 14 09:06:13 2018
+++ src/sys/arch/aarch64/aarch64/start.S Fri Sep 14 09:06:12 2018
@@ -0,0 +1,80 @@
+/* $NetBSD: start.S,v 1.1 2018/09/14 09:06:12 skrll Exp $ */
+
+/*
+ * Copyright (c) 2017 Ryo Shimizu <[email protected]>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opt_arm_debug.h" /* VERBOSE_INIT_ARM */
+
+#include <sys/cdefs.h>
+
+#include <aarch64/asm.h>
+
+RCSID("$NetBSD: start.S,v 1.1 2018/09/14 09:06:12 skrll Exp $")
+
+/* load far effective address (pc relative) */
+.macro ADDR, reg, addr
+ adrp \reg, \addr
+ add \reg, \reg, #:lo12:\addr
+.endm
+
+/*
+ * Kernel start routine for aarch64 boards.
+ */
+ .global start
+start:
+ adr x9, start
+ ldr x10, =start
+
+ sub x10, x10, x9
+
+ /* address of kern_vtopdiff (relative) */
+ ADDR x8, kern_vtopdiff
+ str x10, [x8] /* kern_vtopdiff = start(virt) - start(phys) */
+
+ /*
+ * store uboot arguments to uboot_args[4]
+ */
+
+ /* address of uboot_args (relative) */
+ ADDR x8, uboot_args
+ str x0, [x8, #(8*0)]
+ str x1, [x8, #(8*1)]
+ str x2, [x8, #(8*2)]
+ str x3, [x8, #(8*3)]
+
+ /*
+ * ARM64 boot protocol has FDT address in x0 *
+ */
+ ADDR x8, fdt_addr_r
+ str x0, [x8]
+
+ b aarch64_start /* aarch64_start() @ aarch64/locore.S */
+
+ENTRY_NP(uartputc)
+#ifdef EARLYCONS
+ b ___CONCAT(EARLYCONS, _platform_early_putchar)
+#endif
+ ret
