From f90bee30b79a440bc011c2eec6d1751f98c78839 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Thu, 21 Mar 2024 21:06:30 +0000 Subject: [PATCH] Fix #2534, Switch pc rtems toolchains to use osal generic-rtems bsp --- cmake/sample_defs/toolchain-i686-rtems4.11.cmake | 2 +- cmake/sample_defs/toolchain-i686-rtems5.cmake | 2 +- cmake/sample_defs/toolchain-i686-rtems6.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/sample_defs/toolchain-i686-rtems4.11.cmake b/cmake/sample_defs/toolchain-i686-rtems4.11.cmake index 8ae67d777..81084137d 100644 --- a/cmake/sample_defs/toolchain-i686-rtems4.11.cmake +++ b/cmake/sample_defs/toolchain-i686-rtems4.11.cmake @@ -20,7 +20,7 @@ set(RTEMS_BSP "pc686") # these settings are specific to cFE/OSAL and determines which # abstraction layers are built when using this toolchain SET(CFE_SYSTEM_PSPNAME pc-rtems) -SET(OSAL_SYSTEM_BSPTYPE pc-rtems) +SET(OSAL_SYSTEM_BSPTYPE generic-rtems) SET(OSAL_SYSTEM_OSTYPE rtems) # This is for version specific RTEMS ifdefs needed by the OSAL and PSP diff --git a/cmake/sample_defs/toolchain-i686-rtems5.cmake b/cmake/sample_defs/toolchain-i686-rtems5.cmake index 16d74c437..38caaab70 100644 --- a/cmake/sample_defs/toolchain-i686-rtems5.cmake +++ b/cmake/sample_defs/toolchain-i686-rtems5.cmake @@ -20,7 +20,7 @@ set(RTEMS_BSP "pc686") # these settings are specific to cFE/OSAL and determines which # abstraction layers are built when using this toolchain SET(CFE_SYSTEM_PSPNAME pc-rtems) -SET(OSAL_SYSTEM_BSPTYPE pc-rtems) +SET(OSAL_SYSTEM_BSPTYPE generic-rtems) SET(OSAL_SYSTEM_OSTYPE rtems) # This is for version specific RTEMS ifdefs needed by the OSAL and PSP diff --git a/cmake/sample_defs/toolchain-i686-rtems6.cmake b/cmake/sample_defs/toolchain-i686-rtems6.cmake index 03aa5c289..f9e9be1aa 100644 --- a/cmake/sample_defs/toolchain-i686-rtems6.cmake +++ b/cmake/sample_defs/toolchain-i686-rtems6.cmake @@ -20,7 +20,7 @@ set(RTEMS_BSP "pc686") # these settings are specific to cFE/OSAL and determines which # abstraction layers are built when using this toolchain SET(CFE_SYSTEM_PSPNAME pc-rtems) -SET(OSAL_SYSTEM_BSPTYPE pc-rtems) +SET(OSAL_SYSTEM_BSPTYPE generic-rtems) SET(OSAL_SYSTEM_OSTYPE rtems) # This is for version specific RTEMS ifdefs needed by the OSAL and PSP