Changeset 005b765 in mainline for kernel/arch/arm32/src/fpu_context.c

Timestamp:

2013-01-24T22:07:06Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

03362fbd, 3acd1bb, d59c046

Parents:

6218d4b (diff), 24bead17 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge arm improvements.

Speed up boot by enabling caches early (but disable before jumping to kernel).
Add cycle counters on armv7.
Move bbxm dispc driver to uspace.
Add arm PROCESSOR and PROCESSOR_ARCH defines.

File:

• kernel/arch/arm32/src/fpu_context.c (modified) (3 diffs)

kernel/arch/arm32/src/fpu_context.c

@@ -119 +119 @@
  * rely on user decision to use CONFIG_FPU.
  */
-#ifdef PROCESSOR_armv7_a
+#ifdef PROCESSOR_ARC_armv7_a
         const uint32_t cpacr = CPACR_read();
         /* FPU needs access to coprocessor 10 and 11.
@@ -148 +148 @@
  * rely on user decision to use CONFIG_FPU.
  */
-#ifndef PROCESSOR_armv7_a
-        return;
-#endif
-
+#ifdef PROCESSOR_ARCH_armv7_a
         /* Allow coprocessor access */
         uint32_t cpacr = CPACR_read();
@@ -159 +156 @@
         cpacr |= (CPACR_CP_FULL_ACCESS(10) | CPACR_CP_FULL_ACCESS(11));
         CPACR_write(cpacr);
-
-        smc_coherence(0);
+#endif
 }