diff --git a/firmware/export/config.h b/firmware/export/config.h
index 9af8b1f70d..61f8d61b41 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -563,7 +563,7 @@ Lyre prototype 1 */
 #define CPU_ARM
 #define ARM_ARCH 7 /* ARMv7 */
 
-#elif (CONFIG_CPU == IMX31L) \
+#elif (CONFIG_CPU == IMX31L) || defined(SAMSUNG_YPR0) \
   || ((CONFIG_PLATFORM & PLATFORM_MAEMO4) && defined(MAEMO_ARM_BUILD))
 #define CPU_ARM
 #define ARM_ARCH 6 /* ARMv6 */
diff --git a/tools/configure b/tools/configure
index 0a4766d505..ac2c66a6b1 100755
--- a/tools/configure
+++ b/tools/configure
@@ -672,7 +672,6 @@ ypr0cc () {
  endian="little"
  thread_support="HAVE_SIGALTSTACK_THREADS"
  app_type="ypr0"
- arch="unknown"
 
  # Include path
  GCCOPTS="$GCCOPTS  -D_GNU_SOURCE=1 -U_FORTIFY_SOURCE -D_REENTRANT"