From 71f01aaa43fc3b5e0f53674cb227efa66f6f8a96 Mon Sep 17 00:00:00 2001 From: TuxSH Date: Wed, 7 Mar 2018 14:34:47 +0100 Subject: [PATCH] Fix freudian slip --- exosphere/src/bootup.c | 8 ++++---- exosphere/src/syscrt0.h | 17 ----------------- exosphere/src/sysctr0.h | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 exosphere/src/syscrt0.h create mode 100644 exosphere/src/sysctr0.h diff --git a/exosphere/src/bootup.c b/exosphere/src/bootup.c index b89efd3c7..6e7eb8176 100644 --- a/exosphere/src/bootup.c +++ b/exosphere/src/bootup.c @@ -19,7 +19,7 @@ #include "interrupt.h" #include "cpu_context.h" #include "actmon.h" -#include "syscrt0.h" +#include "sysctr0.h" #include "mmu.h" #include "arm.h" @@ -136,7 +136,7 @@ void bootup_misc_mmio(void) { /* Lock Non-Secure writes to Secure Boot RESET Vector. */ SB_CSR_0 = 2; - + /* Setup PMC Secure Scratch RESET Vector for warmboot. */ APBDEV_PMC_SECURE_SCRATCH34_0 = reset_vec; APBDEV_PMC_SECURE_SCRATCH35_0 = 0; @@ -181,7 +181,7 @@ void setup_4x_mmio(void) { void setup_current_core_state(void) { uint64_t temp_reg; - + /* Setup system registers. */ SET_SYSREG(actlr_el3, 0x73ull); SET_SYSREG(actlr_el2, 0x73ull); @@ -192,7 +192,7 @@ void setup_current_core_state(void) { __isb(); - SET_SYSREG(cntfrq_el0, MAKE_SYSCRT0_REG(0x20)); /* TODO: Reg name. */ + SET_SYSREG(cntfrq_el0, MAKE_SYSCTR0_REG(0x20)); /* TODO: Reg name. */ SET_SYSREG(cnthctl_el2, 3ull); __isb(); diff --git a/exosphere/src/syscrt0.h b/exosphere/src/syscrt0.h deleted file mode 100644 index 52280a082..000000000 --- a/exosphere/src/syscrt0.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef EXOSPHERE_SYSCRT0_H -#define EXOSPHERE_SYSCRT0_H - -#include - -#include "memory_map.h" - -/* Exosphere driver for the Tegra X1 SYSCRT0 Registers. */ - -#define SYSCRT0_BASE (MMIO_GET_DEVICE_ADDRESS(MMIO_DEVID_SYSCTR0)) - - -#define MAKE_SYSCRT0_REG(n) MAKE_REG32(SYSCRT0_BASE + n) - - - -#endif diff --git a/exosphere/src/sysctr0.h b/exosphere/src/sysctr0.h new file mode 100644 index 000000000..9450daed1 --- /dev/null +++ b/exosphere/src/sysctr0.h @@ -0,0 +1,17 @@ +#ifndef EXOSPHERE_SYSCTR0_H +#define EXOSPHERE_SYSCTR0_H + +#include + +#include "memory_map.h" + +/* Exosphere driver for the Tegra X1 SYSCRT0 Registers. */ + +#define SYSCTR0_BASE (MMIO_GET_DEVICE_ADDRESS(MMIO_DEVID_SYSCTR0)) + + +#define MAKE_SYSCTR0_REG(n) MAKE_REG32(SYSCTR0_BASE + n) + + + +#endif