From b1b8af04439240c532d3530a02773b75b9853f77 Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Tue, 26 May 2020 10:17:19 +0100 Subject: [PATCH] system: Remove CNTFRQ_EL0 write from arm64 boot We don't need this anymore since this is initialized at gem5 construction. JIRA: https://gem5.atlassian.net/browse/GEM5-611 Change-Id: I42a3d53a4defba498a23d9a7c192dfff5852c1c7 Reviewed-by: Ciro Santilli Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/29613 Maintainer: Jason Lowe-Power Tested-by: Bobby R. Bruce --- system/arm/bootloader/arm64/boot.S | 2 -- system/arm/bootloader/arm64/makefile | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/system/arm/bootloader/arm64/boot.S b/system/arm/bootloader/arm64/boot.S index fa7acdb58..b3baa71b0 100644 --- a/system/arm/bootloader/arm64/boot.S +++ b/system/arm/bootloader/arm64/boot.S @@ -40,8 +40,6 @@ .globl _start _start: - ldr x0, =CNTFRQ - msr cntfrq_el0, x0 /* * EL3 initialisation */ diff --git a/system/arm/bootloader/arm64/makefile b/system/arm/bootloader/arm64/makefile index fd5f69f5b..2112b6e71 100644 --- a/system/arm/bootloader/arm64/makefile +++ b/system/arm/bootloader/arm64/makefile @@ -34,7 +34,7 @@ BUILDDIR = . DESTDIR = $(error Please set DESTDIR to wanted installation directory) CFLAGS = -march=armv8-a -CPPFLAGS = -DPHYS_OFFSET=0x80000000 -DCNTFRQ=0x01800000 \ +CPPFLAGS = -DPHYS_OFFSET=0x80000000 \ -DUART_BASE=0x1c090000 -DSYSREGS_BASE=0x1c010000 \ -Dkernel=0x80080000 \ -Dmbox=0x8000fff8 -Ddtb=0x80000100 -- 2.30.2