Module Name: src
Committed By: skrll
Date: Sat Nov 28 14:29:31 UTC 2020
Modified Files:
src/sys/arch/evbarm/imx31: imx31lk_start.S
Log Message:
Build fix
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/imx31/imx31lk_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/imx31/imx31lk_start.S
diff -u src/sys/arch/evbarm/imx31/imx31lk_start.S:1.6 src/sys/arch/evbarm/imx31/imx31lk_start.S:1.7
--- src/sys/arch/evbarm/imx31/imx31lk_start.S:1.6 Mon Oct 15 16:54:54 2018
+++ src/sys/arch/evbarm/imx31/imx31lk_start.S Sat Nov 28 14:29:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31lk_start.S,v 1.6 2018/10/15 16:54:54 skrll Exp $ */
+/* $NetBSD: imx31lk_start.S,v 1.7 2020/11/28 14:29:31 skrll Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -32,7 +32,7 @@
#include <arm/armreg.h>
#include "assym.h"
-RCSID("$NetBSD: imx31lk_start.S,v 1.6 2018/10/15 16:54:54 skrll Exp $")
+RCSID("$NetBSD: imx31lk_start.S,v 1.7 2020/11/28 14:29:31 skrll Exp $")
#ifndef SDRAM_START
#define SDRAM_START 0x80000000
@@ -46,7 +46,8 @@ RCSID("$NetBSD: imx31lk_start.S,v 1.6 20
.text
.global _C_LABEL(imx31lk_start)
-_C_LABEL(imx31lk_start):
+
+ENTRY_NP(imx31lk_start)
cpsid if, #PSR_SVC32_MODE
/*
@@ -60,7 +61,8 @@ _C_LABEL(imx31lk_start):
mcr p15, 0, r3, c2, c0, 2 /* set TTBCR to enable TTBR1 */
#endif
- mov r1, #(KERNEL_BASE >> L1_S_SHIFT)
+ ldr r1, =KERNEL_BASE
+ lsr r1, r1, L1_S_SHIFT
add r2, r1, #0x80 /* 128 1MB entries */
ldr r3, .Lsdram_pde
1:
