From 6e47d95ce6caced0ee77a2660c632ded636f195e Mon Sep 17 00:00:00 2001 From: NicJA Date: Tue, 14 Apr 2015 01:28:38 +0000 Subject: [PATCH] fix arm v7 detection git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@50374 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- arch/arm-all/processor/processor_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm-all/processor/processor_util.c b/arch/arm-all/processor/processor_util.c index d09a681ee2..4aae326f26 100644 --- a/arch/arm-all/processor/processor_util.c +++ b/arch/arm-all/processor/processor_util.c @@ -70,12 +70,12 @@ VOID ReadProcessorInformation(struct ARMProcessorInformation * info) { info->Family = CPUFAMILY_ARM_6; + if if ((scp_reg & 0xFFF0) == 0xc070) + info->Family = CPUFAMILY_ARM_7; + DPROBE(bug("[processor.ARM] %s: Checking Memory Model Feature Register..\n", __PRETTY_FUNCTION__)); asm volatile("mrc p15, 0, %[scp_reg], c0, c1, 4" : [scp_reg] "=r" (scp_reg) ); - if (((((scp_reg >> 4) & 0xF) >= 1) && ((scp_reg & 0xF) >= 3)) || (((scp_reg >> 4) & 0xF) >= 3)) - info->Family = CPUFAMILY_ARM_7; - DPROBE(bug("[processor.ARM] %s: - %02d:%02d\n", __PRETTY_FUNCTION__, (scp_reg >> 4) & 0xF, scp_reg & 0xF)); } else -- 2.11.4.GIT