[rtems commit] bsp/qoriq: Add QORIQ_IS_HYPERVISOR_GUEST

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    20fc4f95aabc835e4734acbc7bb014f656640d40
Changeset: http://git.rtems.org/rtems/commit/?id=20fc4f95aabc835e4734acbc7bb014f656640d40

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Sep  7 12:49:18 2017 +0200

bsp/qoriq: Add QORIQ_IS_HYPERVISOR_GUEST

Update #3085.

---

 c/src/lib/libbsp/powerpc/qoriq/configure.ac  | 9 ++++++---
 c/src/lib/libbsp/powerpc/qoriq/include/bsp.h | 6 ++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/c/src/lib/libbsp/powerpc/qoriq/configure.ac b/c/src/lib/libbsp/powerpc/qoriq/configure.ac
index 4c2fd32..eafa262 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/configure.ac
+++ b/c/src/lib/libbsp/powerpc/qoriq/configure.ac
@@ -62,9 +62,9 @@ RTEMS_BSPOPTS_SET([QORIQ_CPU_COUNT],[qoriq_e6500*],[24])
 RTEMS_BSPOPTS_SET([QORIQ_CPU_COUNT],[*],[2])
 RTEMS_BSPOPTS_HELP([QORIQ_CPU_COUNT],[maximum virtual processor count])
 
-RTEMS_BSPOPTS_SET([QORIQ_THREAD_COUNT],[qoriq_e6500*],[2])
-RTEMS_BSPOPTS_SET([QORIQ_THREAD_COUNT],[*],[1])
-RTEMS_BSPOPTS_HELP([QORIQ_THREAD_COUNT],[the number of threads per processor])
+RTEMS_BSPOPTS_SET([QORIQ_PHYSICAL_THREAD_COUNT],[qoriq_e6500*],[2])
+RTEMS_BSPOPTS_SET([QORIQ_PHYSICAL_THREAD_COUNT],[*],[1])
+RTEMS_BSPOPTS_HELP([QORIQ_PHYSICAL_THREAD_COUNT],[the number of threads per core])
 
 RTEMS_BSPOPTS_SET([QORIQ_ETSEC_1_PHY_ADDR],[*],[-1])
 RTEMS_BSPOPTS_HELP([QORIQ_ETSEC_1_PHY_ADDR],[PHY address for eTSEC interface 1])
@@ -137,6 +137,9 @@ RTEMS_BSPOPTS_SET([QORIQ_HAS_HYPERVISOR_MODE],[qoriq_e6500*],[1])
 RTEMS_BSPOPTS_SET([QORIQ_HAS_HYPERVISOR_MODE],[*],[])
 RTEMS_BSPOPTS_HELP([QORIQ_HAS_HYPERVISOR_MODE],[defined if the processor core has a hypervisor mode])
 
+RTEMS_BSPOPTS_SET([QORIQ_IS_HYPERVISOR_GUEST],[*],[])
+RTEMS_BSPOPTS_HELP([QORIQ_IS_HYPERVISOR_GUEST],[defined if we are a hypervisor guest])
+
 RTEMS_BSPOPTS_SET([QORIQ_CLOCK_TIMER],[qoriq_core_1],[4])
 RTEMS_BSPOPTS_SET([QORIQ_CLOCK_TIMER],[*],[0])
 RTEMS_BSPOPTS_HELP([QORIQ_CLOCK_TIMER],[global timer used for system clock, 0..3 maps to A0..A3, and 4..7 maps to B0..B3])
diff --git a/c/src/lib/libbsp/powerpc/qoriq/include/bsp.h b/c/src/lib/libbsp/powerpc/qoriq/include/bsp.h
index d570504..0497905 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/qoriq/include/bsp.h
@@ -25,6 +25,12 @@
 
 #include <bspopts.h>
 
+#ifdef QORIQ_IS_HYPERVISOR_GUEST
+#define QORIQ_THREAD_COUNT 1
+#else
+#define QORIQ_THREAD_COUNT QORIQ_PHYSICAL_THREAD_COUNT
+#endif
+
 #ifndef ASM
 
 #include <rtems.h>