Module Name: src
Committed By: skrll
Date: Fri Aug 3 15:38:16 UTC 2018
Modified Files:
src/sys/arch/evbarm/rpi: rpi_start.S
Log Message:
Subtract KERNEL_BASE_VOFFSET from all VAs to get PA. How did this work
before?
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/rpi/rpi_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/evbarm/rpi/rpi_start.S
diff -u src/sys/arch/evbarm/rpi/rpi_start.S:1.18 src/sys/arch/evbarm/rpi/rpi_start.S:1.19
--- src/sys/arch/evbarm/rpi/rpi_start.S:1.18 Wed Jun 27 11:12:15 2018
+++ src/sys/arch/evbarm/rpi/rpi_start.S Fri Aug 3 15:38:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_start.S,v 1.18 2018/06/27 11:12:15 ryo Exp $ */
+/* $NetBSD: rpi_start.S,v 1.19 2018/08/03 15:38:16 skrll Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
@@ -96,7 +96,7 @@
#include <arm/armreg.h>
#include "assym.h"
-RCSID("$NetBSD: rpi_start.S,v 1.18 2018/06/27 11:12:15 ryo Exp $")
+RCSID("$NetBSD: rpi_start.S,v 1.19 2018/08/03 15:38:16 skrll Exp $")
#if defined(VERBOSE_INIT_ARM)
@@ -141,16 +141,16 @@ _C_LABEL(rpi_start):
#if defined(VERBOSE_INIT_ARM)
/* stack for calling bcm2835_platform_early_putchar() */
ldr sp, Lbootstk
-#if !defined(KERNEL_BASES_EQUAL)
sub sp, sp, #KERNEL_BASE_VOFFSET
-#endif
#endif /* VERBOSE_INIT_ARM */
ldr r8, Luboot_args
+ sub r8, r8, #KERNEL_BASE_VOFFSET
stmia r8!, {r0-r3}
#ifdef FDT
ldr r8, Lfdt_addr_r
+ sub r8, r8, #KERNEL_BASE_VOFFSET
str r2, [r8]
#endif
mrs r0, cpsr
