Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision c127e1ccb10c2c7b86a2fce5e27f2378ecb9a6a9)
+++ HelenOS.config	(revision 49a736e2c42817abe3098179ad216dafecd091e7)
@@ -96,5 +96,5 @@
 
 % CPU type
-@ "armv7" ARMv7
+@ "armv7_a" ARMv7-A
 ! [PLATFORM=arm32&MACHINE=beagleboardxm] PROCESSOR (choice)
 
Index: boot/arch/arm32/Makefile.inc
===================================================================
--- boot/arch/arm32/Makefile.inc	(revision c127e1ccb10c2c7b86a2fce5e27f2378ecb9a6a9)
+++ boot/arch/arm32/Makefile.inc	(revision 49a736e2c42817abe3098179ad216dafecd091e7)
@@ -49,5 +49,5 @@
 BITS = 32
 ENDIANESS = LE
-EXTRA_CFLAGS = -march=armv4
+EXTRA_CFLAGS = -march=$(subst _,-,$(PROCESSOR))
 
 ifeq ($(MACHINE), gta02)
Index: boot/arch/arm32/src/mm.c
===================================================================
--- boot/arch/arm32/src/mm.c	(revision c127e1ccb10c2c7b86a2fce5e27f2378ecb9a6a9)
+++ boot/arch/arm32/src/mm.c	(revision 49a736e2c42817abe3098179ad216dafecd091e7)
@@ -107,9 +107,5 @@
 		"mcr p15, 0, r0, c3, c0, 0\n"
 		
-#ifdef PROCESSOR_armv7
-		/* Clean L2 cache */
-		"mov r12, #0x1\n"   //set up to invalidate L2
-		"smc #0\n"  //Call SMI monitor
-		
+#ifdef PROCESSOR_armv7_a
 		/* Read Auxiliary control register */
 		"mrc p15, 0, r0, c1, c0, 1\n"
@@ -123,5 +119,5 @@
 		"mrc p15, 0, r0, c1, c0, 0\n"
 		
-#ifdef PROCESSOR_armv7
+#ifdef PROCESSOR_armv7_a
 		/* Mask to enable paging, alignment and caching */
 		"ldr r1, =0x00000007\n"
Index: kernel/arch/arm32/Makefile.inc
===================================================================
--- kernel/arch/arm32/Makefile.inc	(revision c127e1ccb10c2c7b86a2fce5e27f2378ecb9a6a9)
+++ kernel/arch/arm32/Makefile.inc	(revision 49a736e2c42817abe3098179ad216dafecd091e7)
@@ -33,5 +33,5 @@
 ATSIGN = %
 
-GCC_CFLAGS += -march=armv4
+GCC_CFLAGS += -march=$(subst _,-,$(PROCESSOR))
 
 BITS = 32
Index: kernel/arch/arm32/include/asm.h
===================================================================
--- kernel/arch/arm32/include/asm.h	(revision c127e1ccb10c2c7b86a2fce5e27f2378ecb9a6a9)
+++ kernel/arch/arm32/include/asm.h	(revision 49a736e2c42817abe3098179ad216dafecd091e7)
@@ -49,5 +49,5 @@
 NO_TRACE static inline void cpu_sleep(void)
 {
-#ifdef PROCESSOR_armv7
+#ifdef PROCESSOR_armv7_a
 	asm volatile ( "wfe" :: );
 #endif
Index: kernel/arch/arm32/include/mm/page.h
===================================================================
--- kernel/arch/arm32/include/mm/page.h	(revision c127e1ccb10c2c7b86a2fce5e27f2378ecb9a6a9)
+++ kernel/arch/arm32/include/mm/page.h	(revision 49a736e2c42817abe3098179ad216dafecd091e7)
@@ -55,5 +55,5 @@
 #endif
 
-#if defined(PROCESSOR_armv7)
+#if defined(PROCESSOR_armv7_a)
 #include "page_armv7.h"
 #elif defined(PROCESSOR_armv4) | defined(PROCESSOR_armv5)
Index: kernel/arch/arm32/src/cpu/cpu.c
===================================================================
--- kernel/arch/arm32/src/cpu/cpu.c	(revision c127e1ccb10c2c7b86a2fce5e27f2378ecb9a6a9)
+++ kernel/arch/arm32/src/cpu/cpu.c	(revision 49a736e2c42817abe3098179ad216dafecd091e7)
@@ -100,5 +100,5 @@
 void cpu_arch_init(void)
 {
-#if defined(PROCESSOR_armv7)
+#if defined(PROCESSOR_armv7_a)
 	uint32_t control_reg = 0;
 	asm volatile (
Index: kernel/arch/arm32/src/exception.c
===================================================================
--- kernel/arch/arm32/src/exception.c	(revision c127e1ccb10c2c7b86a2fce5e27f2378ecb9a6a9)
+++ kernel/arch/arm32/src/exception.c	(revision 49a736e2c42817abe3098179ad216dafecd091e7)
@@ -122,5 +122,5 @@
 	uint32_t control_reg = 0;
 	
-#if defined(PROCESSOR_armv7)
+#if defined(PROCESSOR_armv7_a)
 	asm volatile (
 		"mrc p15, 0, %[control_reg], c1, c0"
@@ -137,5 +137,5 @@
 	control_reg |= CP15_R1_HIGH_VECTORS_BIT;
 	
-#if defined(PROCESSOR_armv7)
+#if defined(PROCESSOR_armv7_a)
 	asm volatile (
 		"mcr p15, 0, %[control_reg], c1, c0"
Index: uspace/lib/c/arch/arm32/Makefile.common
===================================================================
--- uspace/lib/c/arch/arm32/Makefile.common	(revision c127e1ccb10c2c7b86a2fce5e27f2378ecb9a6a9)
+++ uspace/lib/c/arch/arm32/Makefile.common	(revision 49a736e2c42817abe3098179ad216dafecd091e7)
@@ -28,5 +28,5 @@
 #
 
-GCC_CFLAGS += -ffixed-r9 -mtp=soft -fno-omit-frame-pointer -march=armv4
+GCC_CFLAGS += -ffixed-r9 -mtp=soft -fno-omit-frame-pointer -march=$(subst _,-,$(PROCESSOR))
 
 ENDIANESS = LE