Module Name: src
Committed By: matt
Date: Thu May 14 17:15:56 UTC 2015
Modified Files:
src/sys/arch/arm/arm: cpufunc_asm_pj4b.S
Log Message:
Use movw/movw
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/arm/cpufunc_asm_pj4b.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/arm/arm/cpufunc_asm_pj4b.S
diff -u src/sys/arch/arm/arm/cpufunc_asm_pj4b.S:1.8 src/sys/arch/arm/arm/cpufunc_asm_pj4b.S:1.9
--- src/sys/arch/arm/arm/cpufunc_asm_pj4b.S:1.8 Thu May 14 05:39:32 2015
+++ src/sys/arch/arm/arm/cpufunc_asm_pj4b.S Thu May 14 17:15:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc_asm_pj4b.S,v 1.8 2015/05/14 05:39:32 hsuenaga Exp $ */
+/* $NetBSD: cpufunc_asm_pj4b.S,v 1.9 2015/05/14 17:15:56 matt Exp $ */
/*******************************************************************************
Copyright (C) Marvell International Ltd. and its affiliates
@@ -41,9 +41,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
#include <arm/asm.h>
#include <arm/locore.h>
-.Lpj4b_l2_barrier_reg:
- .word _C_LABEL(armadaxp_l2_barrier_reg)
-
/* LINTSTUB: void pj4b_cpu_sleep(int); */
ENTRY(pj4b_cpu_sleep)
dsb
@@ -92,7 +89,8 @@ END(pj4b_config)
/* LINTSTUB: void pj4b_io_coherency_barrier(vaddr_t, paddr_t, vsize_t); */
ENTRY_NP(pj4b_io_coherency_barrier)
- ldr r0, .Lpj4b_l2_barrier_reg
+ movw r0, #:lower16:_C_LABEL(armadaxp_l2_barrier_reg)
+ movt r0, #:upper16:_C_LABEL(armadaxp_l2_barrier_reg)
ldr r0, [r0] @ MVSOC_MLMB_CIB_BARRIER
mov r1, #1 @ MVSOC_MLMB_CIB_BARRIER_TRIGGER
str r1, [r0]
