From 7dcf9d51e5ffadfcf8b5fceddcddb4e1d0a7db37 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Fri, 16 Oct 2015 13:10:02 -0700 Subject: arm64: tegra132: tegra210: Remove old arm64/stage_entry.S This patch removes the old arm64/stage_entry.S code that was too specific to the Tegra SoC boot flow, and replaces it with code that hides the peculiarities of switching to a different CPU/arch in ramstage in the Tegra SoC directories. BRANCH=None BUG=None TEST=Built Ryu and Smaug. !!!UNTESTED!!! Change-Id: Ib3a0448b30ac9c7132581464573efd5e86e03698 Signed-off-by: Julius Werner Reviewed-on: http://review.coreboot.org/12078 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Aaron Durbin --- src/arch/arm64/include/armv8/arch/cpu.h | 12 ------------ src/arch/arm64/include/armv8/arch/lib_helpers.h | 8 ++++---- 2 files changed, 4 insertions(+), 16 deletions(-) (limited to 'src/arch/arm64/include/armv8') diff --git a/src/arch/arm64/include/armv8/arch/cpu.h b/src/arch/arm64/include/armv8/arch/cpu.h index fdc34e5086..6e096cc8e6 100644 --- a/src/arch/arm64/include/armv8/arch/cpu.h +++ b/src/arch/arm64/include/armv8/arch/cpu.h @@ -20,18 +20,6 @@ static inline unsigned int smp_processor_id(void) { return 0; } -/* - * The arm64_cpu_startup() initializes CPU's exception stack and regular - * stack as well initializing the C environment for the processor. Finally it - * calls into c_entry. - */ -void arm64_cpu_startup(void); - -/* - * The arm64_arch_timer_init() initializes the CPU's cntfrq register of - * ARM arch timer. - */ -void arm64_arch_timer_init(void); #if !defined(__PRE_RAM__) struct cpu_driver { }; diff --git a/src/arch/arm64/include/armv8/arch/lib_helpers.h b/src/arch/arm64/include/armv8/arch/lib_helpers.h index 6dd33b352f..51a754a8af 100644 --- a/src/arch/arm64/include/armv8/arch/lib_helpers.h +++ b/src/arch/arm64/include/armv8/arch/lib_helpers.h @@ -58,10 +58,10 @@ #define SCR_EA_MASK (1 << SCR_EA_SHIFT) #define SCR_EA_ENABLE (1 << SCR_EA_SHIFT) #define SCR_EA_DISABLE (0 << SCR_EA_SHIFT) -#define SCR_SMC_SHIFT 7 -#define SCR_SMC_MASK (1 << SCR_SMC_SHIFT) -#define SCR_SMC_DISABLE (1 << SCR_SMC_SHIFT) -#define SCR_SMC_ENABLE (0 << SCR_SMC_SHIFT) +#define SCR_SMD_SHIFT 7 +#define SCR_SMD_MASK (1 << SCR_SMD_SHIFT) +#define SCR_SMD_DISABLE (1 << SCR_SMD_SHIFT) +#define SCR_SMD_ENABLE (0 << SCR_SMD_SHIFT) #define SCR_HVC_SHIFT 8 #define SCR_HVC_MASK (1 << SCR_HVC_SHIFT) #define SCR_HVC_DISABLE (0 << SCR_HVC_SHIFT) -- cgit v1.2.3