Module Name: src
Committed By: skrll
Date: Mon Sep 10 07:30:33 UTC 2018
Modified Files:
src/sys/arch/aarch64/aarch64: locore.S
src/sys/arch/evbarm/fdt: fdt_start.S
Log Message:
Don't use printx before setting up stack.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/aarch64/aarch64/locore.S
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/fdt/fdt_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/locore.S
diff -u src/sys/arch/aarch64/aarch64/locore.S:1.23 src/sys/arch/aarch64/aarch64/locore.S:1.24
--- src/sys/arch/aarch64/aarch64/locore.S:1.23 Mon Sep 10 05:14:42 2018
+++ src/sys/arch/aarch64/aarch64/locore.S Mon Sep 10 07:30:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.23 2018/09/10 05:14:42 skrll Exp $ */
+/* $NetBSD: locore.S,v 1.24 2018/09/10 07:30:33 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -35,7 +35,7 @@
#include <aarch64/hypervisor.h>
#include "assym.h"
-RCSID("$NetBSD: locore.S,v 1.23 2018/09/10 05:14:42 skrll Exp $")
+RCSID("$NetBSD: locore.S,v 1.24 2018/09/10 07:30:33 skrll Exp $")
/* #define DEBUG_LOCORE */
/* #define DEBUG_MMU */
@@ -79,6 +79,10 @@ ENTRY_NP(aarch64_start)
ADDR x0, bootstk
mov sp, x0
+#ifdef VERBOSE_INIT_ARM
+ PRINT("boot NetBSD/evbarm (aarch64)\r\n")
+#endif
+
#ifdef DEBUG_LOCORE
PRINT("PC = ")
bl 1f
Index: src/sys/arch/evbarm/fdt/fdt_start.S
diff -u src/sys/arch/evbarm/fdt/fdt_start.S:1.3 src/sys/arch/evbarm/fdt/fdt_start.S:1.4
--- src/sys/arch/evbarm/fdt/fdt_start.S:1.3 Wed Jul 18 06:50:48 2018
+++ src/sys/arch/evbarm/fdt/fdt_start.S Mon Sep 10 07:30:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_start.S,v 1.3 2018/07/18 06:50:48 ryo Exp $ */
+/* $NetBSD: fdt_start.S,v 1.4 2018/09/10 07:30:33 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -32,10 +32,7 @@
#include <aarch64/asm.h>
-RCSID("$NetBSD: fdt_start.S,v 1.3 2018/07/18 06:50:48 ryo Exp $")
-
-#define PRINT(string) \
- bl xprint;.asciz string;.align 2
+RCSID("$NetBSD: fdt_start.S,v 1.4 2018/09/10 07:30:33 skrll Exp $")
/* load far effective address (pc relative) */
.macro ADDR, reg, addr
@@ -74,11 +71,6 @@ start:
ADDR x8, fdt_addr_r
str x0, [x8]
-
-#ifdef VERBOSE_INIT_ARM
- PRINT("boot NetBSD/evbarm (aarch64)\r\n")
-#endif
-
b aarch64_start /* aarch64_start() @ aarch64/locore.S */
ENTRY_NP(uartputc)
