summaryrefslogtreecommitdiffstats
path: root/cpukit/score/cpu/arm
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2009-10-01 12:57:30 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2009-10-01 12:57:30 +0000
commitf98ce8b87cbbab00afa021fbe77ce1b9bed6ea69 (patch)
tree3eaf2583bbe8b84b11173905794c5237ecc24c8e /cpukit/score/cpu/arm
parent2009-10-01 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-f98ce8b87cbbab00afa021fbe77ce1b9bed6ea69.tar.bz2
2009-10-01 Joel Sherrill <joel.sherrill@oarcorp.com>
* rtems/score/arm.h: Recognize ARMv6J as needed by arm1136 variants.
Diffstat (limited to 'cpukit/score/cpu/arm')
-rw-r--r--cpukit/score/cpu/arm/ChangeLog4
-rw-r--r--cpukit/score/cpu/arm/rtems/score/arm.h3
2 files changed, 7 insertions, 0 deletions
diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog
index 481089a0d5..ba717ae081 100644
--- a/cpukit/score/cpu/arm/ChangeLog
+++ b/cpukit/score/cpu/arm/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-01 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * rtems/score/arm.h: Recognize ARMv6J as needed by arm1136 variants.
+
2009-09-15 Sebastian Huber <sebastian.huber@embedded-brains.de>
* rtems/score/cpu.h: Fix for inline asm in _CPU_Fatal_halt().
diff --git a/cpukit/score/cpu/arm/rtems/score/arm.h b/cpukit/score/cpu/arm/rtems/score/arm.h
index e9a21baf7c..243630d182 100644
--- a/cpukit/score/cpu/arm/rtems/score/arm.h
+++ b/cpukit/score/cpu/arm/rtems/score/arm.h
@@ -50,6 +50,9 @@ extern "C" {
#elif defined(__ARM_ARCH_5TE__)
# define CPU_MODEL_NAME "ARMv5TE"
+#elif defined(__ARM_ARCH_6J__)
+# define CPU_MODEL_NAME "ARMv6J"
+
#else
# error "Unsupported CPU Model"